X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fdata-editor.ui;h=5437ff55715457034f7b915e3505a015d182ec40;hb=da08e8b9ea6bfa772b4daec4a944279267852515;hp=57bb3f779548c8577c6089492608d4f606d1824a;hpb=10a3bd6d431947ed371bd8eea77400776e1cbc07;p=pspp

diff --git a/src/ui/gui/data-editor.ui b/src/ui/gui/data-editor.ui
index 57bb3f7795..5437ff5571 100644
--- a/src/ui/gui/data-editor.ui
+++ b/src/ui/gui/data-editor.ui
@@ -36,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">
@@ -57,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">
@@ -64,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">
@@ -185,10 +188,12 @@
           </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>
@@ -222,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>
@@ -244,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>
@@ -342,14 +350,16 @@
           </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>
@@ -358,6 +368,7 @@
             <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>
@@ -450,14 +461,16 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="two-related-samples">
+          <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">
+          <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>
@@ -469,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>
@@ -602,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"/>
@@ -631,18 +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">