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

diff --git a/src/ui/gui/data-editor.ui b/src/ui/gui/data-editor.ui
index 6d3b44a6c1..68712e1553 100644
--- a/src/ui/gui/data-editor.ui
+++ b/src/ui/gui/data-editor.ui
@@ -12,18 +12,21 @@
         <child>
           <object class="GtkAction" id="new1">
             <property name="stock-id">file-new-data</property>
+	    <property name="label" translatable="yes">_New...</property>
             <property name="name">new1</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="file_new_syntax">
             <property name="name">file_new_syntax</property>
+	    <property name="stock-id">file-syntax-data</property>
             <property name="label" translatable="yes">_Syntax</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="file_new_data">
             <property name="name">file_new_data</property>
+	    <property name="stock-id">file-system-data</property>
             <property name="label" translatable="yes">_Data</property>
           </object>
         </child>
@@ -33,6 +36,7 @@
             <property name="name">file_open</property>
             <property name="label" translatable="yes">_Open...</property>
           </object>
+	  <accelerator key="O" modifiers="GDK_CONTROL_MASK"/>
         </child>
         <child>
           <object class="GtkAction" id="file_import">
@@ -54,6 +58,7 @@
             <property name="name">file_save</property>
 	    <property name="label" translatable="yes">_Save</property>
           </object>
+	  <accelerator key="S" modifiers="GDK_CONTROL_MASK"/>
         </child>
         <child>
           <object class="GtkAction" id="file_save_as">
@@ -61,6 +66,7 @@
             <property name="name">file_save_as</property>
             <property name="label" translatable="yes">Save _As...</property>
           </object>
+	  <accelerator key="S" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK"/>
         </child>
         <child>
           <object class="GtkAction" id="file-information">
@@ -73,12 +79,14 @@
           <object class="GtkAction" id="file_information_working-file">
             <property name="name">file_information_working-file</property>
             <property name="label" translatable="yes">Working File</property>
+	    <property name="stock-id">display-information-working-file</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="file_information_external-file">
             <property name="name">file_information_external-file</property>
             <property name="label" translatable="yes">External File...</property>
+	    <property name="stock-id">display-information-external-file</property>
           </object>
         </child>
         <child>
@@ -171,18 +179,21 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="data_transpose">
+          <object class="PsppireDialogActionFlip" id="data_transpose">
 	    <property name="stock-id">data-transpose</property>
             <property name="name">data_transpose</property>
+            <property name="manager">uimanager1</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">
+          <object class="PsppireDialogActionAggregate" id="data_aggregate">
 	    <property name="stock-id">data-aggregate</property>
             <property name="name">data_aggregate</property>
+            <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">_Aggregate...</property>
+	    <property name="tooltip" translatable="yes">Aggregate the case values into a new variable</property>
           </object>
         </child>
         <child>
@@ -216,15 +227,17 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="transform_compute">
+          <object class="PsppireDialogActionCompute" id="transform_compute">
             <property name="name">transform_compute</property>
+            <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">_Compute...</property>
 	    <property name="stock-id">transform-compute</property>
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="transform_count">
+          <object class="PsppireDialogActionCount" id="transform_count">
             <property name="name">transform_count</property>
+            <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">Cou_nt...</property>
 	    <property name="stock-id">transform-count</property>
           </object>
@@ -238,8 +251,9 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="transform_autorecode">
+          <object class="PsppireDialogActionAutorecode" id="transform_autorecode">
             <property name="name">transform_autorecode</property>
+            <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">Auto_matic Recode...</property>
 	    <property name="stock-id">transform-automatic-recode</property>
           </object>
@@ -322,8 +336,9 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="one-sample-t-test">
+          <object class="PsppireDialogActionTt1s" id="one-sample-t-test">
             <property name="name">one-sample-t-test</property>
+            <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">_One Sample T Test...</property>
           </object>
         </child>
@@ -335,21 +350,25 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="paired-t-test">
+          <object class="PsppireDialogActionPaired" id="paired-t-test">
             <property name="name">paired-t-test</property>
+            <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">_Paired Samples T Test...</property>
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="oneway-anova">
+          <object class="PsppireDialogActionOneway" id="oneway-anova">
             <property name="name">oneway-anova</property>
+            <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">One Way _ANOVA...</property>
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="univariate">
+          <object class="PsppireDialogActionUnivariate" id="univariate">
             <property name="name">univariate</property>
+            <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">_Univariate Analysis...</property>
+	    <property name="stock-id">analyze-univariate-analysis</property>
             <property name="visible">False</property>
           </object>
         </child>
@@ -414,8 +433,9 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="chi-square">
+          <object class="PsppireDialogActionChisquare" id="chi-square">
             <property name="name">chi-square</property>
+            <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">_Chi-Square...</property>
           </object>
         </child>
@@ -427,26 +447,30 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="runs">
+          <object class="PsppireDialogActionRuns" id="runs">
             <property name="name">runs</property>
+            <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">R_uns...</property>
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="ks-one-sample">
+          <object class="PsppireDialogAction1sks" id="ks-one-sample">
             <property name="name">ks-one-sample</property>
+            <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">1-Sample _K-S...</property>
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="two-related-samples">
-            <property name="name">"two-related-samples"></property>
+          <object class="PsppireDialogActionTwoSample" id="two-related-samples">
+            <property name="name">two-related-samples</property>
+            <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">2 _Related Samples...</property>
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="k-related-samples">
-            <property name="name">"k-related-samples"></property>
+          <object class="PsppireDialogActionKRelated" id="k-related-samples">
+            <property name="name">k-related-samples</property>
+            <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">K Related _Samples...</property>
           </object>
         </child>
@@ -458,6 +482,36 @@
 	    <property name="stock-id">analyze-roc-curve</property>
           </object>
         </child>
+        <child>
+          <object class="GtkAction" id="graphs">
+            <property name="name">graphs</property>
+            <property name="label" translatable="yes">_Graphs</property>
+          </object>
+        </child>
+        <child>
+          <object class="PsppireDialogActionScatterplot" id="graphs_scatterplot">
+            <property name="manager">uimanager1</property>
+            <property name="name">graphs_scatterplot</property>
+            <property name="label" translatable="yes">_Scatterplot</property>
+	    <property name="stock-id">graphs-scatterplot</property>
+          </object>
+        </child>
+        <child>
+          <object class="PsppireDialogActionHistogram" id="graphs_histogram">
+            <property name="manager">uimanager1</property>
+            <property name="name">graphs_histogram</property>
+            <property name="label" translatable="yes">_Histogram</property>
+	    <property name="stock-id">graphs-histogram</property>
+          </object>
+        </child>
+        <child>
+          <object class="PsppireDialogActionBarchart" id="graphs_barchart">
+            <property name="manager">uimanager1</property>
+            <property name="name">graphs_barchart</property>
+            <property name="label" translatable="yes">_Barchart</property>
+	    <property name="stock-id">graphs-barchart</property>
+          </object>
+        </child>
         <child>
           <object class="GtkAction" id="utilities">
             <property name="name">utilities</property>
@@ -591,6 +645,14 @@
           </menu>
           <menuitem action="roc-curve"/>
         </menu>
+        <menu action="graphs">
+          <menuitem action="graphs_scatterplot"/>
+        </menu>
+        <menu action="graphs">
+          <menuitem action="graphs_scatterplot"/>
+          <menuitem action="graphs_histogram"/>
+	  <menuitem action="graphs_barchart"/>
+        </menu>
         <menu action="utilities">
           <menuitem action="utilities_variables"/>
           <menuitem action="utilities_comments"/>
@@ -620,17 +682,14 @@
   <object class="GtkMenuBar" constructor="uimanager1" id="menubar">
     <property name="visible">True</property>
   </object>
-  <object class="GtkHandleBox" id="handlebox1">
-    <property name="visible">True</property>
-    <child>
       <object class="GtkToolbar" constructor="uimanager1" id="toolbar">
         <property name="visible">True</property>
+        <property name="toolbar-style">GTK_TOOLBAR_ICONS</property>
       </object>
-    </child>
-  </object>
 
-  <object class="GtkHBox" id="status-bar">
+  <object class="GtkBox" id="status-bar">
     <property name="visible">True</property>
+    <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
     <property name="spacing">6</property>
     <child>
       <object class="GtkFrame" id="frame2">