r19566 by craig - #12764: Apply patch for locking issues

[scribus-commit]

Author: craig
Date: Wed Oct  8 21:59:25 2014
New Revision: 19566

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19566
Log:
#12764: Apply patch for locking issues

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

Modified: trunk/Scribus/scribus/appmodehelper.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19566&path=/trunk/Scribus/scribus/appmodehelper.cpp
==============================================================================
--- trunk/Scribus/scribus/appmodehelper.cpp (original)
+++ trunk/Scribus/scribus/appmodehelper.cpp Wed Oct  8 21:59:25 2014
@@ -538,6 +538,7 @@
 	(*a_scrActions)["toolsPDFAnnot3D"]->setEnabled(b2);
 #endif
 	(*a_scrActions)["itemDelete"]->setEnabled(b2);
+	(*a_scrActions)["itemLock"]->setEnabled(b2);
 	(*a_scrActions)["itemConvertToTextFrame"]->setEnabled(b2);
 	(*a_scrActions)["itemConvertToImageFrame"]->setEnabled(b2);
 	(*a_scrActions)["itemConvertToPolygon"]->setEnabled(b2);

Modified: trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19566&path=/trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp Wed Oct  8 21:59:25 2014
@@ -417,6 +417,7 @@
 	if (!m_haveDoc || !m_haveItem || !m_ScMW || m_ScMW->scriptIsRunning())
 		return;
 	doUnGroup->setEnabled(mode != modeEdit && mode != modeEditClip && m_item->isGroup());
+	doLock->setEnabled(mode != modeEditClip);
 }
 
 void PropertiesPalette_XYZ::handleSelectionChanged()