r15085 by cbradney - #8149: Backport the gs warning message change to 137svn

scribus-commit scribus-commit at lists.scribus.net
Wed May 19 00:40:28 CEST 2010


Revision: 15085
Author: cbradney
Date: 2010-05-18T22:35:19.397190Z
Commit message: #8149: Backport the gs warning message change to 137svn

Changeset: 
M  /branches/Version135/Scribus/scribus/about.cpp
M  /branches/Version135/Scribus/scribus/scribus.cpp

Diffs:
Index: scribus/about.cpp
===================================================================
--- scribus/about.cpp	(revision 15084)
+++ scribus/about.cpp	(revision 15085)
@@ -114,7 +114,7 @@
 	buildID = new QLabel( tab );
 	buildID->setAlignment(Qt::AlignCenter);
 	buildID->setTextInteractionFlags(Qt::TextSelectableByMouse);
-	QString BUILD_DAY = "01";
+	QString BUILD_DAY = "18";
 	QString BUILD_MONTH = CommonStrings::may;
 	QString BUILD_YEAR = "2010";
 	QString BUILD_TIME = "";
Index: scribus/scribus.cpp
===================================================================
--- scribus/scribus.cpp	(revision 15084)
+++ scribus/scribus.cpp	(revision 15085)
@@ -7648,13 +7648,22 @@
 	QString mess;
 	if (!ScCore->haveGS())
 	{
-		mess = tr("The following programs are missing:")+"\n\n";
+		QMessageBox mb(this);
+		QString msg = tr("Ghostscript is not installed on your system, or Scribus is not configured with the path to the software.");
+		QString msg2("<qt>");
 #ifndef _WIN32
-		mess += tr("Ghostscript : You cannot use EPS images or Print Preview")+"\n\n";
+		msg2 += tr("Until this is remedied, you cannot import EPS images or use Print Preview. ")+"\n";
 #else
-		mess += tr("Ghostscript : You cannot use EPS images or PostScript Print Preview")+"\n\n";
+		msg2 += tr("Until this is remedied, you cannot import EPS images or use PostScript Print Preview. ")+"\n";
 #endif
-		QMessageBox::warning(this, CommonStrings::trWarning, mess, 1, 0, 0);
+		msg2 += tr("Please read our <a href=\"http://wiki.scribus.net/index.php/Ghostscript\">help and installation instructions</a>.") + "</qt>";
+		QMessageBox msgBox;
+		msgBox.addButton(QMessageBox::Ok);
+		msgBox.setIcon(QMessageBox::Warning);
+		msgBox.setWindowTitle( tr("Ghostscript is missing") );
+		msgBox.setText(msg);
+		msgBox.setInformativeText(msg2);
+		msgBox.exec();
 	}
 
 	propertiesPalette->startup();




More information about the scribus-commit mailing list