Move implementation of the datasheet variable popup menu to the GtkBuilder file
[pspp-builds.git] / src / ui / gui / psppire-data-window.c
index e9a89465b4cf1c17cda74bd5356e9547cf5b296d..aedfe4f0737c0961c478ee73653d490bf251ac5f 100644 (file)
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008, 2009  Free Software Foundation
+   Copyright (C) 2008, 2009, 2010  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
 #include <gtk/gtksignal.h>
 #include <gtk/gtkbox.h>
-#include "executor.h"
-#include "helper.h"
-
-#include "text-data-import-dialog.h"
-
-
-#include <ui/syntax-gen.h>
-#include <language/syntax-string-source.h>
-#include <libpspp/message.h>
 #include <stdlib.h>
 
-#include <data/procedure.h>
-
-#include "psppire.h"
-#include "psppire-window.h"
-#include "psppire-data-window.h"
-#include "psppire-syntax-window.h"
-
-#include "about.h"
-
-#include "goto-case-dialog.h"
-#include "weight-cases-dialog.h"
-#include "split-file-dialog.h"
-#include "transpose-dialog.h"
-#include "sort-cases-dialog.h"
-#include "select-cases-dialog.h"
-#include "compute-dialog.h"
-#include "find-dialog.h"
-#include "rank-dialog.h"
-#include "recode-dialog.h"
-#include "comments-dialog.h"
-#include "variable-info-dialog.h"
-#include "descriptives-dialog.h"
-#include "crosstabs-dialog.h"
-#include "frequencies-dialog.h"
-#include "examine-dialog.h"
-#include "regression-dialog.h"
-#include "reliability-dialog.h"
-#include "roc-dialog.h"
-#include "correlation-dialog.h"
-#include "oneway-anova-dialog.h"
-#include "t-test-independent-samples-dialog.h"
-#include "t-test-one-sample.h"
-#include "t-test-paired-samples.h"
-
+#include "data/any-reader.h"
+#include "data/procedure.h"
+#include "language/syntax-string-source.h"
+#include "libpspp/message.h"
+#include "ui/gui/about.h"
+#include "ui/gui/comments-dialog.h"
+#include "ui/gui/compute-dialog.h"
+#include "ui/gui/correlation-dialog.h"
+#include "ui/gui/crosstabs-dialog.h"
+#include "ui/gui/descriptives-dialog.h"
+#include "ui/gui/examine-dialog.h"
+#include "ui/gui/executor.h"
+#include "ui/gui/factor-dialog.h"
+#include "ui/gui/find-dialog.h"
+#include "ui/gui/frequencies-dialog.h"
+#include "ui/gui/goto-case-dialog.h"
+#include "ui/gui/helper.h"
+#include "ui/gui/oneway-anova-dialog.h"
+#include "ui/gui/psppire-data-window.h"
+#include "ui/gui/psppire-syntax-window.h"
+#include "ui/gui/psppire-window.h"
+#include "ui/gui/psppire.h"
+#include "ui/gui/rank-dialog.h"
+#include "ui/gui/recode-dialog.h"
+#include "ui/gui/regression-dialog.h"
+#include "ui/gui/reliability-dialog.h"
+#include "ui/gui/roc-dialog.h"
+#include "ui/gui/select-cases-dialog.h"
+#include "ui/gui/sort-cases-dialog.h"
+#include "ui/gui/split-file-dialog.h"
+#include "ui/gui/t-test-independent-samples-dialog.h"
+#include "ui/gui/t-test-one-sample.h"
+#include "ui/gui/t-test-paired-samples.h"
+#include "ui/gui/text-data-import-dialog.h"
+#include "ui/gui/transpose-dialog.h"
+#include "ui/gui/variable-info-dialog.h"
+#include "ui/gui/weight-cases-dialog.h"
+#include "ui/syntax-gen.h"
 
 #include <gettext.h>
 #define _(msgid) gettext (msgid)
@@ -389,7 +384,19 @@ sysfile_chooser_dialog (PsppireWindow *toplevel)
                                 GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
                                 NULL);
 
-  GtkFileFilter *filter = gtk_file_filter_new ();
+  GtkFileFilter *filter;
+
+  filter = gtk_file_filter_new ();
+  gtk_file_filter_set_name (filter, _("Data and Syntax Files"));
+  gtk_file_filter_add_pattern (filter, "*.sav");
+  gtk_file_filter_add_pattern (filter, "*.SAV");
+  gtk_file_filter_add_pattern (filter, "*.por");
+  gtk_file_filter_add_pattern (filter, "*.POR");
+  gtk_file_filter_add_pattern (filter, "*.sps");
+  gtk_file_filter_add_pattern (filter, "*.SPS");
+  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
+
+  filter = gtk_file_filter_new ();
   gtk_file_filter_set_name (filter, _("System Files (*.sav)"));
   gtk_file_filter_add_pattern (filter, "*.sav");
   gtk_file_filter_add_pattern (filter, "*.SAV");
@@ -401,6 +408,12 @@ sysfile_chooser_dialog (PsppireWindow *toplevel)
   gtk_file_filter_add_pattern (filter, "*.POR");
   gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
 
+  filter = gtk_file_filter_new ();
+  gtk_file_filter_set_name (filter, _("Syntax Files (*.sps) "));
+  gtk_file_filter_add_pattern (filter, "*.sps");
+  gtk_file_filter_add_pattern (filter, "*.SPS");
+  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
+
   filter = gtk_file_filter_new ();
   gtk_file_filter_set_name (filter, _("All Files"));
   gtk_file_filter_add_pattern (filter, "*");
@@ -433,7 +446,7 @@ sysfile_chooser_dialog (PsppireWindow *toplevel)
 /* Callback for the data_open action.
    Prompts for a filename and opens it */
 static void
-open_data_dialog (GtkAction *action, PsppireWindow *de)
+open_window (GtkAction *action, PsppireWindow *de)
 {
   GtkWidget *dialog = sysfile_chooser_dialog (de);
 
@@ -444,7 +457,10 @@ open_data_dialog (GtkAction *action, PsppireWindow *de)
        gchar *name =
          gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
 
-       psppire_window_load (de, name);
+        if (any_reader_may_open (name))
+          psppire_window_load (de, name);
+        else
+          open_syntax_window (name);
 
        g_free (name);
       }
@@ -533,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);
 }
 
 
@@ -619,8 +635,8 @@ data_save_as_dialog (PsppireDataWindow *de)
       (gtk_radio_button_get_group (GTK_RADIO_BUTTON(button_sys)),
        _("Portable File"));
 
-    gtk_box_pack_start_defaults (GTK_BOX (vbox), button_sys);
-    gtk_box_pack_start_defaults (GTK_BOX (vbox), button_por);
+    psppire_box_pack_start_defaults (GTK_BOX (vbox), button_sys);
+    psppire_box_pack_start_defaults (GTK_BOX (vbox), button_por);
 
     gtk_widget_show_all (vbox);
 
@@ -827,73 +843,6 @@ file_quit (GtkCheckMenuItem *menuitem, gpointer data)
 }
 
 
-
-static GtkWidget *
-create_data_sheet_variable_popup_menu (PsppireDataWindow *de)
-{
-  GtkWidget *menu = gtk_menu_new ();
-
-  GtkWidget *sort_ascending =
-    gtk_action_create_menu_item (gtk_action_new ("sort-up",
-                                                _("Sort Ascending"),
-                                                NULL,
-                                                "gtk-sort-ascending"));
-
-  GtkWidget *sort_descending =
-    gtk_action_create_menu_item (gtk_action_new ("sort-down",
-                                                _("Sort Descending"),
-                                                NULL,
-                                                "gtk-sort-descending"));
-
-  GtkWidget *insert_variable =
-    gtk_menu_item_new_with_label (_("Insert Variable"));
-
-  GtkWidget *clear_variable =
-    gtk_menu_item_new_with_label (_("Clear"));
-
-
-  gtk_action_connect_proxy (de->delete_variables,
-                           clear_variable );
-
-
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), insert_variable);
-
-
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu),
-                        gtk_separator_menu_item_new ());
-
-
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), clear_variable);
-
-
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu),
-                        gtk_separator_menu_item_new ());
-
-
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), sort_ascending);
-
-
-  g_signal_connect_swapped (sort_ascending, "activate",
-                           G_CALLBACK (psppire_data_editor_sort_ascending),
-                           de->data_editor);
-
-  g_signal_connect_swapped (sort_descending, "activate",
-                           G_CALLBACK (psppire_data_editor_sort_descending),
-                           de->data_editor);
-
-  g_signal_connect_swapped (insert_variable, "activate",
-                           G_CALLBACK (gtk_action_activate),
-                           de->insert_variable);
-
-
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), sort_descending);
-
-  gtk_widget_show_all (menu);
-
-  return menu;
-}
-
-
 static GtkWidget *
 create_data_sheet_cases_popup_menu (PsppireDataWindow *de)
 {
@@ -1069,22 +1018,6 @@ on_switch_sheet (GtkNotebook *notebook,
 }
 
 
-static GtkAction *
-resolve_action (GtkBuilder *builder, const gchar *action, const gchar *proxy)
-{
-  GtkWidget *pr = NULL;
-  GtkAction *act = get_action_assert (builder, action);
-  g_assert (GTK_IS_ACTION (act));
-
-  if ( proxy )
-    pr = get_widget_assert (builder, proxy);
-
-  if ( pr )
-    gtk_action_connect_proxy (act, pr);
-
-  return act;
-}
-
 
 static void
 set_unsaved (gpointer w)
@@ -1177,29 +1110,11 @@ 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_data", NULL);
-
-    g_object_set (action_data_open,
-                 "tooltip",  _("Open a data file"),
-                 "stock-id", "gtk-open",
-                 NULL);
-
-    g_signal_connect (action_data_open, "activate",
-                     G_CALLBACK (open_data_dialog), de);
-
-    g_signal_connect_swapped (toolbarbutton, "clicked",
-                     G_CALLBACK (gtk_action_activate), action_data_open);
-  }
-
 
 
   {
     GtkAction *action_data_new =
-      resolve_action (de->builder, "file_new_data", NULL);
+      get_action_assert (de->builder, "file_new_data");
 
     g_object_set (action_data_new,
                  "tooltip", _("New data file"),
@@ -1214,7 +1129,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   {
     GtkAction *invoke_text_import_assistant =
-      resolve_action (de->builder, "file_import-text", NULL);
+      get_action_assert (de->builder, "file_import-text");
 
     g_object_set (invoke_text_import_assistant,
                  "tooltip",  _("Import text data file"),
@@ -1228,25 +1143,23 @@ 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 =
-      resolve_action (de->builder, "file_save_as", NULL);
+      get_action_assert (de->builder, "file_save_as");
 
     g_object_set (action_data_save_as,
                  "tooltip", _("Save data to file"),
@@ -1260,8 +1173,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   {
     GtkAction *action_info_working_file =
-      resolve_action (de->builder,
-                     "file_information_working-file", NULL);
+      get_action_assert (de->builder, "file_information_working-file");
 
 
     g_signal_connect_swapped (action_info_working_file, "activate",
@@ -1271,8 +1183,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   {
     GtkAction *action_info_external_file =
-      resolve_action (de->builder,
-                     "file_information_external-file", NULL);
+      get_action_assert (de->builder, "file_information_external-file");
 
 
     g_signal_connect_swapped (action_info_external_file, "activate",
@@ -1281,28 +1192,42 @@ 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 =
-      resolve_action (de->builder, "edit_clear-cases", NULL);
+      get_action_assert (de->builder, "edit_clear-cases");
 
 
     g_object_set (de->delete_cases,
@@ -1321,7 +1246,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   {
     de->delete_variables =
-      resolve_action (de->builder, "edit_clear-variables", NULL);
+      get_action_assert (de->builder, "edit_clear-variables");
 
     g_object_set (de->delete_variables,
                  "label", _("Clear"),
@@ -1338,69 +1263,10 @@ 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 =
-      resolve_action (de->builder, "data_transpose", NULL);
+      get_action_assert (de->builder, "data_transpose");
 
 
     g_object_set (invoke_transpose_dialog,
@@ -1413,23 +1279,9 @@ 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);
+      get_action_assert (de->builder, "data_sort-cases");
 
 
     g_object_set (invoke_sort_cases_dialog,
@@ -1442,23 +1294,10 @@ 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 =
-      resolve_action (de->builder, "transform_compute", NULL);
+      get_action_assert (de->builder, "transform_compute");
 
     g_object_set (invoke_compute_dialog,
                  "tooltip", _("Compute new values for a variable"),
@@ -1469,10 +1308,43 @@ 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 =
-      resolve_action (de->builder, "oneway-anova", NULL);
+      get_action_assert (de->builder, "oneway-anova");
 
     g_object_set (invoke_oneway_anova_dialog,
                  "tooltip", _("Perform one way analysis of variance"),
@@ -1485,7 +1357,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   {
     GtkAction *invoke_t_test_independent_samples_dialog =
-      resolve_action (de->builder, "indep-t-test", NULL);
+      get_action_assert (de->builder, "indep-t-test");
 
 
     g_object_set (invoke_t_test_independent_samples_dialog,
@@ -1500,7 +1372,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   {
     GtkAction *invoke_t_test_paired_samples_dialog =
-      resolve_action (de->builder, "paired-t-test", NULL);
+      get_action_assert (de->builder, "paired-t-test");
 
     g_object_set (invoke_t_test_paired_samples_dialog,
                  "tooltip",
@@ -1514,7 +1386,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   {
     GtkAction *invoke_t_test_one_sample_dialog =
-      resolve_action (de->builder, "one-sample-t-test", NULL);
+      get_action_assert (de->builder, "one-sample-t-test");
 
     g_object_set (invoke_t_test_one_sample_dialog,
                  "tooltip",
@@ -1528,7 +1400,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   {
     GtkAction *invoke_comments_dialog =
-      resolve_action (de->builder, "utilities_comments", NULL);
+      get_action_assert (de->builder, "utilities_comments");
 
 
     g_object_set (invoke_comments_dialog,
@@ -1542,20 +1414,9 @@ 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);
+      get_action_assert (de->builder, "transform_rank");
 
     g_object_set (invoke_rank_dialog,
                  "stock-id", "pspp-rank-cases",
@@ -1569,7 +1430,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   {
     GtkAction *invoke_recode_same_dialog =
-      resolve_action (de->builder, "transform_recode-same", NULL);
+      get_action_assert (de->builder, "transform_recode-same");
 
     g_object_set (invoke_recode_same_dialog,
                  "stock-id", "pspp-recode-same",
@@ -1583,7 +1444,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   {
     GtkAction *invoke_recode_different_dialog  =
-      resolve_action (de->builder, "transform_recode-different", NULL);
+      get_action_assert (de->builder, "transform_recode-different");
 
     g_object_set (invoke_recode_different_dialog,
                  "stock-id", "pspp-recode-different",
@@ -1595,23 +1456,9 @@ 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);
+      get_action_assert (de->builder, "analyze_descriptives");
 
     g_object_set (invoke_descriptives_dialog,
                  "tooltip", _("Calculate descriptive statistics (mean, variance, ...)"),
@@ -1625,7 +1472,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   {
     GtkAction *invoke_frequencies_dialog =
-      resolve_action (de->builder,  "analyze_frequencies", NULL);
+      get_action_assert (de->builder, "analyze_frequencies");
 
     g_object_set (invoke_frequencies_dialog,
                  "tooltip", _("Generate frequency statistics"),
@@ -1639,7 +1486,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   {
     GtkAction *invoke_crosstabs_dialog =
-      resolve_action (de->builder, "crosstabs", NULL);
+      get_action_assert (de->builder, "crosstabs");
 
     g_object_set (invoke_crosstabs_dialog,
                  "tooltip", _("Generate crosstabulations"),
@@ -1654,7 +1501,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   {
     GtkAction *invoke_examine_dialog =
-      resolve_action (de->builder, "analyze_explore", NULL);
+      get_action_assert (de->builder, "analyze_explore");
 
     g_object_set (invoke_examine_dialog,
                  "tooltip", _("Examine Data by Factors"),
@@ -1668,7 +1515,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   {
     GtkAction *invoke_regression_dialog =
-      resolve_action (de->builder, "linear-regression", NULL);
+      get_action_assert (de->builder, "linear-regression");
 
     g_object_set (invoke_regression_dialog,
                  "tooltip", _("Estimate parameters of the linear model"),
@@ -1682,7 +1529,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   {
     GtkAction *invoke_reliability_dialog =
-      resolve_action (de->builder, "reliability", NULL);
+      get_action_assert (de->builder, "reliability");
 
     g_object_set (invoke_reliability_dialog,
                  "tooltip", _("Reliability Analysis"),
@@ -1696,7 +1543,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   {
     GtkAction *invoke_roc_dialog =
-      resolve_action (de->builder, "roc-curve", NULL);
+      get_action_assert (de->builder, "roc-curve");
 
     g_object_set (invoke_roc_dialog,
                  "tooltip", _("ROC Curve"),
@@ -1710,7 +1557,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   {
     GtkAction *invoke_correlation_dialog =
-      resolve_action (de->builder, "correlation", NULL);
+      get_action_assert (de->builder, "correlation");
 
     g_object_set (invoke_correlation_dialog,
                  "tooltip", _("Bivariate Correlation"),
@@ -1722,6 +1569,20 @@ psppire_data_window_init (PsppireDataWindow *de)
                      G_CALLBACK (correlation_dialog), de);
   }
 
+  {
+    GtkAction *invoke_factor_dialog =
+      get_action_assert (de->builder, "factor-analysis");
+
+    g_object_set (invoke_factor_dialog,
+                 "tooltip", _("Principal Axis Factoring and Principal Components Analysis"),
+                 "stock-id", "pspp-factor",
+                 NULL
+                 );
+
+    g_signal_connect (invoke_factor_dialog, "activate",
+                     G_CALLBACK (factor_dialog), de);
+  }
+
 
   {
     GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER));
@@ -1783,10 +1644,6 @@ psppire_data_window_init (PsppireDataWindow *de)
                    G_CALLBACK (create_syntax_window),
                    NULL);
 
-  g_signal_connect (get_action_assert (de->builder,"file_open_syntax"),
-                   "activate",
-                   G_CALLBACK (open_syntax_window),
-                   de);
 
   {
     GtkAction *abt = get_action_assert (de->builder, "help_about");
@@ -1844,7 +1701,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   {
     GtkAction *font_action =
-      resolve_action (de->builder, "view_fonts", NULL);
+      get_action_assert (de->builder, "view_fonts");
 
     g_object_set (font_action,
                  "stock-id", "gtk-select-font",
@@ -1873,7 +1730,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   {
     GtkAction *split_window_action =
-      resolve_action (de->builder, "windows_split", NULL);
+      get_action_assert (de->builder, "windows_split");
 
     g_object_set (split_window_action,
                  "tooltip", _("Split the window vertically and horizontally"),
@@ -1893,8 +1750,16 @@ psppire_data_window_init (PsppireDataWindow *de)
   }
 
   {
-    GtkMenu *data_sheet_variable_popup_menu =
-      GTK_MENU (create_data_sheet_variable_popup_menu (de));
+    GtkMenu *data_sheet_variable_popup_menu = get_widget_assert (de->builder,
+                                                                "datasheet-variable-popup");
+
+    g_signal_connect_swapped (get_action_assert (de->builder, "sort-up"), "activate",
+                           G_CALLBACK (psppire_data_editor_sort_ascending),
+                           de->data_editor);
+
+    g_signal_connect_swapped (get_action_assert (de->builder, "sort-down"), "activate",
+                           G_CALLBACK (psppire_data_editor_sort_descending),
+                           de->data_editor);
 
     GtkMenu *var_sheet_variable_popup_menu =
       GTK_MENU (create_var_sheet_variable_popup_menu (de));