From a69b63413accf01fefaac113d86c9f9c0a6c10b2 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Wed, 12 May 2010 10:00:38 +0200 Subject: [PATCH] Remove unnecessary GtkAction * variables --- src/ui/gui/psppire-data-window.c | 275 ++++++------------------------- 1 file changed, 50 insertions(+), 225 deletions(-) diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c index d6026bec..4a64cac3 100644 --- a/src/ui/gui/psppire-data-window.c +++ b/src/ui/gui/psppire-data-window.c @@ -1013,82 +1013,39 @@ psppire_data_window_init (PsppireDataWindow *de) g_signal_connect_swapped (get_action_assert (de->builder, "edit_cut"), "activate", G_CALLBACK (on_edit_cut), de); + g_signal_connect_swapped (get_action_assert (de->builder, "file_new_data"),"activate", G_CALLBACK (new_file), de); - { - GtkAction *action_data_new = get_action_assert (de->builder, "file_new_data"); - - g_signal_connect_swapped (action_data_new, "activate", G_CALLBACK (new_file), de); - } - - - - { - GtkAction *invoke_text_import_assistant = get_action_assert (de->builder, "file_import-text"); - - g_signal_connect_swapped (invoke_text_import_assistant, "activate", G_CALLBACK (text_data_import_assistant), 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); - } - - - { - GtkAction *action_data_open = get_action_assert (de->builder, "file_open"); - - g_signal_connect_swapped (action_data_open, "activate", G_CALLBACK (open_window), de); - } - - { - GtkAction *action_data_save_as = get_action_assert (de->builder, "file_save_as"); + g_signal_connect_swapped (get_action_assert (de->builder, "file_import-text"), "activate", G_CALLBACK (text_data_import_assistant), 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"); - - 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"); - - g_signal_connect_swapped (action_info_external_file, "activate", G_CALLBACK (sysfile_info), de); - } + g_signal_connect_swapped (get_action_assert (de->builder, "file_save"),"activate", G_CALLBACK (data_save), de); + + g_signal_connect_swapped (get_action_assert (de->builder, "file_open"), "activate", G_CALLBACK (open_window), de); + g_signal_connect_swapped (get_action_assert (de->builder, "file_save_as"), "activate", G_CALLBACK (data_save_as_dialog), de); + g_signal_connect_swapped (get_action_assert (de->builder, "file_information_working-file"), "activate", G_CALLBACK (display_dict), de); + g_signal_connect_swapped (get_action_assert (de->builder, "file_information_external-file"), "activate", G_CALLBACK (sysfile_info), de); g_signal_connect_swapped (get_action_assert (de->builder, "edit_paste"), "activate", G_CALLBACK (on_edit_paste), de); { de->insert_case = get_action_assert (de->builder, "edit_insert-case"); g_signal_connect_swapped (de->insert_case, "activate", G_CALLBACK (insert_case), de); - } { de->insert_variable = get_action_assert (de->builder, "action_insert-variable"); - g_signal_connect_swapped (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_swapped (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_swapped (value_labels_action, "toggled", G_CALLBACK (toggle_value_labels), de); + de->invoke_goto_dialog = get_action_assert (de->builder, "edit_goto-case"); + g_signal_connect_swapped (de->invoke_goto_dialog, "activate", G_CALLBACK (goto_case_dialog), de); } + g_signal_connect_swapped (get_action_assert (de->builder, "view_value-labels"), "toggled", G_CALLBACK (toggle_value_labels), de); + { de->delete_cases = get_action_assert (de->builder, "edit_clear-cases"); @@ -1107,174 +1064,54 @@ psppire_data_window_init (PsppireDataWindow *de) } + g_signal_connect_swapped (get_action_assert (de->builder, "data_transpose"), "activate", G_CALLBACK (transpose_dialog), de); - { - GtkAction *invoke_transpose_dialog = get_action_assert (de->builder, "data_transpose"); + g_signal_connect_swapped (get_action_assert (de->builder, "data_sort-cases"), "activate", G_CALLBACK (sort_cases_dialog), de); - g_signal_connect_swapped (invoke_transpose_dialog, "activate", G_CALLBACK (transpose_dialog), de); - } + g_signal_connect_swapped (get_action_assert (de->builder, "transform_compute"), "activate", G_CALLBACK (compute_dialog), de); + g_signal_connect_swapped (get_action_assert (de->builder, "edit_find"), "activate", G_CALLBACK (find_dialog), de); - { - GtkAction *invoke_sort_cases_dialog = get_action_assert (de->builder, "data_sort-cases"); + g_signal_connect_swapped (get_action_assert (de->builder, "data_split-file"), "activate", G_CALLBACK (split_file_dialog), de); - g_signal_connect_swapped (invoke_sort_cases_dialog, "activate", G_CALLBACK (sort_cases_dialog), de); - } - - - - { - GtkAction *invoke_compute_dialog = get_action_assert (de->builder, "transform_compute"); - - g_signal_connect_swapped (invoke_compute_dialog, "activate", G_CALLBACK (compute_dialog), de); - } - - { - GtkAction *invoke_find_dialog = get_action_assert (de->builder, "edit_find"); - - g_signal_connect_swapped (invoke_find_dialog, "activate", G_CALLBACK (find_dialog), de); - } + g_signal_connect_swapped (get_action_assert (de->builder, "data_weight-cases"), "activate", G_CALLBACK (weight_cases_dialog), de); + g_signal_connect_swapped (get_action_assert (de->builder, "utilities_variables"), "activate", G_CALLBACK (variable_info_dialog), de); - { - GtkAction *invoke_split_file_dialog = get_action_assert (de->builder, "data_split-file"); - - g_signal_connect_swapped (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_swapped (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_swapped (invoke_variable_info_dialog, "activate", G_CALLBACK (variable_info_dialog), de); - } + g_signal_connect_swapped (get_action_assert (de->builder, "oneway-anova"), "activate", G_CALLBACK (oneway_anova_dialog), de); + g_signal_connect_swapped (get_action_assert (de->builder, "indep-t-test"), "activate", G_CALLBACK (t_test_independent_samples_dialog), de); + g_signal_connect_swapped (get_action_assert (de->builder, "paired-t-test"), "activate", G_CALLBACK (t_test_paired_samples_dialog), de); - { - GtkAction *invoke_oneway_anova_dialog = get_action_assert (de->builder, "oneway-anova"); - - g_signal_connect_swapped (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"); - - g_signal_connect_swapped (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_signal_connect_swapped (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"); - - g_signal_connect_swapped (invoke_t_test_one_sample_dialog, "activate", G_CALLBACK (t_test_one_sample_dialog), de); - } + g_signal_connect_swapped (get_action_assert (de->builder, "one-sample-t-test"), "activate", G_CALLBACK (t_test_one_sample_dialog), de); + g_signal_connect_swapped (get_action_assert (de->builder, "utilities_comments"), "activate", G_CALLBACK (comments_dialog), de); + + g_signal_connect_swapped (get_action_assert (de->builder, "transform_rank"), "activate", G_CALLBACK (rank_dialog), de); + + g_signal_connect_swapped (get_action_assert (de->builder, "transform_recode-same"), "activate", G_CALLBACK (recode_same_dialog), de); + + g_signal_connect_swapped (get_action_assert (de->builder, "transform_recode-different"), "activate", G_CALLBACK (recode_different_dialog), de); - { - GtkAction *invoke_comments_dialog = get_action_assert (de->builder, "utilities_comments"); - - g_signal_connect_swapped (invoke_comments_dialog, "activate", G_CALLBACK (comments_dialog), de); - } - - - - { - GtkAction *invoke_rank_dialog = get_action_assert (de->builder, "transform_rank"); - - g_signal_connect_swapped (invoke_rank_dialog, "activate", G_CALLBACK (rank_dialog), de); - } - - - { - GtkAction *invoke_recode_same_dialog = get_action_assert (de->builder, "transform_recode-same"); - - g_signal_connect_swapped (invoke_recode_same_dialog, "activate", G_CALLBACK (recode_same_dialog), de); - } - - - { - GtkAction *invoke_recode_different_dialog = get_action_assert (de->builder, "transform_recode-different"); - - - g_signal_connect_swapped (invoke_recode_different_dialog, "activate", G_CALLBACK (recode_different_dialog), de); - } - - - { - GtkAction *invoke_descriptives_dialog = get_action_assert (de->builder, "analyze_descriptives"); - - g_signal_connect_swapped (invoke_descriptives_dialog, "activate", G_CALLBACK (descriptives_dialog), de); - } - - - { - GtkAction *invoke_frequencies_dialog = get_action_assert (de->builder, "analyze_frequencies"); - - g_signal_connect_swapped (invoke_frequencies_dialog, "activate", G_CALLBACK (frequencies_dialog), de); - } - - - { - GtkAction *invoke_crosstabs_dialog = get_action_assert (de->builder, "crosstabs"); - - g_signal_connect_swapped (invoke_crosstabs_dialog, "activate", G_CALLBACK (crosstabs_dialog), de); - } - - - { - GtkAction *invoke_examine_dialog = get_action_assert (de->builder, "analyze_explore"); - - g_signal_connect_swapped (invoke_examine_dialog, "activate", G_CALLBACK (examine_dialog), de); - } - - - { - GtkAction *invoke_regression_dialog = get_action_assert (de->builder, "linear-regression"); - - g_signal_connect_swapped (invoke_regression_dialog, "activate", G_CALLBACK (regression_dialog), de); - } - - { - GtkAction *invoke_reliability_dialog = get_action_assert (de->builder, "reliability"); - - g_signal_connect_swapped (invoke_reliability_dialog, "activate", G_CALLBACK (reliability_dialog), de); - } - - { - GtkAction *invoke_roc_dialog = get_action_assert (de->builder, "roc-curve"); - - g_signal_connect_swapped (invoke_roc_dialog, "activate", G_CALLBACK (roc_dialog), de); - } - - { - GtkAction *invoke_correlation_dialog = get_action_assert (de->builder, "correlation"); - - g_signal_connect_swapped (invoke_correlation_dialog, "activate", G_CALLBACK (correlation_dialog), de); - } - - { - GtkAction *invoke_factor_dialog = get_action_assert (de->builder, "factor-analysis"); - - g_signal_connect_swapped (invoke_factor_dialog, "activate", G_CALLBACK (factor_dialog), de); - } - + g_signal_connect_swapped (get_action_assert (de->builder, "analyze_descriptives"), "activate", G_CALLBACK (descriptives_dialog), de); + + g_signal_connect_swapped (get_action_assert (de->builder, "analyze_frequencies"), "activate", G_CALLBACK (frequencies_dialog), de); + + g_signal_connect_swapped (get_action_assert (de->builder, "crosstabs"), "activate", G_CALLBACK (crosstabs_dialog), de); + + g_signal_connect_swapped (get_action_assert (de->builder, "analyze_explore"), "activate", G_CALLBACK (examine_dialog), de); + + g_signal_connect_swapped (get_action_assert (de->builder, "linear-regression"), "activate", G_CALLBACK (regression_dialog), de); + + g_signal_connect_swapped (get_action_assert (de->builder, "reliability"), "activate", G_CALLBACK (reliability_dialog), de); + + g_signal_connect_swapped (get_action_assert (de->builder, "roc-curve"), "activate", G_CALLBACK (roc_dialog), de); + + g_signal_connect_swapped (get_action_assert (de->builder, "correlation"), "activate", G_CALLBACK (correlation_dialog), de); + + g_signal_connect_swapped (get_action_assert (de->builder, "factor-analysis"), "activate", G_CALLBACK (factor_dialog), de); + { GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER)); @@ -1357,14 +1194,7 @@ psppire_data_window_init (PsppireDataWindow *de) g_signal_connect_swapped (get_action_assert (de->builder, "view_variables"), "activate", G_CALLBACK (variable_view_activate), de); - - { - GtkAction *font_action = get_action_assert (de->builder, "view_fonts"); - - g_signal_connect_swapped (font_action, "activate", G_CALLBACK (fonts_activate), de); - } - - + g_signal_connect_swapped (get_action_assert (de->builder, "view_fonts"), "activate", G_CALLBACK (fonts_activate), de); g_signal_connect_swapped (get_action_assert (de->builder, "file_quit"), "activate", G_CALLBACK (file_quit), de); @@ -1372,12 +1202,7 @@ psppire_data_window_init (PsppireDataWindow *de) g_signal_connect_swapped (get_action_assert (de->builder, "windows_minimise_all"), "activate", G_CALLBACK (psppire_window_minimise_all), de); - - { - GtkAction *split_window_action = get_action_assert (de->builder, "windows_split"); - - g_signal_connect_swapped (split_window_action, "toggled", G_CALLBACK (toggle_split_window), de); - } + g_signal_connect_swapped (get_action_assert (de->builder, "windows_split"), "toggled", G_CALLBACK (toggle_split_window), de); { GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER)); -- 2.30.2