Add "x" prefix to calls to plain malloc(), calloc(), strdup(), realloc().

[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 7a4f8cefbd16885b6d983410db4941cca29251f3..990e4ab5fed6245b33df401868c4c5f79a206feb 100644 (file)
--- a/src/ui/gui/psppire-window.c
+++ b/src/ui/gui/psppire-window.c
@@ -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);
 
@@ -315,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);
@@ -382,12 +385,17 @@ on_delete (PsppireWindow *w, GdkEvent *event, gpointer user_data)
     {
       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;
        }
     }
 
@@ -403,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);
 
@@ -426,51 +435,70 @@ psppire_window_init (PsppireWindow *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));
 
@@ -480,6 +508,7 @@ psppire_window_query_save (PsppireWindow *se)
 }
 
 
+
 const gchar *
 psppire_window_get_filename (PsppireWindow *w)
 {
@@ -498,9 +527,10 @@ psppire_window_set_filename (PsppireWindow *w, const gchar *filename)
 void
 psppire_window_set_unsaved (PsppireWindow *w)
 {
-  w->dirty = TRUE;
+  if ( w->dirty == FALSE)
+    g_get_current_time (&w->savetime);
 
-  g_get_current_time (&w->savetime);
+  w->dirty = TRUE;
 
   psppire_window_set_title (w);
 }
@@ -576,6 +606,9 @@ 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;
@@ -599,6 +632,7 @@ psppire_window_load (PsppireWindow *w, const gchar *file)
 
   if ( ok )
     {
+      psppire_window_set_filename (w, file);
       add_most_recent (file, the_recent_mgr);
       w->dirty = FALSE;
     }
@@ -627,7 +661,7 @@ add_most_recent (const char *file_name, GtkRecentManager *rm)
 
 
 
-/* 
+/*
    If FILE_NAME exists in the recent list, then  delete it.
  */
 static void
@@ -639,6 +673,5 @@ delete_recent (const char *file_name, GtkRecentManager *rm)
     gtk_recent_manager_remove_item (rm, uri, NULL);
 
   g_free (uri);
-  
 }