Remove the resolve_action function which is no longer needed
[pspp-builds.git] / src / ui / gui / psppire-data-window.c
index 00dba993ce3991ca5537edfd49dadacc6cc6cdcd..55e206e1a9226731b741c9b4e72fcf2c217657fd 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);
 }
 
 
@@ -1085,22 +1085,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)
@@ -1193,29 +1177,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", 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);
-  }
-
 
 
   {
     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"),
@@ -1230,7 +1196,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"),
@@ -1244,25 +1210,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"),
@@ -1276,8 +1240,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",
@@ -1287,8 +1250,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",
@@ -1297,28 +1259,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,
@@ -1337,7 +1313,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"),
@@ -1354,69 +1330,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,
@@ -1429,23 +1346,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,
@@ -1458,23 +1361,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"),
@@ -1485,10 +1375,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"),
@@ -1501,7 +1424,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,
@@ -1516,7 +1439,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",
@@ -1530,7 +1453,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",
@@ -1544,7 +1467,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,
@@ -1558,20 +1481,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",
@@ -1585,7 +1497,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",
@@ -1599,7 +1511,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",
@@ -1611,23 +1523,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, ...)"),
@@ -1641,7 +1539,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"),
@@ -1655,7 +1553,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"),
@@ -1670,7 +1568,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"),
@@ -1684,7 +1582,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"),
@@ -1698,7 +1596,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"),
@@ -1712,7 +1610,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"),
@@ -1726,7 +1624,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"),
@@ -1740,7 +1638,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   {
     GtkAction *invoke_factor_dialog =
-      resolve_action (de->builder, "factor-analysis", NULL);
+      get_action_assert (de->builder, "factor-analysis");
 
     g_object_set (invoke_factor_dialog,
                  "tooltip", _("Principal Axis Factoring and Principal Components Analysis"),
@@ -1870,7 +1768,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",
@@ -1899,7 +1797,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"),