r18071 by fschmid - Fixed Bug #11352: Closing the Master Pages dialog automatically opens Arrange Pages dialog

[scribus-commit]

Author: fschmid
Date: Mon Jan  7 13:42:53 2013
New Revision: 18071

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18071
Log:
Fixed Bug #11352: Closing the Master Pages dialog automatically opens Arrange Pages dialog

Modified:
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/scribus.h

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18071&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Mon Jan  7 13:42:53 2013
@@ -8977,6 +8977,7 @@
 {
 	if (!HaveDoc)
 		return;
+	m_pagePalVisible = pagePalette->isVisible();
 	QString mpName = "";
 	if (temp.isEmpty())
 		mpName = doc->currentPage()->MPageNam;
@@ -9094,7 +9095,8 @@
 		Apply_MasterPage(doc->DocPages.at(c)->MPageNam, c, false);
 
 	pagePalette->endMasterPageMode();
-
+	pagePalette->setVisible(m_pagePalVisible);
+	scrActions["toolsPages"]->setChecked(m_pagePalVisible);
 	doc->setCurrentPage(doc->DocPages.at(storedPageNum));
 	doc->minCanvasCoordinate = doc->stored_minCanvasCoordinate;
 	doc->maxCanvasCoordinate = doc->stored_maxCanvasCoordinate;

Modified: trunk/Scribus/scribus/scribus.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18071&path=/trunk/Scribus/scribus/scribus.h
==============================================================================
--- trunk/Scribus/scribus/scribus.h (original)
+++ trunk/Scribus/scribus/scribus.h Mon Jan  7 13:42:53 2013
@@ -636,6 +636,7 @@
 	bool insertMarkDialog(PageItem_TextFrame* item, MarkType mT, ScItemsState* &is);
 	int m_marksCount; //remember marks count from last call
 	bool m_WasAutoSave;
+	bool m_pagePalVisible;
 };
 
 #endif