X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fdata-editor.ui;h=048ba0bbb15669c0988a3e0bb776deaf76eea040;hb=dd0534adaf2831e6857185aa6580fa44aff19545;hp=99ddbfa446516500ed9cee96158f4598b77a3a4c;hpb=3cc9782b5f4d9cb108a246a3cd676d233d26ed06;p=pspp

diff --git a/src/ui/gui/data-editor.ui b/src/ui/gui/data-editor.ui
index 99ddbfa446..048ba0bbb1 100644
--- a/src/ui/gui/data-editor.ui
+++ b/src/ui/gui/data-editor.ui
@@ -12,21 +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="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="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="stock-id">file-system-data</property>
             <property name="label" translatable="yes">_Data</property>
           </object>
         </child>
@@ -36,18 +36,19 @@
             <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">
             <property name="name">file_import</property>
             <property name="label" translatable="yes">I_mport Data...</property>
-	    <property name="stock-id">file-import-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="label" translatable="yes">_Rename Dataset...</property>
             <property name="stock-id">file-rename-data-set</property>
           </object>
         </child>
@@ -55,8 +56,9 @@
           <object class="GtkAction" id="file_save">
             <property name="stock-id">file-save-data</property>
             <property name="name">file_save</property>
-	    <property name="label" translatable="yes">_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">
@@ -76,14 +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>
+            <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>
+            <property name="stock-id">display-information-external-file</property>
           </object>
         </child>
         <child>
@@ -143,8 +146,8 @@
           <object class="GtkToggleAction" id="view_value-labels">
             <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">view-value-labels</property>
+            <property name="tooltip" translatable="yes">Show/hide value labels</property>
+            <property name="stock-id">view-value-labels</property>
           </object>
         </child>
         <child>
@@ -157,7 +160,7 @@
           <object class="GtkRadioAction" id="view_variables">
             <property name="name">view_variables</property>
             <property name="label" translatable="yes">_Variables</property>
-	    <property name="group">view_data</property>
+            <property name="group">view_data</property>
           </object>
         </child>
         <child>
@@ -171,48 +174,53 @@
             <property name="label" translatable="yes">_Sort Cases...</property>
             <property name="name">data_sort-cases</property>
             <property name="manager">uimanager1</property>
-	    <property name="stock-id">data-sort-cases</property>
-	    <property name="tooltip" translatable="yes">Sort cases in the active dataset</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="PsppireDialogActionFlip" id="data_transpose">
-	    <property name="stock-id">data-transpose</property>
+            <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>
+            <property name="tooltip" translatable="yes">Transpose the cases with the variables</property>
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="data_aggregate">
-	    <property name="stock-id">data-aggregate</property>
+          <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>
-          <object class="GtkAction" id="data_split-file">
+          <object class="PsppireDialogActionSplit" id="data_split-file">
             <property name="name">data_split-file</property>
+            <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">S_plit File...</property>
-	    <property name="tooltip" translatable="yes">Split the active dataset</property>
-	    <property name="stock-id">data-split-file</property>
+            <property name="tooltip" translatable="yes">Split the active dataset</property>
+            <property name="stock-id">data-split-file</property>
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="data_select-cases">
+          <object class="PsppireDialogActionSelect" id="data_select-cases">
             <property name="name">data_select-cases</property>
+            <property name="manager">uimanager1</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>
+            <property name="tooltip" translatable="yes">Choose a subset of cases for analysis</property>
+            <property name="stock-id">data-select-cases</property>
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="data_weight-cases">
+          <object class="PsppireDialogActionWeight" id="data_weight-cases">
             <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">data-weight-cases</property>
+	    <property name="manager">uimanager1</property>
+            <property name="tooltip" translatable="yes">Weight cases by variable</property>
+            <property name="stock-id">data-weight-cases</property>
           </object>
         </child>
         <child>
@@ -222,17 +230,19 @@
           </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>
+            <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>
+            <property name="stock-id">transform-count</property>
           </object>
         </child>
         <child>
@@ -240,35 +250,38 @@
             <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>
+            <property name="stock-id">transform-rank-cases</property>
           </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>
+            <property name="stock-id">transform-automatic-recode</property>
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="transform_recode-same">
+          <object class="PsppireDialogActionRecodeSame" id="transform_recode-same">
             <property name="name">transform_recode-same</property>
+	    <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">Recode into _Same Variables...</property>
-	    <property name="stock-id">transform-in-to-same-variables</property>
+            <property name="stock-id">transform-in-to-same-variables</property>
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="transform_recode-different">
+          <object class="PsppireDialogActionRecodeDifferent" id="transform_recode-different">
+	    <property name="manager">uimanager1</property>
             <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>
+            <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>
+            <property name="stock-id">transform-run-pending</property>
           </object>
           <accelerator key="G" modifiers="GDK_CONTROL_MASK"/>
         </child>
@@ -282,7 +295,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>
+            <property name="stock-id">analyze-descriptive-statistics</property>
           </object>
         </child>
         <child>
@@ -317,7 +330,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>
+            <property name="stock-id">analyze-compare-means</property>
           </object>
         </child>
         <child>
@@ -328,8 +341,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 +355,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,7 +373,7 @@
             <property name="name">univariate</property>
             <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">_Univariate Analysis...</property>
-            <property name="visible">False</property>
+            <property name="stock-id">analyze-univariate-analysis</property>
           </object>
         </child>
         <child>
@@ -365,7 +381,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>
+            <property name="stock-id">analyze-bivariate-correlation</property>
           </object>
         </child>
         <child>
@@ -373,7 +389,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>
+            <property name="stock-id">analyze-kmeans-cluster</property>
           </object>
         </child>
         <child>
@@ -381,7 +397,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>
+            <property name="stock-id">analyze-factor-analysis</property>
           </object>
         </child>
         <child>
@@ -389,14 +405,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>
+            <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>
+            <property name="stock-id">analyze-regression</property>
           </object>
         </child>
         <child>
@@ -417,7 +433,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>
+            <property name="stock-id">analyze-non-parametric-statistics</property>
           </object>
         </child>
         <child>
@@ -442,20 +458,23 @@
           </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>
@@ -464,49 +483,60 @@
             <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>
+            <property name="stock-id">analyze-roc-curve</property>
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="utilities">
-            <property name="name">utilities</property>
-            <property name="label" translatable="yes">_Utilities</property>
+          <object class="GtkAction" id="graphs">
+            <property name="name">graphs</property>
+            <property name="label" translatable="yes">_Graphs</property>
           </object>
         </child>
         <child>
-          <object class="PsppireDialogActionVarInfo" id="utilities_variables">
+          <object class="PsppireDialogActionScatterplot" id="graphs_scatterplot">
             <property name="manager">uimanager1</property>
-            <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">utilities-variables</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="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 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="GtkAction" id="windows">
-            <property name="name">windows</property>
-            <property name="label" translatable="yes">_Windows</property>
+          <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="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 class="GtkAction" id="utilities">
+            <property name="name">utilities</property>
+            <property name="label" translatable="yes">_Utilities</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 class="PsppireDialogActionVarInfo" id="utilities_variables">
+            <property name="manager">uimanager1</property>
+            <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">utilities-variables</property>
+          </object>
+        </child>
+        <child>
+          <object class="PsppireDialogActionComments" id="utilities_comments">
+            <property name="manager">uimanager1</property>
+            <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>
       </object>
@@ -535,8 +565,8 @@
           <separator/>
           <menuitem action="file_quit"/>
         </menu>
-	<placeholder name="DataSheetEditMenu"/>
-	<placeholder name="VarSheetEditMenu"/>
+        <placeholder name="DataSheetEditMenu"/>
+        <placeholder name="VarSheetEditMenu"/>
         <menu action="view">
           <menuitem action="view_statusbar"/>
           <separator/>
@@ -600,27 +630,31 @@
           </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"/>
         </menu>
-        <menu action="windows">
-          <menuitem action="windows_minimise_all"/>
-          <menuitem action="windows_split"/>
-        </menu>
       </menubar>
       <toolbar action="toolbar">
-	<toolitem name="toolbar_open" action="file_open"/>
-	<toolitem name="toolbar_save" action="file_save"/>
-	<separator/>
-	<placeholder name="DataSheetToolItems"/>
-	<placeholder name="VarSheetToolItems"/>
-	<separator/>
-	<toolitem name="toolbar_split-file" action="data_split-file"/>
-	<toolitem name="toolbar_weight-cases" action="data_weight-cases"/>
-	<toolitem name="toolbar_select-cases" action="data_select-cases"/>
-	<separator/>
-	<toolitem name="toolbar_select-cases" action="view_value-labels"/>
+        <toolitem name="toolbar_open" action="file_open"/>
+        <toolitem name="toolbar_save" action="file_save"/>
+        <separator/>
+        <placeholder name="DataSheetToolItems"/>
+        <placeholder name="VarSheetToolItems"/>
+        <separator/>
+        <toolitem name="toolbar_split-file" action="data_split-file"/>
+        <toolitem name="toolbar_weight-cases" action="data_weight-cases"/>
+        <toolitem name="toolbar_select-cases" action="data_select-cases"/>
+        <separator/>
+        <toolitem name="toolbar_select-cases" action="view_value-labels"/>
       </toolbar>
     </ui>
   </object>
@@ -629,17 +663,13 @@
   <object class="GtkMenuBar" constructor="uimanager1" id="menubar">
     <property name="visible">True</property>
   </object>
-  <object class="GtkHandleBox" id="handlebox1">
+  <object class="GtkToolbar" constructor="uimanager1" id="toolbar">
     <property name="visible">True</property>
-    <child>
-      <object class="GtkToolbar" constructor="uimanager1" id="toolbar">
-        <property name="visible">True</property>
-      </object>
-    </child>
+    <property name="toolbar-style">GTK_TOOLBAR_ICONS</property>
   </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">