meld r1003 - trunk/glade2

[stevek svn gnome org]

Author: stevek
Date: Thu Jun 19 23:11:10 2008
New Revision: 1003
URL: http://svn.gnome.org/viewvc/meld?rev=1003&view=rev

Log:
Improve keyboard shortcuts consistency. Bug 538566 from Kai Willadsen.



Modified:
   trunk/glade2/meldapp.glade

Modified: trunk/glade2/meldapp.glade
==============================================================================
--- trunk/glade2/meldapp.glade	(original)
+++ trunk/glade2/meldapp.glade	Thu Jun 19 23:11:10 2008
@@ -247,6 +247,7 @@
                                 <property name="use_underline">True</property>
                                 <property name="use_stock">True</property>
                                 <signal name="activate" handler="on_menu_undo_activate"/>
+                                <accelerator key="z" modifiers="GDK_CONTROL_MASK" signal="activate"/>
                               </widget>
                             </child>
                             <child>
@@ -256,6 +257,7 @@
                                 <property name="use_underline">True</property>
                                 <property name="use_stock">True</property>
                                 <signal name="activate" handler="on_menu_redo_activate"/>
+                                <accelerator key="z" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK" signal="activate"/>
                               </widget>
                             </child>
                             <child>
@@ -310,12 +312,7 @@
                                 <property name="label" translatable="yes">Find Ne_xt</property>
                                 <property name="use_underline">True</property>
                                 <signal name="activate" handler="on_menu_find_next_activate"/>
-                                <child internal-child="image">
-                                  <widget class="GtkImage" id="menu-item-image6">
-                                    <property name="stock">gtk-find</property>
-                                    <property name="icon_size">1</property>
-                                  </widget>
-                                </child>
+                                <accelerator key="g" modifiers="GDK_CONTROL_MASK" signal="activate"/>
                               </widget>
                             </child>
                             <child>
@@ -387,6 +384,7 @@
                                 <property name="label" translatable="yes">_Stop</property>
                                 <property name="use_underline">True</property>
                                 <signal name="activate" handler="on_toolbar_stop_clicked"/>
+                                <accelerator key="Escape" signal="activate"/>
                                 <child internal-child="image">
                                   <widget class="GtkImage" id="menu-item-image16">
                                     <property name="visible">True</property>