Revision: 1912
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=1912&view=rev
Author: Sikon
Date: 2008-01-04 10:33:32 -0800 (Fri, 04 Jan 2008)
Log Message:
-----------
Quit confirmation enhancement
Modified Paths:
--------------
gtkpod/trunk/ChangeLog
gtkpod/trunk/src/misc_confirm.c
Modified: gtkpod/trunk/ChangeLog
===================================================================
--- gtkpod/trunk/ChangeLog 2008-01-04 17:58:33 UTC (rev 1911)
+++ gtkpod/trunk/ChangeLog 2008-01-04 18:33:32 UTC (rev 1912)
@@ -5,7 +5,12 @@
* src/display_playlists.c:
A bit more UI polish in the main window. Sane defaults for pane sizes.
+
+ * src/misc_confirm.c:
+ Made the quit confirmation use three buttons (Quit without saving,
+ Cancel, Save), per HIG.
+
2008-01-03 Todd Zullinger <tmzullinger at users.sourceforge.net>
* data/icons/hicolor/*:
Modified: gtkpod/trunk/src/misc_confirm.c
===================================================================
--- gtkpod/trunk/src/misc_confirm.c 2008-01-04 17:58:33 UTC (rev 1911)
+++ gtkpod/trunk/src/misc_confirm.c 2008-01-04 18:33:32 UTC (rev 1912)
@@ -860,23 +860,33 @@
*
* return value: TRUE if it's OK to quit.
*/
-static gboolean
-ok_to_close_gtkpod (void)
+static gboolean ok_to_close_gtkpod (void)
{
gint result = GTK_RESPONSE_OK;
if (!files_are_saved ())
{
- const gchar *str = _("Data has been changed and not been saved.
If you quit gtkpod, all unsaved changes will be lost.\n\nAre you sure you want
to quit?");
+ const gchar *str = _("Data has been changed and not been saved.
If you quit gtkpod, all unsaved changes will be lost.\n\nADo you want to save
your changes first?");
- result = gtkpod_confirmation_simple(GTK_WINDOW (gtkpod_window),
+ result = gtkpod_confirmation_hig(GTK_WINDOW (gtkpod_window),
GTK_MESSAGE_WARNING,
-
_("Unsaved data present"),
+
_("Save changes before quiting?"),
str,
-
GTK_STOCK_QUIT);
+
GTK_STOCK_SAVE,
+
GTK_STOCK_CANCEL,
+
_("Quit without saving"),
+
NULL);
}
- return (result == GTK_RESPONSE_OK);
+ /* User pressed Cancel */
+ if (result == GTK_RESPONSE_CANCEL)
+ return FALSE;
+
+ /* User pressed Save */
+ if (result == GTK_RESPONSE_OK)
+ handle_export ();
+
+ return TRUE;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
