X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-window.c;h=63ad9fe1bdc0457644ff5c9865a7c9c7f3acab1e;hb=01b970b8972e4e457b1d8e3f5af350c325152942;hp=d6026bec1cf041d16813b6b245413d753d076c9c;hpb=18068527645fe7a23c7ea3b746ad3280bfa75b9e;p=pspp diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c index d6026bec1c..63ad9fe1bd 100644 --- a/src/ui/gui/psppire-data-window.c +++ b/src/ui/gui/psppire-data-window.c @@ -25,9 +25,11 @@ #include "language/syntax-string-source.h" #include "libpspp/message.h" #include "ui/gui/help-menu.h" +#include "ui/gui/binomial-dialog.h" #include "ui/gui/comments-dialog.h" #include "ui/gui/compute-dialog.h" #include "ui/gui/correlation-dialog.h" +#include "ui/gui/chi-square-dialog.h" #include "ui/gui/crosstabs-dialog.h" #include "ui/gui/descriptives-dialog.h" #include "ui/gui/examine-dialog.h" @@ -55,6 +57,7 @@ #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/aggregate-dialog.h" #include "ui/gui/variable-info-dialog.h" #include "ui/gui/weight-cases-dialog.h" #include "ui/syntax-gen.h" @@ -362,7 +365,7 @@ load_file (PsppireWindow *de, const gchar *file_name) g_free (native_file_name); - sss = create_syntax_string_source ("GET FILE=%s.", + sss = create_syntax_format_source ("GET FILE=%s.", ds_cstr (&filename)); ds_destroy (&filename); @@ -457,11 +460,14 @@ open_window (PsppireWindow *de) gchar *name = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); - if (any_reader_may_open (name)) + gchar *sysname = convert_glib_filename_to_system_filename (name, NULL); + + if (any_reader_may_open (sysname)) psppire_window_load (de, name); else open_syntax_window (name); + g_free (sysname); g_free (name); } break; @@ -524,12 +530,12 @@ save_file (PsppireWindow *w) if ( de->save_as_portable ) { - sss = create_syntax_string_source ("EXPORT OUTFILE=%s.", + sss = create_syntax_format_source ("EXPORT OUTFILE=%s.", ds_cstr (&filename)); } else { - sss = create_syntax_string_source ("SAVE OUTFILE=%s.", + sss = create_syntax_format_source ("SAVE OUTFILE=%s.", ds_cstr (&filename)); } @@ -583,7 +589,7 @@ sysfile_info (PsppireDataWindow *de) g_free (native_file_name); - sss = create_syntax_string_source ("SYSFILE INFO %s.", + sss = create_syntax_format_source ("SYSFILE INFO %s.", ds_cstr (&filename)); execute_syntax (sss); } @@ -934,6 +940,21 @@ set_unsaved (gpointer w) psppire_window_set_unsaved (PSPPIRE_WINDOW (w)); } + +/* Connects the action called ACTION_NAME to HANDLER passing DW as the auxilliary data. + Returns a pointer to the action +*/ +static GtkAction * +connect_action (PsppireDataWindow *dw, const char *action_name, + GCallback handler) +{ + GtkAction *action = get_action_assert (dw->builder, action_name); + + g_signal_connect_swapped (action, "activate", handler, dw); + + return action; +} + static void psppire_data_window_init (PsppireDataWindow *de) { @@ -1009,85 +1030,33 @@ psppire_data_window_init (PsppireDataWindow *de) de); - g_signal_connect_swapped (get_action_assert (de->builder, "edit_copy"), "activate", G_CALLBACK (on_edit_copy), de); - - g_signal_connect_swapped (get_action_assert (de->builder, "edit_cut"), "activate", G_CALLBACK (on_edit_cut), 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 (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"); + connect_action (de, "edit_copy", G_CALLBACK (on_edit_copy)); - g_signal_connect_swapped (action_info_working_file, "activate", G_CALLBACK (display_dict), de); - } + connect_action (de, "edit_cut", G_CALLBACK (on_edit_cut)); + connect_action (de, "file_new_data", G_CALLBACK (new_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); - } - + connect_action (de, "file_import-text", G_CALLBACK (text_data_import_assistant)); + connect_action (de, "file_save", G_CALLBACK (data_save)); + + connect_action (de, "file_open", G_CALLBACK (open_window)); + connect_action (de, "file_save_as", G_CALLBACK (data_save_as_dialog)); - g_signal_connect_swapped (get_action_assert (de->builder, "edit_paste"), "activate", G_CALLBACK (on_edit_paste), de); + connect_action (de, "file_information_working-file", G_CALLBACK (display_dict)); - { - de->insert_case = get_action_assert (de->builder, "edit_insert-case"); - g_signal_connect_swapped (de->insert_case, "activate", G_CALLBACK (insert_case), de); - - } + connect_action (de, "file_information_external-file", G_CALLBACK (sysfile_info)); - { - de->insert_variable = get_action_assert (de->builder, "action_insert-variable"); + connect_action (de, "edit_paste", G_CALLBACK (on_edit_paste)); - g_signal_connect_swapped (de->insert_variable, "activate", G_CALLBACK (on_insert_variable), de); - } + de->insert_case = connect_action (de, "edit_insert-case", G_CALLBACK (insert_case)); - 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); + de->insert_variable = connect_action (de, "action_insert-variable", G_CALLBACK (on_insert_variable)); + de->invoke_goto_dialog = connect_action (de, "edit_goto-case", G_CALLBACK (goto_case_dialog)); - { - 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); - } + 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 +1076,63 @@ psppire_data_window_init (PsppireDataWindow *de) } + connect_action (de, "data_transpose", G_CALLBACK (transpose_dialog)); - { - GtkAction *invoke_transpose_dialog = get_action_assert (de->builder, "data_transpose"); - - g_signal_connect_swapped (invoke_transpose_dialog, "activate", G_CALLBACK (transpose_dialog), de); - } - - - { - GtkAction *invoke_sort_cases_dialog = get_action_assert (de->builder, "data_sort-cases"); - - 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); - } - + connect_action (de, "data_select-cases", G_CALLBACK (select_cases_dialog)); - { - 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); - } - - - - { - 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); - } - - - { - 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); - } - + connect_action (de, "data_sort-cases", G_CALLBACK (sort_cases_dialog)); - { - GtkAction *invoke_frequencies_dialog = get_action_assert (de->builder, "analyze_frequencies"); - - g_signal_connect_swapped (invoke_frequencies_dialog, "activate", G_CALLBACK (frequencies_dialog), de); - } + connect_action (de, "data_aggregate", G_CALLBACK (aggregate_dialog)); + connect_action (de, "transform_compute", G_CALLBACK (compute_dialog)); - { - 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); - } + connect_action (de, "edit_find", G_CALLBACK (find_dialog)); + connect_action (de, "data_split-file", G_CALLBACK (split_file_dialog)); - { - GtkAction *invoke_regression_dialog = get_action_assert (de->builder, "linear-regression"); + connect_action (de, "data_weight-cases", G_CALLBACK (weight_cases_dialog)); - g_signal_connect_swapped (invoke_regression_dialog, "activate", G_CALLBACK (regression_dialog), de); - } - { - GtkAction *invoke_reliability_dialog = get_action_assert (de->builder, "reliability"); + connect_action (de, "utilities_variables", G_CALLBACK (variable_info_dialog)); + + connect_action (de, "oneway-anova", G_CALLBACK (oneway_anova_dialog)); - g_signal_connect_swapped (invoke_reliability_dialog, "activate", G_CALLBACK (reliability_dialog), de); - } + connect_action (de, "indep-t-test", G_CALLBACK (t_test_independent_samples_dialog)); - { - GtkAction *invoke_roc_dialog = get_action_assert (de->builder, "roc-curve"); + connect_action (de, "paired-t-test", G_CALLBACK (t_test_paired_samples_dialog)); - g_signal_connect_swapped (invoke_roc_dialog, "activate", G_CALLBACK (roc_dialog), de); - } + connect_action (de, "one-sample-t-test", G_CALLBACK (t_test_one_sample_dialog)); - { - GtkAction *invoke_correlation_dialog = get_action_assert (de->builder, "correlation"); + connect_action (de, "utilities_comments", G_CALLBACK (comments_dialog)); + + connect_action (de, "transform_rank", G_CALLBACK (rank_dialog)); + + connect_action (de, "transform_recode-same", G_CALLBACK (recode_same_dialog)); + + connect_action (de, "transform_recode-different", G_CALLBACK (recode_different_dialog)); - g_signal_connect_swapped (invoke_correlation_dialog, "activate", G_CALLBACK (correlation_dialog), de); - } + connect_action (de, "analyze_descriptives", G_CALLBACK (descriptives_dialog)); + + connect_action (de, "analyze_frequencies", G_CALLBACK (frequencies_dialog)); + + connect_action (de, "crosstabs", G_CALLBACK (crosstabs_dialog)); + + connect_action (de, "analyze_explore", G_CALLBACK (examine_dialog)); + + connect_action (de, "linear-regression", G_CALLBACK (regression_dialog)); + + connect_action (de, "reliability", G_CALLBACK (reliability_dialog)); + + connect_action (de, "roc-curve", G_CALLBACK (roc_dialog)); - { - GtkAction *invoke_factor_dialog = get_action_assert (de->builder, "factor-analysis"); + connect_action (de, "correlation", G_CALLBACK (correlation_dialog)); + + connect_action (de, "factor-analysis", G_CALLBACK (factor_dialog)); - g_signal_connect_swapped (invoke_factor_dialog, "activate", G_CALLBACK (factor_dialog), de); - } + connect_action (de, "chi-square", G_CALLBACK (chisquare_dialog)); + connect_action (de, "binomial", G_CALLBACK (binomial_dialog)); + { GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER)); @@ -1327,8 +1185,7 @@ psppire_data_window_init (PsppireDataWindow *de) } - g_signal_connect_swapped (get_action_assert (de->builder,"file_new_syntax"), "activate", G_CALLBACK (create_syntax_window), NULL); - + connect_action (de, "file_new_syntax", G_CALLBACK (create_syntax_window)); g_signal_connect (de->data_editor, @@ -1349,35 +1206,23 @@ psppire_data_window_init (PsppireDataWindow *de) gtk_notebook_set_current_page (GTK_NOTEBOOK (de->data_editor), PSPPIRE_DATA_EDITOR_VARIABLE_VIEW); gtk_notebook_set_current_page (GTK_NOTEBOOK (de->data_editor), PSPPIRE_DATA_EDITOR_DATA_VIEW); - g_signal_connect_swapped (get_action_assert (de->builder, "view_statusbar"), "activate", G_CALLBACK (status_bar_activate), de); - - g_signal_connect_swapped (get_action_assert (de->builder, "view_gridlines"), "activate", G_CALLBACK (grid_lines_activate), de); - - g_signal_connect_swapped (get_action_assert (de->builder, "view_data"), "activate", G_CALLBACK (data_view_activate), de); + connect_action (de, "view_statusbar", G_CALLBACK (status_bar_activate)); - g_signal_connect_swapped (get_action_assert (de->builder, "view_variables"), "activate", G_CALLBACK (variable_view_activate), de); + connect_action (de, "view_gridlines", G_CALLBACK (grid_lines_activate)); + connect_action (de, "view_data", G_CALLBACK (data_view_activate)); - { - GtkAction *font_action = get_action_assert (de->builder, "view_fonts"); - - g_signal_connect_swapped (font_action, "activate", G_CALLBACK (fonts_activate), de); - } + connect_action (de, "view_variables", G_CALLBACK (variable_view_activate)); + connect_action (de, "view_fonts", G_CALLBACK (fonts_activate)); + connect_action (de, "file_quit", G_CALLBACK (file_quit)); - g_signal_connect_swapped (get_action_assert (de->builder, "file_quit"), "activate", G_CALLBACK (file_quit), de); + connect_action (de, "transform_run-pending", G_CALLBACK (execute)); - g_signal_connect_swapped (get_action_assert (de->builder, "transform_run-pending"), "activate", G_CALLBACK (execute), de); + connect_action (de, "windows_minimise_all", G_CALLBACK (psppire_window_minimise_all)); - 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)); @@ -1422,6 +1267,8 @@ GtkWidget* psppire_data_window_new (void) { return GTK_WIDGET (g_object_new (psppire_data_window_get_type (), + /* TRANSLATORS: This will form a filename. Please avoid whitespace. */ + "filename", _("PSPP-data"), "description", _("Data Editor"), NULL)); }