r18579 by craig - #11816: Disable some menu items on startup

[scribus-commit]

Author: craig
Date: Mon Oct 28 21:15:47 2013
New Revision: 18579

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18579
Log:
#11816: Disable some menu items on startup

Modified:
    trunk/Scribus/scribus/actionmanager.cpp
    trunk/Scribus/scribus/pdflib_core.cpp
    trunk/Scribus/scribus/scribus.cpp

Modified: trunk/Scribus/scribus/actionmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18579&path=/trunk/Scribus/scribus/actionmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/actionmanager.cpp (original)
+++ trunk/Scribus/scribus/actionmanager.cpp Mon Oct 28 21:15:47 2013
@@ -2526,6 +2526,7 @@
 	(*scrActions)["viewShowRulers"]->setEnabled(false);
 //	scrMenuMgr->setMenuEnabled("Insert", false);
 	(*scrActions)["insertFrame"]->setEnabled(false);
+	(*scrActions)["insertSampleText"]->setEnabled(false);
 	(*scrActions)["itemDuplicate"]->setEnabled(false);
 	(*scrActions)["itemMulDuplicate"]->setEnabled(false);
 	(*scrActions)["itemTransform"]->setEnabled(false);
@@ -2545,6 +2546,14 @@
 	(*scrActions)["itemPreviewNormal"]->setEnabled(false);
 	(*scrActions)["itemPreviewFull"]->setEnabled(false);
 	(*scrActions)["itemAttributes"]->setEnabled(false);
+	(*scrActions)["itemPDFAnnotationProps"]->setEnabled(false);
+	(*scrActions)["itemPDFFieldProps"]->setEnabled(false);
+	(*scrActions)["itemConvertToBezierCurve"]->setEnabled(false);
+	(*scrActions)["itemConvertToImageFrame"]->setEnabled(false);
+	(*scrActions)["itemConvertToOutlines"]->setEnabled(false);
+	(*scrActions)["itemConvertToPolygon"]->setEnabled(false);
+	(*scrActions)["itemConvertToTextFrame"]->setEnabled(false);
+	(*scrActions)["itemConvertToSymbolFrame"]->setEnabled(false);
 	(*scrActions)["toolsSelect"]->setEnabled(false);
 	(*scrActions)["toolsRotate"]->setEnabled(false);
 	(*scrActions)["toolsEditContents"]->setEnabled(false);

Modified: trunk/Scribus/scribus/pdflib_core.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18579&path=/trunk/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- trunk/Scribus/scribus/pdflib_core.cpp (original)
+++ trunk/Scribus/scribus/pdflib_core.cpp Mon Oct 28 21:15:47 2013
@@ -6274,7 +6274,7 @@
 		}
 	}
 	double patternScaleX, patternScaleY, patternOffsetX, patternOffsetY, patternRotation, patternSkewX, patternSkewY, patternSpace;
-	bool mirrorX, mirrorY;
+	bool mirrorX=false, mirrorY=false;
 	if (kind == 0)
 	{
 		currItem->patternTransform(patternScaleX, patternScaleY, patternOffsetX, patternOffsetY, patternRotation, patternSkewX, patternSkewY);

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18579&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Mon Oct 28 21:15:47 2013
@@ -11092,6 +11092,8 @@
 
 void ScribusMainWindow::slotInsertMarkNote()
 {
+	if (!HaveDoc)
+		return;
 	if (doc->m_docNotesStylesList.count() == 1)
 	{ //fast insert note with the only default notes style avaiable
 		PageItem* currItem = doc->m_Selection->itemAt(0);