Whitespace changes only
[pspp-builds.git] / src / ui / gui / psppire-data-window.c
index 55e206e1a9226731b741c9b4e72fcf2c217657fd..bdd03a2d97fec57378d3be34cca9023d96231f27 100644 (file)
@@ -24,7 +24,7 @@
 #include "data/procedure.h"
 #include "language/syntax-string-source.h"
 #include "libpspp/message.h"
-#include "ui/gui/about.h"
+#include "ui/gui/help-menu.h"
 #include "ui/gui/comments-dialog.h"
 #include "ui/gui/compute-dialog.h"
 #include "ui/gui/correlation-dialog.h"
@@ -843,145 +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)
-{
-  GtkWidget *menu = gtk_menu_new ();
-
-  GtkWidget *insert_case =
-    gtk_menu_item_new_with_label (_("Insert Case"));
-
-  GtkWidget *delete_case =
-    gtk_menu_item_new_with_label (_("Clear"));
-
-
-  gtk_action_connect_proxy (de->delete_cases,
-                           delete_case);
-
-
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), insert_case);
-
-  g_signal_connect_swapped (insert_case, "activate",
-                           G_CALLBACK (gtk_action_activate),
-                           de->insert_case);
-
-
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu),
-                        gtk_separator_menu_item_new ());
-
-
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), delete_case);
-
-
-  gtk_widget_show_all (menu);
-
-  return menu;
-}
-
-
-static GtkWidget *
-create_var_sheet_variable_popup_menu (PsppireDataWindow *de)
-{
-  GtkWidget *menu = gtk_menu_new ();
-
-  GtkWidget *insert_variable =
-    gtk_menu_item_new_with_label (_("Insert Variable"));
-
-  GtkWidget *delete_variable =
-    gtk_menu_item_new_with_label (_("Clear"));
-
-
-  gtk_action_connect_proxy (de->delete_variables,
-                           delete_variable);
-
-
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), insert_variable);
-
-  g_signal_connect_swapped (insert_variable, "activate",
-                           G_CALLBACK (gtk_action_activate),
-                           de->insert_variable);
-
-
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu),
-                        gtk_separator_menu_item_new ());
-
-
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), delete_variable);
-
-
-  gtk_widget_show_all (menu);
-
-  return menu;
-}
-
-
 static void
 on_recent_data_select (GtkMenuShell *menushell,
                       PsppireWindow *window)
@@ -1180,31 +1041,17 @@ psppire_data_window_init (PsppireDataWindow *de)
 
 
   {
-    GtkAction *action_data_new =
-      get_action_assert (de->builder, "file_new_data");
+    GtkAction *action_data_new = get_action_assert (de->builder, "file_new_data");
 
-    g_object_set (action_data_new,
-                 "tooltip", _("New data file"),
-                 "stock-id", "gtk-new",
-                 NULL);
-
-    g_signal_connect (action_data_new, "activate",
-                     G_CALLBACK (new_file), de);
+    g_signal_connect (action_data_new, "activate", G_CALLBACK (new_file), de);
   }
 
 
 
   {
-    GtkAction *invoke_text_import_assistant =
-      get_action_assert (de->builder, "file_import-text");
-
-    g_object_set (invoke_text_import_assistant,
-                 "tooltip",  _("Import text data file"),
-                 "stock-id", "gtk-convert",
-                 NULL);
+    GtkAction *invoke_text_import_assistant = get_action_assert (de->builder, "file_import-text");
 
-    g_signal_connect (invoke_text_import_assistant, "activate",
-                     G_CALLBACK (text_data_import_assistant), de);
+    g_signal_connect (invoke_text_import_assistant, "activate", G_CALLBACK (text_data_import_assistant), de);
   }
 
 
@@ -1212,49 +1059,34 @@ psppire_data_window_init (PsppireDataWindow *de)
   {
     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_signal_connect_swapped (action_data_save, "activate", 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);
+    g_signal_connect (action_data_open, "activate", G_CALLBACK (open_window), de);
   }
 
   {
-    GtkAction *action_data_save_as =
-      get_action_assert (de->builder, "file_save_as");
+    GtkAction *action_data_save_as = get_action_assert (de->builder, "file_save_as");
 
-    g_object_set (action_data_save_as,
-                 "tooltip", _("Save data to file"),
-                 "stock-id", "gtk-save-as",
-                 NULL);
-
-    g_signal_connect_swapped (action_data_save_as, "activate",
-                     G_CALLBACK (data_save_as_dialog), de);
+    g_signal_connect_swapped (action_data_save_as, "activate", G_CALLBACK (data_save_as_dialog), de);
   }
 
 
   {
-    GtkAction *action_info_working_file =
-      get_action_assert (de->builder, "file_information_working-file");
-
+    GtkAction *action_info_working_file = get_action_assert (de->builder, "file_information_working-file");
 
-    g_signal_connect_swapped (action_info_working_file, "activate",
-                     G_CALLBACK (display_dict), de);
+    g_signal_connect_swapped (action_info_working_file, "activate", G_CALLBACK (display_dict), de);
   }
 
 
   {
-    GtkAction *action_info_external_file =
-      get_action_assert (de->builder, "file_information_external-file");
+    GtkAction *action_info_external_file = get_action_assert (de->builder, "file_information_external-file");
 
-
-    g_signal_connect_swapped (action_info_external_file, "activate",
-                     G_CALLBACK (sysfile_info), de);
+    g_signal_connect_swapped (action_info_external_file, "activate", G_CALLBACK (sysfile_info), de);
   }
 
 
@@ -1266,20 +1098,14 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   {
     de->insert_case = get_action_assert (de->builder, "edit_insert-case");
-    g_signal_connect (de->insert_case, "activate",
-                   G_CALLBACK (insert_case),
-                   de);
+    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 (de->insert_variable, "activate",
-                   G_CALLBACK (on_insert_variable),
-                   de);
-    
-
+    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");
@@ -1288,43 +1114,22 @@ psppire_data_window_init (PsppireDataWindow *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);
+    g_signal_connect (value_labels_action, "toggled", G_CALLBACK (toggle_value_labels), de);
   }
 
   {
-    de->delete_cases =
-      get_action_assert (de->builder, "edit_clear-cases");
+    de->delete_cases = get_action_assert (de->builder, "edit_clear-cases");
 
-
-    g_object_set (de->delete_cases,
-                 "label", _("Clear"),
-                 "tooltip", _("Delete the cases at the selected position(s)"),
-                 "stock-id", "gtk-clear",
-                 NULL);
-
-    g_signal_connect_swapped (de->delete_cases, "activate",
-                             G_CALLBACK (psppire_data_editor_delete_cases),
-                             de->data_editor);
+    g_signal_connect_swapped (de->delete_cases, "activate", G_CALLBACK (psppire_data_editor_delete_cases), de->data_editor);
 
     gtk_action_set_visible (de->delete_cases, FALSE);
   }
 
 
   {
-    de->delete_variables =
-      get_action_assert (de->builder, "edit_clear-variables");
-
-    g_object_set (de->delete_variables,
-                 "label", _("Clear"),
-                 "tooltip", _("Delete the variables at the selected position(s)"),
-                 "stock-id", "gtk-clear",
-                 NULL);
+    de->delete_variables = get_action_assert (de->builder, "edit_clear-variables");
 
-
-    g_signal_connect_swapped (de->delete_variables, "activate",
-                             G_CALLBACK (psppire_data_editor_delete_variables),
-                             de->data_editor);
+    g_signal_connect_swapped (de->delete_variables, "activate", G_CALLBACK (psppire_data_editor_delete_variables), de->data_editor);
 
     gtk_action_set_visible (de->delete_variables, FALSE);
   }
@@ -1332,70 +1137,44 @@ psppire_data_window_init (PsppireDataWindow *de)
 
 
   {
-    GtkAction *invoke_transpose_dialog =
-      get_action_assert (de->builder, "data_transpose");
-
+    GtkAction *invoke_transpose_dialog = get_action_assert (de->builder, "data_transpose");
 
-    g_object_set (invoke_transpose_dialog,
-                 "tooltip", _("Transpose the cases with the variables"),
-                 "stock-id", "pspp-transpose",
-                 NULL);
-
-    g_signal_connect (invoke_transpose_dialog, "activate",
-                     G_CALLBACK (transpose_dialog), de);
+    g_signal_connect (invoke_transpose_dialog, "activate", G_CALLBACK (transpose_dialog), de);
   }
 
 
   {
-    GtkAction *invoke_sort_cases_dialog =
-      get_action_assert (de->builder, "data_sort-cases");
-
-
-    g_object_set (invoke_sort_cases_dialog,
-                 "tooltip", _("Sort cases in the active file"),
-                 "stock-id", "gtk-sort-ascending",
-                 NULL);
+    GtkAction *invoke_sort_cases_dialog = get_action_assert (de->builder, "data_sort-cases");
 
-    g_signal_connect (invoke_sort_cases_dialog, "activate",
-                     G_CALLBACK (sort_cases_dialog), de);
+    g_signal_connect (invoke_sort_cases_dialog, "activate", G_CALLBACK (sort_cases_dialog), de);
   }
 
 
 
   {
-    GtkAction *invoke_compute_dialog =
-      get_action_assert (de->builder, "transform_compute");
-
-    g_object_set (invoke_compute_dialog,
-                 "tooltip", _("Compute new values for a variable"),
-                 "stock-id", "pspp-compute",
-                 NULL);
+    GtkAction *invoke_compute_dialog = get_action_assert (de->builder, "transform_compute");
 
-    g_signal_connect (invoke_compute_dialog, "activate",
-                     G_CALLBACK (compute_dialog), de);
+    g_signal_connect (invoke_compute_dialog, "activate", 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);
+    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);
+     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);
+    g_signal_connect (invoke_weight_cases_dialog, "activate", G_CALLBACK (weight_cases_dialog), de);
   }
 
 
@@ -1403,251 +1182,125 @@ psppire_data_window_init (PsppireDataWindow *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);
+    g_signal_connect (invoke_variable_info_dialog, "activate", G_CALLBACK (variable_info_dialog), de);
   }
 
 
 
   {
-    GtkAction *invoke_oneway_anova_dialog =
-      get_action_assert (de->builder, "oneway-anova");
-
-    g_object_set (invoke_oneway_anova_dialog,
-                 "tooltip", _("Perform one way analysis of variance"),
-                 NULL);
+    GtkAction *invoke_oneway_anova_dialog = get_action_assert (de->builder, "oneway-anova");
 
-    g_signal_connect (invoke_oneway_anova_dialog, "activate",
-                     G_CALLBACK (oneway_anova_dialog), de);
+    g_signal_connect (invoke_oneway_anova_dialog, "activate", G_CALLBACK (oneway_anova_dialog), de);
   }
 
 
   {
-    GtkAction *invoke_t_test_independent_samples_dialog =
-      get_action_assert (de->builder, "indep-t-test");
+    GtkAction *invoke_t_test_independent_samples_dialog = get_action_assert (de->builder, "indep-t-test");
 
-
-    g_object_set (invoke_t_test_independent_samples_dialog,
-                 "tooltip",
-                 _("Calculate T Test for samples from independent groups"),
-                 NULL);
-
-    g_signal_connect (invoke_t_test_independent_samples_dialog, "activate",
-                     G_CALLBACK (t_test_independent_samples_dialog), de);
+    g_signal_connect (invoke_t_test_independent_samples_dialog, "activate", G_CALLBACK (t_test_independent_samples_dialog), de);
   }
 
 
   {
-    GtkAction *invoke_t_test_paired_samples_dialog =
-      get_action_assert (de->builder, "paired-t-test");
-
-    g_object_set (invoke_t_test_paired_samples_dialog,
-                 "tooltip",
-                 _("Calculate T Test for paired samples"),
-                 NULL);
+    GtkAction *invoke_t_test_paired_samples_dialog = get_action_assert (de->builder, "paired-t-test");
 
-    g_signal_connect (invoke_t_test_paired_samples_dialog, "activate",
-                     G_CALLBACK (t_test_paired_samples_dialog), de);
+    g_signal_connect (invoke_t_test_paired_samples_dialog, "activate", G_CALLBACK (t_test_paired_samples_dialog), de);
   }
 
 
   {
-    GtkAction *invoke_t_test_one_sample_dialog =
-      get_action_assert (de->builder, "one-sample-t-test");
+    GtkAction *invoke_t_test_one_sample_dialog = get_action_assert (de->builder, "one-sample-t-test");
 
-    g_object_set (invoke_t_test_one_sample_dialog,
-                 "tooltip",
-                 _("Calculate T Test for sample from a single distribution"),
-                 NULL);
-
-    g_signal_connect (invoke_t_test_one_sample_dialog, "activate",
-                     G_CALLBACK (t_test_one_sample_dialog), de);
+    g_signal_connect (invoke_t_test_one_sample_dialog, "activate", G_CALLBACK (t_test_one_sample_dialog), de);
   }
 
 
   {
-    GtkAction *invoke_comments_dialog =
-      get_action_assert (de->builder, "utilities_comments");
-
-
-    g_object_set (invoke_comments_dialog,
-                 "tooltip",
-                 _("Commentary text for the data file"),
-                 NULL);
+    GtkAction *invoke_comments_dialog = get_action_assert (de->builder, "utilities_comments");
 
-    g_signal_connect (invoke_comments_dialog, "activate",
-                     G_CALLBACK (comments_dialog), de);
+    g_signal_connect (invoke_comments_dialog, "activate", G_CALLBACK (comments_dialog), de);
   }
 
 
 
   {
-    GtkAction *invoke_rank_dialog =
-      get_action_assert (de->builder, "transform_rank");
+    GtkAction *invoke_rank_dialog = get_action_assert (de->builder, "transform_rank");
 
-    g_object_set (invoke_rank_dialog,
-                 "stock-id", "pspp-rank-cases",
-                 "tooltip", _("Rank Cases"),
-                 NULL);
-
-    g_signal_connect (invoke_rank_dialog, "activate",
-                     G_CALLBACK (rank_dialog), de);
+    g_signal_connect (invoke_rank_dialog, "activate", G_CALLBACK (rank_dialog), de);
   }
 
 
   {
-    GtkAction *invoke_recode_same_dialog =
-      get_action_assert (de->builder, "transform_recode-same");
-
-    g_object_set (invoke_recode_same_dialog,
-                 "stock-id", "pspp-recode-same",
-                 "tooltip", _("Recode values into the same variables"),
-                 NULL);
+    GtkAction *invoke_recode_same_dialog = get_action_assert (de->builder, "transform_recode-same");
 
-    g_signal_connect (invoke_recode_same_dialog, "activate",
-                     G_CALLBACK (recode_same_dialog), de);
+    g_signal_connect (invoke_recode_same_dialog, "activate", G_CALLBACK (recode_same_dialog), de);
   }
 
 
   {
-    GtkAction *invoke_recode_different_dialog  =
-      get_action_assert (de->builder, "transform_recode-different");
+    GtkAction *invoke_recode_different_dialog  = get_action_assert (de->builder, "transform_recode-different");
 
-    g_object_set (invoke_recode_different_dialog,
-                 "stock-id", "pspp-recode-different",
-                 "tooltip", _("Recode values into different variables"),
-                 NULL);
 
-    g_signal_connect (invoke_recode_different_dialog, "activate",
-                     G_CALLBACK (recode_different_dialog), de);
+    g_signal_connect (invoke_recode_different_dialog, "activate", G_CALLBACK (recode_different_dialog), de);
   }
 
 
   {
-    GtkAction *invoke_descriptives_dialog =
-      get_action_assert (de->builder, "analyze_descriptives");
-
-    g_object_set (invoke_descriptives_dialog,
-                 "tooltip", _("Calculate descriptive statistics (mean, variance, ...)"),
-                 "stock-id", "pspp-descriptives",
-                 NULL);
+    GtkAction *invoke_descriptives_dialog = get_action_assert (de->builder, "analyze_descriptives");
 
-    g_signal_connect (invoke_descriptives_dialog, "activate",
-                     G_CALLBACK (descriptives_dialog), de);
+    g_signal_connect (invoke_descriptives_dialog, "activate", G_CALLBACK (descriptives_dialog), de);
   }
 
 
   {
-    GtkAction *invoke_frequencies_dialog =
-      get_action_assert (de->builder, "analyze_frequencies");
-
-    g_object_set (invoke_frequencies_dialog,
-                 "tooltip", _("Generate frequency statistics"),
-                 "stock-id", "pspp-frequencies",
-                 NULL);
+    GtkAction *invoke_frequencies_dialog = get_action_assert (de->builder, "analyze_frequencies");
 
-    g_signal_connect (invoke_frequencies_dialog, "activate",
-                     G_CALLBACK (frequencies_dialog), de);
+    g_signal_connect (invoke_frequencies_dialog, "activate", G_CALLBACK (frequencies_dialog), de);
   }
 
 
   {
-    GtkAction *invoke_crosstabs_dialog =
-      get_action_assert (de->builder, "crosstabs");
+    GtkAction *invoke_crosstabs_dialog = get_action_assert (de->builder, "crosstabs");
 
-    g_object_set (invoke_crosstabs_dialog,
-                 "tooltip", _("Generate crosstabulations"),
-                 "stock-id", "pspp-crosstabs",
-                 NULL);
-
-    g_signal_connect (invoke_crosstabs_dialog, "activate",
-                     G_CALLBACK (crosstabs_dialog), de);
+    g_signal_connect (invoke_crosstabs_dialog, "activate", G_CALLBACK (crosstabs_dialog), de);
   }
 
 
-
   {
-    GtkAction *invoke_examine_dialog =
-      get_action_assert (de->builder, "analyze_explore");
-
-    g_object_set (invoke_examine_dialog,
-                 "tooltip", _("Examine Data by Factors"),
-                 "stock-id", "pspp-examine",
-                 NULL);
+    GtkAction *invoke_examine_dialog = get_action_assert (de->builder, "analyze_explore");
 
-    g_signal_connect (invoke_examine_dialog, "activate",
-                     G_CALLBACK (examine_dialog), de);
+    g_signal_connect (invoke_examine_dialog, "activate", G_CALLBACK (examine_dialog), de);
   }
 
 
   {
-    GtkAction *invoke_regression_dialog =
-      get_action_assert (de->builder, "linear-regression");
+    GtkAction *invoke_regression_dialog = get_action_assert (de->builder, "linear-regression");
 
-    g_object_set (invoke_regression_dialog,
-                 "tooltip", _("Estimate parameters of the linear model"),
-                 "stock-id", "pspp-regression",
-                 NULL
-                 );
-
-    g_signal_connect (invoke_regression_dialog, "activate",
-                     G_CALLBACK (regression_dialog), de);
+    g_signal_connect (invoke_regression_dialog, "activate", G_CALLBACK (regression_dialog), de);
   }
 
   {
-    GtkAction *invoke_reliability_dialog =
-      get_action_assert (de->builder, "reliability");
-
-    g_object_set (invoke_reliability_dialog,
-                 "tooltip", _("Reliability Analysis"),
-                 "stock-id", "pspp-reliability",
-                 NULL
-                 );
+    GtkAction *invoke_reliability_dialog = get_action_assert (de->builder, "reliability");
 
-    g_signal_connect (invoke_reliability_dialog, "activate",
-                     G_CALLBACK (reliability_dialog), de);
-  }
+    g_signal_connect (invoke_reliability_dialog, "activate", G_CALLBACK (reliability_dialog), de);
+ }
 
   {
-    GtkAction *invoke_roc_dialog =
-      get_action_assert (de->builder, "roc-curve");
+    GtkAction *invoke_roc_dialog = get_action_assert (de->builder, "roc-curve");
 
-    g_object_set (invoke_roc_dialog,
-                 "tooltip", _("ROC Curve"),
-                 "stock-id", "pspp-roc",
-                 NULL
-                 );
-
-    g_signal_connect (invoke_roc_dialog, "activate",
-                     G_CALLBACK (roc_dialog), de);
+    g_signal_connect (invoke_roc_dialog, "activate", G_CALLBACK (roc_dialog), de);
   }
 
   {
-    GtkAction *invoke_correlation_dialog =
-      get_action_assert (de->builder, "correlation");
-
-    g_object_set (invoke_correlation_dialog,
-                 "tooltip", _("Bivariate Correlation"),
-                 "stock-id", "pspp-correlation",
-                 NULL
-                 );
+    GtkAction *invoke_correlation_dialog = get_action_assert (de->builder, "correlation");
 
-    g_signal_connect (invoke_correlation_dialog, "activate",
-                     G_CALLBACK (correlation_dialog), de);
+    g_signal_connect (invoke_correlation_dialog, "activate", G_CALLBACK (correlation_dialog), de);
   }
 
   {
-    GtkAction *invoke_factor_dialog =
-      get_action_assert (de->builder, "factor-analysis");
+    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);
+    g_signal_connect (invoke_factor_dialog, "activate", G_CALLBACK (factor_dialog), de);
   }
 
 
@@ -1707,26 +1360,11 @@ psppire_data_window_init (PsppireDataWindow *de)
   }
 
   g_signal_connect (get_action_assert (de->builder,"file_new_syntax"),
-                   "activate",
-                   G_CALLBACK (create_syntax_window),
-                   NULL);
-
-
-  {
-    GtkAction *abt = get_action_assert (de->builder, "help_about");
-    g_object_set (abt, "stock-id", "gtk-about", NULL);
-    g_signal_connect (abt,
                      "activate",
-                     G_CALLBACK (about_new),
-                     de);
-  }
+                     G_CALLBACK (create_syntax_window),
+                     NULL);
 
 
-  g_signal_connect (get_action_assert (de->builder,"help_reference"),
-                   "activate",
-                   G_CALLBACK (reference_manual),
-                   de);
-
 
   g_signal_connect (de->data_editor,
                    "cases-selected",
@@ -1767,16 +1405,9 @@ psppire_data_window_init (PsppireDataWindow *de)
 
 
   {
-    GtkAction *font_action =
-      get_action_assert (de->builder, "view_fonts");
-
-    g_object_set (font_action,
-                 "stock-id", "gtk-select-font",
-                 NULL);
+    GtkAction *font_action =  get_action_assert (de->builder, "view_fonts");
 
-    g_signal_connect (font_action,
-                     "activate",
-                     G_CALLBACK (fonts_activate), de);
+    g_signal_connect (font_action, "activate", G_CALLBACK (fonts_activate), de);
   }
 
 
@@ -1796,35 +1427,37 @@ psppire_data_window_init (PsppireDataWindow *de)
 
 
   {
-    GtkAction *split_window_action =
-      get_action_assert (de->builder, "windows_split");
+    GtkAction *split_window_action = get_action_assert (de->builder, "windows_split");
 
-    g_object_set (split_window_action,
-                 "tooltip", _("Split the window vertically and horizontally"),
-                 "stock-id", "pspp-split-window",
-                 NULL);
-
-    g_signal_connect (split_window_action, "toggled",
-                     G_CALLBACK (toggle_split_window),
-                     de);
+    g_signal_connect (split_window_action, "toggled", G_CALLBACK (toggle_split_window), de);
   }
 
   {
     GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER));
 
+    merge_help_menu (uim);
+    
     PSPPIRE_WINDOW (de)->menu =
       GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar/windows/windows_minimise_all")->parent);
   }
 
   {
-    GtkMenu *data_sheet_variable_popup_menu =
-      GTK_MENU (create_data_sheet_variable_popup_menu (de));
+    GtkWidget *data_sheet_cases_popup_menu = get_widget_assert (de->builder,
+                                                             "datasheet-cases-popup");
 
-    GtkMenu *var_sheet_variable_popup_menu =
-      GTK_MENU (create_var_sheet_variable_popup_menu (de));
+    GtkWidget *var_sheet_variable_popup_menu = get_widget_assert (de->builder,
+                                                               "varsheet-variable-popup");
 
-    GtkMenu *data_sheet_cases_popup_menu =
-      GTK_MENU (create_data_sheet_cases_popup_menu (de));
+    GtkWidget *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);
 
     g_object_set (de->data_editor,
                  "datasheet-column-menu", data_sheet_variable_popup_menu,