r17944 by jghali - #11242 : Yes to all/Yes logic inverted

[scribus-commit]

Author: jghali
Date: Sun Dec  9 23:02:43 2012
New Revision: 17944

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17944
Log:
#11242 : Yes to all/Yes logic inverted

Modified:
    trunk/Scribus/scribus/scribusdoc.cpp
    trunk/Scribus/scribus/ui/scmessagebox.cpp

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17944&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Sun Dec  9 23:02:43 2012
@@ -31,12 +31,13 @@
 #include <QEventLoop>
 #include <QFile>
 #include <QList>
-#include <QtAlgorithms>
-#include <QTime>
+#include <QMessageBox>
 #include <QPainter>
 #include <QPixmap>
 #include <QPointer>
 #include <QProgressBar>
+#include <QtAlgorithms>
+#include <QTime>
 #include <qtconcurrentmap.h>
 
 #include "canvas.h"
@@ -112,7 +113,6 @@
 #include "ui/markanchor.h"
 #include "ui/markvariabletext.h"
 #include "ui/marksmanager.h"
-#include "ui/scmessagebox.h"
 #include "ui/storyeditor.h"
 
 // static const bool FRAMESELECTION_EDITS_DEFAULTSTYLE = false;
@@ -11187,7 +11187,7 @@
 			if (currItem->itemText.length() != 0 && (currItem->nextInChain() == 0 || currItem->prevInChain() == 0))
 			{
 				int btnYesToAll = (i < (selectedItemCount - 1)) ? QMessageBox::YesToAll : 0;
-				int t = ScMessageBox::warning(m_ScMW, CommonStrings::trWarning,
+				int t = QMessageBox::warning(m_ScMW, CommonStrings::trWarning,
 									tr("Do you really want to clear all your text?"),
 									QMessageBox::Yes, QMessageBox::No | QMessageBox::Default, btnYesToAll);
 				if (t == QMessageBox::No)
@@ -17914,7 +17914,7 @@
 
 	if (!errStr.isEmpty() && ScCore->usingGUI())
 	{
-		ScMessageBox::warning(this->scMW(), QObject::tr("Unaceptable settings for Notes Style"), "<qt>"+ errStr +"</qt>", QMessageBox::Ok, QMessageBox::Abort | QMessageBox::Default);
+		QMessageBox::warning(this->scMW(), QObject::tr("Unaceptable settings for Notes Style"), "<qt>"+ errStr +"</qt>", QMessageBox::Ok, QMessageBox::Abort | QMessageBox::Default);
 		return false;
 	}
 	return true;

Modified: trunk/Scribus/scribus/ui/scmessagebox.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17944&path=/trunk/Scribus/scribus/ui/scmessagebox.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scmessagebox.cpp (original)
+++ trunk/Scribus/scribus/ui/scmessagebox.cpp Sun Dec  9 23:02:43 2012
@@ -188,7 +188,7 @@
 	int b0=button0, b1=button1, b2=button2;
 	int buttonsUsed=swapButtonValues(b0, b1, b2);
 	int stdReturn=QMessageBox::information(parent, caption, text, b0, b1, b2);
-	return swapReturnValues(b0, b1, b2, stdReturn, buttonsUsed);
+	return stdReturn /*swapReturnValues(b0, b1, b2, stdReturn, buttonsUsed)*/;
 }
 
 int ScMessageBox::information ( QWidget * parent, const QString & caption, const QString & text, const QString & button0Text, const QString & button1Text, const QString & button2Text, int defaultButtonNumber, int escapeButtonNumber)
@@ -205,7 +205,7 @@
 	int b0=button0, b1=button1, b2=button2;
 	int buttonsUsed=swapButtonValues(b0, b1, b2);
 	int stdReturn=QMessageBox::question(parent, caption, text, b0, b1, b2);
-	return swapReturnValues(b0, b1, b2, stdReturn, buttonsUsed);
+	return stdReturn /*swapReturnValues(b0, b1, b2, stdReturn, buttonsUsed)*/;
 }
 
 int ScMessageBox::question ( QWidget * parent, const QString & caption, const QString & text, const QString & button0Text, const QString & button1Text, const QString & button2Text, int defaultButtonNumber, int escapeButtonNumber)
@@ -222,7 +222,7 @@
 	int b0=button0, b1=button1, b2=button2;
 	int buttonsUsed=swapButtonValues(b0, b1, b2);
 	int stdReturn=QMessageBox::warning(parent, caption, text, b0, b1, b2);
-	return swapReturnValues(b0, b1, b2, stdReturn, buttonsUsed);
+	return stdReturn /*swapReturnValues(b0, b1, b2, stdReturn, buttonsUsed)*/;
 }
 
 int ScMessageBox::warning ( QWidget * parent, const QString & caption, const QString & text, const QString & button0Text, const QString & button1Text, const QString & button2Text, int defaultButtonNumber, int escapeButtonNumber)
@@ -239,7 +239,7 @@
 	int b0=button0, b1=button1, b2=button2;
 	int buttonsUsed=swapButtonValues(b0, b1, b2);
 	int stdReturn=QMessageBox::critical(parent, caption, text, b0, b1, b2);
-	return swapReturnValues(b0, b1, b2, stdReturn, buttonsUsed);
+	return stdReturn /*swapReturnValues(b0, b1, b2, stdReturn, buttonsUsed)*/;
 }
 
 int ScMessageBox::critical ( QWidget * parent, const QString & caption, const QString & text, const QString & button0Text, const QString & button1Text, const QString & button2Text, int defaultButtonNumber, int escapeButtonNumber)