X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fdata-editor.glade;h=26167ab59aec170ed67e15595da3b383412d1a23;hb=c24e23657fdb65d4565b85d3d05396531618d8df;hp=68813e02a1cb23aa88079e43de0b47e25e016f3b;hpb=4ea6e37d180c9412cbcd39afa48a516522e6dd71;p=pspp-builds.git

diff --git a/src/ui/gui/data-editor.glade b/src/ui/gui/data-editor.glade
index 68813e02..26167ab5 100644
--- a/src/ui/gui/data-editor.glade
+++ b/src/ui/gui/data-editor.glade
@@ -134,38 +134,60 @@
                 <child>
                   <widget class="GtkMenu" id="edit_menu">
                     <child>
-                      <widget class="GtkImageMenuItem" id="cut1">
+                      <widget class="GtkMenuItem" id="edit_insert-variable">
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="label">gtk-cut</property>
+                        <property name="label" translatable="yes">Insert Variable</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
                       </widget>
                     </child>
                     <child>
-                      <widget class="GtkImageMenuItem" id="copy1">
+                      <widget class="GtkMenuItem" id="edit_insert-case">
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="label">gtk-copy</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>
+                        <property name="sensitive">False</property>
+                        <property name="label">gtk-cut</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </widget>
                     </child>
                     <child>
-                      <widget class="GtkImageMenuItem" id="paste1">
+                      <widget class="GtkImageMenuItem" id="edit_copy">
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="label">gtk-paste</property>
+                        <property name="label">gtk-copy</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </widget>
                     </child>
                     <child>
-                      <widget class="GtkMenuItem" id="paste_variables1">
+                      <widget class="GtkImageMenuItem" id="edit_paste">
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="label" translatable="yes">Paste _Variables</property>
+                        <property name="label">gtk-paste</property>
                         <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
                       </widget>
                     </child>
                     <child>
@@ -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>
@@ -354,7 +346,7 @@
                       </widget>
                     </child>
                     <child>
-                      <widget class="GtkMenuItem" id="select_cases1">
+                      <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>
@@ -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>
@@ -747,7 +739,7 @@
             <property name="can_focus">True</property>
             <property name="tab_pos">GTK_POS_BOTTOM</property>
             <property name="scrollable">True</property>
-            <property name="enable_popup">True</property>
+            <property name="enable_popup">False</property>
             <child>
               <widget class="GtkVBox" id="vbox3">
                 <property name="visible">True</property>
@@ -900,31 +892,6 @@
                 <property name="position">1</property>
               </packing>
             </child>
-            <child>
-              <widget class="GtkFrame" id="frame4">
-                <property name="visible">True</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">GTK_SHADOW_IN</property>
-                <child>
-                  <widget class="GtkEventBox" id="eventbox3">
-                    <property name="visible">True</property>
-                    <property name="tooltip" translatable="yes">OMS Area</property>
-                    <child>
-                      <widget class="GtkLabel" id="oms-area">
-                        <property name="visible">True</property>
-                        <property name="width_chars">3</property>
-                        <property name="single_line_mode">True</property>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
             <child>
               <widget class="GtkFrame" id="frame5">
                 <property name="visible">True</property>
@@ -937,7 +904,7 @@
                     <child>
                       <widget class="GtkLabel" id="case-counter-area">
                         <property name="visible">True</property>
-                        <property name="width_chars">25</property>
+                        <property name="width_chars">20</property>
                         <property name="single_line_mode">True</property>
                       </widget>
                     </child>
@@ -989,7 +956,7 @@
                       <widget class="GtkLabel" id="weight-status-area">
                         <property name="visible">True</property>
                         <property name="ellipsize">PANGO_ELLIPSIZE_START</property>
-                        <property name="width_chars">10</property>
+                        <property name="width_chars">15</property>
                         <property name="single_line_mode">True</property>
                       </widget>
                     </child>
@@ -1015,7 +982,7 @@
                       <widget class="GtkLabel" id="split-file-status-area">
                         <property name="visible">True</property>
                         <property name="ellipsize">PANGO_ELLIPSIZE_START</property>
-                        <property name="width_chars">10</property>
+                        <property name="width_chars">15</property>
                         <property name="single_line_mode">True</property>
                       </widget>
                     </child>