X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fdata-editor.ui;h=26821ebf17b936b2d31affbfb964b9c627b14c1f;hb=d4ae90b2fe74d2d1427afad35d32c9e5584211ed;hp=023b9698740f727bf8192a2cbd836b8d39ba6184;hpb=a3b36ef5a41b5fd4899b31dcde7bafad49642028;p=pspp

diff --git a/src/ui/gui/data-editor.ui b/src/ui/gui/data-editor.ui
index 023b969874..26821ebf17 100644
--- a/src/ui/gui/data-editor.ui
+++ b/src/ui/gui/data-editor.ui
@@ -1,21 +1,6 @@
 <?xml version="1.0"?>
 <interface>
   <object class="GtkUIManager" id="uimanager1">
-    <child>
-      <object class="GtkActionGroup" id="actiongroup2">
-        <child>
-          <object class="GtkAction" id="sort-up">
-            <property name="stock-id">gtk-sort-ascending</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="sort-down">
-            <property name="stock-id">gtk-sort-descending</property>
-          </object>
-        </child>
-      </object>
-   </child>
-	
     <child>
       <object class="GtkActionGroup" id="actiongroup1">
         <child>
@@ -46,15 +31,22 @@
           <object class="GtkAction" id="file_open">
             <property name="stock-id">gtk-open</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="label" translatable="yes">_Import Delimited Text Data...</property>
 	    <property name="stock-id">gtk-convert</property>
           </object>
         </child>
+        <child>
+          <object class="GtkAction" id="rename_dataset">
+            <property name="name">rename_dataset</property>
+	    <property name="label" translatable="yes">_Rename Dataset...</property>
+          </object>
+        </child>
         <child>
           <object class="GtkAction" id="file_save">
             <property name="stock-id">gtk-save</property>
@@ -65,6 +57,7 @@
           <object class="GtkAction" id="file_save_as">
             <property name="stock-id">gtk-save-as</property>
             <property name="name">file_save_as</property>
+            <property name="label" translatable="yes">Save _As...</property>
           </object>
         </child>
         <child>
@@ -83,7 +76,7 @@
         <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="label" translatable="yes">External File...</property>
           </object>
         </child>
         <child>
@@ -110,71 +103,6 @@
             <property name="label" translatable="yes">_Edit</property>
           </object>
         </child>
-        <child>
-          <object class="GtkAction" id="action_insert-variable">
-            <property name="name">action_insert-variable</property>
-            <property name="label" translatable="yes">Insert Variable</property>
-            <property name="tooltip" translatable="yes">Create a new variable at the current position</property>
-	    <property name="stock-id">pspp-insert-variable</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="edit_insert-case">
-            <property name="name">edit_insert-case</property>
-            <property name="label" translatable="yes">Insert Cases</property>
-            <property name="tooltip" translatable="yes">Create a new case at the current position</property>
-	    <property name="stock-id">pspp-insert-case</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="edit_goto-case">
-            <property name="label" translatable="yes">Go To Case</property>
-            <property name="name">edit_goto-case</property>
-            <property name="tooltip" translatable="yes">Jump to a case in the data sheet</property>
-	    <property name="stock-id">gtk-jump-to</property>
-
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="edit_cut">
-            <property name="stock-id">gtk-cut</property>
-            <property name="name">edit_cut</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="edit_copy">
-            <property name="stock-id">gtk-copy</property>
-            <property name="name">edit_copy</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="edit_paste">
-            <property name="stock-id">gtk-paste</property>
-            <property name="name">edit_paste</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="edit_clear-variables">
-            <property name="name">edit_clear-variables</property>
-            <property name="label" translatable="yes">Cl_ear Variables</property>
-	    <property name="tooltip" translatable="yes">Delete the variables at the selected position(s)</property>
-            <property name="stock-id">gtk-clear</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="edit_clear-cases">
-            <property name="name">edit_clear-cases</property>
-            <property name="stock-id">gtk-clear</property>
-            <property name="label" translatable="yes">_Clear Cases</property>
-            <property name="tooltip" translatable="yes">Delete the cases at the selected position(s)</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="edit_find">
-            <property name="stock-id">gtk-find</property>
-            <property name="name">edit_find</property>
-          </object>
-        </child>
         <child>
           <object class="GtkAction" id="view">
             <property name="name">view</property>
@@ -192,6 +120,7 @@
           <object class="GtkAction" id="view_fonts">
             <property name="name">view_fonts</property>
             <property name="stock-id">gtk-select-font</property>
+            <property name="label" translatable="yes">_Font...</property>
           </object>
         </child>
         <child>
@@ -210,15 +139,16 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="view_data">
+          <object class="GtkRadioAction" id="view_data">
             <property name="name">view_data</property>
             <property name="label" translatable="yes">_Data</property>
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="view_variables">
+          <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>
           </object>
         </child>
         <child>
@@ -228,39 +158,47 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="data_sort-cases">
-            <property name="label" translatable="yes">_Sort Cases</property>
+          <object class="PsppireDialogActionSort" id="data_sort-cases">
+            <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="tooltip" translatable="yes">Sort cases in the active file</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="name">data_transpose</property>
-            <property name="label" translatable="yes">_Transpose</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">
+	    <property name="stock-id">pspp-aggregate</property>
+            <property name="name">data_aggregate</property>
+            <property name="label" translatable="yes">_Aggregate...</property>
+          </object>
+        </child>
         <child>
           <object class="GtkAction" id="data_split-file">
             <property name="name">data_split-file</property>
-            <property name="label" translatable="yes">S_plit File</property>
-	    <property name="tooltip" translatable="yes">Split the active 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>
           </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="label" translatable="yes">Select _Cases...</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="data_weight-cases">
             <property name="name">data_weight-cases</property>
-            <property name="label" translatable="yes">_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>
           </object>
@@ -274,25 +212,38 @@
         <child>
           <object class="GtkAction" id="transform_compute">
             <property name="name">transform_compute</property>
-            <property name="label" translatable="yes">_Compute</property>
+            <property name="label" translatable="yes">_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>
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="transform_rank">
+          <object class="PsppireDialogActionRank" id="transform_rank">
             <property name="name">transform_rank</property>
-            <property name="label" translatable="yes">Ran_k Cases</property>
+            <property name="manager">uimanager1</property>
+            <property name="label" translatable="yes">Ran_k 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>
           </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="label" translatable="yes">Recode into _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="label" translatable="yes">Recode into _Different Variables...</property>
           </object>
         </child>
         <child>
@@ -317,25 +268,27 @@
         <child>
           <object class="GtkAction" id="analyze_frequencies">
             <property name="name">analyze_frequencies</property>
-            <property name="label" translatable="yes">_Frequencies</property>
+            <property name="label" translatable="yes">_Frequencies...</property>
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="analyze_descriptives">
+          <object class="PsppireDialogActionDescriptives" id="analyze_descriptives">
+            <property name="manager">uimanager1</property>
             <property name="name">analyze_descriptives</property>
-            <property name="label" translatable="yes">_Descriptives</property>
+            <property name="label" translatable="yes">_Descriptives...</property>
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="analyze_explore">
+          <object class="PsppireDialogActionExamine" id="explore">
             <property name="name">analyze_explore</property>
-            <property name="label" translatable="yes">_Explore</property>
+            <property name="manager">uimanager1</property>
+            <property name="label" translatable="yes">_Explore...</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="crosstabs">
             <property name="name">crosstabs</property>
-            <property name="label" translatable="yes">_Crosstabs</property>
+            <property name="label" translatable="yes">_Crosstabs...</property>
           </object>
         </child>
         <child>
@@ -344,52 +297,78 @@
             <property name="label" translatable="yes">Compare _Means</property>
           </object>
         </child>
+        <child>
+          <object class="PsppireDialogActionMeans" id="means">
+            <property name="name">means</property>
+            <property name="manager">uimanager1</property>
+            <property name="label" translatable="yes">_Means...</property>
+          </object>
+        </child>
         <child>
           <object class="GtkAction" id="one-sample-t-test">
             <property name="name">one-sample-t-test</property>
-            <property name="label" translatable="yes">_One Sample T Test</property>
+            <property name="label" translatable="yes">_One Sample T Test...</property>
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="indep-t-test">
+          <object class="PsppireDialogActionIndepSamps" id="indep-t-test">
             <property name="name">indep-t-test</property>
-            <property name="label" translatable="yes">_Independent Samples T Test</property>
+            <property name="manager">uimanager1</property>
+            <property name="label" translatable="yes">_Independent Samples T Test...</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="paired-t-test">
             <property name="name">paired-t-test</property>
-            <property name="label" translatable="yes">_Paired Samples T Test</property>
+            <property name="label" translatable="yes">_Paired Samples T Test...</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="oneway-anova">
             <property name="name">oneway-anova</property>
-            <property name="label" translatable="yes">One Way _ANOVA</property>
+            <property name="label" translatable="yes">One Way _ANOVA...</property>
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="correlation">
+          <object class="GtkAction" id="univariate">
+            <property name="name">univariate</property>
+            <property name="label" translatable="yes">_Univariate Analysis...</property>
+            <property name="visible">False</property>
+          </object>
+        </child>
+        <child>
+          <object class="PsppireDialogActionCorrelation" id="correlation">
             <property name="name">correlation</property>
+            <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">Bivariate _Correlation...</property>
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="factor-analysis">
+          <object class="PsppireDialogActionKmeans" id="k-means">
+            <property name="name">k-means</property>
+            <property name="manager">uimanager1</property>
+            <property name="label" translatable="yes">_K-Means Cluster...</property>
+          </object>
+        </child>
+        <child>
+          <object class="PsppireDialogActionFactor" id="factor-analysis">
             <property name="name">factor-analysis</property>
-            <property name="label" translatable="yes">Factor _Analysis</property>
+            <property name="manager">uimanager1</property>
+            <property name="label" translatable="yes">Factor _Analysis...</property>
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="reliability">
+          <object class="PsppireDialogActionReliability" id="reliability">
             <property name="name">reliability</property>
-            <property name="label" translatable="yes">Re_liability</property>
+            <property name="manager">uimanager1</property>
+            <property name="label" translatable="yes">Re_liability...</property>
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="linear-regression">
+          <object class="PsppireDialogActionRegression" id="linear-regression">
             <property name="name">linear-regression</property>
-            <property name="label" translatable="yes">Linear _Regression</property>
+            <property name="manager">uimanager1</property>
+            <property name="label" translatable="yes">Linear _Regression...</property>
           </object>
         </child>
         <child>
@@ -401,18 +380,43 @@
         <child>
           <object class="GtkAction" id="chi-square">
             <property name="name">chi-square</property>
-            <property name="label" translatable="yes">_Chi-Square</property>
+            <property name="label" translatable="yes">_Chi-Square...</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="binomial">
             <property name="name">binomial</property>
-            <property name="label" translatable="yes">_Binomial</property>
+            <property name="label" translatable="yes">_Binomial...</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="runs">
+            <property name="name">runs</property>
+            <property name="label" translatable="yes">R_uns...</property>
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="roc-curve">
+          <object class="GtkAction" id="ks-one-sample">
+            <property name="name">ks-one-sample</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>
+            <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>
+            <property name="label" translatable="yes">K Related _Samples...</property>
+          </object>
+        </child>
+        <child>
+          <object class="PsppireDialogActionRoc" id="roc-curve">
             <property name="name">roc-curve</property>
+            <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">ROC Cur_ve...</property>
           </object>
         </child>
@@ -423,9 +427,10 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="utilities_variables">
+          <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="label" translatable="yes">_Variables...</property>
 	    <property name="tooltip" translatable="yes">Jump to variable</property>
 	    <property name="stock-id">pspp-goto-variable</property>
           </object>
@@ -433,7 +438,7 @@
         <child>
           <object class="GtkAction" id="utilities_comments">
             <property name="name">utilities_comments</property>
-            <property name="label" translatable="yes">Data File _Comments</property>
+            <property name="label" translatable="yes">Data File _Comments...</property>
           </object>
         </child>
         <child>
@@ -468,6 +473,7 @@
           <separator/>
           <menuitem action="file_save"/>
           <menuitem action="file_save_as"/>
+          <menuitem action="rename_dataset"/>
           <separator/>
           <menu action="file-information">
             <menuitem action="file_information_working-file"/>
@@ -479,19 +485,8 @@
           <separator/>
           <menuitem action="file_quit"/>
         </menu>
-        <menu action="edit">
-          <menuitem action="action_insert-variable"/>
-          <menuitem action="edit_insert-case"/>
-          <menuitem action="edit_goto-case"/>
-          <separator/>
-          <menuitem action="edit_cut"/>
-          <menuitem action="edit_copy"/>
-          <menuitem action="edit_paste"/>
-          <menuitem action="edit_clear-variables"/>
-          <menuitem action="edit_clear-cases"/>
-          <separator/>
-          <menuitem action="edit_find"/>
-        </menu>
+	<placeholder name="DataSheetEditMenu"/>
+	<placeholder name="VarSheetEditMenu"/>
         <menu action="view">
           <menuitem action="view_statusbar"/>
           <separator/>
@@ -505,6 +500,7 @@
         <menu action="data">
           <menuitem action="data_sort-cases"/>
           <menuitem action="data_transpose"/>
+          <menuitem action="data_aggregate"/>
           <separator/>
           <menuitem action="data_split-file"/>
           <menuitem action="data_select-cases"/>
@@ -512,7 +508,9 @@
         </menu>
         <menu action="transform">
           <menuitem action="transform_compute"/>
+          <menuitem action="transform_count"/>
           <menuitem action="transform_rank"/>
+          <menuitem action="transform_autorecode"/>
           <separator/>
           <menuitem action="transform_recode-same"/>
           <menuitem action="transform_recode-different"/>
@@ -523,22 +521,29 @@
           <menu action="descriptive-statistics">
             <menuitem action="analyze_frequencies"/>
             <menuitem action="analyze_descriptives"/>
-            <menuitem action="analyze_explore"/>
+            <menuitem action="explore"/>
             <menuitem action="crosstabs"/>
           </menu>
           <menu action="compare-means">
+            <menuitem action="means"/>
             <menuitem action="one-sample-t-test"/>
             <menuitem action="indep-t-test"/>
             <menuitem action="paired-t-test"/>
             <menuitem action="oneway-anova"/>
           </menu>
+          <menuitem action="univariate"/>
           <menuitem action="correlation"/>
+          <menuitem action="k-means"/>
           <menuitem action="factor-analysis"/>
           <menuitem action="reliability"/>
           <menuitem action="linear-regression"/>
           <menu action="non-parametrics">
             <menuitem action="chi-square"/>
             <menuitem action="binomial"/>
+            <menuitem action="runs"/>
+            <menuitem action="ks-one-sample"/>
+            <menuitem action="two-related-samples"/>
+            <menuitem action="k-related-samples"/>
           </menu>
           <menuitem action="roc-curve"/>
         </menu>
@@ -552,59 +557,25 @@
         </menu>
       </menubar>
       <toolbar action="toolbar">
-        <placeholder name="tool-items">
-          <toolitem name="toolbar_open" action="file_open"/>
-          <toolitem name="toolbar_save" action="file_save"/>
-	  <separator/>
-          <toolitem name="toolbar_goto-case" action="edit_goto-case"/>
-          <toolitem name="toolbar_goto-variable" action="utilities_variables"/>
-	  <separator/>
-          <toolitem name="toolbar_find" action="edit_find"/>
-	  <separator/>
-	  <toolitem name="toolbar_insert-cases" action="edit_insert-case"/>
-	  <toolitem name="toolbar_insert-variable" action="action_insert-variable"/>
-	  <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"/>
-        </placeholder>
+	<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>
-      <popup name="datasheet-variable-popup">
-	  <menuitem action="action_insert-variable"/>
-	  <separator/>
-	  <menuitem action="edit_clear-variables"/>
-	  <separator/>
-          <menuitem action="sort-up"/>
-          <menuitem action="sort-down"/>
-      </popup>
-      <popup name="varsheet-variable-popup">
-	  <menuitem action="action_insert-variable"/>
-	  <separator/>
-	  <menuitem action="edit_clear-variables"/>
-      </popup>
-      <popup name="datasheet-cases-popup">
-	  <menuitem action="edit_insert-case"/>
-	  <separator/>
-	  <menuitem action="edit_clear-cases"/>
-      </popup>
-</ui>
+    </ui>
   </object>
   <!-- interface-requires gtk+ 2.6 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkMenuBar" constructor="uimanager1" id="menubar">
     <property name="visible">True</property>
   </object>
-  <object class="GtkMenu" constructor="uimanager1" id="datasheet-variable-popup">
-    <property name="visible">True</property>
-  </object>
-  <object class="GtkMenu" constructor="uimanager1" id="varsheet-variable-popup">
-    <property name="visible">True</property>
-  </object>
-  <object class="GtkMenu" constructor="uimanager1" id="datasheet-cases-popup">
-    <property name="visible">True</property>
-  </object>
   <object class="GtkHandleBox" id="handlebox1">
     <property name="visible">True</property>
     <child>