[gnome-terminal] prefs: move mnemonics and menu_accel to General

[Ekaterina Gerasimova <egerasimov src gnome org>]

commit 9df4780f5204c7f944bb34d3e4ff496ed491768f
Author: Ekaterina Gerasimova <kittykat3756 gmail com>
Date:   Tue Feb 26 11:48:48 2013 +0100

    prefs: move mnemonics and menu_accel to General
    
    Move the disable_mnemonics_button and disable_menu_accel_button
    checkboxes from the Keybindings tab to the General tab: their effect on
    the menu depends on the state of show_menubar_button. Bug 694740.

 src/preferences.ui |   84 ++++++++++++++++++++++++++-------------------------
 1 files changed, 43 insertions(+), 41 deletions(-)
---
diff --git a/src/preferences.ui b/src/preferences.ui
index 828f071..324a29e 100644
--- a/src/preferences.ui
+++ b/src/preferences.ui
@@ -84,6 +84,42 @@
                     <property name="position">0</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkCheckButton" id="disable-mnemonics-checkbutton">
+                    <property name="label" translatable="yes">_Enable menu access keys (such as Alt+F to 
open the File menu)</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="disable-menu-accel-checkbutton">
+                    <property name="label" translatable="yes">Enable the _menu shortcut key (F10 by 
default)</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
               </object>
             </child>
             <child type="tab">
@@ -101,22 +137,21 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="border_width">12</property>
-                <property name="n_rows">4</property>
+                <property name="n_rows">2</property>
                 <property name="column_spacing">12</property>
                 <property name="row_spacing">6</property>
                 <child>
-                  <object class="GtkCheckButton" id="disable-mnemonics-checkbutton">
-                    <property name="label" translatable="yes">_Enable menu access keys (such as Alt+F to 
open the File menu)</property>
+                  <object class="GtkLabel" id="label59">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="label" translatable="yes">_Shortcut keys:</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">accelerators-treeview</property>
                   </object>
                   <packing>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
@@ -137,41 +172,8 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="top_attach">3</property>
-                    <property name="bottom_attach">4</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="disable-menu-accel-checkbutton">
-                    <property name="label" translatable="yes">Enable the _menu shortcut key (F10 by 
default)</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="xalign">0</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
                     <property name="top_attach">1</property>
                     <property name="bottom_attach">2</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label59">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Shortcut keys:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">accelerators-treeview</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
                   </packing>
                 </child>
               </object>