X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-window.c;h=990e4ab5fed6245b33df401868c4c5f79a206feb;hb=8ef8acb7c70a321963d30f2264e8f91e16427fcf;hp=6bd6603b60cedf9df509c5cffb2f1368fb2f677d;hpb=1f9780e0184a3115d87783fdcfa39f89877a775e;p=pspp-builds.git diff --git a/src/ui/gui/psppire-window.c b/src/ui/gui/psppire-window.c index 6bd6603b..990e4ab5 100644 --- a/src/ui/gui/psppire-window.c +++ b/src/ui/gui/psppire-window.c @@ -16,6 +16,7 @@ #include + #include #include #include @@ -39,7 +40,6 @@ static void psppire_window_class_init (PsppireWindowClass *class); static void psppire_window_init (PsppireWindow *window); -static PsppireWindowClass *the_class; static GObjectClass *parent_class; GType @@ -97,7 +97,7 @@ psppire_window_set_title (PsppireWindow *window) window->basename ? window->basename : "", mdash, window->description); - if ( window->unsaved) + if (window->dirty) g_string_prepend_c (title, '*'); gtk_window_set_title (GTK_WINDOW (window), title->str); @@ -137,7 +137,7 @@ psppire_window_set_property (GObject *object, name = g_value_get_string (&def); } - candidate_name = strdup (name); + candidate_name = xstrdup (name); while ( psppire_window_register_lookup (reg, candidate_name)) { @@ -145,7 +145,7 @@ psppire_window_set_property (GObject *object, candidate_name = uniquify (name, &x); } - window->basename = g_path_get_basename (candidate_name); + window->basename = g_filename_display_basename (candidate_name); g_value_unset (&def); } @@ -203,7 +203,7 @@ on_realize (GtkWindow *window, gpointer data) static gboolean -on_configure (GtkWidget *window, GdkEventConfigure *event, gpointer data) +save_geometry (GtkWidget *window, GdkEvent *event, gpointer data) { const gchar *base = G_OBJECT_TYPE_NAME (window); @@ -271,7 +271,6 @@ psppire_window_class_init (PsppireWindowClass *class) PROP_FILENAME, filename_spec); - the_class = class; parent_class = g_type_class_peek_parent (class); } @@ -316,7 +315,10 @@ menu_activate (GtkMenuItem *mi, gpointer data) static void insert_menuitem_into_menu (PsppireWindow *window, gpointer key) { - GtkWidget *item = gtk_check_menu_item_new_with_label (key); + gchar *filename = g_filename_display_name (key); + GtkWidget *item = gtk_check_menu_item_new_with_label (filename); + + g_free (filename); g_signal_connect (item, "toggled", G_CALLBACK (menu_toggled), NULL); g_signal_connect (item, "activate", G_CALLBACK (menu_activate), key); @@ -379,16 +381,21 @@ on_delete (PsppireWindow *w, GdkEvent *event, gpointer user_data) { PsppireWindowRegister *reg = psppire_window_register_new (); - if ( w->unsaved ) + if ( w->dirty ) { gint response = psppire_window_query_save (w); - if ( response == GTK_RESPONSE_CANCEL) - return TRUE; - - if ( response == GTK_RESPONSE_ACCEPT) + switch (response) { + default: + case GTK_RESPONSE_CANCEL: + return TRUE; + break; + case GTK_RESPONSE_APPLY: psppire_window_save (w); + break; + case GTK_RESPONSE_REJECT: + break; } } @@ -404,6 +411,7 @@ psppire_window_init (PsppireWindow *window) { window->name = NULL; window->menu = NULL; + window->description = xstrdup (""); window->menuitem_table = g_hash_table_new (g_str_hash, g_str_equal); @@ -420,58 +428,77 @@ psppire_window_init (PsppireWindow *window) G_CALLBACK (remove_menuitem), window); - window->unsaved = FALSE; + window->dirty = FALSE; g_signal_connect_swapped (window, "delete-event", G_CALLBACK (on_delete), window); g_object_set (window, "icon-name", "psppicon", NULL); g_signal_connect (window, "configure-event", - G_CALLBACK (on_configure), window); + G_CALLBACK (save_geometry), window); + + g_signal_connect (window, "window-state-event", + G_CALLBACK (save_geometry), window); g_signal_connect (window, "realize", G_CALLBACK (on_realize), window); } - -/* +/* Ask the user if the buffer should be saved. Return the response. */ gint psppire_window_query_save (PsppireWindow *se) { + gchar *fn; gint response; GtkWidget *dialog; + GtkWidget *cancel_button; const gchar *description; const gchar *filename = psppire_window_get_filename (se); + GTimeVal time; + + g_get_current_time (&time); + g_object_get (se, "description", &description, NULL); g_return_val_if_fail (filename != NULL, GTK_RESPONSE_NONE); + + fn = g_filename_display_basename (filename); + dialog = gtk_message_dialog_new (GTK_WINDOW (se), GTK_DIALOG_MODAL, - GTK_MESSAGE_QUESTION, + GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, - _("Save contents of %s to \"%s\"?"), - description, - filename); + _("Save the changes to \"%s\" before closing?"), + fn); + g_free (fn); - gtk_dialog_add_button (GTK_DIALOG (dialog), - GTK_STOCK_YES, - GTK_RESPONSE_ACCEPT); + g_object_set (dialog, "icon-name", "psppicon", NULL); + + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), + _("If you don't save, changes from the last %ld seconds will be permanently lost."), + time.tv_sec - se->savetime.tv_sec); gtk_dialog_add_button (GTK_DIALOG (dialog), - GTK_STOCK_NO, + _("Close _without saving"), GTK_RESPONSE_REJECT); + cancel_button = gtk_dialog_add_button (GTK_DIALOG (dialog), + GTK_STOCK_CANCEL, + GTK_RESPONSE_CANCEL); + gtk_dialog_add_button (GTK_DIALOG (dialog), - GTK_STOCK_CANCEL, - GTK_RESPONSE_CANCEL); + GTK_STOCK_SAVE, + GTK_RESPONSE_APPLY); + + gtk_widget_grab_focus (cancel_button); response = gtk_dialog_run (GTK_DIALOG (dialog)); @@ -481,6 +508,7 @@ psppire_window_query_save (PsppireWindow *se) } + const gchar * psppire_window_get_filename (PsppireWindow *w) { @@ -497,9 +525,12 @@ psppire_window_set_filename (PsppireWindow *w, const gchar *filename) } void -psppire_window_set_unsaved (PsppireWindow *w, gboolean unsaved) +psppire_window_set_unsaved (PsppireWindow *w) { - w->unsaved = unsaved; + if ( w->dirty == FALSE) + g_get_current_time (&w->savetime); + + w->dirty = TRUE; psppire_window_set_title (w); } @@ -507,7 +538,7 @@ psppire_window_set_unsaved (PsppireWindow *w, gboolean unsaved) gboolean psppire_window_get_unsaved (PsppireWindow *w) { - return w->unsaved; + return w->dirty; } @@ -575,13 +606,49 @@ psppire_window_save (PsppireWindow *w) g_return_if_fail (i->save); i->save (w); + + w->dirty = FALSE; + psppire_window_set_title (w); +} + +extern GtkRecentManager *the_recent_mgr; + +static void add_most_recent (const char *file_name, GtkRecentManager *rm); +static void delete_recent (const char *file_name, GtkRecentManager *rm); + +gboolean +psppire_window_load (PsppireWindow *w, const gchar *file) +{ + gboolean ok; + PsppireWindowIface *i = PSPPIRE_WINDOW_MODEL_GET_IFACE (w); + + g_assert (PSPPIRE_IS_WINDOW_MODEL (w)); + + g_assert (i); + + g_return_val_if_fail (i->load, FALSE); + + ok = i->load (w, file); + + if ( ok ) + { + psppire_window_set_filename (w, file); + add_most_recent (file, the_recent_mgr); + w->dirty = FALSE; + } + else + delete_recent (file, the_recent_mgr); + + psppire_window_set_title (w); + + return ok; } /* Puts FILE_NAME into the recent list. If it's already in the list, it moves it to the top */ -void +static void add_most_recent (const char *file_name, GtkRecentManager *rm) { gchar *uri = g_filename_to_uri (file_name, NULL, NULL); @@ -594,10 +661,10 @@ add_most_recent (const char *file_name, GtkRecentManager *rm) -/* +/* If FILE_NAME exists in the recent list, then delete it. */ -void +static void delete_recent (const char *file_name, GtkRecentManager *rm) { gchar *uri = g_filename_to_uri (file_name, NULL, NULL); @@ -606,6 +673,5 @@ delete_recent (const char *file_name, GtkRecentManager *rm) gtk_recent_manager_remove_item (rm, uri, NULL); g_free (uri); - }