r15802 by jghali - #9476 : not appearing guide issues when applying masterpages with guides

[scribus-commit]

Author: jghali
Date: Sun Nov  7 15:58:50 2010
New Revision: 15802

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15802
Log:
#9476 : not appearing guide issues when applying masterpages with guides

Modified:
    branches/Version135/Scribus/scribus/guidemanager.cpp
    branches/Version135/Scribus/scribus/guidemanager.h
    branches/Version135/Scribus/scribus/scribus.cpp
    branches/Version135/Scribus/scribus/scribusdoc.cpp

Modified: branches/Version135/Scribus/scribus/guidemanager.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15802&path=/branches/Version135/Scribus/scribus/guidemanager.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/guidemanager.cpp (original)
+++ branches/Version135/Scribus/scribus/guidemanager.cpp Sun Nov  7 15:58:50 2010
@@ -122,14 +122,14 @@
 	tabWidget->setEnabled(doc ? true : false);
 }
 
-void GuideManager::setupPage()
+void GuideManager::setupPage(bool storeValues)
 {
 	if (!m_Doc)
 		return;
 	m_drawGuides = false;
 	setEnabled(true);
 	// store old values for current page (=page to leave)
-	if (currentPage)
+	if (currentPage && storeValues)
 		storePageValues(currentPage);
 
 	currentPage = m_Doc->currentPage();

Modified: branches/Version135/Scribus/scribus/guidemanager.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15802&path=/branches/Version135/Scribus/scribus/guidemanager.h
==============================================================================
--- branches/Version135/Scribus/scribus/guidemanager.h (original)
+++ branches/Version135/Scribus/scribus/guidemanager.h Sun Nov  7 15:58:50 2010
@@ -42,7 +42,7 @@
 
 	/*! \brief Set the widgets on the page change.
 	It has to be called on every page to page transition */
-	void setupPage();
+	void setupPage(bool storeValues = true);
 	void setupGui();
 
 	/*! \brief Clear and reset the GUI horizontal list widget. */

Modified: branches/Version135/Scribus/scribus/scribus.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15802&path=/branches/Version135/Scribus/scribus/scribus.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/scribus.cpp (original)
+++ branches/Version135/Scribus/scribus/scribus.cpp Sun Nov  7 15:58:50 2010
@@ -8427,7 +8427,10 @@
 	//CB done by doc::reformpages
 	//slotDocCh();
 	pagePalette->Rebuild();
-	guidePalette->setupPage();
+	// #9476 : call setupPage with false arg to setup only guidePalette GUI
+	// Otherwise setupPage() will apply guides to current page, doesn't need that, 
+	// Apply_MasterPage() has already done it
+	guidePalette->setupPage(false);
 	delete dia;
 }
 

Modified: branches/Version135/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15802&path=/branches/Version135/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/scribusdoc.cpp (original)
+++ branches/Version135/Scribus/scribus/scribusdoc.cpp Sun Nov  7 15:58:50 2010
@@ -9012,7 +9012,9 @@
 		m_ScMW->guidePalette->setDoc(this);
 		if (!isLoading())
 		{
-			m_ScMW->guidePalette->setupPage();
+			// #9476 : call setupPage with false arg to setup only guidePalette GUI
+			// Otherwise expect problems when applying masterpages with guides
+			m_ScMW->guidePalette->setupPage(false);
 			m_ScMW->pagePalette->markPage(newPage->pageNr());
 		}
 	}