From c24e23657fdb65d4565b85d3d05396531618d8df Mon Sep 17 00:00:00 2001
From: John Darrington <john@darrington.wattle.id.au>
Date: Sun, 2 Sep 2007 02:10:28 +0000
Subject: [PATCH] Rearrange menus to be more like later version of other
 software. Delete some unimplemented menuitems.

---
 src/ui/gui/data-editor.c     |  6 +--
 src/ui/gui/data-editor.glade | 78 ++++++++++++++++--------------------
 2 files changed, 38 insertions(+), 46 deletions(-)

diff --git a/src/ui/gui/data-editor.c b/src/ui/gui/data-editor.c
index 7cba02f2..722ac2e8 100644
--- a/src/ui/gui/data-editor.c
+++ b/src/ui/gui/data-editor.c
@@ -456,7 +456,7 @@ new_data_editor (void)
 			    );
 
   gtk_action_connect_proxy (de->insert_variable,
-			    get_widget_assert (de->xml, "data_insert-variable")
+			    get_widget_assert (de->xml, "edit_insert-variable")
 			    );
 
 
@@ -476,7 +476,7 @@ new_data_editor (void)
 
 
   gtk_action_connect_proxy (de->insert_case,
-			    get_widget_assert (de->xml, "data_insert-case")
+			    get_widget_assert (de->xml, "edit_insert-case")
 			    );
 
 
@@ -493,7 +493,7 @@ new_data_editor (void)
 			    );
 
   gtk_action_connect_proxy (de->invoke_goto_dialog,
-			    get_widget_assert (de->xml, "data_goto-case")
+			    get_widget_assert (de->xml, "edit_goto-case")
 			    );
 
 
diff --git a/src/ui/gui/data-editor.glade b/src/ui/gui/data-editor.glade
index 025828bf..26167ab5 100644
--- a/src/ui/gui/data-editor.glade
+++ b/src/ui/gui/data-editor.glade
@@ -133,6 +133,36 @@
                 <property name="use_underline">True</property>
                 <child>
                   <widget class="GtkMenu" id="edit_menu">
+                    <child>
+                      <widget class="GtkMenuItem" id="edit_insert-variable">
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                        <property name="label" translatable="yes">Insert Variable</property>
+                        <property name="use_underline">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkMenuItem" id="edit_insert-case">
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                        <property name="label" translatable="yes">Insert Cases</property>
+                        <property name="use_underline">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="edit_goto-case">
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                        <property name="label" translatable="yes">Go To Case</property>
+                        <property name="use_underline">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkSeparatorMenuItem" id="separator4">
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                      </widget>
+                    </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="edit_cut">
                         <property name="visible">True</property>
@@ -160,14 +190,6 @@
                         <property name="use_stock">True</property>
                       </widget>
                     </child>
-                    <child>
-                      <widget class="GtkMenuItem" id="edit_paste-variables">
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="label" translatable="yes">Paste _Variables</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
                     <child>
                       <widget class="GtkMenuItem" id="edit_clear-variables">
                         <property name="visible">True</property>
@@ -279,36 +301,6 @@
                 <property name="use_underline">True</property>
                 <child>
                   <widget class="GtkMenu" id="data_menu">
-                    <child>
-                      <widget class="GtkMenuItem" id="data_insert-variable">
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="label" translatable="yes">Insert Variable</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkMenuItem" id="data_insert-case">
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="label" translatable="yes">Insert Cases</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="data_goto-case">
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="label" translatable="yes">Go To Case</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkSeparatorMenuItem" id="separator4">
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                      </widget>
-                    </child>
                     <child>
                       <widget class="GtkMenuItem" id="data_sort-cases">
                         <property name="visible">True</property>
@@ -325,16 +317,16 @@
                       </widget>
                     </child>
                     <child>
-                      <widget class="GtkMenuItem" id="merge_files1">
-                        <property name="visible">True</property>
+                      <widget class="GtkMenuItem" id="data_merge-files">
+                        <property name="visible">False</property>
                         <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="aggregate1">
-                        <property name="visible">True</property>
+                      <widget class="GtkMenuItem" id="data_aggregate">
+                        <property name="visible">False</property>
                         <property name="sensitive">False</property>
                         <property name="label" translatable="yes">Aggregate</property>
                         <property name="use_underline">True</property>
@@ -392,7 +384,7 @@
                     </child>
                     <child>
                       <widget class="GtkMenuItem" id="transform_rank">
-                        <property name="visible">True</property>
+                        <property name="visible">False</property>
                         <property name="sensitive">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">Ran_k Cases</property>
-- 
2.30.2