r17948 by jghali - Remove more use of ScMessageBox class
scribus-commit
scribus-commit at lists.scribus.net
Mon Dec 10 04:51:48 UTC 2012
Author: jghali
Date: Mon Dec 10 04:51:48 2012
New Revision: 17948
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17948
Log:
Remove more use of ScMessageBox class
Modified:
trunk/Scribus/scribus/prefsmanager.cpp
trunk/Scribus/scribus/scribus.cpp
Modified: trunk/Scribus/scribus/prefsmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17948&path=/trunk/Scribus/scribus/prefsmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/prefsmanager.cpp (original)
+++ trunk/Scribus/scribus/prefsmanager.cpp Mon Dec 10 04:51:48 2012
@@ -57,7 +57,6 @@
#include "ui/missing.h"
#include "ui/modetoolbar.h"
#include "ui/prefs_keyboardshortcuts.h"
-#include "ui/scmessagebox.h"
extern bool emergencyActivated;
Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17948&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Mon Dec 10 04:51:48 2012
@@ -709,8 +709,8 @@
bool ScribusMainWindow::warningVersion(QWidget *parent)
{
bool retval = false;
- int t = ScMessageBox::warning(parent, QObject::tr("Scribus Development Version"), "<qt>" +
- QObject::tr("You are running a development version of Scribus 1.3.x. The document you are working with was created in Scribus 1.2.x. Saving the current file under 1.3.x renders it unable to be edited in Scribus 1.2.x versions. To preserve the ability to edit in 1.2.x, save this file under a different name and further edit the newly named file and the original will be untouched. Are you sure you wish to proceed with this operation?") + "</qt>",
+ int t = QMessageBox::warning(parent, QObject::tr("Scribus Development Version"), "<qt>" +
+ QObject::tr("You are running a development version of Scribus 1.5.x. The document you are working with was created in Scribus 1.2.x. Saving the current file under 1.5.x renders it unable to be edited in Scribus 1.2.x versions. To preserve the ability to edit in 1.2.x, save this file under a different name and further edit the newly named file and the original will be untouched. Are you sure you wish to proceed with this operation?") + "</qt>",
QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Cancel);
if (t == QMessageBox::Ok)
retval = true;
More information about the scribus-commit
mailing list