r15415 by craig - Fix build issues for page layout variable

[scribus-commit]

Author: craig
Date: Fri Aug 13 21:14:35 2010
New Revision: 15415

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15415
Log:
Fix build issues for page layout variable

Modified:
    trunk/Scribus/scribus/plugins/imposition/imposition.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdpage.cpp
    trunk/Scribus/scribus/scpaths.cpp

Modified: trunk/Scribus/scribus/plugins/imposition/imposition.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15415&path=/trunk/Scribus/scribus/plugins/imposition/imposition.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/imposition/imposition.cpp (original)
+++ trunk/Scribus/scribus/plugins/imposition/imposition.cpp Fri Aug 13 21:14:35 2010
@@ -1276,11 +1276,11 @@
 		}
 		else
 		{
-			lastPage = firstPage + srcDoc->currentPageLayout;
+			lastPage = firstPage + srcDoc->pagePositioning();
 		}
 		
 		//make guides
-		double allWidth = srcDoc->pageWidth * (srcDoc->currentPageLayout+1);
+		double allWidth = srcDoc->pageWidth * (srcDoc->pagePositioning()+1);
 		double allHeight = srcDoc->pageHeight;
 		
 		double guide_x = (p->width() - allWidth)/2; //initial (left) guide
@@ -1341,7 +1341,7 @@
 		}
 		else
 		{
-			lastPage = firstPage + srcDoc->currentPageLayout;
+			lastPage = firstPage + srcDoc->pagePositioning();
 		}
 		
 		targetDoc->setCurrentPage(targetDoc->Pages->at(1));
@@ -1474,12 +1474,12 @@
 
 bool Imposition::verifyFold()
 {
-	if (srcDoc->currentPageLayout == 0) {
+	if (srcDoc->pagePositioning() == 0) {
 		return false;
 		
 	}
 	
-	if (pageWidthBox->value() < (srcDoc->currentPageLayout + 1)*srcDoc->pageWidth ||
+	if (pageWidthBox->value() < (srcDoc->pagePositioning() + 1)*srcDoc->pageWidth ||
 		   pageHeightBox->value() < srcDoc->pageHeight)
 	{
 		return false;

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15415&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.cpp Fri Aug 13 21:14:35 2010
@@ -116,7 +116,7 @@
 	if(!checkHaveDocument())
 		return NULL;
 	MarginStruct margins(ValueToPoint(tpr), ValueToPoint(lr), ValueToPoint(btr), ValueToPoint(rr));
-	ScCore->primaryMainWindow()->doc->resetPage(ScCore->primaryMainWindow()->doc->currentPageLayout, &margins);
+	ScCore->primaryMainWindow()->doc->resetPage(ScCore->primaryMainWindow()->doc->pagePositioning(), &margins);
 	ScCore->primaryMainWindow()->view->reformPages();
 	ScCore->primaryMainWindow()->doc->setModified(true);
 	ScCore->primaryMainWindow()->view->GotoPage(ScCore->primaryMainWindow()->doc->currentPageNumber());
@@ -282,8 +282,8 @@
 		return NULL;
 	if(!checkHaveDocument())
 		return NULL;
-	if (ScCore->primaryMainWindow()->doc->currentPageLayout == fp)
-		ScCore->primaryMainWindow()->doc->setPageSetFirstPage(ScCore->primaryMainWindow()->doc->currentPageLayout, fsl);
+	if (ScCore->primaryMainWindow()->doc->pagePositioning() == fp)
+		ScCore->primaryMainWindow()->doc->setPageSetFirstPage(ScCore->primaryMainWindow()->doc->pagePositioning(), fsl);
 	ScCore->primaryMainWindow()->view->reformPages();
 	ScCore->primaryMainWindow()->view->GotoPage(ScCore->primaryMainWindow()->doc->currentPageNumber()); // is this needed?
 	ScCore->primaryMainWindow()->view->DrawNew();   // is this needed?

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdpage.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15415&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdpage.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdpage.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdpage.cpp Fri Aug 13 21:14:35 2010
@@ -117,7 +117,7 @@
 		return NULL;
 
 	int loc = (e > -1) ? e : ScCore->primaryMainWindow()->doc->Pages->count();
-	if (ScCore->primaryMainWindow()->doc->pageSets()[ScCore->primaryMainWindow()->doc->currentPageLayout].Columns != 1)
+	if (ScCore->primaryMainWindow()->doc->pageSets()[ScCore->primaryMainWindow()->doc->pagePositioning()].Columns != 1)
 	{
 		switch (ScCore->primaryMainWindow()->doc->locationOfPage(loc))
 		{
@@ -386,7 +386,7 @@
 
 		QString qName(CommonStrings::trMasterPageNormal);
 
-		if (ScCore->primaryMainWindow()->doc->pageSets()[ScCore->primaryMainWindow()->doc->currentPageLayout].Columns != 1) {
+		if (ScCore->primaryMainWindow()->doc->pageSets()[ScCore->primaryMainWindow()->doc->pagePositioning()].Columns != 1) {
 			ScCore->primaryMainWindow()->doc->locationOfPage(loc);
 			switch (ScCore->primaryMainWindow()->doc->locationOfPage(loc))
 			{

Modified: trunk/Scribus/scribus/scpaths.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15415&path=/trunk/Scribus/scribus/scpaths.cpp
==============================================================================
--- trunk/Scribus/scribus/scpaths.cpp (original)
+++ trunk/Scribus/scribus/scpaths.cpp Fri Aug 13 21:14:35 2010
@@ -63,7 +63,7 @@
 // obtained from the system.
 #ifdef Q_WS_MAC
 	QString pathPtr(bundleDir());
-	qDebug() << QString("scpaths: bundle at %1:").arg(pathPtr);
+	qDebug() << QString("scpaths: bundle at %1").arg(pathPtr);
 	m_shareDir = QString("%1/Contents/share/scribus/").arg(pathPtr);
 	m_docDir = QString("%1/Contents/share/doc/scribus/").arg(pathPtr);
 	m_iconDir = QString("%1/Contents/share/scribus/icons/").arg(pathPtr);