Remove property settings from psppire_data_window and put them into the GtkBuilder...
[pspp-builds.git] / src / ui / gui / psppire-data-window.c
index 6f3fdd4608b661da8c899a4fca6984689b1708eb..d11dc3fa867777d056e04305fb213fea857eab56 100644 (file)
@@ -843,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)
 {
@@ -1085,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)
@@ -1197,12 +1114,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   {
     GtkAction *action_data_new =
-      resolve_action (de->builder, "file_new_data", NULL);
-
-    g_object_set (action_data_new,
-                 "tooltip", _("New data file"),
-                 "stock-id", "gtk-new",
-                 NULL);
+      get_action_assert (de->builder, "file_new_data");
 
     g_signal_connect (action_data_new, "activate",
                      G_CALLBACK (new_file), de);
@@ -1212,12 +1124,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   {
     GtkAction *invoke_text_import_assistant =
-      resolve_action (de->builder, "file_import-text", NULL);
-
-    g_object_set (invoke_text_import_assistant,
-                 "tooltip",  _("Import text data file"),
-                 "stock-id", "gtk-convert",
-                 NULL);
+      get_action_assert (de->builder, "file_import-text");
 
     g_signal_connect (invoke_text_import_assistant, "activate",
                      G_CALLBACK (text_data_import_assistant), de);
@@ -1242,12 +1149,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   {
     GtkAction *action_data_save_as =
-      resolve_action (de->builder, "file_save_as", NULL);
-
-    g_object_set (action_data_save_as,
-                 "tooltip", _("Save data to file"),
-                 "stock-id", "gtk-save-as",
-                 NULL);
+      get_action_assert (de->builder, "file_save_as");
 
     g_signal_connect_swapped (action_data_save_as, "activate",
                      G_CALLBACK (data_save_as_dialog), de);
@@ -1256,8 +1158,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",
@@ -1267,8 +1168,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",
@@ -1312,14 +1212,8 @@ psppire_data_window_init (PsppireDataWindow *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,
-                 "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),
@@ -1331,14 +1225,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   {
     de->delete_variables =
-      resolve_action (de->builder, "edit_clear-variables", NULL);
-
-    g_object_set (de->delete_variables,
-                 "label", _("Clear"),
-                 "tooltip", _("Delete the variables at the selected position(s)"),
-                 "stock-id", "gtk-clear",
-                 NULL);
-
+      get_action_assert (de->builder, "edit_clear-variables");
 
     g_signal_connect_swapped (de->delete_variables, "activate",
                              G_CALLBACK (psppire_data_editor_delete_variables),
@@ -1351,13 +1238,8 @@ psppire_data_window_init (PsppireDataWindow *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,
-                 "tooltip", _("Transpose the cases with the variables"),
-                 "stock-id", "pspp-transpose",
-                 NULL);
 
     g_signal_connect (invoke_transpose_dialog, "activate",
                      G_CALLBACK (transpose_dialog), de);
@@ -1366,14 +1248,9 @@ psppire_data_window_init (PsppireDataWindow *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,
-                 "tooltip", _("Sort cases in the active file"),
-                 "stock-id", "gtk-sort-ascending",
-                 NULL);
-
     g_signal_connect (invoke_sort_cases_dialog, "activate",
                      G_CALLBACK (sort_cases_dialog), de);
   }
@@ -1382,12 +1259,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   {
     GtkAction *invoke_compute_dialog =
-      resolve_action (de->builder, "transform_compute", NULL);
-
-    g_object_set (invoke_compute_dialog,
-                 "tooltip", _("Compute new values for a variable"),
-                 "stock-id", "pspp-compute",
-                 NULL);
+      get_action_assert (de->builder, "transform_compute");
 
     g_signal_connect (invoke_compute_dialog, "activate",
                      G_CALLBACK (compute_dialog), de);
@@ -1429,11 +1301,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   {
     GtkAction *invoke_oneway_anova_dialog =
-      resolve_action (de->builder, "oneway-anova", NULL);
-
-    g_object_set (invoke_oneway_anova_dialog,
-                 "tooltip", _("Perform one way analysis of variance"),
-                 NULL);
+      get_action_assert (de->builder, "oneway-anova");
 
     g_signal_connect (invoke_oneway_anova_dialog, "activate",
                      G_CALLBACK (oneway_anova_dialog), de);
@@ -1442,13 +1310,8 @@ 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,
-                 "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);
@@ -1457,12 +1320,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   {
     GtkAction *invoke_t_test_paired_samples_dialog =
-      resolve_action (de->builder, "paired-t-test", NULL);
-
-    g_object_set (invoke_t_test_paired_samples_dialog,
-                 "tooltip",
-                 _("Calculate T Test for paired samples"),
-                 NULL);
+      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);
@@ -1471,12 +1329,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   {
     GtkAction *invoke_t_test_one_sample_dialog =
-      resolve_action (de->builder, "one-sample-t-test", NULL);
-
-    g_object_set (invoke_t_test_one_sample_dialog,
-                 "tooltip",
-                 _("Calculate T Test for sample from a single distribution"),
-                 NULL);
+      get_action_assert (de->builder, "one-sample-t-test");
 
     g_signal_connect (invoke_t_test_one_sample_dialog, "activate",
                      G_CALLBACK (t_test_one_sample_dialog), de);
@@ -1485,14 +1338,9 @@ 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,
-                 "tooltip",
-                 _("Commentary text for the data file"),
-                 NULL);
-
     g_signal_connect (invoke_comments_dialog, "activate",
                      G_CALLBACK (comments_dialog), de);
   }
@@ -1501,12 +1349,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   {
     GtkAction *invoke_rank_dialog =
-      resolve_action (de->builder, "transform_rank", NULL);
-
-    g_object_set (invoke_rank_dialog,
-                 "stock-id", "pspp-rank-cases",
-                 "tooltip", _("Rank Cases"),
-                 NULL);
+      get_action_assert (de->builder, "transform_rank");
 
     g_signal_connect (invoke_rank_dialog, "activate",
                      G_CALLBACK (rank_dialog), de);
@@ -1515,12 +1358,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   {
     GtkAction *invoke_recode_same_dialog =
-      resolve_action (de->builder, "transform_recode-same", NULL);
-
-    g_object_set (invoke_recode_same_dialog,
-                 "stock-id", "pspp-recode-same",
-                 "tooltip", _("Recode values into the same variables"),
-                 NULL);
+      get_action_assert (de->builder, "transform_recode-same");
 
     g_signal_connect (invoke_recode_same_dialog, "activate",
                      G_CALLBACK (recode_same_dialog), de);
@@ -1529,12 +1367,8 @@ 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",
-                 "tooltip", _("Recode values into different variables"),
-                 NULL);
 
     g_signal_connect (invoke_recode_different_dialog, "activate",
                      G_CALLBACK (recode_different_dialog), de);
@@ -1543,12 +1377,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   {
     GtkAction *invoke_descriptives_dialog =
-      resolve_action (de->builder,  "analyze_descriptives", NULL);
-
-    g_object_set (invoke_descriptives_dialog,
-                 "tooltip", _("Calculate descriptive statistics (mean, variance, ...)"),
-                 "stock-id", "pspp-descriptives",
-                 NULL);
+      get_action_assert (de->builder, "analyze_descriptives");
 
     g_signal_connect (invoke_descriptives_dialog, "activate",
                      G_CALLBACK (descriptives_dialog), de);
@@ -1557,12 +1386,8 @@ 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"),
-                 "stock-id", "pspp-frequencies",
-                 NULL);
 
     g_signal_connect (invoke_frequencies_dialog, "activate",
                      G_CALLBACK (frequencies_dialog), de);
@@ -1571,12 +1396,8 @@ 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"),
-                 "stock-id", "pspp-crosstabs",
-                 NULL);
 
     g_signal_connect (invoke_crosstabs_dialog, "activate",
                      G_CALLBACK (crosstabs_dialog), de);
@@ -1586,12 +1407,8 @@ 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"),
-                 "stock-id", "pspp-examine",
-                 NULL);
 
     g_signal_connect (invoke_examine_dialog, "activate",
                      G_CALLBACK (examine_dialog), de);
@@ -1600,13 +1417,8 @@ 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"),
-                 "stock-id", "pspp-regression",
-                 NULL
-                 );
 
     g_signal_connect (invoke_regression_dialog, "activate",
                      G_CALLBACK (regression_dialog), de);
@@ -1614,13 +1426,8 @@ 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"),
-                 "stock-id", "pspp-reliability",
-                 NULL
-                 );
 
     g_signal_connect (invoke_reliability_dialog, "activate",
                      G_CALLBACK (reliability_dialog), de);
@@ -1628,13 +1435,8 @@ 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"),
-                 "stock-id", "pspp-roc",
-                 NULL
-                 );
 
     g_signal_connect (invoke_roc_dialog, "activate",
                      G_CALLBACK (roc_dialog), de);
@@ -1642,13 +1444,8 @@ 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"),
-                 "stock-id", "pspp-correlation",
-                 NULL
-                 );
 
     g_signal_connect (invoke_correlation_dialog, "activate",
                      G_CALLBACK (correlation_dialog), de);
@@ -1656,13 +1453,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   {
     GtkAction *invoke_factor_dialog =
-      resolve_action (de->builder, "factor-analysis", NULL);
-
-    g_object_set (invoke_factor_dialog,
-                 "tooltip", _("Principal Axis Factoring and Principal Components Analysis"),
-                 "stock-id", "pspp-factor",
-                 NULL
-                 );
+      get_action_assert (de->builder, "factor-analysis");
 
     g_signal_connect (invoke_factor_dialog, "activate",
                      G_CALLBACK (factor_dialog), de);
@@ -1732,7 +1523,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   {
     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),
@@ -1785,12 +1576,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 
 
   {
-    GtkAction *font_action =
-      resolve_action (de->builder, "view_fonts", NULL);
-
-    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",
@@ -1815,12 +1601,8 @@ 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"),
-                 "stock-id", "pspp-split-window",
-                 NULL);
 
     g_signal_connect (split_window_action, "toggled",
                      G_CALLBACK (toggle_split_window),
@@ -1835,8 +1617,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));