Merge 'master' into 'psppsheet'.

[pspp] / src / ui / gui / data-editor.ui

diff --git a/src/ui/gui/data-editor.ui b/src/ui/gui/data-editor.ui
index 491b94b1bc683dd533e7e84c1a66285799e6396b..0b1378e8422b557741bcaa9569ff0520b98112c4 100644 (file)
--- a/src/ui/gui/data-editor.ui
+++ b/src/ui/gui/data-editor.ui
@@ -266,8 +266,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>
@@ -286,8 +287,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>
@@ -397,8 +399,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>
@@ -532,7 +535,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"/>