X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fdata-editor.ui;h=cfa5b3e91834ea6e4cab79daaf83f02d0b8e7902;hb=5166b8309e1fec33d5122de360ba212ad3107a2c;hp=e64334a6681db76141b4d37620ec1347c53d162e;hpb=770a9763c4059adc0fde5f7b169814181ac14158;p=pspp

diff --git a/src/ui/gui/data-editor.ui b/src/ui/gui/data-editor.ui
index e64334a668..cfa5b3e918 100644
--- a/src/ui/gui/data-editor.ui
+++ b/src/ui/gui/data-editor.ui
@@ -219,15 +219,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>
@@ -237,9 +238,10 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="data_sort-cases">
+          <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 dataset</property>
           </object>
@@ -294,11 +296,24 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="transform_rank">
+          <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="PsppireDialogActionRank" id="transform_rank">
             <property name="name">transform_rank</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>
@@ -337,14 +352,16 @@
           </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>
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="analyze_explore">
+          <object class="PsppireDialogActionExamine" id="explore">
             <property name="name">analyze_explore</property>
+            <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">_Explore...</property>
           </object>
         </child>
@@ -360,6 +377,13 @@
             <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>
@@ -367,8 +391,9 @@
           </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="manager">uimanager1</property>
             <property name="label" translatable="yes">_Independent Samples T Test...</property>
           </object>
         </child>
@@ -385,26 +410,44 @@
           </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="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="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="manager">uimanager1</property>
             <property name="label" translatable="yes">Linear _Regression...</property>
           </object>
         </child>
@@ -426,6 +469,24 @@
             <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="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>
@@ -433,8 +494,9 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="roc-curve">
+          <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>
@@ -445,7 +507,8 @@
           </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="tooltip" translatable="yes">Jump to variable</property>
@@ -536,7 +599,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"/>
@@ -547,22 +612,28 @@
           <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"/>