[rkward-cvs] SF.net SVN: rkward: [2086] branches/KDE4_port

[tfry at users.sourceforge.net]

Revision: 2086
          http://rkward.svn.sourceforge.net/rkward/?rev=2086&view=rev
Author:   tfry
Date:     2007-10-16 08:26:31 -0700 (Tue, 16 Oct 2007)

Log Message:
-----------
Correct quitting logic

Modified Paths:
--------------
    branches/KDE4_port/TODO_KDE4
    branches/KDE4_port/rkward/rkward.cpp

Modified: branches/KDE4_port/TODO_KDE4
===================================================================
--- branches/KDE4_port/TODO_KDE4	2007-10-16 15:18:34 UTC (rev 2085)
+++ branches/KDE4_port/TODO_KDE4	2007-10-16 15:26:31 UTC (rev 2086)
@@ -34,7 +34,6 @@
 rkward
 	- does closing windows work
 	- does updating captions work (when switching windows / window url changes)?
-	- when selecting cancel while quitting, app still closes!
 
 output window
 	- does it reload all changed images?

Modified: branches/KDE4_port/rkward/rkward.cpp
===================================================================
--- branches/KDE4_port/rkward/rkward.cpp	2007-10-16 15:18:34 UTC (rev 2085)
+++ branches/KDE4_port/rkward/rkward.cpp	2007-10-16 15:26:31 UTC (rev 2086)
@@ -189,7 +189,10 @@
 
 	if (doQueryQuit ()) {
 		emit (aboutToQuitRKWard());
+		e->accept ();
 		new RKQuitAgent (this);
+	} else {
+		e->ignore ();
 	}
 }
 
@@ -507,10 +510,10 @@
 
 //	if (!RObjectList::getGlobalEnv ()->isEmpty ()) {
 	int res;
-	res = KMessageBox::questionYesNoCancel (this, i18n ("Quitting RKWard: Do you want to save the workspace?\nRKWard will remain open if you press Cancel"), i18n ("Save Workspace?"));
+	res = KMessageBox::questionYesNoCancel (this, i18n ("Quitting RKWard: Do you want to save the workspace?"), i18n ("Save Workspace?"), KStandardGuiItem::save (), KStandardGuiItem::discard (), KGuiItem (i18n ("Don't quit")));
 	if (res == KMessageBox::Yes) {
 		new RKSaveAgent (RObjectList::getObjectList ()->getWorkspaceURL (), false, RKSaveAgent::DoNothing);
-	} else if (res != KMessageBox::No) {
+	} else if (res == KMessageBox::Cancel) {
 		slotSetStatusReady ();
 		return false;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.