gnome-commander r2187 - in trunk: . doc/C src/intviewer

[epiotr svn gnome org]

Author: epiotr
Date: Mon Oct 13 19:51:56 2008
New Revision: 2187
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=2187&view=rev

Log:
Internal viewer - new key bindings: T and ALT+ENTER for metadata tags viewing

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/doc/C/gnome-commander.xml
   trunk/src/intviewer/viewer-window.cc

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Mon Oct 13 19:51:56 2008
@@ -17,7 +17,8 @@
  * New or updated docs: de, en, es
  * New or updated translations: ar, de, es, eu, pl
  * New key bindings:
-      ...            ...
+      T              Show metadata tags (replaces the old E)
+      ALT+ENTER      Show metadata tags
 
 
 ===================================

Modified: trunk/doc/C/gnome-commander.xml
==============================================================================
--- trunk/doc/C/gnome-commander.xml	(original)
+++ trunk/doc/C/gnome-commander.xml	Mon Oct 13 19:51:56 2008
@@ -3444,8 +3444,7 @@
           </varlistentry>
           <varlistentry>
             <term>
-              <guilabel>Pick window size and zoom factor
-            automatically</guilabel></term>
+              <guilabel>Pick window size and zoom factor automatically</guilabel></term>
             <listitem>
               <para>Select this option to resize the image window to fit the
             image or to resize the image to fit the image
@@ -3500,6 +3499,10 @@
         <entry><para>Toggles line wrapping (applicable only in text display modes)</para></entry>
         </row>
         <row valign="top">
+        <entry><para>T</para><keycombo><keycap>ALT</keycap><keycap>ENTER</keycap></keycombo></entry>
+        <entry><para>Shows metadata tags</para></entry>
+        </row>
+        <row valign="top">
         <entry><para>Input Modes:</para></entry>
         </row>
         <row valign="top">
@@ -5976,7 +5979,10 @@
                             <para>New key bindings:</para>
                             <itemizedlist>
                                 <listitem>
-                                    <para><keycombo><keycap>...</keycap><keycap>...</keycap></keycombo>   ...</para>
+                                    <para><keycombo><keycap>T</keycap></keycombo>   Show metadata tags (replaces the old E)</para>
+                                </listitem>
+                                <listitem>
+                                    <para><keycombo><keycap>ALT</keycap><keycap>ENTER</keycap></keycombo>   Show metadata tags</para>
                                 </listitem>
                             </itemizedlist>
                         </listitem>

Modified: trunk/src/intviewer/viewer-window.cc
==============================================================================
--- trunk/src/intviewer/viewer-window.cc	(original)
+++ trunk/src/intviewer/viewer-window.cc	Mon Oct 13 19:51:56 2008
@@ -390,16 +390,24 @@
 
     GViewerWindow *w = GVIEWER_WINDOW (widget);
 
-    if (event->state & GDK_CONTROL_MASK)
+    if (state_is_ctrl(event->state))
         switch (event->keyval)
         {
+            case GDK_t:
+            case GDK_T:
+                if (w->priv->metadata_visible)
+                    gviewer_window_hide_metadata(w);
+                else
+                    gviewer_window_show_metadata(w);
+                return TRUE;
+
             case GDK_w:
             case GDK_W:
                 gtk_widget_destroy(GTK_WIDGET (w));
                 return TRUE;
         }
 
-    if (event->state & GDK_SHIFT_MASK)
+    if (state_is_shift(event->state))
         switch (event->keyval)
         {
             case GDK_F7:
@@ -407,7 +415,16 @@
                return TRUE;
         }
 
-    switch (event->keyval)
+    if (state_is_alt(event->state))
+        switch (event->keyval)
+        {
+            case GDK_Return:
+            case GDK_KP_Enter:
+                gviewer_window_show_metadata(w);
+                return TRUE;
+        }
+
+    switch (state_is_blank(event->keyval))
     {
         case GDK_plus:
         case GDK_KP_Add:
@@ -739,7 +756,7 @@
     };
 
     MENU_ITEM_DATA image_menu_items[] = {
-        {MI_CHECK, _("_Show EXIF/IPTC Information"), GDK_e, NO_MODIFIER,
+        {MI_CHECK, _("Show Metadata _Tags"), GDK_t, NO_MODIFIER,
                 G_CALLBACK (menu_view_exif_information),
                 GNOME_APP_PIXMAP_NONE, NO_PIXMAP_INFO,
                 NO_GOBJ_KEY, NO_GOBJ_VAL,