X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fdata-editor.ui;h=6d3b44a6c16a925f785c64c7daf14b8600d41ecf;hb=9f24d90e6ceb568b95d6a0e9fd4926777711e140;hp=0b1378e8422b557741bcaa9569ff0520b98112c4;hpb=fa1fffd5c789d9c7875fc3bdf556eaf017cf524e;p=pspp

diff --git a/src/ui/gui/data-editor.ui b/src/ui/gui/data-editor.ui
index 0b1378e842..6d3b44a6c1 100644
--- a/src/ui/gui/data-editor.ui
+++ b/src/ui/gui/data-editor.ui
@@ -11,7 +11,7 @@
         </child>
         <child>
           <object class="GtkAction" id="new1">
-            <property name="stock-id">gtk-new</property>
+            <property name="stock-id">file-new-data</property>
             <property name="name">new1</property>
           </object>
         </child>
@@ -29,33 +29,35 @@
         </child>
         <child>
           <object class="GtkAction" id="file_open">
-            <property name="stock-id">gtk-open</property>
+            <property name="stock-id">file-open-data</property>
             <property name="name">file_open</property>
             <property name="label" translatable="yes">_Open...</property>
           </object>
         </child>
         <child>
-          <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 class="GtkAction" id="file_import">
+            <property name="name">file_import</property>
+            <property name="label" translatable="yes">I_mport Data...</property>
+	    <property name="stock-id">file-import-data</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="rename_dataset">
             <property name="name">rename_dataset</property>
 	    <property name="label" translatable="yes">_Rename Dataset...</property>
+            <property name="stock-id">file-rename-data-set</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="file_save">
-            <property name="stock-id">gtk-save</property>
+            <property name="stock-id">file-save-data</property>
             <property name="name">file_save</property>
+	    <property name="label" translatable="yes">_Save</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="file_save_as">
-            <property name="stock-id">gtk-save-as</property>
+            <property name="stock-id">file-save-as</property>
             <property name="name">file_save_as</property>
             <property name="label" translatable="yes">Save _As...</property>
           </object>
@@ -64,7 +66,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>
+            <property name="stock-id">file-display-information</property>
           </object>
         </child>
         <child>
@@ -83,17 +85,19 @@
           <object class="GtkAction" id="file_recent-data">
             <property name="name">file_recent-data</property>
             <property name="label" translatable="yes">Recently Used Da_ta</property>
+            <property name="stock-id">file-recently-used</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="file_recent-files">
             <property name="name">file_recent-files</property>
             <property name="label" translatable="yes">Recently Used _Files</property>
+            <property name="stock-id">file-recently-used</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="file_quit">
-            <property name="stock-id">gtk-quit</property>
+            <property name="stock-id">file-quit</property>
             <property name="name">file_quit</property>
           </object>
         </child>
@@ -119,7 +123,7 @@
         <child>
           <object class="GtkAction" id="view_fonts">
             <property name="name">view_fonts</property>
-            <property name="stock-id">gtk-select-font</property>
+            <property name="stock-id">view-font</property>
             <property name="label" translatable="yes">_Font...</property>
           </object>
         </child>
@@ -135,7 +139,7 @@
             <property name="name">view_value-labels</property>
             <property name="label" translatable="yes">Value _Labels</property>
 	    <property name="tooltip" translatable="yes">Show/hide value labels</property>
-	    <property name="stock-id">pspp-value-labels</property>
+	    <property name="stock-id">view-value-labels</property>
           </object>
         </child>
         <child>
@@ -162,13 +166,13 @@
             <property name="label" translatable="yes">_Sort Cases...</property>
             <property name="name">data_sort-cases</property>
             <property name="manager">uimanager1</property>
-	    <property name="stock-id">gtk-sort-ascending</property>
+	    <property name="stock-id">data-sort-cases</property>
 	    <property name="tooltip" translatable="yes">Sort cases in the active dataset</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="data_transpose">
-	    <property name="stock-id">pspp-transpose</property>
+	    <property name="stock-id">data-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>
@@ -176,7 +180,7 @@
         </child>
         <child>
           <object class="GtkAction" id="data_aggregate">
-	    <property name="stock-id">pspp-aggregate</property>
+	    <property name="stock-id">data-aggregate</property>
             <property name="name">data_aggregate</property>
             <property name="label" translatable="yes">_Aggregate...</property>
           </object>
@@ -186,13 +190,15 @@
             <property name="name">data_split-file</property>
             <property name="label" translatable="yes">S_plit File...</property>
 	    <property name="tooltip" translatable="yes">Split the active dataset</property>
-	    <property name="stock-id">pspp-split-file</property>
+	    <property name="stock-id">data-split-file</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="data_select-cases">
             <property name="name">data_select-cases</property>
             <property name="label" translatable="yes">Select _Cases...</property>
+	    <property name="tooltip" translatable="yes">Choose a subset of cases for analysis</property>
+	    <property name="stock-id">data-select-cases</property>
           </object>
         </child>
         <child>
@@ -200,7 +206,7 @@
             <property name="name">data_weight-cases</property>
             <property name="label" translatable="yes">_Weight Cases...</property>
 	    <property name="tooltip" translatable="yes">Weight cases by variable</property>
-	    <property name="stock-id">pspp-weight-cases</property>
+	    <property name="stock-id">data-weight-cases</property>
           </object>
         </child>
         <child>
@@ -213,12 +219,14 @@
           <object class="GtkAction" id="transform_compute">
             <property name="name">transform_compute</property>
             <property name="label" translatable="yes">_Compute...</property>
+	    <property name="stock-id">transform-compute</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="transform_count">
             <property name="name">transform_count</property>
             <property name="label" translatable="yes">Cou_nt...</property>
+	    <property name="stock-id">transform-count</property>
           </object>
         </child>
         <child>
@@ -226,30 +234,35 @@
             <property name="name">transform_rank</property>
             <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">Ran_k Cases...</property>
+	    <property name="stock-id">transform-rank-cases</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="transform_autorecode">
             <property name="name">transform_autorecode</property>
             <property name="label" translatable="yes">Auto_matic Recode...</property>
+	    <property name="stock-id">transform-automatic-recode</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="transform_recode-same">
             <property name="name">transform_recode-same</property>
             <property name="label" translatable="yes">Recode into _Same Variables...</property>
+	    <property name="stock-id">transform-in-to-same-variables</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="transform_recode-different">
             <property name="name">transform_recode-different</property>
             <property name="label" translatable="yes">Recode into _Different Variables...</property>
+	    <property name="stock-id">transform-in-to-different-variables</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="transform_run-pending">
             <property name="name">transform_run-pending</property>
             <property name="label" translatable="yes">_Run Pending Transforms</property>
+	    <property name="stock-id">transform-run-pending</property>
           </object>
           <accelerator key="G" modifiers="GDK_CONTROL_MASK"/>
         </child>
@@ -263,6 +276,7 @@
           <object class="GtkAction" id="descriptive-statistics">
             <property name="name">descriptive-statistics</property>
             <property name="label" translatable="yes">_Descriptive Statistics</property>
+	    <property name="stock-id">analyze-descriptive-statistics</property>
           </object>
         </child>
         <child>
@@ -297,6 +311,7 @@
           <object class="GtkAction" id="compare-means">
             <property name="name">compare-means</property>
             <property name="label" translatable="yes">Compare _Means</property>
+	    <property name="stock-id">analyze-compare-means</property>
           </object>
         </child>
         <child>
@@ -343,6 +358,7 @@
             <property name="name">correlation</property>
             <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">Bivariate _Correlation...</property>
+	    <property name="stock-id">analyze-bivariate-correlation</property>
           </object>
         </child>
         <child>
@@ -350,6 +366,7 @@
             <property name="name">k-means</property>
             <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">_K-Means Cluster...</property>
+	    <property name="stock-id">analyze-kmeans-cluster</property>
           </object>
         </child>
         <child>
@@ -357,6 +374,7 @@
             <property name="name">factor-analysis</property>
             <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">Factor _Analysis...</property>
+	    <property name="stock-id">analyze-factor-analysis</property>
           </object>
         </child>
         <child>
@@ -364,12 +382,14 @@
             <property name="name">reliability</property>
             <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">Re_liability...</property>
+	    <property name="stock-id">analyze-realiability</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="regression">
             <property name="name">regression</property>
             <property name="label" translatable="yes">_Regression</property>
+	    <property name="stock-id">analyze-regression</property>
           </object>
         </child>
         <child>
@@ -390,6 +410,7 @@
           <object class="GtkAction" id="non-parametrics">
             <property name="name">non-parametrics</property>
             <property name="label" translatable="yes">_Non-Parametric Statistics</property>
+	    <property name="stock-id">analyze-non-parametric-statistics</property>
           </object>
         </child>
         <child>
@@ -434,6 +455,7 @@
             <property name="name">roc-curve</property>
             <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">ROC Cur_ve...</property>
+	    <property name="stock-id">analyze-roc-curve</property>
           </object>
         </child>
         <child>
@@ -448,13 +470,14 @@
             <property name="name">utilities_variables</property>
             <property name="label" translatable="yes">_Variables...</property>
 	    <property name="tooltip" translatable="yes">Jump to variable</property>
-	    <property name="stock-id">pspp-goto-variable</property>
+	    <property name="stock-id">utilities-variables</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="utilities_comments">
             <property name="name">utilities_comments</property>
             <property name="label" translatable="yes">Data File _Comments...</property>
+	    <property name="stock-id">utilities-data-file-comments</property>
           </object>
         </child>
         <child>
@@ -467,12 +490,14 @@
           <object class="GtkAction" id="windows_minimise_all">
             <property name="name">windows_minimise_all</property>
             <property name="label" translatable="yes">_Minimize All Windows</property>
+	    <property name="stock-id">windows-minimize-all</property>
           </object>
         </child>
         <child>
           <object class="GtkToggleAction" id="windows_split">
             <property name="name">windows_split</property>
             <property name="label" translatable="yes">_Split</property>
+	    <property name="stock-id">windows-split</property>
           </object>
         </child>
       </object>
@@ -485,7 +510,7 @@
             <menuitem action="file_new_data"/>
           </menu>
           <menuitem action="file_open"/>
-          <menuitem action="file_import-text"/>
+          <menuitem action="file_import"/>
           <separator/>
           <menuitem action="file_save"/>
           <menuitem action="file_save_as"/>
@@ -629,31 +654,6 @@
         <property name="position">0</property>
       </packing>
     </child>
-    <child>
-      <object class="GtkFrame" id="frame3">
-        <property name="visible">True</property>
-        <property name="label_xalign">0</property>
-        <property name="shadow_type">in</property>
-        <child>
-          <object class="GtkEventBox" id="eventbox2">
-            <property name="visible">True</property>
-            <property name="tooltip-text" translatable="yes">Processor Area</property>
-            <child>
-              <object class="GtkLabel" id="processor-area">
-                <property name="visible">True</property>
-                <property name="width_chars">35</property>
-                <property name="single_line_mode">True</property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
     <child>
       <object class="GtkFrame" id="frame5">
         <property name="visible">True</property>