X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-window.c;h=15f8503de26589aba8b82de8bcccdce830b8a01e;hb=65d602ed236d685ffec00ad1552a193cf47b2e4d;hp=3c80523a9ad24c8e766715eb66cfed0ed26e9671;hpb=50f6ea7d66d03895020891215fb4f55bbf061003;p=pspp diff --git a/src/ui/gui/psppire-window.c b/src/ui/gui/psppire-window.c index 3c80523a9a..15f8503de2 100644 --- a/src/ui/gui/psppire-window.c +++ b/src/ui/gui/psppire-window.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2009, 2010, 2011, 2013, 2014 Free Software Foundation + Copyright (C) 2009, 2010, 2011, 2013, 2014, 2020 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 @@ -44,41 +44,12 @@ #include "psppire-syntax-window.h" #include "psppire-window-register.h" -static void psppire_window_base_init (PsppireWindowClass *class); static void psppire_window_class_init (PsppireWindowClass *class); static void psppire_window_init (PsppireWindow *window); - static GObjectClass *parent_class; -GType -psppire_window_get_type (void) -{ - static GType psppire_window_type = 0; - - if (!psppire_window_type) - { - static const GTypeInfo psppire_window_info = - { - sizeof (PsppireWindowClass), - (GBaseInitFunc) psppire_window_base_init, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) psppire_window_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (PsppireWindow), - 0, - (GInstanceInitFunc) psppire_window_init, - }; - - psppire_window_type = - g_type_register_static (PSPPIRE_TYPE_WINDOW_BASE, "PsppireWindow", - &psppire_window_info, G_TYPE_FLAG_ABSTRACT); - } - - return psppire_window_type; -} - +G_DEFINE_ABSTRACT_TYPE (PsppireWindow, psppire_window, PSPPIRE_TYPE_WINDOW_BASE) /* Properties */ enum @@ -95,7 +66,7 @@ psppire_window_set_title (PsppireWindow *window) { GString *title = g_string_sized_new (80); - if (window->dirty) + if (window->edited != NULL) g_string_append_c (title, '*'); if (window->basename || window->id) @@ -245,6 +216,9 @@ psppire_window_finalize (GObject *object) PsppireWindowRegister *reg = psppire_window_register_new (); + if (window->edited) + g_date_time_unref (window->edited); + g_signal_handler_disconnect (reg, window->remove_handler); g_signal_handler_disconnect (reg, window->insert_handler); psppire_window_register_remove (reg, window->list_name); @@ -265,6 +239,8 @@ psppire_window_class_init (PsppireWindowClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); + object_class->finalize = psppire_window_finalize; + GParamSpec *description_spec = null_if_empty_param ("description", "Description", @@ -306,16 +282,6 @@ psppire_window_class_init (PsppireWindowClass *class) } -static void -psppire_window_base_init (PsppireWindowClass *class) -{ - GObjectClass *object_class = G_OBJECT_CLASS (class); - - object_class->finalize = psppire_window_finalize; -} - - - static void insert_menuitem_into_menu (PsppireWindow *window, gpointer key) { @@ -323,6 +289,7 @@ insert_menuitem_into_menu (PsppireWindow *window, gpointer key) GtkWidget *item; filename = g_filename_display_name (key); item = gtk_check_menu_item_new_with_label (filename); + g_object_ref_sink (item); g_free (filename); g_hash_table_insert (window->menuitem_table, key, item); @@ -333,7 +300,7 @@ insert_item (gpointer key, gpointer value, gpointer data) { PsppireWindow *window = PSPPIRE_WINDOW (data); - if ( NULL != g_hash_table_lookup (window->menuitem_table, key)) + if (NULL != g_hash_table_lookup (window->menuitem_table, key)) return; insert_menuitem_into_menu (window, key); @@ -368,7 +335,7 @@ on_delete (PsppireWindow *w, GdkEvent *event, gpointer user_data) { PsppireWindowRegister *reg = psppire_window_register_new (); - if ( w->dirty ) + if (w->edited != NULL) { gint response = psppire_window_query_save (w); @@ -380,7 +347,7 @@ on_delete (PsppireWindow *w, GdkEvent *event, gpointer user_data) break; case GTK_RESPONSE_APPLY: psppire_window_save (w); - if (w->dirty) + if (w->edited != NULL) { /* Save failed, or user exited Save As dialog with Cancel. */ return TRUE; @@ -391,7 +358,7 @@ on_delete (PsppireWindow *w, GdkEvent *event, gpointer user_data) } } - if ( 1 == psppire_window_register_n_items (reg)) + if (1 == psppire_window_register_n_items (reg)) gtk_main_quit (); return FALSE; @@ -406,24 +373,26 @@ psppire_window_init (PsppireWindow *window) window->id = NULL; window->description = NULL; window->list_name = NULL; + window->edited = NULL; - window->menuitem_table = g_hash_table_new (g_str_hash, g_str_equal); + window->menuitem_table = g_hash_table_new_full (g_str_hash, g_str_equal, + NULL, g_object_unref); g_signal_connect (window, "realize", G_CALLBACK (insert_existing_items), NULL); - window->insert_handler = g_signal_connect (psppire_window_register_new (), + PsppireWindowRegister *reg = psppire_window_register_new (); + window->insert_handler = g_signal_connect (reg, "inserted", G_CALLBACK (insert_menuitem), window); - window->remove_handler = g_signal_connect (psppire_window_register_new (), + window->remove_handler = g_signal_connect (reg, "removed", G_CALLBACK (remove_menuitem), window); window->added_separator = FALSE; - window->dirty = FALSE; g_signal_connect_swapped (window, "delete-event", G_CALLBACK (on_delete), window); @@ -443,9 +412,9 @@ psppire_window_query_save (PsppireWindow *se) gchar *description; - GTimeVal time; - - g_get_current_time (&time); + GDateTime *now = g_date_time_new_now_utc (); + GTimeSpan timespan = g_date_time_difference (now, se->edited); + g_date_time_unref (now); if (se->filename) description = g_filename_display_basename (se->filename); @@ -466,7 +435,7 @@ psppire_window_query_save (PsppireWindow *se) 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); + (long int) (timespan / G_TIME_SPAN_SECOND)); gtk_dialog_add_button (GTK_DIALOG (dialog), _("Close _without saving"), @@ -508,10 +477,8 @@ psppire_window_set_filename (PsppireWindow *w, const gchar *filename) void psppire_window_set_unsaved (PsppireWindow *w) { - if ( w->dirty == FALSE) - g_get_current_time (&w->savetime); - - w->dirty = TRUE; + if (w->edited == NULL) + w->edited = g_date_time_new_now_utc (); psppire_window_set_title (w); } @@ -519,7 +486,7 @@ psppire_window_set_unsaved (PsppireWindow *w) gboolean psppire_window_get_unsaved (PsppireWindow *w) { - return w->dirty; + return w->edited != NULL; } @@ -561,7 +528,8 @@ psppire_window_model_get_type (void) NULL, /* class_data */ 0, 0, /* n_preallocs */ - NULL + NULL, + NULL /* value_table */ }; window_model_type = @@ -588,7 +556,10 @@ psppire_window_save (PsppireWindow *w) else { i->save (w); - w->dirty = FALSE; + if (w->edited) + g_date_time_unref (w->edited); + w->edited = NULL; + psppire_window_set_title (w); } } @@ -632,10 +603,12 @@ psppire_window_load (PsppireWindow *w, const gchar *file, ok = i->load (w, file, encoding, hint); - if ( ok ) + if (ok) { psppire_window_set_filename (w, file); - w->dirty = FALSE; + if (w->edited) + g_date_time_unref (w->edited); + w->edited = NULL; } else delete_recent (file); @@ -702,7 +675,7 @@ psppire_window_file_chooser_dialog (PsppireWindow *toplevel) const gchar *filename = toplevel->filename; gchar *dir_name; - if ( ! g_path_is_absolute (filename)) + if (! g_path_is_absolute (filename)) { gchar *path = g_build_filename (g_get_current_dir (), filename, NULL); @@ -891,7 +864,7 @@ add_most_recent (const char *file_name, const char *mime_type, const char *encoding) { gchar *uri = g_filename_to_uri (file_name, NULL, NULL); - if ( uri ) + if (uri) { GtkRecentData recent_data; gchar *full_mime_type; @@ -930,9 +903,8 @@ delete_recent (const char *file_name) { gchar *uri = g_filename_to_uri (file_name, NULL, NULL); - if ( uri ) + if (uri) gtk_recent_manager_remove_item (gtk_recent_manager_get_default (), uri, NULL); g_free (uri); } -