From: auroux <auroux>
Date: Mon, 18 Oct 2010 18:45:36 +0000 (+0000)
Subject: fix: close dialog should focus on "Save"
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=83f3c3f7a7a7b642be3121c596f55684809e719b;p=xournal.git

fix: close dialog should focus on "Save"
---

diff --git a/ChangeLog b/ChangeLog
index 82b8abb..a5b18ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@ This version:
   - Spanish translation (Alvaro), Brazil Portuguese translation (Marco Souza)
   - fix save bug with text boxes containing > 4095 characters
   - Czech translation (David Kolibac), Dutch translation (Timo Kluck)
+  - fix crash upon unplugging input devices
+  - change close dialog box default to "save" (patch by Kit Barnes)
 
 Version 0.4.5 (Oct 2, 2009):
   - bugfixes for GTK+ 2.16/2.17 issues with xinput events
diff --git a/src/xo-misc.c b/src/xo-misc.c
index cb8fd48..158b81b 100644
--- a/src/xo-misc.c
+++ b/src/xo-misc.c
@@ -1659,9 +1659,12 @@ gboolean ok_to_close(void)
 
   if (ui.saved) return TRUE;
   dialog = gtk_message_dialog_new(GTK_WINDOW (winMain), GTK_DIALOG_DESTROY_WITH_PARENT,
-    GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO, _("Save changes to '%s'?"),
+    GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, _("Save changes to '%s'?"),
     (ui.filename!=NULL) ? ui.filename:_("Untitled"));
+  gtk_dialog_add_button(GTK_DIALOG (dialog), GTK_STOCK_DISCARD, GTK_RESPONSE_NO);
+  gtk_dialog_add_button(GTK_DIALOG (dialog), GTK_STOCK_SAVE, GTK_RESPONSE_YES);
   gtk_dialog_add_button(GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+  gtk_dialog_set_default_response(GTK_DIALOG (dialog), GTK_RESPONSE_YES);
   response = gtk_dialog_run(GTK_DIALOG (dialog));
   gtk_widget_destroy(dialog);
   if (response == GTK_RESPONSE_CANCEL || response == GTK_RESPONSE_DELETE_EVENT)