X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fdata-editor.ui;h=10f0f5f8c4e318027ce2e774fa94ac8b7ce19333;hb=137fae2d8d88234543d9b41286c20e6ba8b2cd98;hp=4beae4807ae5981f1e9f1e5621e92f0fc69d636d;hpb=f9b848024070c889f4ff95a36d35081d05622f2a;p=pspp

diff --git a/src/ui/gui/data-editor.ui b/src/ui/gui/data-editor.ui
index 4beae4807a..10f0f5f8c4 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">
@@ -222,15 +225,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>
@@ -328,8 +333,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>
@@ -341,14 +347,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>
@@ -357,6 +365,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>
@@ -449,14 +458,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>
@@ -630,17 +641,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">