r18250 by craig - #11107: Set default for page import list to be * (all), and remove default text. Fix minor layout issue in related message box

[scribus-commit]

Author: craig
Date: Sun Apr 14 14:50:54 2013
New Revision: 18250

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18250
Log:
#11107: Set default for page import list to be * (all), and remove default text. Fix minor layout issue in related message box

Modified:
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/ui/mergedoc.cpp

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18250&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Sun Apr 14 14:50:54 2013
@@ -3836,7 +3836,7 @@
 			{
 				qApp->setOverrideCursor(QCursor(Qt::ArrowCursor));
 				int scmReturn=ScMessageBox::information(this, tr("Import Page(s)"), "<qt>" +
-				QObject::tr("<p>You are trying to import more pages than there are available in the current document counting from the active page.</p>Choose one of the following:<br>"
+				QObject::tr("<p>You are trying to import more pages than there are available in the current document counting from the active page.</p>Choose one of the following:"
 				"<ul><li><b>Create</b> missing pages</li>"
 				"<li><b>Import</b> pages until the last page</li>"
 				"<li><b>Cancel</b></li></ul>") + "</qt>",

Modified: trunk/Scribus/scribus/ui/mergedoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18250&path=/trunk/Scribus/scribus/ui/mergedoc.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/mergedoc.cpp (original)
+++ trunk/Scribus/scribus/ui/mergedoc.cpp Sun Apr 14 14:50:54 2013
@@ -75,7 +75,6 @@
 		                           "a range of pages or a single page number.") + "</qt>");
 		fromInfoLayout->addWidget( pageNumberData, 1, 1 );
 		fromLabel = new QLabel(this);
-		fromLabel->setText( tr(" from 0"));
 		fromInfoLayout->addWidget( fromLabel, 1, 2 );
 		createPageData = new QCheckBox( this );
 		createPageData->setText( tr("Create Page(s)"));
@@ -169,6 +168,7 @@
 				else
 				{
 					pageNumberData->setEnabled(true);
+					pageNumberData->setText("*");
 				}
 				if (!masterPages)
 					fromLabel->setText( tr(" from %1").arg(count));