X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-window.c;h=c655ece6a8bc3989ad991a36046882f1ca1ab530;hb=0d2d1a1e7036d45c7d02a1ba211e1dd96a88a867;hp=ef9e0b6eeaa034f528ad998828244e856e2cd20e;hpb=60426b863b7b51f6295c2884478ae02863d3b79d;p=pspp-builds.git diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c index ef9e0b6e..c655ece6 100644 --- a/src/ui/gui/psppire-data-window.c +++ b/src/ui/gui/psppire-data-window.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2008, 2009 Free Software Foundation + Copyright (C) 2008, 2009, 2010 Free Software Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,47 +18,46 @@ #include #include -#include "helper.h" - -#include "text-data-import-dialog.h" - - -#include -#include -#include #include -#include - -#include "psppire.h" -#include "psppire-window.h" -#include "psppire-data-window.h" -#include "psppire-syntax-window.h" - -#include "about.h" - -#include "goto-case-dialog.h" -#include "weight-cases-dialog.h" -#include "split-file-dialog.h" -#include "transpose-dialog.h" -#include "sort-cases-dialog.h" -#include "select-cases-dialog.h" -#include "compute-dialog.h" -#include "find-dialog.h" -#include "rank-dialog.h" -#include "recode-dialog.h" -#include "comments-dialog.h" -#include "variable-info-dialog.h" -#include "descriptives-dialog.h" -#include "crosstabs-dialog.h" -#include "frequencies-dialog.h" -#include "examine-dialog.h" -#include "regression-dialog.h" -#include "oneway-anova-dialog.h" -#include "t-test-independent-samples-dialog.h" -#include "t-test-one-sample.h" -#include "t-test-paired-samples.h" - +#include "data/any-reader.h" +#include "data/procedure.h" +#include "language/syntax-string-source.h" +#include "libpspp/message.h" +#include "ui/gui/about.h" +#include "ui/gui/comments-dialog.h" +#include "ui/gui/compute-dialog.h" +#include "ui/gui/correlation-dialog.h" +#include "ui/gui/crosstabs-dialog.h" +#include "ui/gui/descriptives-dialog.h" +#include "ui/gui/examine-dialog.h" +#include "ui/gui/executor.h" +#include "ui/gui/factor-dialog.h" +#include "ui/gui/find-dialog.h" +#include "ui/gui/frequencies-dialog.h" +#include "ui/gui/goto-case-dialog.h" +#include "ui/gui/helper.h" +#include "ui/gui/oneway-anova-dialog.h" +#include "ui/gui/psppire-data-window.h" +#include "ui/gui/psppire-syntax-window.h" +#include "ui/gui/psppire-window.h" +#include "ui/gui/psppire.h" +#include "ui/gui/rank-dialog.h" +#include "ui/gui/recode-dialog.h" +#include "ui/gui/regression-dialog.h" +#include "ui/gui/reliability-dialog.h" +#include "ui/gui/roc-dialog.h" +#include "ui/gui/select-cases-dialog.h" +#include "ui/gui/sort-cases-dialog.h" +#include "ui/gui/split-file-dialog.h" +#include "ui/gui/t-test-independent-samples-dialog.h" +#include "ui/gui/t-test-one-sample.h" +#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/variable-info-dialog.h" +#include "ui/gui/weight-cases-dialog.h" +#include "ui/syntax-gen.h" #include #define _(msgid) gettext (msgid) @@ -229,12 +228,14 @@ on_filter_change (GObject *o, gint filter_index, gpointer data) else { PsppireVarStore *vs = NULL; + PsppireDict *dict = NULL; struct variable *var ; gchar *text ; g_object_get (de->data_editor, "var-store", &vs, NULL); + g_object_get (vs, "dictionary", &dict, NULL); - var = psppire_dict_get_variable (vs->dict, filter_index); + var = psppire_dict_get_variable (dict, filter_index); text = g_strdup_printf (_("Filter by %s"), var_get_name (var)); @@ -300,11 +301,13 @@ on_weight_change (GObject *o, gint weight_index, gpointer data) { struct variable *var ; PsppireVarStore *vs = NULL; + PsppireDict *dict = NULL; gchar *text; g_object_get (de->data_editor, "var-store", &vs, NULL); - - var = psppire_dict_get_variable (vs->dict, weight_index); + g_object_get (vs, "dictionary", &dict, NULL); + + var = psppire_dict_get_variable (dict, weight_index); text = g_strdup_printf (_("Weight by %s"), var_get_name (var)); @@ -381,7 +384,19 @@ sysfile_chooser_dialog (PsppireWindow *toplevel) GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); - GtkFileFilter *filter = gtk_file_filter_new (); + GtkFileFilter *filter; + + filter = gtk_file_filter_new (); + gtk_file_filter_set_name (filter, _("Data and Syntax Files")); + gtk_file_filter_add_pattern (filter, "*.sav"); + gtk_file_filter_add_pattern (filter, "*.SAV"); + gtk_file_filter_add_pattern (filter, "*.por"); + gtk_file_filter_add_pattern (filter, "*.POR"); + gtk_file_filter_add_pattern (filter, "*.sps"); + gtk_file_filter_add_pattern (filter, "*.SPS"); + gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); + + filter = gtk_file_filter_new (); gtk_file_filter_set_name (filter, _("System Files (*.sav)")); gtk_file_filter_add_pattern (filter, "*.sav"); gtk_file_filter_add_pattern (filter, "*.SAV"); @@ -393,6 +408,12 @@ sysfile_chooser_dialog (PsppireWindow *toplevel) gtk_file_filter_add_pattern (filter, "*.POR"); gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); + filter = gtk_file_filter_new (); + gtk_file_filter_set_name (filter, _("Syntax Files (*.sps) ")); + gtk_file_filter_add_pattern (filter, "*.sps"); + gtk_file_filter_add_pattern (filter, "*.SPS"); + gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); + filter = gtk_file_filter_new (); gtk_file_filter_set_name (filter, _("All Files")); gtk_file_filter_add_pattern (filter, "*"); @@ -403,7 +424,17 @@ sysfile_chooser_dialog (PsppireWindow *toplevel) gchar *filename = NULL; g_object_get (toplevel, "filename", &filename, NULL); - dir_name = g_path_get_dirname (filename); + if ( ! g_path_is_absolute (filename)) + { + gchar *path = + g_build_filename (g_get_current_dir (), filename, NULL); + dir_name = g_path_get_dirname (path); + g_free (path); + } + else + { + dir_name = g_path_get_dirname (filename); + } gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), dir_name); free (dir_name); @@ -415,7 +446,7 @@ sysfile_chooser_dialog (PsppireWindow *toplevel) /* Callback for the data_open action. Prompts for a filename and opens it */ static void -open_data_dialog (GtkAction *action, PsppireWindow *de) +open_window (GtkAction *action, PsppireWindow *de) { GtkWidget *dialog = sysfile_chooser_dialog (de); @@ -426,7 +457,10 @@ open_data_dialog (GtkAction *action, PsppireWindow *de) gchar *name = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); - psppire_window_load (de, name); + if (any_reader_may_open (name)) + psppire_window_load (de, name); + else + open_syntax_window (name); g_free (name); } @@ -509,15 +543,14 @@ static void insert_case (GtkAction *action, gpointer data) { PsppireDataWindow *dw = PSPPIRE_DATA_WINDOW (data); - psppire_data_editor_insert_case (dw->data_editor); } 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); } @@ -602,8 +635,8 @@ data_save_as_dialog (PsppireDataWindow *de) (gtk_radio_button_get_group (GTK_RADIO_BUTTON(button_sys)), _("Portable File")); - gtk_box_pack_start_defaults (GTK_BOX (vbox), button_sys); - gtk_box_pack_start_defaults (GTK_BOX (vbox), button_por); + psppire_box_pack_start_defaults (GTK_BOX (vbox), button_sys); + psppire_box_pack_start_defaults (GTK_BOX (vbox), button_por); gtk_widget_show_all (vbox); @@ -810,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) @@ -1052,22 +946,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) @@ -1079,6 +957,7 @@ static void psppire_data_window_init (PsppireDataWindow *de) { PsppireVarStore *vs; + PsppireDict *dict = NULL; GtkWidget *menubar; GtkWidget *hb ; @@ -1134,15 +1013,17 @@ psppire_data_window_init (PsppireDataWindow *de) g_assert(vs); /* Traps a possible bug in w32 build */ - g_signal_connect (vs->dict, "weight-changed", + g_object_get (vs, "dictionary", &dict, NULL); + + g_signal_connect (dict, "weight-changed", G_CALLBACK (on_weight_change), de); - g_signal_connect (vs->dict, "filter-changed", + g_signal_connect (dict, "filter-changed", G_CALLBACK (on_filter_change), de); - g_signal_connect (vs->dict, "split-changed", + g_signal_connect (dict, "split-changed", G_CALLBACK (on_split_change), de); @@ -1157,34 +1038,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_data", NULL); - - g_object_set (action_data_open, - "tooltip", _("Open a data file"), - "stock-id", "gtk-open", - NULL); - - g_signal_connect (action_data_open, "activate", - G_CALLBACK (open_data_dialog), 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); - - 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); @@ -1194,12 +1052,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); @@ -1208,31 +1061,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); - - g_object_set (action_data_save_as, - "label", _("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); @@ -1241,8 +1086,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", @@ -1252,8 +1096,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", @@ -1262,35 +1105,43 @@ 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); + { - de->delete_cases = - resolve_action (de->builder, "edit_clear-cases", NULL); + 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 = + 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), @@ -1302,14 +1153,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), @@ -1319,145 +1163,73 @@ 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"); + GtkAction *invoke_transpose_dialog = + get_action_assert (de->builder, "data_transpose"); - 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); + g_signal_connect (invoke_transpose_dialog, "activate", + G_CALLBACK (transpose_dialog), de); } { - GtkAction *invoke_transpose_dialog = - resolve_action (de->builder, "data_transpose", NULL); - + GtkAction *invoke_sort_cases_dialog = + get_action_assert (de->builder, "data_sort-cases"); - 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_sort_cases_dialog, "activate", + G_CALLBACK (sort_cases_dialog), 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); + { + GtkAction *invoke_compute_dialog = + get_action_assert (de->builder, "transform_compute"); - g_signal_connect (invoke_split_file_dialog, "activate", - G_CALLBACK (split_file_dialog), de); + g_signal_connect (invoke_compute_dialog, "activate", + G_CALLBACK (compute_dialog), de); } - { - GtkAction *invoke_sort_cases_dialog = - resolve_action (de->builder, "data_sort-cases", NULL); + GtkAction *invoke_find_dialog = get_action_assert (de->builder, "edit_find"); + g_signal_connect (invoke_find_dialog, "activate", + G_CALLBACK (find_dialog), de); + } - g_object_set (invoke_sort_cases_dialog, - "tooltip", _("Sort cases in the active file"), - "stock-id", "gtk-sort-ascending", - NULL); + + { + GtkAction *invoke_split_file_dialog = get_action_assert (de->builder, "data_split-file"); - g_signal_connect (invoke_sort_cases_dialog, "activate", - G_CALLBACK (sort_cases_dialog), de); + g_signal_connect (invoke_split_file_dialog, "activate", + G_CALLBACK (split_file_dialog), 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); + GtkAction *invoke_weight_cases_dialog = get_action_assert (de->builder, "data_weight-cases"); - g_signal_connect (invoke_select_cases_dialog, "activate", - G_CALLBACK (select_cases_dialog), de); + g_signal_connect (invoke_weight_cases_dialog, "activate", + G_CALLBACK (weight_cases_dialog), 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); + { + GtkAction *invoke_variable_info_dialog = get_action_assert (de->builder, "utilities_variables"); - g_signal_connect (invoke_compute_dialog, "activate", - G_CALLBACK (compute_dialog), de); + 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); - - 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); @@ -1466,14 +1238,9 @@ 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); } @@ -1481,12 +1248,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); @@ -1495,12 +1257,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); @@ -1509,39 +1266,18 @@ 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); } - { - 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); - - 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); @@ -1550,12 +1286,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); @@ -1564,40 +1295,17 @@ 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); } - { - 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); - - 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); @@ -1606,12 +1314,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); @@ -1620,12 +1324,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); @@ -1635,12 +1335,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); @@ -1649,19 +1345,50 @@ 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); } - { + { + GtkAction *invoke_reliability_dialog = + get_action_assert (de->builder, "reliability"); + + + g_signal_connect (invoke_reliability_dialog, "activate", + G_CALLBACK (reliability_dialog), de); + } + + { + GtkAction *invoke_roc_dialog = + get_action_assert (de->builder, "roc-curve"); + + + g_signal_connect (invoke_roc_dialog, "activate", + G_CALLBACK (roc_dialog), de); + } + + { + GtkAction *invoke_correlation_dialog = + get_action_assert (de->builder, "correlation"); + + + g_signal_connect (invoke_correlation_dialog, "activate", + G_CALLBACK (correlation_dialog), de); + } + + { + GtkAction *invoke_factor_dialog = + get_action_assert (de->builder, "factor-analysis"); + + g_signal_connect (invoke_factor_dialog, "activate", + G_CALLBACK (factor_dialog), de); + } + + + { GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER)); GtkWidget *recent_data = @@ -1721,14 +1448,10 @@ psppire_data_window_init (PsppireDataWindow *de) G_CALLBACK (create_syntax_window), NULL); - g_signal_connect (get_action_assert (de->builder,"file_open_syntax"), - "activate", - G_CALLBACK (open_syntax_window), - 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), @@ -1781,12 +1504,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", @@ -1811,40 +1529,45 @@ 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), de); } - de->data_sheet_variable_popup_menu = - GTK_MENU (create_data_sheet_variable_popup_menu (de)); - - de->var_sheet_variable_popup_menu = - GTK_MENU (create_var_sheet_variable_popup_menu (de)); + { + GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER)); - de->data_sheet_cases_popup_menu = - GTK_MENU (create_data_sheet_cases_popup_menu (de)); + PSPPIRE_WINDOW (de)->menu = + GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar/windows/windows_minimise_all")->parent); + } { - GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER)); + GtkWidget *data_sheet_cases_popup_menu = get_widget_assert (de->builder, + "datasheet-cases-popup"); - PSPPIRE_WINDOW (de)->menu = - GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar/windows/windows_minimise_all")->parent); - } + GtkWidget *var_sheet_variable_popup_menu = get_widget_assert (de->builder, + "varsheet-variable-popup"); + GtkWidget *data_sheet_variable_popup_menu = get_widget_assert (de->builder, + "datasheet-variable-popup"); - g_object_set (de->data_editor, - "datasheet-column-menu", de->data_sheet_variable_popup_menu, - "datasheet-row-menu", de->data_sheet_cases_popup_menu, - "varsheet-row-menu", de->var_sheet_variable_popup_menu, - NULL); + 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, + "datasheet-row-menu", data_sheet_cases_popup_menu, + "varsheet-row-menu", var_sheet_variable_popup_menu, + NULL); + } gtk_widget_show (GTK_WIDGET (de->data_editor)); gtk_widget_show (box);