X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fdata-editor.ui;h=2a5289477977ff180b2453e82389dfab1464f66c;hb=cf10258e2e58c352c555dd2579d2fe9f5b2fce50;hp=cfa5b3e91834ea6e4cab79daaf83f02d0b8e7902;hpb=2648cb6603262653fa660d0b7045450d5df6e6a9;p=pspp

diff --git a/src/ui/gui/data-editor.ui b/src/ui/gui/data-editor.ui
index cfa5b3e918..2a52894779 100644
--- a/src/ui/gui/data-editor.ui
+++ b/src/ui/gui/data-editor.ui
@@ -49,9 +49,9 @@
           </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>
+          <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">gtk-convert</property>
           </object>
         </child>
@@ -346,8 +346,9 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="analyze_frequencies">
-            <property name="name">analyze_frequencies</property>
+          <object class="PsppireDialogActionFrequencies" id="frequencies">
+            <property name="manager">uimanager1</property>
+            <property name="name">frequencies</property>
             <property name="label" translatable="yes">_Frequencies...</property>
           </object>
         </child>
@@ -366,8 +367,9 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="crosstabs">
+          <object class="PsppireDialogActionCrosstabs" id="crosstabs">
             <property name="name">crosstabs</property>
+            <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">_Crosstabs...</property>
           </object>
         </child>
@@ -444,11 +446,24 @@
             <property name="label" translatable="yes">Re_liability...</property>
           </object>
         </child>
+        <child>
+          <object class="GtkAction" id="regression">
+            <property name="name">regression</property>
+            <property name="label" translatable="yes">_Regression</property>
+          </object>
+        </child>
         <child>
           <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>
+            <property name="label" translatable="yes">_Linear...</property>
+          </object>
+        </child>
+        <child>
+          <object class="PsppireDialogActionLogistic" id="logistic-regression">
+            <property name="name">logistic-regression</property>
+            <property name="manager">uimanager1</property>
+            <property name="label" translatable="yes">_Binary Logistic...</property>
           </object>
         </child>
         <child>
@@ -464,8 +479,9 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="binomial">
+          <object class="PsppireDialogActionBinomial" id="binomial">
             <property name="name">binomial</property>
+            <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">_Binomial...</property>
           </object>
         </child>
@@ -549,7 +565,7 @@
             <menuitem action="file_new_data"/>
           </menu>
           <menuitem action="file_open"/>
-          <menuitem action="file_import-text"/>
+          <menuitem action="file_import"/>
           <separator/>
           <menuitem action="file_save"/>
           <menuitem action="file_save_as"/>
@@ -610,7 +626,7 @@
         </menu>
         <menu action="analyze">
           <menu action="descriptive-statistics">
-            <menuitem action="analyze_frequencies"/>
+            <menuitem action="frequencies"/>
             <menuitem action="analyze_descriptives"/>
             <menuitem action="explore"/>
             <menuitem action="crosstabs"/>
@@ -627,7 +643,10 @@
           <menuitem action="k-means"/>
           <menuitem action="factor-analysis"/>
           <menuitem action="reliability"/>
-          <menuitem action="linear-regression"/>
+          <menu action="regression">
+            <menuitem action="linear-regression"/>
+            <menuitem action="logistic-regression"/>
+          </menu>
           <menu action="non-parametrics">
             <menuitem action="chi-square"/>
             <menuitem action="binomial"/>