X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-window.c;h=5efb02dedb1e1ecade630d4e25af1025cb59d2c1;hb=84fbb877ec23bfab78876cd90aa7a29175495144;hp=b17b1913356c949ddf3d6e6151b4548ebd245635;hpb=8af88c0b7ea2fe75df7e45497988ed0371006a86;p=pspp-builds.git diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c index b17b1913..5efb02de 100644 --- a/src/ui/gui/psppire-data-window.c +++ b/src/ui/gui/psppire-data-window.c @@ -53,7 +53,6 @@ #include "crosstabs-dialog.h" #include "frequencies-dialog.h" #include "examine-dialog.h" -#include "dict-display.h" #include "regression-dialog.h" #include "oneway-anova-dialog.h" #include "t-test-independent-samples-dialog.h" @@ -161,6 +160,7 @@ extern PsppireVarStore *the_var_store; extern struct dataset *the_dataset; extern PsppireDataStore *the_data_store ; +extern GtkRecentManager *the_recent_mgr; static void set_paste_menuitem_sensitivity (PsppireDataWindow *de, gboolean x) @@ -343,9 +343,8 @@ dump_rm (GtkRecentManager *rm) #endif -void -psppire_data_window_load_file (PsppireDataWindow *de, - const gchar *file_name) +static gboolean +load_file (PsppireWindow *de, const gchar *file_name) { struct getl_interface *sss; struct string filename; @@ -355,22 +354,23 @@ psppire_data_window_load_file (PsppireDataWindow *de, 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, the_recent_mgr); + psppire_window_set_filename (de, file_name); + return TRUE; } - psppire_window_set_unsaved (PSPPIRE_WINDOW (de), FALSE); + return FALSE; } /* Callback for the data_open action. Prompts for a filename and opens it */ static void -open_data_dialog (GtkAction *action, PsppireDataWindow *de) +open_data_dialog (GtkAction *action, PsppireWindow *de) { GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Open"), @@ -416,7 +416,7 @@ open_data_dialog (GtkAction *action, PsppireDataWindow *de) gchar *name = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); - psppire_data_window_load_file (de, name); + psppire_window_load (de, name); g_free (name); } @@ -447,14 +447,15 @@ name_has_suffix (const gchar *name) /* Save DE to file */ static void -save_file (PsppireDataWindow *de) +save_file (PsppireWindow *w) { gchar *fn = NULL; GString *fnx; struct getl_interface *sss; struct string file_name ; + PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (w); - g_object_get (de, "filename", &fn, NULL); + g_object_get (w, "filename", &fn, NULL); fnx = g_string_new (fn); @@ -484,8 +485,6 @@ save_file (PsppireDataWindow *de) ds_destroy (&file_name); execute_syntax (sss); - - psppire_window_set_unsaved (PSPPIRE_WINDOW (de), FALSE); } @@ -577,7 +576,7 @@ data_save_as_dialog (PsppireDataWindow *de) psppire_window_set_filename (PSPPIRE_WINDOW (de), filename->str); - save_file (de); + save_file (PSPPIRE_WINDOW (de)); g_string_free (filename, TRUE); } @@ -598,7 +597,7 @@ data_save (PsppireWindow *de) const gchar *fn = psppire_window_get_filename (de); if ( NULL != fn) - save_file (PSPPIRE_DATA_WINDOW (de)); + psppire_window_save (de); else data_save_as_dialog (PSPPIRE_DATA_WINDOW (de)); } @@ -690,6 +689,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 = @@ -704,8 +704,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->builder, - "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 @@ -799,15 +799,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); @@ -838,7 +838,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); @@ -874,7 +874,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); @@ -894,10 +894,9 @@ create_var_sheet_variable_popup_menu (PsppireDataWindow *de) static void on_recent_data_select (GtkMenuShell *menushell, - gpointer user_data) + PsppireWindow *window) { gchar *file; - PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (user_data); gchar *uri = gtk_recent_chooser_get_current_uri (GTK_RECENT_CHOOSER (menushell)); @@ -906,7 +905,7 @@ on_recent_data_select (GtkMenuShell *menushell, g_free (uri); - psppire_data_window_load_file (de, file); + psppire_window_load (window, file); g_free (file); } @@ -927,8 +926,10 @@ 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); } @@ -1014,7 +1015,7 @@ resolve_action (GtkBuilder *builder, const gchar *action, const gchar *proxy) static void set_unsaved (gpointer w) { - psppire_window_set_unsaved (PSPPIRE_WINDOW (w), TRUE); + psppire_window_set_unsaved (PSPPIRE_WINDOW (w)); } static void @@ -1049,15 +1050,6 @@ psppire_data_window_init (PsppireDataWindow *de) connect_help (de->builder); - g_object_ref (menubar); - gtk_widget_unparent (menubar); - - g_object_ref (hb); - gtk_widget_unparent (hb); - - g_object_ref (sb); - gtk_widget_unparent (sb); - gtk_box_pack_start (GTK_BOX (box), menubar, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (box), hb, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (box), GTK_WIDGET (de->data_editor), TRUE, TRUE, 0); @@ -1109,8 +1101,10 @@ 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", "button-open"); + resolve_action (de->builder, "file_open_data", NULL); g_object_set (action_data_open, "tooltip", _("Open a data file"), @@ -1119,6 +1113,9 @@ psppire_data_window_init (PsppireDataWindow *de) 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); } @@ -1585,7 +1582,7 @@ psppire_data_window_init (PsppireDataWindow *de) G_CALLBACK (regression_dialog), de); } - { + { GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER)); GtkWidget *recent_data = @@ -1609,6 +1606,8 @@ psppire_data_window_init (PsppireDataWindow *de) 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_recent_chooser_add_filter (GTK_RECENT_CHOOSER (menu_data), filter); } @@ -1625,6 +1624,8 @@ psppire_data_window_init (PsppireDataWindow *de) gtk_recent_filter_add_pattern (filter, "*.sps"); gtk_recent_filter_add_pattern (filter, "*.SPS"); + 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); } @@ -1673,7 +1674,7 @@ 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); @@ -1787,5 +1788,6 @@ psppire_data_window_new (void) static void psppire_data_window_iface_init (PsppireWindowIface *iface) { - iface->save = data_save; + iface->save = save_file; + iface->load = load_file; }