/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2009 Free Software Foundation
+ Copyright (C) 2009, 2010 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
#include <gtk/gtkmain.h>
#include <stdlib.h>
+#include <xalloc.h>
#include <gettext.h>
#define _(msgid) gettext (msgid)
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);
name = g_value_get_string (&def);
}
- candidate_name = strdup (name);
+ candidate_name = xstrdup (name);
while ( psppire_window_register_lookup (reg, candidate_name))
{
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);
}
}
-static gboolean
-on_configure (GtkWidget *window, GdkEventConfigure *event, gpointer data)
-{
- const gchar *base = G_OBJECT_TYPE_NAME (window);
-
- PsppireConf *conf = psppire_conf_new ();
-
- psppire_conf_save_window_geometry (conf, base, event);
-
- return FALSE;
-}
-
-
static void
psppire_window_finalize (GObject *object)
{
g_param_spec_string ("filename",
"File name",
"The name of the file associated with this window, if any",
- "Untitled",
+ /* TRANSLATORS: This will form a filename. Please avoid whitespace. */
+ _("Untitled"),
G_PARAM_CONSTRUCT | G_PARAM_READWRITE);
g_unichar_to_utf8 (0x2014, mdash);
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);
{
PsppireWindowRegister *reg = psppire_window_register_new ();
- if ( w->unsaved )
+ const gchar *base = G_OBJECT_TYPE_NAME (w);
+
+ PsppireConf *conf = psppire_conf_new ();
+
+ psppire_conf_save_window_geometry (conf, base, GTK_WINDOW (w));
+
+
+ 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;
}
}
{
window->name = NULL;
window->menu = NULL;
+ window->description = xstrdup ("");
window->menuitem_table = g_hash_table_new (g_str_hash, g_str_equal);
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_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));
}
+
const gchar *
psppire_window_get_filename (PsppireWindow *w)
{
}
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);
}
gboolean
psppire_window_get_unsaved (PsppireWindow *w)
{
- return w->unsaved;
+ return w->dirty;
}
g_return_if_fail (i->save);
i->save (w);
+
+ w->dirty = FALSE;
+ psppire_window_set_title (w);
}
extern GtkRecentManager *the_recent_mgr;
g_return_val_if_fail (i->load, FALSE);
- ok = i->load (w, file);
+ ok = i->load (w, file);
if ( ok )
- add_most_recent (file, the_recent_mgr);
+ {
+ 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_unsaved (w, FALSE);
+ psppire_window_set_title (w);
return ok;
}
-/*
+/*
If FILE_NAME exists in the recent list, then delete it.
*/
static void
gtk_recent_manager_remove_item (rm, uri, NULL);
g_free (uri);
-
}
projects / pspp / blobdiff