X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fdata-editor.ui;h=69f2b413901f43aa4e67e5f6cb5c01bce72ef468;hb=b6088c04a2380078af7ce9c18b6ba52a0f6b38cf;hp=9e1fa74e876652e468b2c4de643614874899bedc;hpb=8bfe6b7a62becebdd5a8b37badec3f0508a99aad;p=pspp-builds.git

diff --git a/src/ui/gui/data-editor.ui b/src/ui/gui/data-editor.ui
index 9e1fa74e..69f2b413 100644
--- a/src/ui/gui/data-editor.ui
+++ b/src/ui/gui/data-editor.ui
@@ -6,18 +6,15 @@
         <child>
           <object class="GtkAction" id="sort-up">
             <property name="stock-id">gtk-sort-ascending</property>
-            <property name="label" translatable="yes">Sort Ascending</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="sort-down">
             <property name="stock-id">gtk-sort-descending</property>
-            <property name="label" translatable="yes">Sort Descending</property>
           </object>
         </child>
       </object>
-   </child>
-	
+    </child>
     <child>
       <object class="GtkActionGroup" id="actiongroup1">
         <child>
@@ -54,6 +51,7 @@
           <object class="GtkAction" id="file_import-text">
             <property name="name">file_import-text</property>
             <property name="label" translatable="yes">_Import Delimited Text Data</property>
+	    <property name="stock-id">gtk-convert</property>
           </object>
         </child>
         <child>
@@ -72,6 +70,7 @@
           <object class="GtkAction" id="file-information">
             <property name="name">file-information</property>
             <property name="label" translatable="yes">D_isplay Data File Information</property>
+            <property name="stock-id">gtk-info</property>
           </object>
         </child>
         <child>
@@ -157,12 +156,16 @@
           <object class="GtkAction" id="edit_clear-variables">
             <property name="name">edit_clear-variables</property>
             <property name="label" translatable="yes">Cl_ear Variables</property>
+	    <property name="tooltip" translatable="yes">Delete the variables at the selected position(s)</property>
+            <property name="stock-id">gtk-clear</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="edit_clear-cases">
             <property name="name">edit_clear-cases</property>
+            <property name="stock-id">gtk-clear</property>
             <property name="label" translatable="yes">_Clear Cases</property>
+            <property name="tooltip" translatable="yes">Delete the cases at the selected position(s)</property>
           </object>
         </child>
         <child>
@@ -187,7 +190,7 @@
         <child>
           <object class="GtkAction" id="view_fonts">
             <property name="name">view_fonts</property>
-            <property name="label" translatable="yes">_Fonts</property>
+            <property name="stock-id">gtk-select-font</property>
           </object>
         </child>
         <child>
@@ -227,12 +230,23 @@
           <object class="GtkAction" id="data_sort-cases">
             <property name="label" translatable="yes">_Sort Cases</property>
             <property name="name">data_sort-cases</property>
+	    <property name="stock-id">gtk-sort-ascending</property>
+	    <property name="tooltip" translatable="yes">Sort cases in the active file</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="data_transpose">
+	    <property name="stock-id">pspp-transpose</property>
             <property name="name">data_transpose</property>
             <property name="label" translatable="yes">_Transpose</property>
+	    <property name="tooltip" translatable="yes">Transpose the cases with the variables</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="data_aggregate">
+	    <property name="stock-id">pspp-aggregate</property>
+            <property name="name">data_aggregate</property>
+            <property name="label" translatable="yes">_Aggregate</property>
           </object>
         </child>
         <child>
@@ -446,24 +460,6 @@
             <property name="label" translatable="yes">_Split</property>
           </object>
         </child>
-        <child>
-          <object class="GtkAction" id="help">
-            <property name="name">help</property>
-            <property name="label" translatable="yes">_Help</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="help_reference">
-            <property name="name">help_reference</property>
-            <property name="label">_Reference Manual</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="help_about">
-            <property name="stock-id">gtk-about</property>
-            <property name="name">help_about</property>
-          </object>
-        </child>
       </object>
     </child>
     <ui>
@@ -515,6 +511,7 @@
         <menu action="data">
           <menuitem action="data_sort-cases"/>
           <menuitem action="data_transpose"/>
+          <menuitem action="data_aggregate"/>
           <separator/>
           <menuitem action="data_split-file"/>
           <menuitem action="data_select-cases"/>
@@ -560,10 +557,6 @@
           <menuitem action="windows_minimise_all"/>
           <menuitem action="windows_split"/>
         </menu>
-        <menu action="help">
-          <menuitem action="help_reference"/>
-          <menuitem action="help_about"/>
-        </menu>
       </menubar>
       <toolbar action="toolbar">
         <placeholder name="tool-items">
@@ -586,14 +579,24 @@
         </placeholder>
       </toolbar>
       <popup name="datasheet-variable-popup">
-	  <menuitem action="action_insert-variable"/>
-	  <separator/>
-	  <menuitem action="edit_clear-variables"/>
-	  <separator/>
-          <menuitem action="sort-up"/>
-          <menuitem action="sort-down"/>
+	<menuitem action="action_insert-variable"/>
+	<separator/>
+	<menuitem action="edit_clear-variables"/>
+	<separator/>
+        <menuitem action="sort-up"/>
+        <menuitem action="sort-down"/>
+      </popup>
+      <popup name="varsheet-variable-popup">
+	<menuitem action="action_insert-variable"/>
+	<separator/>
+	<menuitem action="edit_clear-variables"/>
       </popup>
-</ui>
+      <popup name="datasheet-cases-popup">
+	<menuitem action="edit_insert-case"/>
+	<separator/>
+	<menuitem action="edit_clear-cases"/>
+      </popup>
+    </ui>
   </object>
   <!-- interface-requires gtk+ 2.6 -->
   <!-- interface-naming-policy toplevel-contextual -->
@@ -603,6 +606,12 @@
   <object class="GtkMenu" constructor="uimanager1" id="datasheet-variable-popup">
     <property name="visible">True</property>
   </object>
+  <object class="GtkMenu" constructor="uimanager1" id="varsheet-variable-popup">
+    <property name="visible">True</property>
+  </object>
+  <object class="GtkMenu" constructor="uimanager1" id="datasheet-cases-popup">
+    <property name="visible">True</property>
+  </object>
   <object class="GtkHandleBox" id="handlebox1">
     <property name="visible">True</property>
     <child>