r19552 by craig - #12751: Apply patch to disable menu items

[scribus-commit]

Author: craig
Date: Sun Oct  5 13:17:32 2014
New Revision: 19552

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19552
Log:
#12751: Apply patch to disable menu items

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

Modified: trunk/Scribus/scribus/appmodehelper.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19552&path=/trunk/Scribus/scribus/appmodehelper.cpp
==============================================================================
--- trunk/Scribus/scribus/appmodehelper.cpp (original)
+++ trunk/Scribus/scribus/appmodehelper.cpp Sun Oct  5 13:17:32 2014
@@ -544,6 +544,8 @@
 	(*a_scrActions)["itemConvertToBezierCurve"]->setEnabled(b2);
 	(*a_scrActions)["itemConvertToOutlines"]->setEnabled(b2);
 	(*a_scrActions)["itemConvertToSymbolFrame"]->setEnabled(b2);
+	(*a_scrActions)["pageImport"]->setEnabled(b2);
+	(*a_scrActions)["pageCopyToMasterPage"]->setEnabled(b2);
 
 	setActionGroupEnabled(a_scrLayersActions, b2);
 }

Modified: trunk/Scribus/scribus/canvasgesture_rulermove.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19552&path=/trunk/Scribus/scribus/canvasgesture_rulermove.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasgesture_rulermove.cpp (original)
+++ trunk/Scribus/scribus/canvasgesture_rulermove.cpp Sun Oct  5 13:17:32 2014
@@ -43,6 +43,7 @@
 void RulerGesture::drawControls(QPainter* p)
 {
 	int page = -1;
+	//This is !null where we've entered the RulerGesture::mouseMoveEvent
 	if (!m_mousePoint.isNull())
 		page = m_doc->OnPage(m_mousePoint.x(), m_mousePoint.y());
 	if (page == -1)