gnome-commander r1970 - in trunk: . src

[epiotr svn gnome org]

Author: epiotr
Date: Wed Aug 13 18:16:29 2008
New Revision: 1970
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=1970&view=rev

Log:
Made SHIFT+F2 binding as user definable (mark.compare_directories)

Modified:
   trunk/ChangeLog
   trunk/src/gnome-cmd-file-list.cc
   trunk/src/gnome-cmd-file-list.h
   trunk/src/gnome-cmd-user-actions.cc

Modified: trunk/src/gnome-cmd-file-list.cc
==============================================================================
--- trunk/src/gnome-cmd-file-list.cc	(original)
+++ trunk/src/gnome-cmd-file-list.cc	Wed Aug 13 18:16:29 2008
@@ -1900,13 +1900,8 @@
 }
 
 
-void gnome_cmd_file_list_compare_directories (void)
+void gnome_cmd_file_list_compare_directories (GnomeCmdFileList *fl1, GnomeCmdFileList *fl2)
 {
-    GnomeCmdFileSelector *fs1 = gnome_cmd_main_win_get_fs (main_win, ACTIVE);
-    GnomeCmdFileList     *fl1 = fs1 ? fs1->list : NULL;
-    GnomeCmdFileSelector *fs2 = gnome_cmd_main_win_get_fs (main_win, INACTIVE);
-    GnomeCmdFileList     *fl2 = fs2 ? fs2->list : NULL;
-
     g_return_if_fail (GNOME_CMD_IS_FILE_LIST (fl1) || GNOME_CMD_IS_FILE_LIST (fl2));
 
     gnome_cmd_file_list_unselect_all (fl1);
@@ -2221,10 +2216,6 @@
     {
         switch (event->keyval)
         {
-            case GDK_F2:
-                gnome_cmd_file_list_compare_directories ();
-                return TRUE;
-
             case GDK_F6:
                 gnome_cmd_file_list_show_rename_dialog (fl);
                 return TRUE;

Modified: trunk/src/gnome-cmd-file-list.h
==============================================================================
--- trunk/src/gnome-cmd-file-list.h	(original)
+++ trunk/src/gnome-cmd-file-list.h	Wed Aug 13 18:16:29 2008
@@ -139,7 +139,7 @@
 void gnome_cmd_file_list_unselect_all_with_same_extension (GnomeCmdFileList *fl);
 void gnome_cmd_file_list_restore_selection (GnomeCmdFileList *fl);
 
-void gnome_cmd_file_list_compare_directories (void);
+void gnome_cmd_file_list_compare_directories (GnomeCmdFileList *fl1, GnomeCmdFileList *fl2);
 
 void gnome_cmd_file_list_sort (GnomeCmdFileList *fl);
 

Modified: trunk/src/gnome-cmd-user-actions.cc
==============================================================================
--- trunk/src/gnome-cmd-user-actions.cc	(original)
+++ trunk/src/gnome-cmd-user-actions.cc	Wed Aug 13 18:16:29 2008
@@ -269,6 +269,9 @@
     if (!registered("file.internal_view"))
         register_action(GDK_SHIFT_MASK, GDK_F3, "file.internal_view");
 
+    if (!registered("mark.compare_directories"))
+        register_action(GDK_SHIFT_MASK, GDK_F2, "mark.compare_directories");
+
     if (!registered("mark.select_all"))
     {
         register_action(GDK_CONTROL_MASK, GDK_A, "mark.select_all");
@@ -1159,7 +1162,7 @@
 
 void mark_compare_directories (GtkMenuItem *menuitem, gpointer not_used)
 {
-    gnome_cmd_file_list_compare_directories ();
+    gnome_cmd_file_list_compare_directories (get_fl (ACTIVE), get_fl (INACTIVE));
 }