From f3836c463d118e17f5049236ba016ca87d8d3eee Mon Sep 17 00:00:00 2001
From: John Darrington <john@darrington.wattle.id.au>
Date: Tue, 25 Mar 2008 09:35:03 +0000
Subject: [PATCH] Added menomics to all menuitems. Removed unused menuitems.

---
 src/ui/gui/ChangeLog         |  6 ++++
 src/ui/gui/data-editor.c     | 26 ++++++++--------
 src/ui/gui/data-editor.glade | 57 +++++++++++++-----------------------
 3 files changed, 40 insertions(+), 49 deletions(-)

diff --git a/src/ui/gui/ChangeLog b/src/ui/gui/ChangeLog
index 269ece3e..b1c97bfc 100644
--- a/src/ui/gui/ChangeLog
+++ b/src/ui/gui/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-25  John Darrington <john@darrington.wattle.id.au>
+
+	* data-editor.glade: Removed unused menuitems.
+
+	* data-editor.c data-editor.glade: Added Mnemonics to all menuitems.
+
 2008-03-16  Ben Pfaff  <blp@gnu.org>
 
 	Patch #5368.  Reviewed by John Darrington.  Tested by Jason
diff --git a/src/ui/gui/data-editor.c b/src/ui/gui/data-editor.c
index a94acaf2..b4da5b9f 100644
--- a/src/ui/gui/data-editor.c
+++ b/src/ui/gui/data-editor.c
@@ -320,7 +320,7 @@ new_data_editor (void)
 
   de->toggle_value_labels =
     gtk_toggle_action_new ("toggle-value-labels",
-			   _("Labels"),
+			   _("_Labels"),
 			   _("Show/hide value labels"),
 			   "pspp-value-labels");
 
@@ -374,7 +374,7 @@ new_data_editor (void)
 
   de->insert_variable =
     gtk_action_new ("insert-variable",
-		    _("Insert Variable"),
+		    _("Insert _Variable"),
 		    _("Create a new variable at the current position"),
 		    "pspp-insert-variable");
 
@@ -393,7 +393,7 @@ new_data_editor (void)
 
   de->insert_case =
     gtk_action_new ("insert-case",
-		    _("Insert Case"),
+		    _("Insert Ca_se"),
 		    _("Create a new case at the current position"),
 		    "pspp-insert-case");
 
@@ -414,7 +414,7 @@ new_data_editor (void)
 
   de->invoke_goto_dialog =
     gtk_action_new ("goto-case-dialog",
-		    _("Goto Case"),
+		    _("_Goto Case"),
 		    _("Jump to a Case in the Data Sheet"),
 		    "gtk-jump-to");
 
@@ -434,7 +434,7 @@ new_data_editor (void)
 
   de->invoke_weight_cases_dialog =
     gtk_action_new ("weight-cases-dialog",
-		    _("Weights"),
+		    _("_Weights"),
 		    _("Weight cases by variable"),
 		    "pspp-weight-cases");
 
@@ -444,7 +444,7 @@ new_data_editor (void)
 
   de->invoke_transpose_dialog =
     gtk_action_new ("transpose-dialog",
-		    _("Transpose"),
+		    _("_Transpose"),
 		    _("Transpose the cases with the variables"),
 		    NULL);
 
@@ -456,7 +456,7 @@ new_data_editor (void)
 
   de->invoke_split_file_dialog =
     gtk_action_new ("split-file-dialog",
-		    _("Split"),
+		    _("S_plit"),
 		    _("Split the active file"),
 		    "pspp-split-file");
 
@@ -467,7 +467,7 @@ new_data_editor (void)
 
   de->invoke_sort_cases_dialog =
     gtk_action_new ("sort-cases-dialog",
-		    _("Sort"),
+		    _("_Sort"),
 		    _("Sort cases in the active file"),
 		    "pspp-sort-cases");
 
@@ -476,7 +476,7 @@ new_data_editor (void)
 
   de->invoke_select_cases_dialog =
     gtk_action_new ("select-cases-dialog",
-		    _("Select Cases"),
+		    _("Select _Cases"),
 		    _("Select cases from the active file"),
 		    "pspp-select-cases");
 
@@ -486,7 +486,7 @@ new_data_editor (void)
 
   de->invoke_compute_dialog =
     gtk_action_new ("compute-dialog",
-		    _("Compute"),
+		    _("_Compute"),
 		    _("Compute new values for a variable"),
 		    "pspp-compute");
 
@@ -534,7 +534,7 @@ new_data_editor (void)
 
   de->invoke_comments_dialog =
     gtk_action_new ("commments-dialog",
-		    _("Data File Comments"),
+		    _("Data File _Comments"),
 		    _("Commentary text for the data file"),
 		    NULL);
 
@@ -543,7 +543,7 @@ new_data_editor (void)
 
   de->invoke_find_dialog  =
     gtk_action_new ("find-dialog",
-		    _("Find"),
+		    _("_Find"),
 		    _("Find Case"),
 		    "gtk-find");
 
@@ -583,7 +583,7 @@ new_data_editor (void)
 
   de->invoke_variable_info_dialog  =
     gtk_action_new ("variable-info-dialog",
-		    _("Variables"),
+		    _("_Variables"),
 		    _("Jump to Variable"),
 		    "pspp-goto-variable");
 
diff --git a/src/ui/gui/data-editor.glade b/src/ui/gui/data-editor.glade
index 5122dca6..cdf6080e 100644
--- a/src/ui/gui/data-editor.glade
+++ b/src/ui/gui/data-editor.glade
@@ -79,6 +79,11 @@
                         <property name="use_underline">True</property>
                       </widget>
                     </child>
+                    <child>
+                      <widget class="GtkSeparatorMenuItem" id="file_separator1">
+                        <property name="visible">True</property>
+                      </widget>
+                    </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="file_save">
                         <property name="visible">True</property>
@@ -96,8 +101,8 @@
                       </widget>
                     </child>
                     <child>
-                      <widget class="GtkSeparatorMenuItem" id="file_separator1">
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                      <widget class="GtkSeparatorMenuItem" id="file_separator2">
+                        <property name="visible">True</property>
                       </widget>
                     </child>
                     <child>
@@ -115,7 +120,7 @@
                       </widget>
                     </child>
                     <child>
-                      <widget class="GtkSeparatorMenuItem" id="separatormenuitem1">
+                      <widget class="GtkSeparatorMenuItem" id="file_separator3">
                         <property name="visible">True</property>
                       </widget>
                     </child>
@@ -238,17 +243,11 @@
                     <child>
                       <widget class="GtkCheckMenuItem" id="view_statusbar">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Status Bar</property>
+                        <property name="label" translatable="yes">_Status Bar</property>
                         <property name="use_underline">True</property>
                         <property name="active">True</property>
                       </widget>
                     </child>
-                    <child>
-                      <widget class="GtkMenuItem" id="toolbars">
-                        <property name="label" translatable="yes">Toolbars</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
                     <child>
                       <widget class="GtkSeparatorMenuItem" id="separator1">
                         <property name="visible">True</property>
@@ -257,14 +256,14 @@
                     <child>
                       <widget class="GtkMenuItem" id="view_fonts">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Fonts</property>
+                        <property name="label" translatable="yes">_Fonts</property>
                         <property name="use_underline">True</property>
                       </widget>
                     </child>
                     <child>
                       <widget class="GtkCheckMenuItem" id="view_gridlines">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Grid Lines</property>
+                        <property name="label" translatable="yes">_Grid Lines</property>
                         <property name="use_underline">True</property>
                         <property name="active">True</property>
                       </widget>
@@ -272,7 +271,7 @@
                     <child>
                       <widget class="GtkCheckMenuItem" id="view_value-labels">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Value Labels</property>
+                        <property name="label" translatable="yes">Value _Labels</property>
                         <property name="use_underline">True</property>
                       </widget>
                     </child>
@@ -284,14 +283,14 @@
                     <child>
                       <widget class="GtkMenuItem" id="view_data">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Data</property>
+                        <property name="label" translatable="yes">_Data</property>
                         <property name="use_underline">True</property>
                       </widget>
                     </child>
                     <child>
                       <widget class="GtkMenuItem" id="view_variables">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Variables</property>
+                        <property name="label" translatable="yes">_Variables</property>
                         <property name="use_underline">True</property>
                       </widget>
                     </child>
@@ -309,7 +308,7 @@
                     <child>
                       <widget class="GtkMenuItem" id="data_sort-cases">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Sort Cases</property>
+                        <property name="label" translatable="yes">_Sort Cases</property>
                         <property name="use_underline">True</property>
                       </widget>
                     </child>
@@ -317,21 +316,7 @@
                       <widget class="GtkMenuItem" id="data_transpose">
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="label" translatable="yes">Transpose</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkMenuItem" id="data_merge-files">
-                        <property name="sensitive">False</property>
-                        <property name="label" translatable="yes">Merge Files</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkMenuItem" id="data_aggregate">
-                        <property name="sensitive">False</property>
-                        <property name="label" translatable="yes">Aggregate</property>
+                        <property name="label" translatable="yes">_Transpose</property>
                         <property name="use_underline">True</property>
                       </widget>
                     </child>
@@ -344,7 +329,7 @@
                     <child>
                       <widget class="GtkMenuItem" id="data_split-file">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Split File</property>
+                        <property name="label" translatable="yes">S_plit File</property>
                         <property name="use_underline">True</property>
                       </widget>
                     </child>
@@ -352,14 +337,14 @@
                       <widget class="GtkMenuItem" id="data_select-cases">
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="label" translatable="yes">Select Cases</property>
+                        <property name="label" translatable="yes">Select _Cases</property>
                         <property name="use_underline">True</property>
                       </widget>
                     </child>
                     <child>
                       <widget class="GtkMenuItem" id="data_weight-cases">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Weight Cases</property>
+                        <property name="label" translatable="yes">_Weight Cases</property>
                         <property name="use_underline">True</property>
                       </widget>
                     </child>
@@ -534,7 +519,7 @@
                     </child>
                     <child>
                       <widget class="GtkMenuItem" id="bivariate-correlation">
-                        <property name="visible">True</property>
+                        <property name="visible">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label" translatable="yes">Bivariate _Correlation</property>
                         <property name="use_underline">True</property>
@@ -550,7 +535,7 @@
                     </child>
                     <child>
                       <widget class="GtkMenuItem" id="non-parametrics">
-                        <property name="visible">True</property>
+                        <property name="visible">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label" translatable="yes">_Non-Parametric Statistics</property>
                         <property name="use_underline">True</property>
-- 
2.30.2