Fix display of window icon

[pspp-builds.git] / src / ui / gui / psppire-window.c

diff --git a/src/ui/gui/psppire-window.c b/src/ui/gui/psppire-window.c
index 79149ea7adf162fa207c8074cc9c7ead09c1c347..6945914a5e294aec189f3ff521b923c1483b3826 100644 (file)
--- a/src/ui/gui/psppire-window.c
+++ b/src/ui/gui/psppire-window.c
@@ -16,6 +16,8 @@
 
 #include <config.h>
 
+#include <gtk/gtkstock.h>
+#include <gtk/gtkmessagedialog.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtkwindow.h>
 #include <gtk/gtkcheckmenuitem.h>
@@ -60,7 +62,7 @@ psppire_window_get_type (void)
 
       psppire_window_type =
        g_type_register_static (GTK_TYPE_WINDOW, "PsppireWindow",
-                               &psppire_window_info, 0);
+                               &psppire_window_info, G_TYPE_FLAG_ABSTRACT);
     }
 
   return psppire_window_type;
@@ -87,13 +89,17 @@ static gchar mdash[6] = {0,0,0,0,0,0};
 static void
 psppire_window_set_title (PsppireWindow *window)
 {
-  gchar *title =
-    g_strdup_printf ( _("%s %s PSPPIRE %s"),
-                     window->basename, mdash, window->description);
+  GString *title = g_string_sized_new (80);
 
-  gtk_window_set_title (GTK_WINDOW (window), title);
+  g_string_printf (title, _("%s %s PSPPIRE %s"),
+                   window->basename, mdash, window->description);
 
-  free (title);
+  if ( window->unsaved)
+    g_string_prepend_c (title, '*');
+
+  gtk_window_set_title (GTK_WINDOW (window), title->str);
+
+  g_string_free (title, TRUE);
 }
 
 static void
@@ -290,7 +296,7 @@ insert_menuitem_into_menu (PsppireWindow *window, gpointer key)
   g_signal_connect (item, "activate", G_CALLBACK (menu_activate), key);
 
   gtk_widget_show (item);
-  
+
   gtk_menu_shell_append (window->menu, item);
 
   /* Set the state without emitting a signal */
@@ -341,6 +347,22 @@ insert_existing_items (PsppireWindow *window)
   psppire_window_register_foreach (psppire_window_register_new (), insert_item, window);
 }
 
+
+static gboolean
+on_delete (GtkWidget *w, GdkEvent *event, gpointer user_data)
+{
+  PsppireWindow *dw = PSPPIRE_WINDOW (user_data);
+
+  PsppireWindowRegister *reg = psppire_window_register_new ();
+
+
+  if ( 1 == psppire_window_register_n_items (reg))
+    gtk_main_quit ();
+
+  return FALSE;
+}
+
+
 static void
 psppire_window_init (PsppireWindow *window)
 {
@@ -361,15 +383,66 @@ psppire_window_init (PsppireWindow *window)
                                             "removed",
                                             G_CALLBACK (remove_menuitem),
                                             window);
+
+  window->unsaved = FALSE;
+
+  g_signal_connect (window, "delete-event", G_CALLBACK (on_delete), window);
+
+  g_object_set (window, "icon-name", "psppicon", NULL);
 }
 
 
-GtkWidget*
-psppire_window_new (void)
+/* If the buffer's modified flag is set,
+   ask the user if the buffer should be saved.
+   Return TRUE if is should.
+*/
+gboolean
+psppire_window_query_save (PsppireWindow *se)
 {
-  return GTK_WIDGET (g_object_new (psppire_window_get_type (),
-                                  "type", GTK_WINDOW_TOPLEVEL,
-                                  NULL));
+  gint response;
+  GtkWidget *dialog;
+
+  const gchar *description;
+  const gchar *filename = psppire_window_get_filename (se);
+
+  if ( ! psppire_window_get_unsaved (se))
+    return FALSE;
+
+  g_object_get (se, "description", &description, NULL);
+
+  g_return_val_if_fail (filename != NULL, FALSE);
+
+  dialog =
+    gtk_message_dialog_new (GTK_WINDOW (se),
+                           GTK_DIALOG_MODAL,
+                           GTK_MESSAGE_QUESTION,
+                           GTK_BUTTONS_NONE,
+                           _("Save contents of %s to \"%s\"?"),
+                           description,
+                           filename);
+
+  gtk_dialog_add_button  (GTK_DIALOG (dialog),
+                         GTK_STOCK_YES,
+                         GTK_RESPONSE_ACCEPT);
+
+  gtk_dialog_add_button  (GTK_DIALOG (dialog),
+                         GTK_STOCK_NO,
+                         GTK_RESPONSE_REJECT);
+
+  gtk_dialog_add_button  (GTK_DIALOG (dialog),
+                         GTK_STOCK_CANCEL,
+                         GTK_RESPONSE_CANCEL);
+
+  response = gtk_dialog_run (GTK_DIALOG (dialog));
+
+  gtk_widget_destroy (dialog);
+
+  if ( response == GTK_RESPONSE_ACCEPT )
+    {
+      return TRUE;
+    }
+
+  return FALSE;
 }
 
 
@@ -388,6 +461,21 @@ psppire_window_set_filename (PsppireWindow *w, const gchar *filename)
   g_object_set (w, "filename", filename, NULL);
 }
 
+void
+psppire_window_set_unsaved (PsppireWindow *w, gboolean unsaved)
+{
+  w->unsaved = unsaved;
+
+  psppire_window_set_title (w);
+}
+
+gboolean
+psppire_window_get_unsaved (PsppireWindow *w)
+{
+  return w->unsaved;
+}
+
+
 \f