r14367 by jghali - #8603 : incorrect default masterpage name when inserting single page

scribus-commit scribus-commit at lists.scribus.net
Sat Nov 28 14:25:19 CET 2009


Revision: 14367
Author: jghali
Date: 2009-11-28T03:49:08.074620Z
Commit message: #8603 : incorrect default masterpage name when inserting single page

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

Diffs:
Index: scribus/inspage.cpp
===================================================================
--- scribus/inspage.cpp	(revision 14366)
+++ scribus/inspage.cpp	(revision 14367)
@@ -74,6 +74,8 @@
 		QComboBox* pageData = new QComboBox(masterPageGroup);
 		for (QMap<QString,int>::Iterator it = currentDoc->MasterNames.begin(); it != currentDoc->MasterNames.end(); ++it)
 			pageData->addItem(it.key() == CommonStrings::masterPageNormal ? CommonStrings::trMasterPageNormal : it.key());
+		if (currentDoc->MasterNames.contains( CommonStrings::trMasterPageNormal))
+			setCurrentComboItem(pageData, CommonStrings::trMasterPageNormal);
 		masterPageLabel = new QLabel(tr("&Master Page:"), masterPageGroup);
 		masterPageLabel->setBuddy(pageData);
 		masterPageLayout->addWidget( masterPageLabel, 0, 0 );




More information about the scribus-commit mailing list