Convert data-editor.glade to data-editor.ui
authorJohn Darrington <john@darrington.wattle.id.au>
Sun, 9 May 2010 16:07:25 +0000 (18:07 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Sun, 9 May 2010 16:07:25 +0000 (18:07 +0200)
src/ui/gui/automake.mk
src/ui/gui/data-editor.glade [deleted file]
src/ui/gui/data-editor.ui [new file with mode: 0644]
src/ui/gui/psppire-data-window.c

index d312e16fba4002794553f6d861cd7dc8989e805e..52e7713472ba5458ed6a97a9acbed39191a507e7 100644 (file)
@@ -22,7 +22,7 @@ UI_FILES = \
        src/ui/gui/text-data-import.ui \
        src/ui/gui/var-sheet-dialogs.ui \
        src/ui/gui/variable-info.ui \
-       src/ui/gui/data-editor.glade \
+       src/ui/gui/data-editor.ui \
        src/ui/gui/output-viewer.glade \
        src/ui/gui/syntax-editor.glade
 
@@ -85,7 +85,6 @@ uninstall-icons:
 UNINSTALL_DATA_HOOKS += uninstall-icons
 
 nodist_src_ui_gui_psppire_DATA = \
-       $(top_builddir)/src/ui/gui/data-editor.ui \
        $(top_builddir)/src/ui/gui/output-viewer.ui \
        $(top_builddir)/src/ui/gui/syntax-editor.ui
 
diff --git a/src/ui/gui/data-editor.glade b/src/ui/gui/data-editor.glade
deleted file mode 100644 (file)
index 479b4b9..0000000
+++ /dev/null
@@ -1,1077 +0,0 @@
-<?xml version="1.0"?>
-<glade-interface>
-  <!-- interface-requires gtk+ 2.6 -->
-  <!-- interface-naming-policy toplevel-contextual -->
-  <widget class="GtkMenuBar" id="menubar">
-    <property name="visible">True</property>
-    <child>
-      <widget class="GtkMenuItem" id="file">
-        <property name="visible">True</property>
-        <property name="label" translatable="yes">_File</property>
-        <property name="use_underline">True</property>
-        <child>
-          <widget class="GtkMenu" id="menuitem1_menu">
-            <child>
-              <widget class="GtkImageMenuItem" id="new1">
-                <property name="label">gtk-new</property>
-                <property name="visible">True</property>
-                <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
-                <child>
-                  <widget class="GtkMenu" id="new1_menu">
-                    <child>
-                      <widget class="GtkMenuItem" id="file_new_syntax">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Syntax</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkMenuItem" id="file_new_data">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Data</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkImageMenuItem" id="file_open">
-                <property name="label">gtk-open</property>
-                <property name="visible">True</property>
-                <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="file_import-text">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">_Import Delimited Text Data</property>
-                <property name="use_underline">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkSeparatorMenuItem" id="file_separator1">
-                <property name="visible">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkImageMenuItem" id="file_save">
-                <property name="label">gtk-save</property>
-                <property name="visible">True</property>
-                <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkImageMenuItem" id="file_save_as">
-                <property name="label">gtk-save-as</property>
-                <property name="visible">True</property>
-                <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkSeparatorMenuItem" id="file_separator2">
-                <property name="visible">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="file-information">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">D_isplay Data File Information</property>
-                <property name="use_underline">True</property>
-                <child>
-                  <widget class="GtkMenu" id="file-info-menu">
-                    <property name="visible">True</property>
-                    <property name="tearoff_state">True</property>
-                    <child>
-                      <widget class="GtkMenuItem" id="file_information_working-file">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Working File</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkMenuItem" id="file_information_external-file">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">External File</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkSeparatorMenuItem" id="separatormenuitem1">
-                <property name="visible">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="file_recent-data">
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">Recently Used Da_ta</property>
-                <property name="use_underline">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="file_recent-files">
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">Recently Used _Files</property>
-                <property name="use_underline">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkSeparatorMenuItem" id="file_separator3">
-                <property name="visible">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkImageMenuItem" id="file_quit">
-                <property name="label">gtk-quit</property>
-                <property name="visible">True</property>
-                <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
-              </widget>
-            </child>
-          </widget>
-        </child>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkMenuItem" id="edit">
-        <property name="visible">True</property>
-        <property name="label" translatable="yes">_Edit</property>
-        <property name="use_underline">True</property>
-        <child>
-          <widget class="GtkMenu" id="edit_menu">
-            <child>
-              <widget class="GtkMenuItem" id="edit_insert-variable">
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="label" translatable="yes">Insert Variable</property>
-                <property name="use_underline">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="edit_insert-case">
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="label" translatable="yes">Insert Cases</property>
-                <property name="use_underline">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkImageMenuItem" id="edit_goto-case">
-                <property name="label">Go To Case</property>
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkSeparatorMenuItem" id="separator4">
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkImageMenuItem" id="edit_cut">
-                <property name="label">gtk-cut</property>
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkImageMenuItem" id="edit_copy">
-                <property name="label">gtk-copy</property>
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkImageMenuItem" id="edit_paste">
-                <property name="label">gtk-paste</property>
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="edit_clear-variables">
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="label" translatable="yes">Cl_ear Variables</property>
-                <property name="use_underline">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="edit_clear-cases">
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="label" translatable="yes">_Clear Cases</property>
-                <property name="use_underline">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkSeparatorMenuItem" id="separator6">
-                <property name="visible">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkImageMenuItem" id="edit_find">
-                <property name="label">gtk-find</property>
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
-              </widget>
-            </child>
-          </widget>
-        </child>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkMenuItem" id="view">
-        <property name="visible">True</property>
-        <property name="label" translatable="yes">_View</property>
-        <property name="use_underline">True</property>
-        <child>
-          <widget class="GtkMenu" id="menuitem3_menu">
-            <child>
-              <widget class="GtkCheckMenuItem" id="view_statusbar">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_Status Bar</property>
-                <property name="use_underline">True</property>
-                <property name="active">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkSeparatorMenuItem" id="separator1">
-                <property name="visible">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="view_fonts">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_Fonts</property>
-                <property name="use_underline">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkCheckMenuItem" id="view_gridlines">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_Grid Lines</property>
-                <property name="use_underline">True</property>
-                <property name="active">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkCheckMenuItem" id="view_value-labels">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Value _Labels</property>
-                <property name="use_underline">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkSeparatorMenuItem" id="separator3">
-                <property name="visible">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="view_data">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_Data</property>
-                <property name="use_underline">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="view_variables">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_Variables</property>
-                <property name="use_underline">True</property>
-              </widget>
-            </child>
-          </widget>
-        </child>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkMenuItem" id="data">
-        <property name="visible">True</property>
-        <property name="label" translatable="yes">_Data</property>
-        <property name="use_underline">True</property>
-        <child>
-          <widget class="GtkMenu" id="data_menu">
-            <child>
-              <widget class="GtkImageMenuItem" id="data_sort-cases">
-                <property name="label" translatable="yes">_Sort Cases</property>
-                <property name="visible">True</property>
-                <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="data_transpose">
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="label" translatable="yes">_Transpose</property>
-                <property name="use_underline">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkSeparatorMenuItem" id="separator5">
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="data_split-file">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">S_plit File</property>
-                <property name="use_underline">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="data_select-cases">
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="label" translatable="yes">Select _Cases</property>
-                <property name="use_underline">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="data_weight-cases">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_Weight Cases</property>
-                <property name="use_underline">True</property>
-              </widget>
-            </child>
-          </widget>
-        </child>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkMenuItem" id="transform">
-        <property name="visible">True</property>
-        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-        <property name="label" translatable="yes">_Transform</property>
-        <property name="use_underline">True</property>
-        <child>
-          <widget class="GtkMenu" id="menu2">
-            <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <child>
-              <widget class="GtkMenuItem" id="transform_compute">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">_Compute</property>
-                <property name="use_underline">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="transform_rank">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">Ran_k Cases</property>
-                <property name="use_underline">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkSeparatorMenuItem" id="separator8">
-                <property name="visible">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="transform_recode-same">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Recode into _Same Variables</property>
-                <property name="use_underline">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="transform_recode-different">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Recode into _Different Variables</property>
-                <property name="use_underline">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkSeparatorMenuItem" id="separator7">
-                <property name="visible">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="transform_run-pending">
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="label" translatable="yes">_Run Pending Transforms</property>
-                <property name="use_underline">True</property>
-                <accelerator key="G" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-              </widget>
-            </child>
-          </widget>
-        </child>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkMenuItem" id="analyze">
-        <property name="visible">True</property>
-        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-        <property name="label" translatable="yes">_Analyze</property>
-        <property name="use_underline">True</property>
-        <child>
-          <widget class="GtkMenu" id="menu3">
-            <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <child>
-              <widget class="GtkMenuItem" id="descriptive-statistics">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">_Descriptive Statistics</property>
-                <property name="use_underline">True</property>
-                <child>
-                  <widget class="GtkMenu" id="menu5">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <child>
-                      <widget class="GtkMenuItem" id="analyze_frequencies">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">_Frequencies</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkMenuItem" id="analyze_descriptives">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">_Descriptives</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkMenuItem" id="analyze_explore">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">_Explore</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkMenuItem" id="crosstabs">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">_Crosstabs</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="compare-means">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">Compare _Means</property>
-                <property name="use_underline">True</property>
-                <child>
-                  <widget class="GtkMenu" id="menu6">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <child>
-                      <widget class="GtkMenuItem" id="one-sample-t-test">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">_One Sample T Test</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkMenuItem" id="indep-t-test">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">_Independent Samples T Test</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkMenuItem" id="paired-t-test">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">_Paired Samples T Test</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkMenuItem" id="oneway-anova">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">One Way _ANOVA</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="correlation">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Bivariate _Correlation...</property>
-                <property name="use_underline">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="factor-analysis">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Factor _Analysis</property>
-                <property name="use_underline">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="reliability">
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">Re_liability</property>
-                <property name="use_underline">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="linear-regression">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">Linear _Regression</property>
-                <property name="use_underline">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="non-parametrics">
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">_Non-Parametric Statistics</property>
-                <property name="use_underline">True</property>
-                <child>
-                  <widget class="GtkMenu" id="menu4">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <child>
-                      <widget class="GtkMenuItem" id="chi-square">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">_Chi-Square</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkMenuItem" id="binomial">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">_Binomial</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="roc-curve">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">ROC Cur_ve...</property>
-                <property name="use_underline">True</property>
-              </widget>
-            </child>
-          </widget>
-        </child>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkMenuItem" id="utilities">
-        <property name="visible">True</property>
-        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-        <property name="label" translatable="yes">_Utilities</property>
-        <property name="use_underline">True</property>
-        <child>
-          <widget class="GtkMenu" id="menu1">
-            <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <child>
-              <widget class="GtkMenuItem" id="utilities_variables">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">_Variables</property>
-                <property name="use_underline">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="utilities_comments">
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">Data File _Comments</property>
-                <property name="use_underline">True</property>
-              </widget>
-            </child>
-          </widget>
-        </child>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkMenuItem" id="windows">
-        <property name="visible">True</property>
-        <property name="label" translatable="yes">_Windows</property>
-        <property name="use_underline">True</property>
-        <child>
-          <widget class="GtkMenu" id="Windows_menu">
-            <child>
-              <widget class="GtkMenuItem" id="windows_minimise_all">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_Minimize All Windows</property>
-                <property name="use_underline">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkCheckMenuItem" id="windows_split">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_Split</property>
-                <property name="use_underline">True</property>
-              </widget>
-            </child>
-          </widget>
-        </child>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkMenuItem" id="help">
-        <property name="visible">True</property>
-        <property name="label" translatable="yes">_Help</property>
-        <property name="use_underline">True</property>
-        <child>
-          <widget class="GtkMenu" id="menuitem5_menu">
-            <child>
-              <widget class="GtkImageMenuItem" id="help_reference">
-                <property name="label">_Reference Manual</property>
-                <property name="visible">True</property>
-                <property name="use_underline">True</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkImageMenuItem" id="help_about">
-                <property name="label">_About</property>
-                <property name="visible">True</property>
-                <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
-              </widget>
-            </child>
-          </widget>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkHandleBox" id="handlebox1">
-    <property name="visible">True</property>
-    <child>
-      <widget class="GtkToolbar" id="toolbar1">
-        <property name="visible">True</property>
-        <child>
-          <widget class="GtkToolButton" id="button-open">
-            <property name="visible">True</property>
-            <property name="tooltip" translatable="yes">Open</property>
-            <property name="stock_id">gtk-open</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkToolButton" id="button-save">
-            <property name="visible">True</property>
-            <property name="tooltip" translatable="yes">Save</property>
-            <property name="stock_id">gtk-save</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkToolButton" id="button-print">
-            <property name="sensitive">False</property>
-            <property name="tooltip" translatable="yes">Print</property>
-            <property name="stock_id">gtk-print</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkToolButton" id="button-recent">
-            <property name="sensitive">False</property>
-            <property name="tooltip" translatable="yes">Recall</property>
-            <property name="stock_id">gtk-missing-image</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkSeparatorToolItem" id="separatortoolitem1"/>
-          <packing>
-            <property name="expand">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkToolButton" id="button-undo">
-            <property name="sensitive">False</property>
-            <property name="tooltip" translatable="yes">Undo</property>
-            <property name="stock_id">gtk-undo</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkToolButton" id="button-redo">
-            <property name="sensitive">False</property>
-            <property name="tooltip" translatable="yes">Redo</property>
-            <property name="stock_id">gtk-redo</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkSeparatorToolItem" id="separatortoolitem2">
-            <property name="visible">True</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkToolButton" id="button-goto-case">
-            <property name="visible">True</property>
-            <property name="sensitive">False</property>
-            <property name="tooltip" translatable="yes">Go To Case</property>
-            <property name="stock_id">gtk-jump-to</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkToolButton" id="button-goto-variable">
-            <property name="visible">True</property>
-            <property name="tooltip" translatable="yes">Variables</property>
-            <property name="use_underline">True</property>
-            <property name="stock_id">gtk-missing-image</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkSeparatorToolItem" id="separatortoolitem5">
-            <property name="visible">True</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkToolButton" id="button-find">
-            <property name="visible">True</property>
-            <property name="sensitive">False</property>
-            <property name="tooltip" translatable="yes">Find</property>
-            <property name="stock_id">gtk-find</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkSeparatorToolItem" id="separatortoolitem4">
-            <property name="visible">True</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkToolButton" id="button-insert-case">
-            <property name="visible">True</property>
-            <property name="sensitive">False</property>
-            <property name="tooltip" translatable="yes">Insert Case</property>
-            <property name="use_underline">True</property>
-            <property name="stock_id">gtk-missing-image</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkToolButton" id="button-insert-variable">
-            <property name="visible">True</property>
-            <property name="sensitive">False</property>
-            <property name="tooltip" translatable="yes">Insert Variable</property>
-            <property name="use_underline">True</property>
-            <property name="stock_id">gtk-missing-image</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkSeparatorToolItem" id="separatortoolitem6">
-            <property name="visible">True</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkToolButton" id="button-split-file">
-            <property name="visible">True</property>
-            <property name="tooltip" translatable="yes">Split File</property>
-            <property name="use_underline">True</property>
-            <property name="stock_id">gtk-missing-image</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkToolButton" id="button-weight-cases">
-            <property name="visible">True</property>
-            <property name="tooltip" translatable="yes">Weight Cases</property>
-            <property name="use_underline">True</property>
-            <property name="stock_id">gtk-missing-image</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkToolButton" id="button-select-cases">
-            <property name="visible">True</property>
-            <property name="sensitive">False</property>
-            <property name="tooltip" translatable="yes">Select Cases</property>
-            <property name="use_underline">True</property>
-            <property name="stock_id">gtk-missing-image</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkSeparatorToolItem" id="separatortoolitem7">
-            <property name="visible">True</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkToggleToolButton" id="togglebutton-value-labels">
-            <property name="visible">True</property>
-            <property name="tooltip" translatable="yes">Value Labels</property>
-            <property name="use_underline">True</property>
-            <property name="stock_id">gtk-missing-image</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkToolButton" id="button-use-sets">
-            <property name="sensitive">False</property>
-            <property name="tooltip" translatable="yes">Use Sets</property>
-            <property name="use_underline">True</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkHBox" id="status-bar">
-    <property name="visible">True</property>
-    <property name="spacing">6</property>
-    <child>
-      <widget class="GtkFrame" id="frame2">
-        <property name="visible">True</property>
-        <property name="label_xalign">0</property>
-        <property name="shadow_type">in</property>
-        <child>
-          <widget class="GtkEventBox" id="eventbox1">
-            <property name="visible">True</property>
-            <property name="tooltip" translatable="yes">Information Area</property>
-            <child>
-              <widget class="GtkLabel" id="information-area">
-                <property name="visible">True</property>
-                <property name="single_line_mode">True</property>
-              </widget>
-            </child>
-          </widget>
-        </child>
-      </widget>
-      <packing>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <widget class="GtkFrame" id="frame3">
-        <property name="visible">True</property>
-        <property name="label_xalign">0</property>
-        <property name="shadow_type">in</property>
-        <child>
-          <widget class="GtkEventBox" id="eventbox2">
-            <property name="visible">True</property>
-            <property name="tooltip" translatable="yes">Processor Area</property>
-            <child>
-              <widget class="GtkLabel" id="processor-area">
-                <property name="visible">True</property>
-                <property name="width_chars">35</property>
-                <property name="single_line_mode">True</property>
-              </widget>
-            </child>
-          </widget>
-        </child>
-      </widget>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <widget class="GtkFrame" id="frame5">
-        <property name="visible">True</property>
-        <property name="label_xalign">0</property>
-        <property name="shadow_type">in</property>
-        <child>
-          <widget class="GtkEventBox" id="eventbox4">
-            <property name="visible">True</property>
-            <property name="tooltip" translatable="yes">Case Counter Area</property>
-            <child>
-              <widget class="GtkLabel" id="case-counter-area">
-                <property name="visible">True</property>
-                <property name="width_chars">20</property>
-                <property name="single_line_mode">True</property>
-              </widget>
-            </child>
-          </widget>
-        </child>
-      </widget>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">3</property>
-      </packing>
-    </child>
-    <child>
-      <widget class="GtkFrame" id="frame6">
-        <property name="visible">True</property>
-        <property name="label_xalign">0</property>
-        <property name="shadow_type">in</property>
-        <child>
-          <widget class="GtkEventBox" id="eventbox5">
-            <property name="visible">True</property>
-            <property name="tooltip" translatable="yes">Filter Use Status Area</property>
-            <child>
-              <widget class="GtkLabel" id="filter-use-status-area">
-                <property name="visible">True</property>
-                <property name="ellipsize">start</property>
-                <property name="width_chars">10</property>
-                <property name="single_line_mode">True</property>
-              </widget>
-            </child>
-          </widget>
-        </child>
-      </widget>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">4</property>
-      </packing>
-    </child>
-    <child>
-      <widget class="GtkFrame" id="frame7">
-        <property name="visible">True</property>
-        <property name="label_xalign">0</property>
-        <property name="shadow_type">in</property>
-        <child>
-          <widget class="GtkEventBox" id="eventbox6">
-            <property name="visible">True</property>
-            <property name="tooltip" translatable="yes">Weight Status Area</property>
-            <child>
-              <widget class="GtkLabel" id="weight-status-area">
-                <property name="visible">True</property>
-                <property name="ellipsize">start</property>
-                <property name="width_chars">15</property>
-                <property name="single_line_mode">True</property>
-              </widget>
-            </child>
-          </widget>
-        </child>
-      </widget>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">5</property>
-      </packing>
-    </child>
-    <child>
-      <widget class="GtkFrame" id="frame8">
-        <property name="visible">True</property>
-        <property name="label_xalign">0</property>
-        <property name="shadow_type">in</property>
-        <child>
-          <widget class="GtkEventBox" id="eventbox7">
-            <property name="visible">True</property>
-            <property name="tooltip" translatable="yes">Split File Status Area</property>
-            <child>
-              <widget class="GtkLabel" id="split-file-status-area">
-                <property name="visible">True</property>
-                <property name="ellipsize">start</property>
-                <property name="width_chars">15</property>
-                <property name="single_line_mode">True</property>
-              </widget>
-            </child>
-          </widget>
-        </child>
-      </widget>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">6</property>
-      </packing>
-    </child>
-  </widget>
-</glade-interface>
diff --git a/src/ui/gui/data-editor.ui b/src/ui/gui/data-editor.ui
new file mode 100644 (file)
index 0000000..64e40e6
--- /dev/null
@@ -0,0 +1,741 @@
+<?xml version="1.0"?>
+<interface>
+  <object class="GtkUIManager" id="uimanager1">
+    <child>
+      <object class="GtkActionGroup" id="actiongroup1">
+        <child>
+          <object class="GtkAction" id="file">
+            <property name="name">file</property>
+            <property name="label" translatable="yes">_File</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="new1">
+            <property name="stock_id">gtk-new</property>
+            <property name="name">new1</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="file_new_syntax">
+            <property name="name">file_new_syntax</property>
+            <property name="label" translatable="yes">_Syntax</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="file_new_data">
+            <property name="name">file_new_data</property>
+            <property name="label" translatable="yes">_Data</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="file_open">
+            <property name="stock_id">gtk-open</property>
+            <property name="name">file_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>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="file_save">
+            <property name="stock_id">gtk-save</property>
+            <property name="name">file_save</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="file_save_as">
+            <property name="stock_id">gtk-save-as</property>
+            <property name="name">file_save_as</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="file-information">
+            <property name="name">file-information</property>
+            <property name="label" translatable="yes">D_isplay Data File Information</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="file_information_working-file">
+            <property name="name">file_information_working-file</property>
+            <property name="label" translatable="yes">Working File</property>
+          </object>
+        </child>
+        <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>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="file_recent-data">
+            <property name="name">file_recent-data</property>
+            <property name="label" translatable="yes">Recently Used Da_ta</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="file_recent-files">
+            <property name="name">file_recent-files</property>
+            <property name="label" translatable="yes">Recently Used _Files</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="file_quit">
+            <property name="stock_id">gtk-quit</property>
+            <property name="name">file_quit</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="edit">
+            <property name="name">edit</property>
+            <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="stock_id">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>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="edit_clear-cases">
+            <property name="name">edit_clear-cases</property>
+            <property name="label" translatable="yes">_Clear Cases</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>
+            <property name="label" translatable="yes">_View</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleAction" id="view_statusbar">
+            <property name="active">True</property>
+            <property name="name">view_statusbar</property>
+            <property name="label" translatable="yes">_Status Bar</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="view_fonts">
+            <property name="name">view_fonts</property>
+            <property name="label" translatable="yes">_Fonts</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleAction" id="view_gridlines">
+            <property name="active">True</property>
+            <property name="name">view_gridlines</property>
+            <property name="label" translatable="yes">_Grid Lines</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleAction" id="view_value-labels">
+            <property name="name">view_value-labels</property>
+            <property name="label" translatable="yes">Value _Labels</property>
+           <property name="tooltip" translatable="yes">Show/hide value labels</property>
+           <property name="stock-id">pspp-value-labels</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" 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">
+            <property name="name">view_variables</property>
+            <property name="label" translatable="yes">_Variables</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="data">
+            <property name="name">data</property>
+            <property name="label" translatable="yes">_Data</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="data_sort-cases">
+            <property name="stock_id">_Sort Cases</property>
+            <property name="name">data_sort-cases</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="data_transpose">
+            <property name="name">data_transpose</property>
+            <property name="label" translatable="yes">_Transpose</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="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>
+          </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="tooltip" translatable="yes">Weight cases by variable</property>
+           <property name="stock-id">pspp-weight-cases</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="transform">
+            <property name="name">transform</property>
+            <property name="label" translatable="yes">_Transform</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="transform_compute">
+            <property name="name">transform_compute</property>
+            <property name="label" translatable="yes">_Compute</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="transform_rank">
+            <property name="name">transform_rank</property>
+            <property name="label" translatable="yes">Ran_k Cases</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>
+          </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>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="transform_run-pending">
+            <property name="name">transform_run-pending</property>
+            <property name="label" translatable="yes">_Run Pending Transforms</property>
+          </object>
+          <accelerator key="G" modifiers="GDK_CONTROL_MASK"/>
+        </child>
+        <child>
+          <object class="GtkAction" id="analyze">
+            <property name="name">analyze</property>
+            <property name="label" translatable="yes">_Analyze</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="descriptive-statistics">
+            <property name="name">descriptive-statistics</property>
+            <property name="label" translatable="yes">_Descriptive Statistics</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="analyze_frequencies">
+            <property name="name">analyze_frequencies</property>
+            <property name="label" translatable="yes">_Frequencies</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="analyze_descriptives">
+            <property name="name">analyze_descriptives</property>
+            <property name="label" translatable="yes">_Descriptives</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="analyze_explore">
+            <property name="name">analyze_explore</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>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="compare-means">
+            <property name="name">compare-means</property>
+            <property name="label" translatable="yes">Compare _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>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="indep-t-test">
+            <property name="name">indep-t-test</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>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="oneway-anova">
+            <property name="name">oneway-anova</property>
+            <property name="label" translatable="yes">One Way _ANOVA</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="correlation">
+            <property name="name">correlation</property>
+            <property name="label" translatable="yes">Bivariate _Correlation...</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="factor-analysis">
+            <property name="name">factor-analysis</property>
+            <property name="label" translatable="yes">Factor _Analysis</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="reliability">
+            <property name="name">reliability</property>
+            <property name="label" translatable="yes">Re_liability</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="linear-regression">
+            <property name="name">linear-regression</property>
+            <property name="label" translatable="yes">Linear _Regression</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="non-parametrics">
+            <property name="name">non-parametrics</property>
+            <property name="label" translatable="yes">_Non-Parametric Statistics</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="chi-square">
+            <property name="name">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>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="roc-curve">
+            <property name="name">roc-curve</property>
+            <property name="label" translatable="yes">ROC Cur_ve...</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="utilities">
+            <property name="name">utilities</property>
+            <property name="label" translatable="yes">_Utilities</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="utilities_variables">
+            <property name="name">utilities_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>
+        </child>
+        <child>
+          <object class="GtkAction" id="utilities_comments">
+            <property name="name">utilities_comments</property>
+            <property name="label" translatable="yes">Data File _Comments</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="windows">
+            <property name="name">windows</property>
+            <property name="label" translatable="yes">_Windows</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="windows_minimise_all">
+            <property name="name">windows_minimise_all</property>
+            <property name="label" translatable="yes">_Minimize All Windows</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleAction" id="windows_split">
+            <property name="name">windows_split</property>
+            <property name="label" translatable="yes">_Split</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="help">
+            <property name="name">help</property>
+            <property name="label" translatable="yes">_Help</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="help_reference">
+            <property name="name">help_reference</property>
+            <property name="label">_Reference Manual</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="help_about">
+            <property name="stock_id">_About</property>
+            <property name="name">help_about</property>
+          </object>
+        </child>
+      </object>
+    </child>
+    <ui>
+      <menubar name="menubar">
+        <menu action="file">
+          <menu action="new1">
+            <menuitem action="file_new_syntax"/>
+            <menuitem action="file_new_data"/>
+          </menu>
+          <menuitem action="file_open"/>
+          <menuitem action="file_import-text"/>
+          <separator/>
+          <menuitem action="file_save"/>
+          <menuitem action="file_save_as"/>
+          <separator/>
+          <menu action="file-information">
+            <menuitem action="file_information_working-file"/>
+            <menuitem action="file_information_external-file"/>
+          </menu>
+          <separator/>
+          <menuitem action="file_recent-data"/>
+          <menuitem action="file_recent-files"/>
+          <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>
+        <menu action="view">
+          <menuitem action="view_statusbar"/>
+          <separator/>
+          <menuitem action="view_fonts"/>
+          <menuitem action="view_gridlines"/>
+          <menuitem action="view_value-labels"/>
+          <separator/>
+          <menuitem action="view_data"/>
+          <menuitem action="view_variables"/>
+        </menu>
+        <menu action="data">
+          <menuitem action="data_sort-cases"/>
+          <menuitem action="data_transpose"/>
+          <separator/>
+          <menuitem action="data_split-file"/>
+          <menuitem action="data_select-cases"/>
+          <menuitem action="data_weight-cases"/>
+        </menu>
+        <menu action="transform">
+          <menuitem action="transform_compute"/>
+          <menuitem action="transform_rank"/>
+          <separator/>
+          <menuitem action="transform_recode-same"/>
+          <menuitem action="transform_recode-different"/>
+          <separator/>
+          <menuitem action="transform_run-pending"/>
+        </menu>
+        <menu action="analyze">
+          <menu action="descriptive-statistics">
+            <menuitem action="analyze_frequencies"/>
+            <menuitem action="analyze_descriptives"/>
+            <menuitem action="analyze_explore"/>
+            <menuitem action="crosstabs"/>
+          </menu>
+          <menu action="compare-means">
+            <menuitem action="one-sample-t-test"/>
+            <menuitem action="indep-t-test"/>
+            <menuitem action="paired-t-test"/>
+            <menuitem action="oneway-anova"/>
+          </menu>
+          <menuitem action="correlation"/>
+          <menuitem action="factor-analysis"/>
+          <menuitem action="reliability"/>
+          <menuitem action="linear-regression"/>
+          <menu action="non-parametrics">
+            <menuitem action="chi-square"/>
+            <menuitem action="binomial"/>
+          </menu>
+          <menuitem action="roc-curve"/>
+        </menu>
+        <menu action="utilities">
+          <menuitem action="utilities_variables"/>
+          <menuitem action="utilities_comments"/>
+        </menu>
+        <menu action="windows">
+          <menuitem action="windows_minimise_all"/>
+          <menuitem action="windows_split"/>
+        </menu>
+        <menu action="help">
+          <menuitem action="help_reference"/>
+          <menuitem action="help_about"/>
+        </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>
+</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="GtkHandleBox" id="handlebox1">
+    <property name="visible">True</property>
+    <child>
+      <object class="GtkToolbar" constructor="uimanager1" id="toolbar">
+        <property name="visible">True</property>
+      </object>
+    </child>
+  </object>
+
+  <object class="GtkHBox" id="status-bar">
+    <property name="visible">True</property>
+    <property name="spacing">6</property>
+    <child>
+      <object class="GtkFrame" id="frame2">
+        <property name="visible">True</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">in</property>
+        <child>
+          <object class="GtkEventBox" id="eventbox1">
+            <property name="visible">True</property>
+            <property name="tooltip-text" translatable="yes">Information Area</property>
+            <child>
+              <object class="GtkLabel" id="information-area">
+                <property name="visible">True</property>
+                <property name="single_line_mode">True</property>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkFrame" id="frame3">
+        <property name="visible">True</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">in</property>
+        <child>
+          <object class="GtkEventBox" id="eventbox2">
+            <property name="visible">True</property>
+            <property name="tooltip-text" translatable="yes">Processor Area</property>
+            <child>
+              <object class="GtkLabel" id="processor-area">
+                <property name="visible">True</property>
+                <property name="width_chars">35</property>
+                <property name="single_line_mode">True</property>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">False</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkFrame" id="frame5">
+        <property name="visible">True</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">in</property>
+        <child>
+          <object class="GtkEventBox" id="eventbox4">
+            <property name="visible">True</property>
+            <property name="tooltip-text" translatable="yes">Case Counter Area</property>
+            <child>
+              <object class="GtkLabel" id="case-counter-area">
+                <property name="visible">True</property>
+                <property name="width_chars">20</property>
+                <property name="single_line_mode">True</property>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">False</property>
+        <property name="position">3</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkFrame" id="frame6">
+        <property name="visible">True</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">in</property>
+        <child>
+          <object class="GtkEventBox" id="eventbox5">
+            <property name="visible">True</property>
+            <property name="tooltip-text" translatable="yes">Filter Use Status Area</property>
+            <child>
+              <object class="GtkLabel" id="filter-use-status-area">
+                <property name="visible">True</property>
+                <property name="ellipsize">start</property>
+                <property name="width_chars">10</property>
+                <property name="single_line_mode">True</property>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">False</property>
+        <property name="position">4</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkFrame" id="frame7">
+        <property name="visible">True</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">in</property>
+        <child>
+          <object class="GtkEventBox" id="eventbox6">
+            <property name="visible">True</property>
+            <property name="tooltip-text" translatable="yes">Weight Status Area</property>
+            <child>
+              <object class="GtkLabel" id="weight-status-area">
+                <property name="visible">True</property>
+                <property name="ellipsize">start</property>
+                <property name="width_chars">15</property>
+                <property name="single_line_mode">True</property>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">False</property>
+        <property name="position">5</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkFrame" id="frame8">
+        <property name="visible">True</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">in</property>
+        <child>
+          <object class="GtkEventBox" id="eventbox7">
+            <property name="visible">True</property>
+            <property name="tooltip-text" translatable="yes">Split File Status Area</property>
+            <child>
+              <object class="GtkLabel" id="split-file-status-area">
+                <property name="visible">True</property>
+                <property name="ellipsize">start</property>
+                <property name="width_chars">15</property>
+                <property name="single_line_mode">True</property>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">False</property>
+        <property name="position">6</property>
+      </packing>
+    </child>
+  </object>
+</interface>
index 00dba993ce3991ca5537edfd49dadacc6cc6cdcd..6f3fdd4608b661da8c899a4fca6984689b1708eb 100644 (file)
@@ -549,8 +549,8 @@ insert_case (GtkAction *action, gpointer data)
 static void
 on_insert_variable (GtkAction *action, gpointer data)
 {
-  PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data);
-  psppire_data_editor_insert_variable (de);
+  PsppireDataWindow *dw = PSPPIRE_DATA_WINDOW (data);
+  psppire_data_editor_insert_variable (dw->data_editor);
 }
 
 
@@ -1193,24 +1193,6 @@ psppire_data_window_init (PsppireDataWindow *de)
 
 
 
-  {
-    GtkWidget *toolbarbutton = get_widget_assert (de->builder, "button-open");
-
-    GtkAction *action_data_open =
-      resolve_action (de->builder, "file_open", NULL);
-
-    g_object_set (action_data_open,
-                 "tooltip",  _("Open a data or syntax file"),
-                 "stock-id", "gtk-open",
-                 NULL);
-
-    g_signal_connect (action_data_open, "activate",
-                     G_CALLBACK (open_window), de);
-
-    g_signal_connect_swapped (toolbarbutton, "clicked",
-                     G_CALLBACK (gtk_action_activate), action_data_open);
-  }
-
 
 
   {
@@ -1244,21 +1226,19 @@ psppire_data_window_init (PsppireDataWindow *de)
 
 
   {
-    GtkAction *action_data_save =
-      resolve_action (de->builder, "file_save", "button-save");
-
-
-    g_object_set (action_data_save,
-                 "tooltip", _("Save data to file"),
-                 "stock-id", "gtk-save",
-                 NULL);
+    GtkAction *action_data_save = get_action_assert (de->builder, "file_save");
 
     g_signal_connect_swapped (action_data_save, "activate",
-                             G_CALLBACK (data_save), de);
+                     G_CALLBACK (data_save), de);
   }
 
 
+  {
+    GtkAction *action_data_open =  get_action_assert (de->builder, "file_open");
 
+    g_signal_connect (action_data_open, "activate",
+                     G_CALLBACK (open_window), de);
+  }
 
   {
     GtkAction *action_data_save_as =
@@ -1297,24 +1277,38 @@ psppire_data_window_init (PsppireDataWindow *de)
 
 
 
-  {
-    GtkAction *value_labels_action =
-      resolve_action (de->builder,
-                     "view_value-labels", "togglebutton-value-labels");
 
-    g_object_set (value_labels_action,
-                 "tooltip",  _("Show/hide value labels"),
-                 "stock-id", "pspp-value-labels",
-                 NULL);
+  g_signal_connect (get_action_assert (de->builder, "edit_paste"), "activate",
+                   G_CALLBACK (on_edit_paste),
+                   de);
 
-    g_signal_connect (value_labels_action, "toggled",
-                     G_CALLBACK (toggle_value_labels), de);
+  {
+    de->insert_case = get_action_assert (de->builder, "edit_insert-case");
+    g_signal_connect (de->insert_case, "activate",
+                   G_CALLBACK (insert_case),
+                   de);
+    
   }
 
+  {
+    de->insert_variable = get_action_assert (de->builder, "action_insert-variable");
 
-  g_signal_connect (get_action_assert (de->builder, "edit_paste"), "activate",
-                   G_CALLBACK (on_edit_paste),
+    g_signal_connect (de->insert_variable, "activate",
+                   G_CALLBACK (on_insert_variable),
                    de);
+    
+
+  }
+
+  de->invoke_goto_dialog = get_action_assert (de->builder, "edit_goto-case");
+  g_signal_connect (de->invoke_goto_dialog, "activate", G_CALLBACK (goto_case_dialog), de);
+
+
+  {
+    GtkAction *value_labels_action = get_action_assert (de->builder, "view_value-labels");
+    g_signal_connect (value_labels_action, "toggled",
+                     G_CALLBACK (toggle_value_labels), de);
+  }
 
   {
     de->delete_cases =
@@ -1354,65 +1348,6 @@ psppire_data_window_init (PsppireDataWindow *de)
   }
 
 
-  de->insert_variable =
-    resolve_action (de->builder, "edit_insert-variable",
-                   "button-insert-variable");
-
-  g_object_set (de->insert_variable,
-               "tooltip", _("Create a new variable at the current position"),
-               "stock-id", "pspp-insert-variable",
-               NULL);
-
-  g_signal_connect (de->insert_variable, "activate",
-                   G_CALLBACK (on_insert_variable), de->data_editor);
-
-
-
-
-
-  de->insert_case =
-    resolve_action (de->builder, "edit_insert-case", "button-insert-case");
-
-  g_object_set (de->insert_case,
-               "tooltip", _("Create a new case at the current position"),
-               "stock-id", "pspp-insert-case",
-               NULL);
-
-  g_signal_connect (de->insert_case, "activate",
-                   G_CALLBACK (insert_case), de);
-
-
-
-
-
-  de->invoke_goto_dialog =
-    resolve_action (de->builder, "edit_goto-case", "button-goto-case");
-
-
-  g_object_set (de->invoke_goto_dialog,
-               "tooltip", _("Jump to a Case in the Data Sheet"),
-               "stock-id", "gtk-jump-to",
-               NULL);
-
-  g_signal_connect (de->invoke_goto_dialog, "activate",
-                   G_CALLBACK (goto_case_dialog), de);
-
-
-
-  {
-    GtkAction *invoke_weight_cases_dialog =
-      resolve_action (de->builder, "data_weight-cases", "button-weight-cases");
-
-
-    g_object_set (invoke_weight_cases_dialog,
-                 "stock-id", "pspp-weight-cases",
-                 "tooltip", _("Weight cases by variable"),
-                 NULL);
-
-    g_signal_connect (invoke_weight_cases_dialog, "activate",
-                     G_CALLBACK (weight_cases_dialog), de);
-  }
-
 
   {
     GtkAction *invoke_transpose_dialog =
@@ -1429,20 +1364,6 @@ psppire_data_window_init (PsppireDataWindow *de)
   }
 
 
-  {
-    GtkAction *invoke_split_file_dialog =
-      resolve_action (de->builder, "data_split-file", "button-split-file");
-
-    g_object_set (invoke_split_file_dialog,
-                 "tooltip", _("Split the active file"),
-                 "stock-id", "pspp-split-file",
-                 NULL);
-
-    g_signal_connect (invoke_split_file_dialog, "activate",
-                     G_CALLBACK (split_file_dialog), de);
-  }
-
-
   {
     GtkAction *invoke_sort_cases_dialog =
       resolve_action (de->builder, "data_sort-cases", NULL);
@@ -1458,19 +1379,6 @@ psppire_data_window_init (PsppireDataWindow *de)
   }
 
 
-  {
-    GtkAction *invoke_select_cases_dialog =
-      resolve_action (de->builder, "data_select-cases", "button-select-cases");
-
-    g_object_set (invoke_select_cases_dialog,
-                 "tooltip", _("Select cases from the active file"),
-                 "stock-id", "pspp-select-cases",
-                 NULL);
-
-    g_signal_connect (invoke_select_cases_dialog, "activate",
-                     G_CALLBACK (select_cases_dialog), de);
-  }
-
 
   {
     GtkAction *invoke_compute_dialog =
@@ -1485,6 +1393,39 @@ psppire_data_window_init (PsppireDataWindow *de)
                      G_CALLBACK (compute_dialog), de);
   }
 
+  {
+    GtkAction *invoke_find_dialog = get_action_assert (de->builder, "edit_find");
+
+    g_signal_connect (invoke_find_dialog, "activate",
+                     G_CALLBACK (find_dialog), de);
+  }
+
+   {
+     GtkAction *invoke_split_file_dialog = get_action_assert (de->builder, "data_split-file");
+
+     g_signal_connect (invoke_split_file_dialog, "activate",
+                     G_CALLBACK (split_file_dialog), de);
+  }
+
+
+  {
+    GtkAction *invoke_weight_cases_dialog = get_action_assert (de->builder, "data_weight-cases");
+
+    g_signal_connect (invoke_weight_cases_dialog, "activate",
+                     G_CALLBACK (weight_cases_dialog), de);
+  }
+
+
+
+   {
+    GtkAction *invoke_variable_info_dialog  =  get_action_assert (de->builder, "utilities_variables");
+
+    g_signal_connect (invoke_variable_info_dialog, "activate",
+                     G_CALLBACK (variable_info_dialog), de);
+  }
+
+
 
   {
     GtkAction *invoke_oneway_anova_dialog =
@@ -1558,17 +1499,6 @@ psppire_data_window_init (PsppireDataWindow *de)
 
 
 
-  {
-    GtkAction *invoke_find_dialog =
-      resolve_action (de->builder, "edit_find", "button-find");
-
-    g_object_set (invoke_find_dialog, "stock-id", "gtk-find", NULL);
-
-    g_signal_connect (invoke_find_dialog, "activate",
-                     G_CALLBACK (find_dialog), de);
-  }
-
-
   {
     GtkAction *invoke_rank_dialog =
       resolve_action (de->builder, "transform_rank", NULL);
@@ -1611,20 +1541,6 @@ psppire_data_window_init (PsppireDataWindow *de)
   }
 
 
-  {
-    GtkAction *invoke_variable_info_dialog  =
-      resolve_action (de->builder, "utilities_variables", "button-goto-variable");
-
-    g_object_set (invoke_variable_info_dialog,
-                 "stock-id", "pspp-goto-variable",
-                 "tooltip", _("Jump to variable"),
-                 NULL);
-
-    g_signal_connect (invoke_variable_info_dialog, "activate",
-                     G_CALLBACK (variable_info_dialog), de);
-  }
-
-
   {
     GtkAction *invoke_descriptives_dialog =
       resolve_action (de->builder,  "analyze_descriptives", NULL);