X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-window.c;h=ffa9482eb0f4b766c391e32ac7c3ecac9dca3087;hb=66153a44d861ccddf6a176ec5a94ffb959232ad6;hp=16e8a8a016bfaa674e9b59bd19f0b3f4cb683b1a;hpb=76160320343cb402ed54024f8ea258e548c0b0c5;p=pspp-builds.git diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c index 16e8a8a0..ffa9482e 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 Free Software Foundation + Copyright (C) 2008, 2009 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,7 +18,7 @@ #include #include -#include +#include "executor.h" #include "helper.h" #include "text-data-import-dialog.h" @@ -31,6 +31,8 @@ #include +#include "psppire.h" +#include "psppire-window.h" #include "psppire-data-window.h" #include "psppire-syntax-window.h" @@ -52,8 +54,8 @@ #include "crosstabs-dialog.h" #include "frequencies-dialog.h" #include "examine-dialog.h" -#include "dict-display.h" #include "regression-dialog.h" +#include "reliability-dialog.h" #include "oneway-anova-dialog.h" #include "t-test-independent-samples-dialog.h" #include "t-test-one-sample.h" @@ -72,6 +74,9 @@ static void psppire_data_window_class_init (PsppireDataWindowClass *class); static void psppire_data_window_init (PsppireDataWindow *data_editor); +static void psppire_data_window_iface_init (PsppireWindowIface *iface); + + GType psppire_data_window_get_type (void) { @@ -80,38 +85,46 @@ psppire_data_window_get_type (void) if (!psppire_data_window_type) { static const GTypeInfo psppire_data_window_info = - { - sizeof (PsppireDataWindowClass), - (GBaseInitFunc) psppire_data_window_base_init, - (GBaseFinalizeFunc) psppire_data_window_base_finalize, - (GClassInitFunc)psppire_data_window_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (PsppireDataWindow), - 0, - (GInstanceInitFunc) psppire_data_window_init, - }; + { + sizeof (PsppireDataWindowClass), + (GBaseInitFunc) psppire_data_window_base_init, + (GBaseFinalizeFunc) psppire_data_window_base_finalize, + (GClassInitFunc)psppire_data_window_class_init, + (GClassFinalizeFunc) NULL, + NULL, + sizeof (PsppireDataWindow), + 0, + (GInstanceInitFunc) psppire_data_window_init, + }; + + static const GInterfaceInfo window_interface_info = + { + (GInterfaceInitFunc) psppire_data_window_iface_init, + NULL, + NULL + }; psppire_data_window_type = - g_type_register_static (PSPPIRE_WINDOW_TYPE, "PsppireDataWindow", + g_type_register_static (PSPPIRE_TYPE_WINDOW, "PsppireDataWindow", &psppire_data_window_info, 0); + + + g_type_add_interface_static (psppire_data_window_type, + PSPPIRE_TYPE_WINDOW_MODEL, + &window_interface_info); } return psppire_data_window_type; } +static GObjectClass *parent_class ; static void psppire_data_window_finalize (GObject *object) { PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (object); - GObjectClass *class = G_OBJECT_GET_CLASS (object); - - GObjectClass *parent_class = g_type_class_peek_parent (class); - - g_object_unref (de->xml); - + g_object_unref (de->builder); if (G_OBJECT_CLASS (parent_class)->finalize) (*G_OBJECT_CLASS (parent_class)->finalize) (object); @@ -121,6 +134,7 @@ psppire_data_window_finalize (GObject *object) static void psppire_data_window_class_init (PsppireDataWindowClass *class) { + parent_class = g_type_class_peek_parent (class); } @@ -136,7 +150,7 @@ psppire_data_window_base_init (PsppireDataWindowClass *class) static void psppire_data_window_base_finalize (PsppireDataWindowClass *class, - gpointer class_data) + gpointer class_data) { } @@ -148,27 +162,24 @@ extern PsppireVarStore *the_var_store; extern struct dataset *the_dataset; extern PsppireDataStore *the_data_store ; +extern GtkRecentManager *the_recent_mgr; static void -update_paste_menuitems (GtkWidget *w, gboolean x, gpointer data) +set_paste_menuitem_sensitivity (PsppireDataWindow *de, gboolean x) { - PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); + GtkAction *edit_paste = get_action_assert (de->builder, "edit_paste"); - GtkWidget * edit_paste = get_widget_assert (de->xml, "edit_paste"); - - gtk_widget_set_sensitive (edit_paste, x); + gtk_action_set_sensitive (edit_paste, x); } static void -update_cut_copy_menuitems (GtkWidget *w, gboolean x, gpointer data) +set_cut_copy_menuitem_sensitivity (PsppireDataWindow *de, gboolean x) { - PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); - - GtkWidget * edit_copy = get_widget_assert (de->xml, "edit_copy"); - GtkWidget * edit_cut = get_widget_assert (de->xml, "edit_cut"); + GtkAction *edit_copy = get_action_assert (de->builder, "edit_copy"); + GtkAction *edit_cut = get_action_assert (de->builder, "edit_cut"); - gtk_widget_set_sensitive (edit_copy, x); - gtk_widget_set_sensitive (edit_cut, x); + gtk_action_set_sensitive (edit_copy, x); + gtk_action_set_sensitive (edit_cut, x); } /* Run the EXECUTE command. */ @@ -186,10 +197,13 @@ transformation_change_callback (bool transformations_pending, { PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); + GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER)); + GtkWidget *menuitem = - get_widget_assert (de->xml, "transform_run-pending"); + gtk_ui_manager_get_widget (uim,"/ui/menubar/transform/transform_run-pending"); + GtkWidget *status_label = - get_widget_assert (de->xml, "case-counter-area"); + get_widget_assert (de->builder, "case-counter-area"); gtk_widget_set_sensitive (menuitem, transformations_pending); @@ -208,7 +222,7 @@ on_filter_change (GObject *o, gint filter_index, gpointer data) PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); GtkWidget *filter_status_area = - get_widget_assert (de->xml, "filter-use-status-area"); + get_widget_assert (de->builder, "filter-use-status-area"); if ( filter_index == -1 ) { @@ -217,12 +231,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)); @@ -241,7 +257,7 @@ on_split_change (PsppireDict *dict, gpointer data) size_t n_split_vars = dict_get_split_cnt (dict->dict); GtkWidget *split_status_area = - get_widget_assert (de->xml, "split-file-status-area"); + get_widget_assert (de->builder, "split-file-status-area"); if ( n_split_vars == 0 ) { @@ -278,7 +294,7 @@ on_weight_change (GObject *o, gint weight_index, gpointer data) PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); GtkWidget *weight_status_area = - get_widget_assert (de->xml, "weight-status-area"); + get_widget_assert (de->builder, "weight-status-area"); if ( weight_index == -1 ) { @@ -288,11 +304,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)); @@ -302,55 +320,68 @@ on_weight_change (GObject *o, gint weight_index, gpointer data) } } -/* Puts FILE_NAME into the recent list. - If it's already in the list, it moves it to the top -*/ +#if 0 static void -add_most_recent (const char *file_name) +dump_rm (GtkRecentManager *rm) { -#if RECENT_LISTS_AVAILABLE + GList *items = gtk_recent_manager_get_items (rm); - GtkRecentManager *manager = gtk_recent_manager_get_default(); - gchar *uri = g_filename_to_uri (file_name, NULL, NULL); + GList *i; - gtk_recent_manager_remove_item (manager, uri, NULL); + g_print ("Recent Items:\n"); + for (i = items; i; i = i->next) + { + GtkRecentInfo *ri = i->data; - if ( ! gtk_recent_manager_add_item (manager, uri)) - g_warning ("Could not add item %s to recent list\n",uri); + g_print ("Item: %s (Mime: %s) (Desc: %s) (URI: %s)\n", + gtk_recent_info_get_short_name (ri), + gtk_recent_info_get_mime_type (ri), + gtk_recent_info_get_description (ri), + gtk_recent_info_get_uri (ri) + ); - g_free (uri); -#endif + + gtk_recent_info_unref (ri); + } + + g_list_free (items); } +#endif -static void -open_data_file (const gchar *file_name, PsppireDataWindow *de) + +static gboolean +load_file (PsppireWindow *de, const gchar *file_name) { + gchar *native_file_name; struct getl_interface *sss; struct string filename; ds_init_empty (&filename); - syntax_gen_string (&filename, ss_cstr (file_name)); + + native_file_name = + convert_glib_filename_to_system_filename (file_name, NULL); + + syntax_gen_string (&filename, ss_cstr (native_file_name)); + + g_free (native_file_name); sss = create_syntax_string_source ("GET FILE=%s.", ds_cstr (&filename)); + ds_destroy (&filename); if (execute_syntax (sss) ) - { - psppire_window_set_filename (PSPPIRE_WINDOW (de), file_name); - add_most_recent (file_name); - } -} + return TRUE; + return FALSE; +} -/* Callback for the data_open action. - Prompts for a filename and opens it */ -static void -open_data_dialog (GtkAction *action, PsppireDataWindow *de) +static GtkWidget * +sysfile_chooser_dialog (PsppireWindow *toplevel) { GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Open"), - GTK_WINDOW (de), + GTK_WINDOW (toplevel), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, @@ -373,24 +404,47 @@ open_data_dialog (GtkAction *action, PsppireDataWindow *de) gtk_file_filter_add_pattern (filter, "*"); gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); + { + gchar *dir_name; + gchar *filename = NULL; + g_object_get (toplevel, "filename", &filename, NULL); - if (de->file_name) - { - gchar *dir_name = g_path_get_dirname (de->file_name); - gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), - dir_name); - free (dir_name); - } + 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); + } + + return dialog; +} + +/* Callback for the data_open action. + Prompts for a filename and opens it */ +static void +open_data_dialog (GtkAction *action, PsppireWindow *de) +{ + GtkWidget *dialog = sysfile_chooser_dialog (de); switch (gtk_dialog_run (GTK_DIALOG (dialog))) { case GTK_RESPONSE_ACCEPT: { - g_free (de->file_name); - de->file_name = + gchar *name = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); - open_data_file (de->file_name, de); + psppire_window_load (de, name); + + g_free (name); } break; default: @@ -417,44 +471,51 @@ name_has_suffix (const gchar *name) } -/* Append SUFFIX to the filename of DE */ +/* Save DE to file */ static void -append_filename_suffix (PsppireDataWindow *de, const gchar *suffix) +save_file (PsppireWindow *w) { - if ( ! name_has_suffix (de->file_name)) + gchar *native_file_name = NULL; + gchar *file_name = NULL; + GString *fnx; + struct getl_interface *sss; + struct string filename ; + PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (w); + + g_object_get (w, "filename", &file_name, NULL); + + fnx = g_string_new (file_name); + + if ( ! name_has_suffix (fnx->str)) { - gchar *s = de->file_name; - de->file_name = g_strconcat (de->file_name, suffix, NULL); - g_free (s); + if ( de->save_as_portable) + g_string_append (fnx, ".por"); + else + g_string_append (fnx, ".sav"); } -} -/* Save DE to file */ -static void -save_file (PsppireDataWindow *de) -{ - struct getl_interface *sss; - struct string file_name ; + ds_init_empty (&filename); + + native_file_name = + convert_glib_filename_to_system_filename (fnx->str, NULL); - g_assert (de->file_name); + g_string_free (fnx, TRUE); - ds_init_empty (&file_name); - syntax_gen_string (&file_name, ss_cstr (de->file_name)); + syntax_gen_string (&filename, ss_cstr (native_file_name)); + g_free (native_file_name); if ( de->save_as_portable ) { - append_filename_suffix (de, ".por"); sss = create_syntax_string_source ("EXPORT OUTFILE=%s.", - ds_cstr (&file_name)); + ds_cstr (&filename)); } else { - append_filename_suffix (de, ".sav"); sss = create_syntax_string_source ("SAVE OUTFILE=%s.", - ds_cstr (&file_name)); + ds_cstr (&filename)); } - ds_destroy (&file_name); + ds_destroy (&filename); execute_syntax (sss); } @@ -464,7 +525,6 @@ static void insert_case (GtkAction *action, gpointer data) { PsppireDataWindow *dw = PSPPIRE_DATA_WINDOW (data); - psppire_data_editor_insert_case (dw->data_editor); } @@ -476,9 +536,49 @@ on_insert_variable (GtkAction *action, gpointer data) } +static void +display_dict (PsppireDataWindow *de) +{ + + struct getl_interface *sss = + create_syntax_string_source ("DISPLAY DICTIONARY."); + + execute_syntax (sss); +} + +static void +sysfile_info (PsppireDataWindow *de) +{ + GtkWidget *dialog = sysfile_chooser_dialog (PSPPIRE_WINDOW (de)); + + if ( GTK_RESPONSE_ACCEPT == gtk_dialog_run (GTK_DIALOG (dialog))) + { + struct string filename; + struct getl_interface *sss; + gchar *file_name = + gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); + + gchar *native_file_name = + convert_glib_filename_to_system_filename (file_name, NULL); + + ds_init_empty (&filename); + + syntax_gen_string (&filename, ss_cstr (native_file_name)); + + g_free (native_file_name); + + sss = create_syntax_string_source ("SYSFILE INFO %s.", + ds_cstr (&filename)); + execute_syntax (sss); + } + + gtk_widget_destroy (dialog); +} + + /* Callback for data_save_as action. Prompt for a filename and save */ static void -data_save_as_dialog (GtkAction *action, PsppireDataWindow *de) +data_save_as_dialog (PsppireDataWindow *de) { GtkWidget *button_sys; GtkWidget *dialog = @@ -529,22 +629,28 @@ data_save_as_dialog (GtkAction *action, PsppireDataWindow *de) { case GTK_RESPONSE_ACCEPT: { - g_free (de->file_name); - - de->file_name = - gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); + GString *filename = + g_string_new + ( + gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)) + ); de->save_as_portable = ! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button_sys)); - if ( de->save_as_portable) - append_filename_suffix (de, ".por"); - else - append_filename_suffix (de, ".sav"); + if ( ! name_has_suffix (filename->str)) + { + if ( de->save_as_portable) + g_string_append (filename, ".por"); + else + g_string_append (filename, ".sav"); + } + + psppire_window_set_filename (PSPPIRE_WINDOW (de), filename->str); - save_file (de); + save_file (PSPPIRE_WINDOW (de)); - psppire_window_set_filename (PSPPIRE_WINDOW (de), de->file_name); + g_string_free (filename, TRUE); } break; default: @@ -556,15 +662,16 @@ data_save_as_dialog (GtkAction *action, PsppireDataWindow *de) /* Callback for data_save action. - If there's an existing file name, then just save, - otherwise prompt for a file name, then save */ + */ static void -data_save (GtkAction *action, PsppireDataWindow *de) +data_save (PsppireWindow *de) { - if ( de->file_name) - save_file (de); + const gchar *fn = psppire_window_get_filename (de); + + if ( NULL != fn) + psppire_window_save (de); else - data_save_as_dialog (action, de); + data_save_as_dialog (PSPPIRE_DATA_WINDOW (de)); } @@ -578,64 +685,11 @@ new_file (GtkAction *action, PsppireDataWindow *de) execute_syntax (sss); - g_free (de->file_name); - de->file_name = NULL; - - // default_window_name (de); + psppire_window_set_filename (PSPPIRE_WINDOW (de), NULL); } -/* Create the GtkActions and connect to their signals */ -static void -register_data_editor_actions (PsppireDataWindow *de) -{ - de->action_data_open = - gtk_action_new ("data-open-dialog", - _("Open"), - _("Open a data file"), - "gtk-open"); - - g_signal_connect (de->action_data_open, "activate", - G_CALLBACK (open_data_dialog), de); - - - de->action_data_save = gtk_action_new ("data-save", - _("Save"), - _("Save data to file"), - "gtk-save"); - - g_signal_connect (de->action_data_save, "activate", - G_CALLBACK (data_save), de); - - - de->action_data_save_as = gtk_action_new ("data-save-as-dialog", - _("Save As"), - _("Save data to file"), - "gtk-save"); - - g_signal_connect (de->action_data_save_as, "activate", - G_CALLBACK (data_save_as_dialog), de); - - de->action_data_new = - gtk_action_new ("data-new", - _("New"), - _("New data file"), - NULL); - - g_signal_connect (de->action_data_new, "activate", - G_CALLBACK (new_file), de); - - de->invoke_text_import_assistant = - gtk_action_new ("file_import-text", - _("_Import Text Data"), - _("Import text data file"), - ""); - - g_signal_connect (de->invoke_text_import_assistant, "activate", - G_CALLBACK (text_data_import_assistant), de); -} - static void on_edit_paste (GtkAction *a, gpointer data) { @@ -664,12 +718,12 @@ on_edit_cut (GtkMenuItem *m, gpointer data) static void -status_bar_activate (GtkCheckMenuItem *menuitem, gpointer data) +status_bar_activate (GtkToggleAction *action, gpointer data) { PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); - GtkWidget *statusbar = get_widget_assert (de->xml, "status-bar"); + GtkWidget *statusbar = get_widget_assert (de->builder, "status-bar"); - if ( gtk_check_menu_item_get_active (menuitem) ) + if ( gtk_toggle_action_get_active (action) ) gtk_widget_show (statusbar); else gtk_widget_hide (statusbar); @@ -677,16 +731,14 @@ status_bar_activate (GtkCheckMenuItem *menuitem, gpointer data) static void -grid_lines_activate (GtkCheckMenuItem *menuitem, gpointer data) +grid_lines_activate (GtkToggleAction *action, gpointer data) { PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); - const gboolean grid_visible = gtk_check_menu_item_get_active (menuitem); + const gboolean grid_visible = gtk_toggle_action_get_active (action); psppire_data_editor_show_grid (de->data_editor, grid_visible); } - - static void data_view_activate (GtkCheckMenuItem *menuitem, gpointer data) { @@ -709,6 +761,7 @@ static void fonts_activate (GtkMenuItem *menuitem, gpointer data) { PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); + GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (de)); PangoFontDescription *current_font; gchar *font_name; GtkWidget *dialog = @@ -723,8 +776,8 @@ fonts_activate (GtkMenuItem *menuitem, gpointer data) g_free (font_name); gtk_window_set_transient_for (GTK_WINDOW (dialog), - GTK_WINDOW (get_widget_assert (de->xml, - "data_editor"))); + GTK_WINDOW (toplevel)); + if ( GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (dialog)) ) { const gchar *font = gtk_font_selection_dialog_get_font_name @@ -767,7 +820,8 @@ file_quit (GtkCheckMenuItem *menuitem, gpointer data) Give the user the opportunity to save any unsaved data. */ g_object_unref (the_data_store); - gtk_main_quit (); + + psppire_quit (); } @@ -778,10 +832,16 @@ create_data_sheet_variable_popup_menu (PsppireDataWindow *de) GtkWidget *menu = gtk_menu_new (); GtkWidget *sort_ascending = - gtk_menu_item_new_with_label (_("Sort Ascending")); + gtk_action_create_menu_item (gtk_action_new ("sort-up", + _("Sort Ascending"), + NULL, + "gtk-sort-ascending")); GtkWidget *sort_descending = - gtk_menu_item_new_with_label (_("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")); @@ -811,15 +871,15 @@ create_data_sheet_variable_popup_menu (PsppireDataWindow *de) gtk_menu_shell_append (GTK_MENU_SHELL (menu), sort_ascending); - g_signal_connect_swapped (G_OBJECT (sort_ascending), "activate", + g_signal_connect_swapped (sort_ascending, "activate", G_CALLBACK (psppire_data_editor_sort_ascending), de->data_editor); - g_signal_connect_swapped (G_OBJECT (sort_descending), "activate", + g_signal_connect_swapped (sort_descending, "activate", G_CALLBACK (psppire_data_editor_sort_descending), de->data_editor); - g_signal_connect_swapped (G_OBJECT (insert_variable), "activate", + g_signal_connect_swapped (insert_variable, "activate", G_CALLBACK (gtk_action_activate), de->insert_variable); @@ -850,7 +910,7 @@ create_data_sheet_cases_popup_menu (PsppireDataWindow *de) gtk_menu_shell_append (GTK_MENU_SHELL (menu), insert_case); - g_signal_connect_swapped (G_OBJECT (insert_case), "activate", + g_signal_connect_swapped (insert_case, "activate", G_CALLBACK (gtk_action_activate), de->insert_case); @@ -886,7 +946,7 @@ create_var_sheet_variable_popup_menu (PsppireDataWindow *de) gtk_menu_shell_append (GTK_MENU_SHELL (menu), insert_variable); - g_signal_connect_swapped (G_OBJECT (insert_variable), "activate", + g_signal_connect_swapped (insert_variable, "activate", G_CALLBACK (gtk_action_activate), de->insert_variable); @@ -904,13 +964,11 @@ create_var_sheet_variable_popup_menu (PsppireDataWindow *de) } -#if RECENT_LISTS_AVAILABLE - static void -on_recent_data_select (GtkMenuShell *menushell, gpointer user_data) +on_recent_data_select (GtkMenuShell *menushell, + PsppireWindow *window) { gchar *file; - PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (user_data); gchar *uri = gtk_recent_chooser_get_current_uri (GTK_RECENT_CHOOSER (menushell)); @@ -919,7 +977,7 @@ on_recent_data_select (GtkMenuShell *menushell, gpointer user_data) g_free (uri); - open_data_file (file, de); + psppire_window_load (window, file); g_free (file); } @@ -940,13 +998,14 @@ on_recent_files_select (GtkMenuShell *menushell, gpointer user_data) se = psppire_syntax_window_new (); - psppire_syntax_window_load_from_file (PSPPIRE_SYNTAX_WINDOW (se), file, NULL); - gtk_widget_show (se); + if ( psppire_window_load (PSPPIRE_WINDOW (se), file) ) + gtk_widget_show (se); + else + gtk_widget_destroy (se); g_free (file); } -#endif static void enable_delete_cases (GtkWidget *w, gint case_num, gpointer data) @@ -968,14 +1027,19 @@ enable_delete_variables (GtkWidget *w, gint var, gpointer data) /* Callback for when the datasheet/varsheet is selected */ static void on_switch_sheet (GtkNotebook *notebook, - GtkNotebookPage *page, - guint page_num, - gpointer user_data) + GtkNotebookPage *page, + guint page_num, + gpointer user_data) { PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (user_data); - GtkWidget *view_data = get_widget_assert (de->xml, "view_data"); - GtkWidget *view_variables = get_widget_assert (de->xml, "view_variables"); + GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER)); + + GtkWidget *view_data = + gtk_ui_manager_get_widget (uim,"/ui/menubar/view/view_data"); + + GtkWidget *view_variables = + gtk_ui_manager_get_widget (uim,"/ui/menubar/view/view_variables"); switch (page_num) { @@ -1003,37 +1067,61 @@ 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) +{ + psppire_window_set_unsaved (PSPPIRE_WINDOW (w)); +} static void psppire_data_window_init (PsppireDataWindow *de) { PsppireVarStore *vs; + PsppireDict *dict = NULL; GtkWidget *menubar; GtkWidget *hb ; GtkWidget *sb ; GtkWidget *box = gtk_vbox_new (FALSE, 0); - de->xml = XML_NEW ("data-editor.glade"); + de->builder = builder_new ("data-editor.ui"); - menubar = get_widget_assert (de->xml, "menubar"); - hb = get_widget_assert (de->xml, "handlebox1"); - sb = get_widget_assert (de->xml, "status-bar"); + menubar = get_widget_assert (de->builder, "menubar"); + hb = get_widget_assert (de->builder, "handlebox1"); + sb = get_widget_assert (de->builder, "status-bar"); de->data_editor = PSPPIRE_DATA_EDITOR (psppire_data_editor_new (the_var_store, the_data_store)); - connect_help (de->xml); + g_signal_connect_swapped (the_data_store, "case-changed", + G_CALLBACK (set_unsaved), de); + + g_signal_connect_swapped (the_data_store, "case-inserted", + G_CALLBACK (set_unsaved), de); - g_object_ref (menubar); - gtk_widget_unparent (menubar); + g_signal_connect_swapped (the_data_store, "cases-deleted", + G_CALLBACK (set_unsaved), de); - g_object_ref (hb); - gtk_widget_unparent (hb); + dataset_set_callback (the_dataset, set_unsaved, de); - g_object_ref (sb); - gtk_widget_unparent (sb); + connect_help (de->builder); gtk_box_pack_start (GTK_BOX (box), menubar, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (box), hb, FALSE, TRUE, 0); @@ -1042,11 +1130,16 @@ psppire_data_window_init (PsppireDataWindow *de) gtk_container_add (GTK_CONTAINER (de), box); - g_signal_connect (de->data_editor, "data-selection-changed", - G_CALLBACK (update_cut_copy_menuitems), de); + set_cut_copy_menuitem_sensitivity (de, FALSE); - g_signal_connect (de->data_editor, "data-available-changed", - G_CALLBACK (update_paste_menuitems), de); + g_signal_connect_swapped (de->data_editor, "data-selection-changed", + G_CALLBACK (set_cut_copy_menuitem_sensitivity), de); + + + set_paste_menuitem_sensitivity (de, FALSE); + + g_signal_connect_swapped (de->data_editor, "data-available-changed", + G_CALLBACK (set_paste_menuitem_sensitivity), de); dataset_add_transform_change_callback (the_dataset, transformation_change_callback, @@ -1057,534 +1150,626 @@ 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); - g_signal_connect (get_widget_assert (de->xml, "edit_copy"), + g_signal_connect (get_action_assert (de->builder, "edit_copy"), "activate", G_CALLBACK (on_edit_copy), de); - g_signal_connect (get_widget_assert (de->xml, "edit_cut"), + g_signal_connect (get_action_assert (de->builder, "edit_cut"), "activate", G_CALLBACK (on_edit_cut), de); - register_data_editor_actions (de); - de->toggle_value_labels = - gtk_toggle_action_new ("toggle-value-labels", - _("_Labels"), - _("Show/hide value labels"), - "pspp-value-labels"); + { + GtkWidget *toolbarbutton = get_widget_assert (de->builder, "button-open"); + + GtkAction *action_data_open = + resolve_action (de->builder, "file_open_data", NULL); - g_signal_connect (de->toggle_value_labels, "toggled", - G_CALLBACK (toggle_value_labels), de); + 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); - gtk_action_connect_proxy (GTK_ACTION (de->toggle_value_labels), - get_widget_assert (de->xml, - "togglebutton-value-labels")); + g_signal_connect_swapped (toolbarbutton, "clicked", + G_CALLBACK (gtk_action_activate), action_data_open); + } - gtk_action_connect_proxy (GTK_ACTION (de->toggle_value_labels), - get_widget_assert (de->xml, - "view_value-labels")); + { + 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); - de->delete_cases = - gtk_action_new ("clear-cases", - _("Clear"), - _("Delete the cases at the selected position(s)"), - "pspp-clear-cases"); + g_signal_connect (action_data_new, "activate", + G_CALLBACK (new_file), 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); + + g_signal_connect (invoke_text_import_assistant, "activate", + G_CALLBACK (text_data_import_assistant), 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); + + g_signal_connect_swapped (action_data_save, "activate", + G_CALLBACK (data_save), de); + } - g_signal_connect_swapped (de->delete_cases, "activate", - G_CALLBACK (psppire_data_editor_delete_cases), - de->data_editor); - gtk_action_connect_proxy (de->delete_cases, - get_widget_assert (de->xml, "edit_clear-cases")); - g_signal_connect (get_widget_assert (de->xml, "edit_paste"), "activate", + + { + 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); + + g_signal_connect_swapped (action_data_save_as, "activate", + G_CALLBACK (data_save_as_dialog), de); + } + + + { + GtkAction *action_info_working_file = + resolve_action (de->builder, + "file_information_working-file", NULL); + + + g_signal_connect_swapped (action_info_working_file, "activate", + G_CALLBACK (display_dict), de); + } + + + { + GtkAction *action_info_external_file = + resolve_action (de->builder, + "file_information_external-file", NULL); + + + g_signal_connect_swapped (action_info_external_file, "activate", + G_CALLBACK (sysfile_info), 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 (value_labels_action, "toggled", + G_CALLBACK (toggle_value_labels), de); + } + + + g_signal_connect (get_action_assert (de->builder, "edit_paste"), "activate", G_CALLBACK (on_edit_paste), de); - gtk_action_set_visible (de->delete_cases, FALSE); + { + de->delete_cases = + resolve_action (de->builder, "edit_clear-cases", NULL); - de->delete_variables = - gtk_action_new ("clear-variables", - _("Clear"), - _("Delete the variables at the selected position(s)"), - "pspp-clear-variables"); - g_signal_connect_swapped (de->delete_variables, "activate", - G_CALLBACK (psppire_data_editor_delete_variables), - de->data_editor); + g_object_set (de->delete_cases, + "label", _("Clear"), + "tooltip", _("Delete the cases at the selected position(s)"), + "stock-id", "gtk-clear", + NULL); - gtk_action_connect_proxy (de->delete_variables, - get_widget_assert (de->xml, "edit_clear-variables") - ); + g_signal_connect_swapped (de->delete_cases, "activate", + G_CALLBACK (psppire_data_editor_delete_cases), + de->data_editor); + + gtk_action_set_visible (de->delete_cases, FALSE); + } + + + { + 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); + + + g_signal_connect_swapped (de->delete_variables, "activate", + G_CALLBACK (psppire_data_editor_delete_variables), + de->data_editor); + + gtk_action_set_visible (de->delete_variables, FALSE); + } - gtk_action_set_visible (de->delete_variables, FALSE); de->insert_variable = - gtk_action_new ("insert-variable", - _("Insert _Variable"), - _("Create a new variable at the current position"), - "pspp-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); - gtk_action_connect_proxy (de->insert_variable, - get_widget_assert (de->xml, "button-insert-variable") - ); - gtk_action_connect_proxy (de->insert_variable, - get_widget_assert (de->xml, "edit_insert-variable") - ); de->insert_case = - gtk_action_new ("insert-case", - _("Insert Ca_se"), - _("Create a new case at the current position"), - "pspp-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); - gtk_action_connect_proxy (de->insert_case, - get_widget_assert (de->xml, "button-insert-case") - ); - gtk_action_connect_proxy (de->insert_case, - get_widget_assert (de->xml, "edit_insert-case") - ); - de->invoke_goto_dialog = - gtk_action_new ("goto-case-dialog", - _("_Goto Case"), - _("Jump to a Case in the Data Sheet"), - "gtk-jump-to"); - + resolve_action (de->builder, "edit_goto-case", "button-goto-case"); - gtk_action_connect_proxy (de->invoke_goto_dialog, - get_widget_assert (de->xml, "button-goto-case") - ); - - gtk_action_connect_proxy (de->invoke_goto_dialog, - get_widget_assert (de->xml, "edit_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); - de->invoke_weight_cases_dialog = - gtk_action_new ("weight-cases-dialog", - _("_Weights"), - _("Weight cases by variable"), - "pspp-weight-cases"); - g_signal_connect (de->invoke_weight_cases_dialog, "activate", - G_CALLBACK (weight_cases_dialog), de); + { + GtkAction *invoke_weight_cases_dialog = + resolve_action (de->builder, "data_weight-cases", "button-weight-cases"); - de->invoke_transpose_dialog = - gtk_action_new ("transpose-dialog", - _("_Transpose"), - _("Transpose the cases with the variables"), - NULL); + g_object_set (invoke_weight_cases_dialog, + "stock-id", "pspp-weight-cases", + "tooltip", _("Weight cases by variable"), + NULL); - g_signal_connect (de->invoke_transpose_dialog, "activate", - G_CALLBACK (transpose_dialog), de); + 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); - de->invoke_split_file_dialog = - gtk_action_new ("split-file-dialog", - _("S_plit"), - _("Split the active file"), - "pspp-split-file"); - g_signal_connect (de->invoke_split_file_dialog, "activate", - G_CALLBACK (split_file_dialog), de); + 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); + } - de->invoke_sort_cases_dialog = - gtk_action_new ("sort-cases-dialog", - _("_Sort"), - _("Sort cases in the active file"), - "pspp-sort-cases"); + { + GtkAction *invoke_split_file_dialog = + resolve_action (de->builder, "data_split-file", "button-split-file"); - g_signal_connect (de->invoke_sort_cases_dialog, "activate", - G_CALLBACK (sort_cases_dialog), de); + g_object_set (invoke_split_file_dialog, + "tooltip", _("Split the active file"), + "stock-id", "pspp-split-file", + NULL); - de->invoke_select_cases_dialog = - gtk_action_new ("select-cases-dialog", - _("Select _Cases"), - _("Select cases from the active file"), - "pspp-select-cases"); + g_signal_connect (invoke_split_file_dialog, "activate", + G_CALLBACK (split_file_dialog), de); + } - g_signal_connect (de->invoke_select_cases_dialog, "activate", - G_CALLBACK (select_cases_dialog), de); + { + GtkAction *invoke_sort_cases_dialog = + resolve_action (de->builder, "data_sort-cases", NULL); - de->invoke_compute_dialog = - gtk_action_new ("compute-dialog", - _("_Compute"), - _("Compute new values for a variable"), - "pspp-compute"); - g_signal_connect (de->invoke_compute_dialog, "activate", - G_CALLBACK (compute_dialog), de); + g_object_set (invoke_sort_cases_dialog, + "tooltip", _("Sort cases in the active file"), + "stock-id", "gtk-sort-ascending", + NULL); - de->invoke_oneway_anova_dialog = - gtk_action_new ("oneway-anova", - _("Oneway _ANOVA"), - _("Perform one way analysis of variance"), - NULL); + g_signal_connect (invoke_sort_cases_dialog, "activate", + G_CALLBACK (sort_cases_dialog), de); + } - g_signal_connect (de->invoke_oneway_anova_dialog, "activate", - G_CALLBACK (oneway_anova_dialog), de); - de->invoke_t_test_independent_samples_dialog = - gtk_action_new ("t-test-independent-samples", - _("_Independent Samples T Test"), - _("Calculate T Test for samples from independent groups"), - NULL); + { + GtkAction *invoke_select_cases_dialog = + resolve_action (de->builder, "data_select-cases", "button-select-cases"); - g_signal_connect (de->invoke_t_test_independent_samples_dialog, "activate", - G_CALLBACK (t_test_independent_samples_dialog), de); + 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); + } - de->invoke_t_test_paired_samples_dialog = - gtk_action_new ("t-test-paired-samples", - _("_Paired Samples T Test"), - _("Calculate T Test for paired samples"), - NULL); - g_signal_connect (de->invoke_t_test_paired_samples_dialog, "activate", - G_CALLBACK (t_test_paired_samples_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); - de->invoke_t_test_one_sample_dialog = - gtk_action_new ("t-test-one-sample", - _("One _Sample T Test"), - _("Calculate T Test for sample from a single distribution"), - NULL); + g_signal_connect (invoke_compute_dialog, "activate", + G_CALLBACK (compute_dialog), de); + } - g_signal_connect (de->invoke_t_test_one_sample_dialog, "activate", - G_CALLBACK (t_test_one_sample_dialog), de); + { + GtkAction *invoke_oneway_anova_dialog = + resolve_action (de->builder, "oneway-anova", NULL); - de->invoke_comments_dialog = - gtk_action_new ("commments-dialog", - _("Data File _Comments"), - _("Commentary text for the data file"), - NULL); + g_object_set (invoke_oneway_anova_dialog, + "tooltip", _("Perform one way analysis of variance"), + NULL); - g_signal_connect (de->invoke_comments_dialog, "activate", - G_CALLBACK (comments_dialog), de); + g_signal_connect (invoke_oneway_anova_dialog, "activate", + G_CALLBACK (oneway_anova_dialog), de); + } - de->invoke_find_dialog = - gtk_action_new ("find-dialog", - _("_Find"), - _("Find Case"), - "gtk-find"); - g_signal_connect (de->invoke_find_dialog, "activate", - G_CALLBACK (find_dialog), de); + { + GtkAction *invoke_t_test_independent_samples_dialog = + resolve_action (de->builder, "indep-t-test", NULL); - de->invoke_rank_dialog = - gtk_action_new ("rank-dialog", - _("Ran_k Cases"), - _("Rank Cases"), - "pspp-rank-cases"); + g_object_set (invoke_t_test_independent_samples_dialog, + "tooltip", + _("Calculate T Test for samples from independent groups"), + NULL); - g_signal_connect (de->invoke_rank_dialog, "activate", - G_CALLBACK (rank_dialog), de); + g_signal_connect (invoke_t_test_independent_samples_dialog, "activate", + G_CALLBACK (t_test_independent_samples_dialog), de); + } - de->invoke_recode_same_dialog = - gtk_action_new ("recode-same-dialog", - _("Recode into _Same Variables"), - _("Recode values into the same Variables"), - "pspp-recode-same"); + { + GtkAction *invoke_t_test_paired_samples_dialog = + resolve_action (de->builder, "paired-t-test", NULL); - g_signal_connect (de->invoke_recode_same_dialog, "activate", - G_CALLBACK (recode_same_dialog), de); + g_object_set (invoke_t_test_paired_samples_dialog, + "tooltip", + _("Calculate T Test for paired samples"), + NULL); + g_signal_connect (invoke_t_test_paired_samples_dialog, "activate", + G_CALLBACK (t_test_paired_samples_dialog), de); + } - de->invoke_recode_different_dialog = - gtk_action_new ("recode-different-dialog", - _("Recode into _Different Variables"), - _("Recode values into different Variables"), - "pspp-recode-different"); - g_signal_connect (de->invoke_recode_different_dialog, "activate", - G_CALLBACK (recode_different_dialog), 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); - de->invoke_variable_info_dialog = - gtk_action_new ("variable-info-dialog", - _("_Variables"), - _("Jump to Variable"), - "pspp-goto-variable"); + g_signal_connect (invoke_t_test_one_sample_dialog, "activate", + G_CALLBACK (t_test_one_sample_dialog), de); + } - g_signal_connect (de->invoke_variable_info_dialog, "activate", - G_CALLBACK (variable_info_dialog), de); - de->invoke_descriptives_dialog = - gtk_action_new ("descriptives-dialog", - _("_Descriptives"), - _("Calculate descriptive statistics (mean, variance, ...)"), - "pspp-descriptives"); + { + GtkAction *invoke_comments_dialog = + resolve_action (de->builder, "utilities_comments", NULL); - g_signal_connect (de->invoke_descriptives_dialog, "activate", - G_CALLBACK (descriptives_dialog), de); + g_object_set (invoke_comments_dialog, + "tooltip", + _("Commentary text for the data file"), + NULL); - de->invoke_frequencies_dialog = - gtk_action_new ("frequencies-dialog", - _("_Frequencies"), - _("Generate frequency statistics"), - "pspp-frequencies"); + g_signal_connect (invoke_comments_dialog, "activate", + G_CALLBACK (comments_dialog), de); + } - g_signal_connect (de->invoke_frequencies_dialog, "activate", - G_CALLBACK (frequencies_dialog), de); - de->invoke_crosstabs_dialog = - gtk_action_new ("crosstabs-dialog", - _("_Crosstabs"), - _("Generate crosstabulations"), - "pspp-crosstabs"); - g_signal_connect (de->invoke_crosstabs_dialog, "activate", - G_CALLBACK (crosstabs_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); - de->invoke_examine_dialog = - gtk_action_new ("examine-dialog", - _("_Explore"), - _("Examine Data by Factors"), - "pspp-examine"); + g_signal_connect (invoke_find_dialog, "activate", + G_CALLBACK (find_dialog), de); + } - g_signal_connect (de->invoke_examine_dialog, "activate", - G_CALLBACK (examine_dialog), de); + { + GtkAction *invoke_rank_dialog = + resolve_action (de->builder, "transform_rank", NULL); - de->invoke_regression_dialog = - gtk_action_new ("regression-dialog", - _("Linear _Regression"), - _("Estimate parameters of the linear model"), - "pspp-regression"); + g_object_set (invoke_rank_dialog, + "stock-id", "pspp-rank-cases", + "tooltip", _("Rank Cases"), + NULL); - g_signal_connect (de->invoke_regression_dialog, "activate", - G_CALLBACK (regression_dialog), de); + g_signal_connect (invoke_rank_dialog, "activate", + G_CALLBACK (rank_dialog), de); + } - g_signal_connect_swapped (get_widget_assert (de->xml,"file_new_data"), - "activate", - G_CALLBACK (gtk_action_activate), - de->action_data_new); - g_signal_connect_swapped (get_widget_assert (de->xml,"file_open_data"), - "activate", - G_CALLBACK (gtk_action_activate), - de->action_data_open); + { + 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); + + g_signal_connect (invoke_recode_same_dialog, "activate", + G_CALLBACK (recode_same_dialog), de); + } + -#if RECENT_LISTS_AVAILABLE { - GtkRecentManager *rm = gtk_recent_manager_get_default (); - GtkWidget *recent_data = get_widget_assert (de->xml, "file_recent-data"); - GtkWidget *recent_files = get_widget_assert (de->xml, "file_recent-files"); - GtkWidget *recent_separator = get_widget_assert (de->xml, "file_separator1"); + GtkAction *invoke_recode_different_dialog = + resolve_action (de->builder, "transform_recode-different", NULL); - GtkWidget *menu = gtk_recent_chooser_menu_new_for_manager (rm); + g_object_set (invoke_recode_different_dialog, + "stock-id", "pspp-recode-different", + "tooltip", _("Recode values into different variables"), + NULL); - GtkRecentFilter *filter = gtk_recent_filter_new (); + g_signal_connect (invoke_recode_different_dialog, "activate", + G_CALLBACK (recode_different_dialog), de); + } - gtk_widget_show (recent_data); - gtk_widget_show (recent_files); - gtk_widget_show (recent_separator); - gtk_recent_filter_add_pattern (filter, "*.sav"); - gtk_recent_filter_add_pattern (filter, "*.SAV"); + { + GtkAction *invoke_variable_info_dialog = + resolve_action (de->builder, "utilities_variables", "button-goto-variable"); - gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (menu), filter); + 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); + } - gtk_widget_set_sensitive (recent_data, TRUE); - g_signal_connect (menu, "selection-done", - G_CALLBACK (on_recent_data_select), de); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (recent_data), menu); + { + 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); - filter = gtk_recent_filter_new (); - menu = gtk_recent_chooser_menu_new_for_manager (rm); + g_signal_connect (invoke_descriptives_dialog, "activate", + G_CALLBACK (descriptives_dialog), de); + } - gtk_recent_filter_add_pattern (filter, "*.sps"); - gtk_recent_filter_add_pattern (filter, "*.SPS"); - gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (menu), filter); + { + GtkAction *invoke_frequencies_dialog = + resolve_action (de->builder, "analyze_frequencies", NULL); - gtk_widget_set_sensitive (recent_files, TRUE); - g_signal_connect (menu, "selection-done", - G_CALLBACK (on_recent_files_select), de); + g_object_set (invoke_frequencies_dialog, + "tooltip", _("Generate frequency statistics"), + "stock-id", "pspp-frequencies", + NULL); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (recent_files), menu); + g_signal_connect (invoke_frequencies_dialog, "activate", + G_CALLBACK (frequencies_dialog), de); } -#endif - g_signal_connect (get_widget_assert (de->xml,"file_new_syntax"), - "activate", - G_CALLBACK (create_syntax_window), - NULL); - g_signal_connect (get_widget_assert (de->xml,"file_open_syntax"), - "activate", - G_CALLBACK (open_syntax_window), - de); + { + GtkAction *invoke_crosstabs_dialog = + resolve_action (de->builder, "crosstabs", NULL); - g_signal_connect_swapped (get_widget_assert (de->xml,"file_import-text"), - "activate", - G_CALLBACK (gtk_action_activate), - de->invoke_text_import_assistant); + g_object_set (invoke_crosstabs_dialog, + "tooltip", _("Generate crosstabulations"), + "stock-id", "pspp-crosstabs", + NULL); - g_signal_connect_swapped (get_widget_assert (de->xml,"file_save"), - "activate", - G_CALLBACK (gtk_action_activate), - de->action_data_save); + g_signal_connect (invoke_crosstabs_dialog, "activate", + G_CALLBACK (crosstabs_dialog), de); + } - g_signal_connect_swapped (get_widget_assert (de->xml,"file_save_as"), - "activate", - G_CALLBACK (gtk_action_activate), - de->action_data_save_as); - gtk_action_connect_proxy (de->invoke_find_dialog, - get_widget_assert (de->xml, "edit_find") - ); - gtk_action_connect_proxy (de->invoke_find_dialog, - get_widget_assert (de->xml, "button-find") - ); + { + GtkAction *invoke_examine_dialog = + resolve_action (de->builder, "analyze_explore", NULL); + + 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); + } + + + { + GtkAction *invoke_regression_dialog = + resolve_action (de->builder, "linear-regression", NULL); - gtk_action_connect_proxy (de->invoke_rank_dialog, - get_widget_assert (de->xml, "transform_rank") - ); + g_object_set (invoke_regression_dialog, + "tooltip", _("Estimate parameters of the linear model"), + "stock-id", "pspp-regression", + NULL + ); - gtk_action_connect_proxy (de->invoke_recode_same_dialog, - get_widget_assert (de->xml, - "transform_recode-same") - ); + g_signal_connect (invoke_regression_dialog, "activate", + G_CALLBACK (regression_dialog), de); + } - gtk_action_connect_proxy (de->invoke_recode_different_dialog, - get_widget_assert (de->xml, - "transform_recode-different") - ); + { + GtkAction *invoke_reliability_dialog = + resolve_action (de->builder, "reliability", NULL); - gtk_action_connect_proxy (de->invoke_weight_cases_dialog, - get_widget_assert (de->xml, "data_weight-cases") - ); + g_object_set (invoke_reliability_dialog, + "tooltip", _("Reliability Analysis"), + "stock-id", "pspp-reliability", + NULL + ); - gtk_action_connect_proxy (de->invoke_transpose_dialog, - get_widget_assert (de->xml, "data_transpose") - ); + g_signal_connect (invoke_reliability_dialog, "activate", + G_CALLBACK (reliability_dialog), de); + } - gtk_action_connect_proxy (de->invoke_split_file_dialog, - get_widget_assert (de->xml, "data_split-file") - ); - gtk_action_connect_proxy (de->invoke_sort_cases_dialog, - get_widget_assert (de->xml, "data_sort-cases") - ); + { + GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER)); - gtk_action_connect_proxy (de->invoke_select_cases_dialog, - get_widget_assert (de->xml, "data_select-cases") - ); + GtkWidget *recent_data = + gtk_ui_manager_get_widget (uim,"/ui/menubar/file/file_recent-data"); - gtk_action_connect_proxy (de->invoke_compute_dialog, - get_widget_assert (de->xml, "transform_compute") - ); + GtkWidget *recent_files = + gtk_ui_manager_get_widget (uim,"/ui/menubar/file/file_recent-files"); - gtk_action_connect_proxy (de->invoke_t_test_independent_samples_dialog, - get_widget_assert (de->xml, - "indep-t-test") - ); + GtkWidget *menu_data = + gtk_recent_chooser_menu_new_for_manager (the_recent_mgr); - gtk_action_connect_proxy (de->invoke_t_test_paired_samples_dialog, - get_widget_assert (de->xml, - "paired-t-test") - ); + GtkWidget *menu_files = + gtk_recent_chooser_menu_new_for_manager (the_recent_mgr); + { + GtkRecentFilter *filter = gtk_recent_filter_new (); - gtk_action_connect_proxy (de->invoke_t_test_one_sample_dialog, - get_widget_assert (de->xml, - "one-sample-t-test") - ); + gtk_recent_filter_add_pattern (filter, "*.sav"); + gtk_recent_filter_add_pattern (filter, "*.SAV"); + gtk_recent_filter_add_pattern (filter, "*.por"); + gtk_recent_filter_add_pattern (filter, "*.POR"); + gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER (menu_data), GTK_RECENT_SORT_MRU); - gtk_action_connect_proxy (de->invoke_oneway_anova_dialog, - get_widget_assert (de->xml, - "oneway-anova") - ); + gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (menu_data), filter); + } + gtk_menu_item_set_submenu (GTK_MENU_ITEM (recent_data), menu_data); - gtk_action_connect_proxy (de->invoke_comments_dialog, - get_widget_assert (de->xml, "utilities_comments") - ); - gtk_action_connect_proxy (de->invoke_variable_info_dialog, - get_widget_assert (de->xml, "utilities_variables") - ); + g_signal_connect (menu_data, "selection-done", + G_CALLBACK (on_recent_data_select), + de); - gtk_action_connect_proxy (de->invoke_descriptives_dialog, - get_widget_assert (de->xml, "analyze_descriptives") - ); + { + GtkRecentFilter *filter = gtk_recent_filter_new (); - gtk_action_connect_proxy (de->invoke_crosstabs_dialog, - get_widget_assert (de->xml, "crosstabs") - ); + gtk_recent_filter_add_pattern (filter, "*.sps"); + gtk_recent_filter_add_pattern (filter, "*.SPS"); - gtk_action_connect_proxy (de->invoke_frequencies_dialog, - get_widget_assert (de->xml, "analyze_frequencies") - ); + gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER (menu_files), GTK_RECENT_SORT_MRU); + gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (menu_files), filter); + } - gtk_action_connect_proxy (de->invoke_examine_dialog, - get_widget_assert (de->xml, "analyze_explore") - ); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (recent_files), menu_files); - gtk_action_connect_proxy (de->invoke_regression_dialog, - get_widget_assert (de->xml, "linear-regression") - ); + g_signal_connect (menu_files, "selection-done", + G_CALLBACK (on_recent_files_select), + de); - g_signal_connect (get_widget_assert (de->xml,"help_about"), + } + + g_signal_connect (get_action_assert (de->builder,"file_new_syntax"), + "activate", + G_CALLBACK (create_syntax_window), + NULL); + + g_signal_connect (get_action_assert (de->builder,"file_open_syntax"), "activate", - G_CALLBACK (about_new), + 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), + de); + } + - g_signal_connect (get_widget_assert (de->xml,"help_reference"), + g_signal_connect (get_action_assert (de->builder,"help_reference"), "activate", G_CALLBACK (reference_manual), de); @@ -1601,109 +1786,99 @@ psppire_data_window_init (PsppireDataWindow *de) de); - g_signal_connect (GTK_NOTEBOOK (de->data_editor), + g_signal_connect (de->data_editor, "switch-page", G_CALLBACK (on_switch_sheet), 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 (get_widget_assert (de->xml, "view_statusbar"), + g_signal_connect (get_action_assert (de->builder, "view_statusbar"), "activate", G_CALLBACK (status_bar_activate), de); - g_signal_connect (get_widget_assert (de->xml, "view_gridlines"), + g_signal_connect (get_action_assert (de->builder, "view_gridlines"), "activate", G_CALLBACK (grid_lines_activate), de); - g_signal_connect (get_widget_assert (de->xml, "view_data"), + g_signal_connect (get_action_assert (de->builder, "view_data"), "activate", G_CALLBACK (data_view_activate), de); - g_signal_connect (get_widget_assert (de->xml, "view_variables"), + g_signal_connect (get_action_assert (de->builder, "view_variables"), "activate", G_CALLBACK (variable_view_activate), de); + { + GtkAction *font_action = + resolve_action (de->builder, "view_fonts", NULL); - g_signal_connect (get_widget_assert (de->xml, "view_fonts"), - "activate", - G_CALLBACK (fonts_activate), de); - - - - - gtk_action_connect_proxy (de->action_data_open, - get_widget_assert (de->xml, "button-open") - ); - - gtk_action_connect_proxy (de->action_data_save, - get_widget_assert (de->xml, "button-save") - ); - - gtk_action_connect_proxy (de->invoke_variable_info_dialog, - get_widget_assert (de->xml, "button-goto-variable") - ); - - gtk_action_connect_proxy (de->invoke_weight_cases_dialog, - get_widget_assert (de->xml, "button-weight-cases") - ); + g_object_set (font_action, + "stock-id", "gtk-select-font", + NULL); - gtk_action_connect_proxy (de->invoke_split_file_dialog, - get_widget_assert (de->xml, "button-split-file") - ); + g_signal_connect (font_action, + "activate", + G_CALLBACK (fonts_activate), de); + } - gtk_action_connect_proxy (de->invoke_select_cases_dialog, - get_widget_assert (de->xml, "button-select-cases") - ); - g_signal_connect (get_widget_assert (de->xml, "file_quit"), + g_signal_connect (get_action_assert (de->builder, "file_quit"), "activate", G_CALLBACK (file_quit), de); - g_signal_connect (get_widget_assert (de->xml, "transform_run-pending"), + g_signal_connect (get_action_assert (de->builder, "transform_run-pending"), "activate", G_CALLBACK (execute), de); - g_signal_connect (get_widget_assert (de->xml, "windows_minimise_all"), + g_signal_connect (get_action_assert (de->builder, "windows_minimise_all"), "activate", G_CALLBACK (psppire_window_minimise_all), NULL); - de->toggle_split_window = - gtk_toggle_action_new ("toggle-split-window", - _("_Split Window"), - _("Split the window vertically and horizontally"), - "pspp-split-window"); - g_signal_connect (de->toggle_split_window, "toggled", - G_CALLBACK (toggle_split_window), - de); + { + GtkAction *split_window_action = + resolve_action (de->builder, "windows_split", NULL); - gtk_action_connect_proxy (GTK_ACTION (de->toggle_split_window), - get_widget_assert (de->xml, - "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)); + { + GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER)); - de->var_sheet_variable_popup_menu = - GTK_MENU (create_var_sheet_variable_popup_menu (de)); + PSPPIRE_WINDOW (de)->menu = + GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar/windows/windows_minimise_all")->parent); + } - de->data_sheet_cases_popup_menu = - GTK_MENU (create_data_sheet_cases_popup_menu (de)); + { + GtkMenu *data_sheet_variable_popup_menu = + GTK_MENU (create_data_sheet_variable_popup_menu (de)); - PSPPIRE_WINDOW (de)->menu = GTK_MENU_SHELL (get_widget_assert (de->xml,"Windows_menu")); + GtkMenu *var_sheet_variable_popup_menu = + GTK_MENU (create_var_sheet_variable_popup_menu (de)); - 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); + GtkMenu *data_sheet_cases_popup_menu = + GTK_MENU (create_data_sheet_cases_popup_menu (de)); + + 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); @@ -1714,7 +1889,18 @@ GtkWidget* psppire_data_window_new (void) { return GTK_WIDGET (g_object_new (psppire_data_window_get_type (), - "usage", PSPPIRE_WINDOW_USAGE_DATA, + "description", _("Data Editor"), NULL)); } + + + + + +static void +psppire_data_window_iface_init (PsppireWindowIface *iface) +{ + iface->save = save_file; + iface->load = load_file; +}