X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fdata-editor.ui;h=0b1378e8422b557741bcaa9569ff0520b98112c4;hb=refs%2Fbuilds%2F20130419011830%2Fpspp;hp=3e9179681292f475b3ace88a938c8c5d6bb3a413;hpb=2b4fb7e846d62f1a70656bb42a0f769363ed0832;p=pspp

diff --git a/src/ui/gui/data-editor.ui b/src/ui/gui/data-editor.ui
index 3e91796812..0b1378e842 100644
--- a/src/ui/gui/data-editor.ui
+++ b/src/ui/gui/data-editor.ui
@@ -1,20 +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>
@@ -117,72 +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>
-            <property name="label" translatable="yes">_Find...</property>
-          </object>
-        </child>
         <child>
           <object class="GtkAction" id="view">
             <property name="name">view</property>
@@ -302,8 +222,9 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="transform_rank">
+          <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>
@@ -345,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>
@@ -358,14 +280,16 @@
           </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>
         <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>
@@ -389,8 +313,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>
@@ -428,8 +353,9 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="factor-analysis">
+          <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>
@@ -441,9 +367,23 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="linear-regression">
+          <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="label" translatable="yes">Linear _Regression...</property>
+            <property name="manager">uimanager1</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>
@@ -459,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>
@@ -560,19 +501,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/>
@@ -605,9 +535,9 @@
         </menu>
         <menu action="analyze">
           <menu action="descriptive-statistics">
-            <menuitem action="analyze_frequencies"/>
+            <menuitem action="frequencies"/>
             <menuitem action="analyze_descriptives"/>
-            <menuitem action="analyze_explore"/>
+            <menuitem action="explore"/>
             <menuitem action="crosstabs"/>
           </menu>
           <menu action="compare-means">
@@ -622,7 +552,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"/>
@@ -643,43 +576,18 @@
         </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>
-      </toolbar>
-      <popup name="datasheet-variable-popup">
-	<menuitem action="action_insert-variable"/>
+	<toolitem name="toolbar_open" action="file_open"/>
+	<toolitem name="toolbar_save" action="file_save"/>
 	<separator/>
-	<menuitem action="edit_clear-variables"/>
+	<placeholder name="DataSheetToolItems"/>
+	<placeholder name="VarSheetToolItems"/>
 	<separator/>
-        <menuitem action="sort-up"/>
-        <menuitem action="sort-down"/>
-      </popup>
-      <popup name="varsheet-variable-popup">
-	<menuitem action="action_insert-variable"/>
+	<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/>
-	<menuitem action="edit_clear-variables"/>
-      </popup>
-      <popup name="datasheet-cases-popup">
-	<menuitem action="edit_insert-case"/>
-	<separator/>
-	<menuitem action="edit_clear-cases"/>
-      </popup>
+	<toolitem name="toolbar_select-cases" action="view_value-labels"/>
+      </toolbar>
     </ui>
   </object>
   <!-- interface-requires gtk+ 2.6 -->
@@ -687,15 +595,6 @@
   <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>