gnome-commander r1695 - in trunk: . doc doc/C src

[epiotr svn gnome org]

Author: epiotr
Date: Tue Apr  8 17:24:31 2008
New Revision: 1695
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=1695&view=rev

Log:
Added new key binding: SUPER+F for file search

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/doc/C/gnome-commander.xml
   trunk/doc/keys.txt
   trunk/src/gnome-cmd-user-actions.cc

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Tue Apr  8 17:24:31 2008
@@ -16,7 +16,7 @@
  * Updated help docs
  * New or updated translations: en_GB, es, eu, fi, oc, pl
  * New key bindings:
-      ...            ...
+      SUPER+F        Search files
 
 
 ===================================

Modified: trunk/doc/C/gnome-commander.xml
==============================================================================
--- trunk/doc/C/gnome-commander.xml	(original)
+++ trunk/doc/C/gnome-commander.xml	Tue Apr  8 17:24:31 2008
@@ -5859,7 +5859,7 @@
                             <para>New key bindings:</para>
                             <itemizedlist>
                                 <listitem>
-                                    <para><keycombo><keycap>...</keycap><keycap>...</keycap></keycombo>   ...</para>
+                                    <para><keycombo><keycap>SUPER</keycap><keycap>F</keycap></keycombo>   Search files</para>
                                 </listitem>
                             </itemizedlist>
                         </listitem>

Modified: trunk/doc/keys.txt
==============================================================================
--- trunk/doc/keys.txt	(original)
+++ trunk/doc/keys.txt	Tue Apr  8 17:24:31 2008
@@ -1,4 +1,4 @@
-Keyboard mapping for GNOME Commander v1.2
+Default keyboard mapping for GNOME Commander v1.2
 -----------------------------------------
 
 F1              Help
@@ -77,6 +77,8 @@
 CTRL+\          Go to the root directory
 CTRL+`          Go to the home directory
 
+SUPER+F         Search files
+
 DELETE          Delete files
 
 CTRL+C          Copy files to clipboard (not a global one yet)

Modified: trunk/src/gnome-cmd-user-actions.cc
==============================================================================
--- trunk/src/gnome-cmd-user-actions.cc	(original)
+++ trunk/src/gnome-cmd-user-actions.cc	Tue Apr  8 17:24:31 2008
@@ -213,7 +213,7 @@
     register_action(GDK_F6, "file.rename");
     register_action(GDK_F7, "file.mkdir");
     register_action(GDK_F8, "file.delete");
-    register_action(GDK_F9, "edit.search");
+    // register_action(GDK_F9, "edit.search");     //  do not register F9 here, as edit.search action wouldn't be checked for registration later
     register_action(GDK_F10, "file.exit");
 
     load("key-bindings");
@@ -237,7 +237,14 @@
         register_action(GDK_CONTROL_MASK, GDK_F12, "edit.filter");
 
     if (!registered("edit.search"))
+    {
         register_action(GDK_MOD1_MASK, GDK_F7, "edit.search");
+#ifdef HAVE_GTK_2_10
+        register_action(GDK_SUPER_MASK, GDK_F, "edit.search");
+#else
+        register_action(GDK_MOD4_MASK, GDK_F, "edit.search");
+#endif
+    }
 
     if (!registered("file.advrename"))
     {
@@ -315,6 +322,9 @@
 
     if (!registered("view.refresh"))
         register_action(GDK_CONTROL_MASK, GDK_R, "view.refresh");
+
+    unregister(GDK_F9);                                 // unregister F9 if defined in [key-bindings]
+    register_action(GDK_F9, "edit.search");             // and overwrite it with edit.search action
  }