X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fdata-sheet.ui;h=83df966b235e179f1c61a575a1c9e0f07332603a;hb=03a7b96a587a58bda342b4eb5ce5f935880ba2b7;hp=c97160dbd8b7a4ef435b76d75333d2276a889065;hpb=a2727738806fde48b6f360182f12bd44e1a468db;p=pspp

diff --git a/src/ui/gui/data-sheet.ui b/src/ui/gui/data-sheet.ui
index c97160dbd8..83df966b23 100644
--- a/src/ui/gui/data-sheet.ui
+++ b/src/ui/gui/data-sheet.ui
@@ -3,44 +3,44 @@
   <object class="GtkUIManager" id="data_sheet_uim">
     <ui>
       <menubar name="menubar">
-	<placeholder name="DataSheetEditMenu">
-	  <menu name="edit" action="edit2">
-	    <menuitem action="edit_insert-variable"/>
-	    <menuitem action="edit_insert-case"/>
-	    <menuitem action="edit_goto-variable"/>
-	    <menuitem action="edit_goto-case"/>
-	    <separator/>
-	    <menuitem action="edit_cut"/>
-	    <menuitem action="edit_copy"/>
-	    <menuitem action="edit_paste"/>
-	    <menuitem action="edit_clear-variables"/>
-	    <menuitem action="edit_clear-cases"/>
-	    <separator/>
-	    <menuitem action="edit_find"/>
-	  </menu>
-	</placeholder>
+        <placeholder name="DataSheetEditMenu">
+          <menu name="edit" action="edit2">
+            <menuitem action="edit_insert-variable"/>
+            <menuitem action="edit_insert-case"/>
+            <menuitem action="edit_goto-variable"/>
+            <menuitem action="edit_goto-case"/>
+            <separator/>
+            <menuitem action="edit_cut"/>
+            <menuitem action="edit_copy"/>
+            <menuitem action="edit_paste"/>
+            <menuitem action="edit_clear-variables"/>
+            <menuitem action="edit_clear-cases"/>
+            <separator/>
+            <menuitem action="edit_find"/>
+          </menu>
+        </placeholder>
       </menubar>
       <toolbar name="toolbar">
-	<placeholder name="DataSheetToolItems">
-	  <toolitem name="toolbar_goto-variable" action="edit_goto-variable"/>
-	  <toolitem name="toolbar_goto-case" action="edit_goto-case"/>
-	  <toolitem name="toolbar_find" action="edit_find"/>
-	  <toolitem name="toolbar_insert-cases" action="edit_insert-case"/>
-	  <toolitem name="toolbar_insert-variable" action="edit_insert-variable"/>
-	</placeholder>
+        <placeholder name="DataSheetToolItems">
+          <toolitem name="toolbar_goto-variable" action="edit_goto-variable"/>
+          <toolitem name="toolbar_goto-case" action="edit_goto-case"/>
+          <toolitem name="toolbar_find" action="edit_find"/>
+          <toolitem name="toolbar_insert-cases" action="edit_insert-case"/>
+          <toolitem name="toolbar_insert-variable" action="edit_insert-variable"/>
+        </placeholder>
       </toolbar>
       <popup name="datasheet-variable-popup">
-	<menuitem action="edit_insert-variable"/>
-	<separator/>
-	<menuitem action="edit_clear-variables"/>
-	<separator/>
+        <menuitem action="edit_insert-variable"/>
+        <separator/>
+        <menuitem action="edit_clear-variables"/>
+        <separator/>
         <menuitem action="sort-up"/>
         <menuitem action="sort-down"/>
       </popup>
       <popup name="datasheet-cases-popup">
-	<menuitem action="edit_insert-case"/>
-	<separator/>
-	<menuitem action="edit_clear-cases"/>
+        <menuitem action="edit_insert-case"/>
+        <separator/>
+        <menuitem action="edit_clear-cases"/>
       </popup>
     </ui>
     <child>
@@ -56,23 +56,23 @@
             <property name="name">edit_insert-variable</property>
             <property name="label" translatable="yes">Insert Variable</property>
             <property name="tooltip" translatable="yes">Create a new variable at the current position</property>
-	    <property name="stock-id">pspp-insert-variable</property>
+            <property name="stock-id">edit-insert-variable</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="edit_insert-case">
             <property name="name">edit_insert-case</property>
-            <property name="label" translatable="yes">Insert Cases</property>
+            <property name="label" translatable="yes">Insert Case</property>
             <property name="tooltip" translatable="yes">Create a new case at the current position</property>
-	    <property name="stock-id">pspp-insert-case</property>
+            <property name="stock-id">edit-insert-case</property>
           </object>
         </child>
         <child>
           <object class="PsppireDialogActionVarInfo" id="edit_goto-variable">
             <property name="name">edit_goto-variable</property>
             <property name="label" translatable="yes">Go To Variable...</property>
-	    <property name="tooltip" translatable="yes">Jump to variable</property>
-	    <property name="stock-id">pspp-goto-variable</property>
+            <property name="tooltip" translatable="yes">Jump to variable</property>
+            <property name="stock-id">edit-go-to-variable</property>
           </object>
         </child>
         <child>
@@ -80,25 +80,24 @@
             <property name="label" translatable="yes">Go To Case...</property>
             <property name="name">edit_goto-case</property>
             <property name="tooltip" translatable="yes">Jump to a case in the data sheet</property>
-	    <property name="stock-id">gtk-jump-to</property>
-
+            <property name="stock-id">edit-go-to-case</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="edit_cut">
-            <property name="stock-id">gtk-cut</property>
+            <property name="stock-id">edit-cut</property>
             <property name="name">edit_cut</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="edit_copy">
-            <property name="stock-id">gtk-copy</property>
+            <property name="stock-id">edit-copy</property>
             <property name="name">edit_copy</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="edit_paste">
-            <property name="stock-id">gtk-paste</property>
+            <property name="stock-id">edit-paste</property>
             <property name="name">edit_paste</property>
           </object>
         </child>
@@ -106,33 +105,37 @@
           <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>
+            <property name="tooltip" translatable="yes">Delete the variables at the selected position(s)</property>
+            <property name="stock-id">edit-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="stock-id">edit-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>
           <object class="GtkAction" id="edit_find">
-            <property name="stock-id">gtk-find</property>
+            <property name="stock-id">edit-find</property>
             <property name="name">edit_find</property>
             <property name="label" translatable="yes">_Find...</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="sort-up">
-            <property name="stock-id">gtk-sort-ascending</property>
+            <property name="stock-id">data-sort-ascending</property>
+            <property name="name">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="stock-id">data-sort-descending</property>
+            <property name="name">sort_descending</property>
+            <property name="label" translatable="yes">Sort _Descending</property>
           </object>
         </child>
       </object>