/* 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
static const GTypeInfo psppire_window_info =
{
sizeof (PsppireWindowClass),
- (GBaseInitFunc) psppire_window_base_init,
+ (GBaseInitFunc) (void (*)(void)) psppire_window_base_init,
(GBaseFinalizeFunc) NULL,
- (GClassInitFunc) psppire_window_class_init,
+ (GClassInitFunc) (void (*)(void)) psppire_window_class_init,
(GClassFinalizeFunc) NULL,
NULL,
sizeof (PsppireWindow),
0,
- (GInstanceInitFunc) psppire_window_init,
+ (GInstanceInitFunc) (void (*)(void)) psppire_window_init,
+ NULL /* value_table */
};
psppire_window_type =
{
GString *title = g_string_sized_new (80);
- if (window->dirty)
+ if (window->edited != NULL)
g_string_append_c (title, '*');
if (window->basename || window->id)
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);
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);
{
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);
{
PsppireWindowRegister *reg = psppire_window_register_new ();
- if ( w->dirty )
+ if (w->edited != NULL)
{
gint response = psppire_window_query_save (w);
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;
}
}
- if ( 1 == psppire_window_register_n_items (reg))
+ if (1 == psppire_window_register_n_items (reg))
gtk_main_quit ();
return FALSE;
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);
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);
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);
+ timespan / G_TIME_SPAN_SECOND);
gtk_dialog_add_button (GTK_DIALOG (dialog),
_("Close _without saving"),
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);
}
gboolean
psppire_window_get_unsaved (PsppireWindow *w)
{
- return w->dirty;
+ return w->edited != NULL;
}
NULL, /* class_data */
0,
0, /* n_preallocs */
- NULL
+ NULL,
+ NULL /* value_table */
};
window_model_type =
else
{
i->save (w);
- w->dirty = FALSE;
+ if (w->edited)
+ g_date_time_unref (w->edited);
+ w->edited = NULL;
+
psppire_window_set_title (w);
}
}
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);
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);
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;
{
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);