r19274 by craig - #12362: Allow Preview mode in Master Page Mode. Not sure why this was disabled, seems to work. Remove old code from scribus.cpp now replaced by AppModeHelper

[scribus-commit]

Author: craig
Date: Mon Jun 23 21:15:43 2014
New Revision: 19274

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19274
Log:
#12362: Allow Preview mode in Master Page Mode. Not sure why this was disabled, seems to work. Remove old code from scribus.cpp now replaced by AppModeHelper

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

Modified: trunk/Scribus/scribus/appmodehelper.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19274&path=/trunk/Scribus/scribus/appmodehelper.cpp
==============================================================================
--- trunk/Scribus/scribus/appmodehelper.cpp (original)
+++ trunk/Scribus/scribus/appmodehelper.cpp Mon Jun 23 21:15:43 2014
@@ -202,7 +202,7 @@
 #ifdef HAVE_OSG
 	(*scrActions)["toolsPDFAnnot3D"]->setEnabled(b2);
 #endif
-	(*scrActions)["viewPreviewMode"]->setEnabled(b2);
+	//(*scrActions)["viewPreviewMode"]->setEnabled(b2);
 }
 
 void AppModeHelper::changeLayer(ScribusDoc *doc, bool clipScrapHaveData)

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19274&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Mon Jun 23 21:15:43 2014
@@ -8364,7 +8364,6 @@
 	scrMenuMgr->setMenuEnabled("FileOpenRecent", false);
 	scrActions["fileClose"]->setToolTip( tr("Click here to leave master page edit mode."));
 	scrActions["fileClose"]->setIcon(loadIcon("22/exit.png"));
-	scrActions["viewPreviewMode"]->setEnabled(false);
 }
 
 void ScribusMainWindow::editMasterPagesEnd()
@@ -8382,7 +8381,6 @@
 	appModeHelper.setMasterPageEditMode(false, doc);
 	scrActions["fileClose"]->setToolTip( tr("Close"));
 	scrActions["fileClose"]->setIcon(loadIcon("22/close.png"));
-	scrActions["viewPreviewMode"]->setEnabled(true);
 	scrMenuMgr->setMenuEnabled("FileOpenRecent", true);
 	uint pageCount=doc->DocPages.count();
 	for (uint c=0; c<pageCount; ++c)