X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-window.c;h=b17b1913356c949ddf3d6e6151b4548ebd245635;hb=55077868a3eb1776432bcb46a3627cc8e0ee54db;hp=cd0c3751f4c6a67f4381a16d6098abc5558f28ce;hpb=801bc4e3ff5f7b6c9780ef8cc085825645975f7d;p=pspp diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c index cd0c3751f4..b17b191335 100644 --- a/src/ui/gui/psppire-data-window.c +++ b/src/ui/gui/psppire-data-window.c @@ -30,6 +30,8 @@ #include +#include "psppire.h" +#include "psppire-window.h" #include "psppire-data-window.h" #include "psppire-syntax-window.h" @@ -71,6 +73,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) { @@ -91,9 +96,21 @@ psppire_data_window_get_type (void) (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; @@ -148,7 +165,7 @@ extern PsppireDataStore *the_data_store ; static void set_paste_menuitem_sensitivity (PsppireDataWindow *de, gboolean x) { - GtkAction *edit_paste = get_object_assert (de->builder, "edit_paste"); + GtkAction *edit_paste = get_action_assert (de->builder, "edit_paste"); gtk_action_set_sensitive (edit_paste, x); } @@ -156,8 +173,8 @@ set_paste_menuitem_sensitivity (PsppireDataWindow *de, gboolean x) static void set_cut_copy_menuitem_sensitivity (PsppireDataWindow *de, gboolean x) { - GtkAction *edit_copy = get_object_assert (de->builder, "edit_copy"); - GtkAction *edit_cut = get_object_assert (de->builder, "edit_cut"); + GtkAction *edit_copy = get_action_assert (de->builder, "edit_copy"); + GtkAction *edit_cut = get_action_assert (de->builder, "edit_cut"); gtk_action_set_sensitive (edit_copy, x); gtk_action_set_sensitive (edit_cut, x); @@ -178,8 +195,7 @@ transformation_change_callback (bool transformations_pending, { PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); - GtkUIManager *uim = - GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1")); + GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER)); GtkWidget *menuitem = gtk_ui_manager_get_widget (uim,"/ui/menubar/transform/transform_run-pending"); @@ -298,25 +314,34 @@ 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 + void psppire_data_window_load_file (PsppireDataWindow *de, @@ -335,13 +360,10 @@ psppire_data_window_load_file (PsppireDataWindow *de, if (execute_syntax (sss) ) { psppire_window_set_filename (PSPPIRE_WINDOW (de), file_name); - add_most_recent (file_name); + add_most_recent (file_name, the_recent_mgr); } psppire_window_set_unsaved (PSPPIRE_WINDOW (de), FALSE); - free (de->file_name); - - de->file_name = g_strdup (file_name); } @@ -376,19 +398,22 @@ open_data_dialog (GtkAction *action, PsppireDataWindow *de) gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); - 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); - } + { + gchar *dir_name; + gchar *filename = NULL; + g_object_get (de, "filename", &filename, NULL); + + dir_name = g_path_get_dirname (filename); + gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), + dir_name); + free (dir_name); + } switch (gtk_dialog_run (GTK_DIALOG (dialog))) { case GTK_RESPONSE_ACCEPT: { - gchar *name = + gchar *name = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); psppire_data_window_load_file (de, name); @@ -420,39 +445,38 @@ name_has_suffix (const gchar *name) } -/* Append SUFFIX to the filename of DE */ -static void -append_filename_suffix (PsppireDataWindow *de, const gchar *suffix) -{ - if ( ! name_has_suffix (de->file_name)) - { - gchar *s = de->file_name; - de->file_name = g_strconcat (de->file_name, suffix, NULL); - g_free (s); - } -} - /* Save DE to file */ static void save_file (PsppireDataWindow *de) { + gchar *fn = NULL; + GString *fnx; struct getl_interface *sss; struct string file_name ; - g_assert (de->file_name); + g_object_get (de, "filename", &fn, NULL); + + fnx = g_string_new (fn); + + if ( ! name_has_suffix (fnx->str)) + { + if ( de->save_as_portable) + g_string_append (fnx, ".por"); + else + g_string_append (fnx, ".sav"); + } ds_init_empty (&file_name); - syntax_gen_string (&file_name, ss_cstr (de->file_name)); + syntax_gen_string (&file_name, ss_cstr (fnx->str)); + g_string_free (fnx, FALSE); if ( de->save_as_portable ) { - append_filename_suffix (de, ".por"); sss = create_syntax_string_source ("EXPORT OUTFILE=%s.", ds_cstr (&file_name)); } else { - append_filename_suffix (de, ".sav"); sss = create_syntax_string_source ("SAVE OUTFILE=%s.", ds_cstr (&file_name)); } @@ -483,7 +507,7 @@ on_insert_variable (GtkAction *action, gpointer data) /* 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 = @@ -534,22 +558,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); - psppire_window_set_filename (PSPPIRE_WINDOW (de), de->file_name); + g_string_free (filename, TRUE); } break; default: @@ -561,15 +591,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) + save_file (PSPPIRE_DATA_WINDOW (de)); else - data_save_as_dialog (action, de); + data_save_as_dialog (PSPPIRE_DATA_WINDOW (de)); } @@ -583,9 +614,6 @@ new_file (GtkAction *action, PsppireDataWindow *de) execute_syntax (sss); - g_free (de->file_name); - de->file_name = NULL; - psppire_window_set_filename (PSPPIRE_WINDOW (de), NULL); } @@ -720,7 +748,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 (); } @@ -863,10 +892,9 @@ 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, + gpointer user_data) { gchar *file; PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (user_data); @@ -905,7 +933,6 @@ on_recent_files_select (GtkMenuShell *menushell, gpointer user_data) g_free (file); } -#endif static void enable_delete_cases (GtkWidget *w, gint case_num, gpointer data) @@ -933,8 +960,7 @@ on_switch_sheet (GtkNotebook *notebook, { PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (user_data); - GtkUIManager *uim = - GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1")); + 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"); @@ -971,20 +997,17 @@ on_switch_sheet (GtkNotebook *notebook, static GtkAction * resolve_action (GtkBuilder *builder, const gchar *action, const gchar *proxy) { - GObject *pr = NULL; - GObject *act = get_object_assert (builder, action); + GtkWidget *pr = NULL; + GtkAction *act = get_action_assert (builder, action); g_assert (GTK_IS_ACTION (act)); if ( proxy ) - { - pr = get_object_assert (builder, proxy); - g_assert (GTK_IS_WIDGET (pr)); - } + pr = get_widget_assert (builder, proxy); if ( pr ) - gtk_action_connect_proxy (GTK_ACTION (act), GTK_WIDGET (pr)); + gtk_action_connect_proxy (act, pr); - return GTK_ACTION (act); + return act; } @@ -1003,8 +1026,6 @@ psppire_data_window_init (PsppireDataWindow *de) GtkWidget *hb ; GtkWidget *sb ; - GtkUIManager *uim; - GtkWidget *box = gtk_vbox_new (FALSE, 0); de->builder = builder_new ("data-editor.ui"); @@ -1012,8 +1033,6 @@ psppire_data_window_init (PsppireDataWindow *de) hb = get_widget_assert (de->builder, "handlebox1"); sb = get_widget_assert (de->builder, "status-bar"); - de->file_name = NULL; - de->data_editor = PSPPIRE_DATA_EDITOR (psppire_data_editor_new (the_var_store, the_data_store)); @@ -1079,11 +1098,11 @@ psppire_data_window_init (PsppireDataWindow *de) de); - g_signal_connect (get_object_assert (de->builder, "edit_copy"), + g_signal_connect (get_action_assert (de->builder, "edit_copy"), "activate", G_CALLBACK (on_edit_copy), de); - g_signal_connect (get_object_assert (de->builder, "edit_cut"), + g_signal_connect (get_action_assert (de->builder, "edit_cut"), "activate", G_CALLBACK (on_edit_cut), de); @@ -1144,8 +1163,8 @@ psppire_data_window_init (PsppireDataWindow *de) "stock-id", "gtk-save", NULL); - g_signal_connect (action_data_save, "activate", - G_CALLBACK (data_save), de); + g_signal_connect_swapped (action_data_save, "activate", + G_CALLBACK (data_save), de); } @@ -1161,7 +1180,7 @@ psppire_data_window_init (PsppireDataWindow *de) "stock-id", "gtk-save-as", NULL); - g_signal_connect (action_data_save_as, "activate", + g_signal_connect_swapped (action_data_save_as, "activate", G_CALLBACK (data_save_as_dialog), de); } @@ -1182,7 +1201,7 @@ psppire_data_window_init (PsppireDataWindow *de) } - g_signal_connect (get_object_assert (de->builder, "edit_paste"), "activate", + g_signal_connect (get_action_assert (de->builder, "edit_paste"), "activate", G_CALLBACK (on_edit_paste), de); @@ -1566,63 +1585,69 @@ 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 = + gtk_ui_manager_get_widget (uim,"/ui/menubar/file/file_recent-data"); + GtkWidget *recent_files = + gtk_ui_manager_get_widget (uim,"/ui/menubar/file/file_recent-files"); -#if RECENT_LISTS_AVAILABLE && 0 - { - GtkRecentManager *rm = gtk_recent_manager_get_default (); - GtkWidget *recent_data = get_object_assert (de->builder, "file_recent-data"); - GtkWidget *recent_files = get_object_assert (de->builder, "file_recent-files"); - GtkWidget *recent_separator = get_object_assert (de->builder, "file_separator1"); - GtkWidget *menu = gtk_recent_chooser_menu_new_for_manager (rm); + GtkWidget *menu_data = + gtk_recent_chooser_menu_new_for_manager (the_recent_mgr); - GtkRecentFilter *filter = gtk_recent_filter_new (); + GtkWidget *menu_files = + gtk_recent_chooser_menu_new_for_manager (the_recent_mgr); + + { + GtkRecentFilter *filter = gtk_recent_filter_new (); - 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"); + gtk_recent_filter_add_pattern (filter, "*.por"); + gtk_recent_filter_add_pattern (filter, "*.POR"); - gtk_recent_filter_add_pattern (filter, "*.sav"); - gtk_recent_filter_add_pattern (filter, "*.SAV"); + gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (menu_data), filter); + } - gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (menu), filter); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (recent_data), menu_data); - 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); + g_signal_connect (menu_data, "selection-done", + G_CALLBACK (on_recent_data_select), + de); + { + GtkRecentFilter *filter = gtk_recent_filter_new (); - filter = gtk_recent_filter_new (); - menu = gtk_recent_chooser_menu_new_for_manager (rm); + gtk_recent_filter_add_pattern (filter, "*.sps"); + gtk_recent_filter_add_pattern (filter, "*.SPS"); - gtk_recent_filter_add_pattern (filter, "*.sps"); - gtk_recent_filter_add_pattern (filter, "*.SPS"); + gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (menu_files), filter); + } - gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (menu), filter); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (recent_files), menu_files); - gtk_widget_set_sensitive (recent_files, TRUE); - g_signal_connect (menu, "selection-done", - G_CALLBACK (on_recent_files_select), de); + g_signal_connect (menu_files, "selection-done", + G_CALLBACK (on_recent_files_select), + de); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (recent_files), menu); } -#endif - g_signal_connect (get_object_assert (de->builder,"file_new_syntax"), + g_signal_connect (get_action_assert (de->builder,"file_new_syntax"), "activate", G_CALLBACK (create_syntax_window), NULL); - g_signal_connect (get_object_assert (de->builder,"file_open_syntax"), + g_signal_connect (get_action_assert (de->builder,"file_open_syntax"), "activate", G_CALLBACK (open_syntax_window), de); { - GObject *abt = get_object_assert (de->builder, "help_about"); + GtkAction *abt = get_action_assert (de->builder, "help_about"); g_object_set (abt, "stock-id", "gtk-about", NULL); g_signal_connect (abt, "activate", @@ -1631,7 +1656,7 @@ psppire_data_window_init (PsppireDataWindow *de) } - g_signal_connect (get_object_assert (de->builder,"help_reference"), + g_signal_connect (get_action_assert (de->builder,"help_reference"), "activate", G_CALLBACK (reference_manual), de); @@ -1655,22 +1680,22 @@ psppire_data_window_init (PsppireDataWindow *de) gtk_notebook_set_current_page (GTK_NOTEBOOK (de->data_editor), PSPPIRE_DATA_EDITOR_VARIABLE_VIEW); gtk_notebook_set_current_page (GTK_NOTEBOOK (de->data_editor), PSPPIRE_DATA_EDITOR_DATA_VIEW); - g_signal_connect (get_object_assert (de->builder, "view_statusbar"), + g_signal_connect (get_action_assert (de->builder, "view_statusbar"), "activate", G_CALLBACK (status_bar_activate), de); - g_signal_connect (get_object_assert (de->builder, "view_gridlines"), + g_signal_connect (get_action_assert (de->builder, "view_gridlines"), "activate", G_CALLBACK (grid_lines_activate), de); - g_signal_connect (get_object_assert (de->builder, "view_data"), + g_signal_connect (get_action_assert (de->builder, "view_data"), "activate", G_CALLBACK (data_view_activate), de); - g_signal_connect (get_object_assert (de->builder, "view_variables"), + g_signal_connect (get_action_assert (de->builder, "view_variables"), "activate", G_CALLBACK (variable_view_activate), de); @@ -1690,16 +1715,16 @@ psppire_data_window_init (PsppireDataWindow *de) - g_signal_connect (get_object_assert (de->builder, "file_quit"), + g_signal_connect (get_action_assert (de->builder, "file_quit"), "activate", G_CALLBACK (file_quit), de); - g_signal_connect (get_object_assert (de->builder, "transform_run-pending"), + g_signal_connect (get_action_assert (de->builder, "transform_run-pending"), "activate", G_CALLBACK (execute), de); - g_signal_connect (get_object_assert (de->builder, "windows_minimise_all"), + g_signal_connect (get_action_assert (de->builder, "windows_minimise_all"), "activate", G_CALLBACK (psppire_window_minimise_all), NULL); @@ -1727,10 +1752,12 @@ psppire_data_window_init (PsppireDataWindow *de) de->data_sheet_cases_popup_menu = GTK_MENU (create_data_sheet_cases_popup_menu (de)); - uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1")); + { + GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER)); PSPPIRE_WINDOW (de)->menu = GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar/windows/windows_minimise_all")->parent); + } g_object_set (de->data_editor, @@ -1752,3 +1779,13 @@ psppire_data_window_new (void) NULL)); } + + + + + +static void +psppire_data_window_iface_init (PsppireWindowIface *iface) +{ + iface->save = data_save; +}