r19205 by craig - #12366: Disable embed image on last doc close, re-sort code in same section alphabetically

scribus-commit scribus-commit at lists.scribus.net
Wed Jun 11 18:51:05 UTC 2014


Author: craig
Date: Wed Jun 11 18:51:05 2014
New Revision: 19205

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19205
Log:
#12366: Disable embed image on last doc close, re-sort code in same section alphabetically

Modified:
    trunk/Scribus/scribus/appmodehelper.cpp

Modified: trunk/Scribus/scribus/appmodehelper.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19205&path=/trunk/Scribus/scribus/appmodehelper.cpp
==============================================================================
--- trunk/Scribus/scribus/appmodehelper.cpp (original)
+++ trunk/Scribus/scribus/appmodehelper.cpp Wed Jun 11 18:51:05 2014
@@ -410,118 +410,120 @@
 
 void AppModeHelper::mainWindowCloseLastDoc()
 {
-	(*scrActions)["fileDocSetup150"]->setEnabled(false);
-	(*scrActions)["filePrint"]->setEnabled(false);
-	(*scrActions)["fileSave"]->setEnabled(false);
-	(*scrActions)["fileSaveAs"]->setEnabled(false);
-	(*scrActions)["fileRevert"]->setEnabled(false);
-	(*scrActions)["fileCollect"]->setEnabled(false);
-	(*scrActions)["fileClose"]->setEnabled(false);
 	if ( ScCore->haveGS() || ScCore->isWinGUI() )
 		(*scrActions)["PrintPreview"]->setEnabled(false);
 	if ((*scrActions)["SaveAsDocumentTemplate"])
 		(*scrActions)["SaveAsDocumentTemplate"]->setEnabled(false);
+	(*scrActions)["editClearContents"]->setEnabled(false);
+	(*scrActions)["editCopy"]->setEnabled(false);
+	(*scrActions)["editCut"]->setEnabled(false);
+	(*scrActions)["editDeselectAll"]->setEnabled(false);
+	(*scrActions)["editEditRenderSource"]->setEnabled(false);
+	(*scrActions)["editEditWithImageEditor"]->setEnabled(false);
+	(*scrActions)["editJavascripts"]->setEnabled(false);
+	(*scrActions)["editMarks"]->setEnabled(false);
+	(*scrActions)["editMasterPages"]->setEnabled(false);
+	(*scrActions)["editNotesStyles"]->setEnabled(false);
+	(*scrActions)["editPaste"]->setEnabled(false);
+	(*scrActions)["editRedoAction"]->setEnabled(false);
+	(*scrActions)["editReplaceColors"]->setEnabled(false);
+	(*scrActions)["editSearchReplace"]->setEnabled(false);
+	(*scrActions)["editSelectAll"]->setEnabled(false);
+	(*scrActions)["editSelectAllOnLayer"]->setEnabled(false);
+	(*scrActions)["editStyles"]->setEnabled(false);
+	(*scrActions)["editUndoAction"]->setEnabled(false);
+	(*scrActions)["extrasDeHyphenateText"]->setEnabled(false);
+	(*scrActions)["extrasHyphenateText"]->setEnabled(false);
+	(*scrActions)["fileClose"]->setEnabled(false);
+	(*scrActions)["fileCollect"]->setEnabled(false);
+	(*scrActions)["fileDocSetup150"]->setEnabled(false);
+	(*scrActions)["fileExportAsEPS"]->setEnabled(false);
 	(*scrActions)["fileExportAsPDF"]->setEnabled(false);
 	(*scrActions)["fileExportText"]->setEnabled(false);
-	(*scrActions)["fileExportAsEPS"]->setEnabled(false);
+	(*scrActions)["fileImportAppendText"]->setEnabled(false);
+	(*scrActions)["fileImportImage"]->setEnabled(false);
 	(*scrActions)["fileImportText"]->setEnabled(false);
 	(*scrActions)["fileImportText2"]->setEnabled(false);
-	(*scrActions)["fileImportImage"]->setEnabled(false);
-	(*scrActions)["fileImportAppendText"]->setEnabled(false);
 	(*scrActions)["fileImportVector"]->setEnabled(false);
-	(*scrActions)["pageInsert"]->setEnabled(false);
-	(*scrActions)["pageImport"]->setEnabled(false);
+	(*scrActions)["filePrint"]->setEnabled(false);
+	(*scrActions)["fileRevert"]->setEnabled(false);
+	(*scrActions)["fileSave"]->setEnabled(false);
+	(*scrActions)["fileSaveAs"]->setEnabled(false);
+	(*scrActions)["insertFrame"]->setEnabled(false);
+	(*scrActions)["insertSampleText"]->setEnabled(false);
+	(*scrActions)["itemAdjustFrameToImage"]->setEnabled(false);
+	(*scrActions)["itemAdjustImageToFrame"]->setEnabled(false);
+	(*scrActions)["itemAttributes"]->setEnabled(false);
+	(*scrActions)["itemDelete"]->setEnabled(false);
+	(*scrActions)["itemDuplicate"]->setEnabled(false);
+	(*scrActions)["itemExtendedImageProperties"]->setEnabled(false);
+	(*scrActions)["itemLower"]->setEnabled(false);
+	(*scrActions)["itemLowerToBottom"]->setEnabled(false);
+	(*scrActions)["itemMulDuplicate"]->setEnabled(false);
+	(*scrActions)["itemPreviewFull"]->setEnabled(false);
+	(*scrActions)["itemPreviewLow"]->setEnabled(false);
+	(*scrActions)["itemPreviewNormal"]->setEnabled(false);
+	(*scrActions)["itemRaise"]->setEnabled(false);
+	(*scrActions)["itemRaiseToTop"]->setEnabled(false);
+	(*scrActions)["itemSendToInline"]->setEnabled(false);
+	(*scrActions)["itemSendToPattern"]->setEnabled(false);
+	(*scrActions)["itemToggleInlineImage"]->setEnabled(false);
+	(*scrActions)["itemTransform"]->setEnabled(false);
+	(*scrActions)["itemUpdateImage"]->setEnabled(false);
+	(*scrActions)["pageApplyMasterPage"]->setEnabled(false);
+	(*scrActions)["pageCopy"]->setEnabled(false);
+	(*scrActions)["pageCopyToMasterPage"]->setEnabled(false);
 	(*scrActions)["pageDelete"]->setEnabled(false);
 	(*scrActions)["pageImport"]->setEnabled(false);
-	(*scrActions)["pageMove"]->setEnabled(false);
-	(*scrActions)["pageCopy"]->setEnabled(false);
-	(*scrActions)["pageApplyMasterPage"]->setEnabled(false);
-	(*scrActions)["pageCopyToMasterPage"]->setEnabled(false);
+	(*scrActions)["pageImport"]->setEnabled(false);
+	(*scrActions)["pageInsert"]->setEnabled(false);
 	(*scrActions)["pageManageGuides"]->setEnabled(false);
 	(*scrActions)["pageManageMargins"]->setEnabled(false);
-	(*scrActions)["editUndoAction"]->setEnabled(false);
-	(*scrActions)["editRedoAction"]->setEnabled(false);
-	(*scrActions)["editCut"]->setEnabled(false);
-	(*scrActions)["editCopy"]->setEnabled(false);
-	(*scrActions)["editPaste"]->setEnabled(false);
-	(*scrActions)["editClearContents"]->setEnabled(false);
-	(*scrActions)["editSelectAll"]->setEnabled(false);
-	(*scrActions)["editSelectAllOnLayer"]->setEnabled(false);
-	(*scrActions)["editDeselectAll"]->setEnabled(false);
-	(*scrActions)["editReplaceColors"]->setEnabled(false);
-	(*scrActions)["editStyles"]->setEnabled(false);
-	(*scrActions)["editMarks"]->setEnabled(false);
-	(*scrActions)["editNotesStyles"]->setEnabled(false);
-	(*scrActions)["editSearchReplace"]->setEnabled(false);
-	(*scrActions)["editMasterPages"]->setEnabled(false);
-	(*scrActions)["editJavascripts"]->setEnabled(false);
-	(*scrActions)["editEditWithImageEditor"]->setEnabled(false);
-	(*scrActions)["editEditRenderSource"]->setEnabled(false);
-	(*scrActions)["extrasHyphenateText"]->setEnabled(false);
-	(*scrActions)["extrasDeHyphenateText"]->setEnabled(false);
-	(*scrActions)["insertSampleText"]->setEnabled(false);
-	(*scrActions)["viewFitInWindow"]->setEnabled(false);
-	(*scrActions)["viewFitWidth"]->setEnabled(false);
-	(*scrActions)["viewFit50"]->setEnabled(false);
-	(*scrActions)["viewFit75"]->setEnabled(false);
+	(*scrActions)["pageMove"]->setEnabled(false);
+	(*scrActions)["toolsCopyProperties"]->setEnabled(false);
+	(*scrActions)["toolsEditContents"]->setEnabled(false);
+	(*scrActions)["toolsEditWithStoryEditor"]->setEnabled(false);
+	(*scrActions)["toolsEyeDropper"]->setEnabled(false);
+	(*scrActions)["toolsInsertArc"]->setEnabled(false);
+	(*scrActions)["toolsInsertBezier"]->setEnabled(false);
+	(*scrActions)["toolsInsertCalligraphicLine"]->setEnabled(false);
+	(*scrActions)["toolsInsertFreehandLine"]->setEnabled(false);
+	(*scrActions)["toolsInsertImageFrame"]->setEnabled(false);
+	(*scrActions)["toolsInsertLine"]->setEnabled(false);
+	(*scrActions)["toolsInsertPolygon"]->setEnabled(false);
+	(*scrActions)["toolsInsertRenderFrame"]->setEnabled(false);
+	(*scrActions)["toolsInsertShape"]->setEnabled(false);
+	(*scrActions)["toolsInsertSpiral"]->setEnabled(false);
+	(*scrActions)["toolsInsertTable"]->setEnabled(false);
+	(*scrActions)["toolsInsertTextFrame"]->setEnabled(false);
+	(*scrActions)["toolsLinkTextFrame"]->setEnabled(false);
+	(*scrActions)["toolsMeasurements"]->setEnabled(false);
+	(*scrActions)["toolsPDFAnnotLink"]->setEnabled(false);
+	(*scrActions)["toolsPDFAnnotText"]->setEnabled(false);
+	(*scrActions)["toolsPDFCheckBox"]->setEnabled(false);
+	(*scrActions)["toolsPDFComboBox"]->setEnabled(false);
+	(*scrActions)["toolsPDFListBox"]->setEnabled(false);
+	(*scrActions)["toolsPDFPushButton"]->setEnabled(false);
+	(*scrActions)["toolsPDFRadioButton"]->setEnabled(false);
+	(*scrActions)["toolsPDFTextField"]->setEnabled(false);
+	(*scrActions)["toolsRotate"]->setEnabled(false);
+	(*scrActions)["toolsSelect"]->setEnabled(false);
+	(*scrActions)["toolsUnlinkTextFrame"]->setEnabled(false);
+	(*scrActions)["toolsUnlinkTextFrameWithTextCopy"]->setEnabled(false);
+	(*scrActions)["toolsUnlinkTextFrameWithTextCut"]->setEnabled(false);
+	(*scrActions)["toolsZoom"]->setEnabled(false);
 	(*scrActions)["viewFit100"]->setEnabled(false);
 	(*scrActions)["viewFit200"]->setEnabled(false);
 	(*scrActions)["viewFit400"]->setEnabled(false);
-	(*scrActions)["viewSnapToGuides"]->setChecked(false);
+	(*scrActions)["viewFit50"]->setEnabled(false);
+	(*scrActions)["viewFit75"]->setEnabled(false);
+	(*scrActions)["viewFitInWindow"]->setEnabled(false);
+	(*scrActions)["viewFitWidth"]->setEnabled(false);
+	(*scrActions)["viewShowRulers"]->setEnabled(false);
 	(*scrActions)["viewSnapToElements"]->setChecked(false);
 	(*scrActions)["viewSnapToGrid"]->setChecked(false);
-	(*scrActions)["viewShowRulers"]->setEnabled(false);
-	(*scrActions)["insertFrame"]->setEnabled(false);
-	(*scrActions)["itemDuplicate"]->setEnabled(false);
-	(*scrActions)["itemMulDuplicate"]->setEnabled(false);
-	(*scrActions)["itemTransform"]->setEnabled(false);
-	(*scrActions)["itemDelete"]->setEnabled(false);
-	(*scrActions)["itemRaise"]->setEnabled(false);
-	(*scrActions)["itemLower"]->setEnabled(false);
-	(*scrActions)["itemRaiseToTop"]->setEnabled(false);
-	(*scrActions)["itemLowerToBottom"]->setEnabled(false);
-	(*scrActions)["itemSendToPattern"]->setEnabled(false);
-	(*scrActions)["itemSendToInline"]->setEnabled(false);
-	(*scrActions)["itemAdjustFrameToImage"]->setEnabled(false);
-	(*scrActions)["itemAdjustImageToFrame"]->setEnabled(false);
-	(*scrActions)["itemExtendedImageProperties"]->setEnabled(false);
-	(*scrActions)["itemUpdateImage"]->setEnabled(false);
-	(*scrActions)["itemPreviewLow"]->setEnabled(false);
-	(*scrActions)["itemPreviewNormal"]->setEnabled(false);
-	(*scrActions)["itemPreviewFull"]->setEnabled(false);
-	(*scrActions)["itemAttributes"]->setEnabled(false);
-	(*scrActions)["toolsSelect"]->setEnabled(false);
-	(*scrActions)["toolsRotate"]->setEnabled(false);
-	(*scrActions)["toolsEditContents"]->setEnabled(false);
-	(*scrActions)["toolsEditWithStoryEditor"]->setEnabled(false);
-	(*scrActions)["toolsZoom"]->setEnabled(false);
-	(*scrActions)["toolsInsertTextFrame"]->setEnabled(false);
-	(*scrActions)["toolsInsertImageFrame"]->setEnabled(false);
-	(*scrActions)["toolsInsertShape"]->setEnabled(false);
-	(*scrActions)["toolsInsertLine"]->setEnabled(false);
-	(*scrActions)["toolsInsertBezier"]->setEnabled(false);
-	(*scrActions)["toolsInsertFreehandLine"]->setEnabled(false);
-	(*scrActions)["toolsInsertCalligraphicLine"]->setEnabled(false);
-	(*scrActions)["toolsInsertPolygon"]->setEnabled(false);
-	(*scrActions)["toolsInsertArc"]->setEnabled(false);
-	(*scrActions)["toolsInsertSpiral"]->setEnabled(false);
-	(*scrActions)["toolsInsertRenderFrame"]->setEnabled(false);
-	(*scrActions)["toolsInsertTable"]->setEnabled(false);
-	(*scrActions)["toolsLinkTextFrame"]->setEnabled(false);
-	(*scrActions)["toolsUnlinkTextFrame"]->setEnabled(false);
-	(*scrActions)["toolsUnlinkTextFrameWithTextCopy"]->setEnabled(false);
-	(*scrActions)["toolsUnlinkTextFrameWithTextCut"]->setEnabled(false);
-	(*scrActions)["toolsMeasurements"]->setEnabled(false);
-	(*scrActions)["toolsCopyProperties"]->setEnabled(false);
-	(*scrActions)["toolsEyeDropper"]->setEnabled(false);
-	(*scrActions)["toolsPDFPushButton"]->setEnabled(false);
-	(*scrActions)["toolsPDFRadioButton"]->setEnabled(false);
-	(*scrActions)["toolsPDFTextField"]->setEnabled(false);
-	(*scrActions)["toolsPDFCheckBox"]->setEnabled(false);
-	(*scrActions)["toolsPDFComboBox"]->setEnabled(false);
-	(*scrActions)["toolsPDFListBox"]->setEnabled(false);
-	(*scrActions)["toolsPDFAnnotText"]->setEnabled(false);
-	(*scrActions)["toolsPDFAnnotLink"]->setEnabled(false);
+	(*scrActions)["viewSnapToGuides"]->setChecked(false);
+
 #ifdef HAVE_OSG
 	(*scrActions)["toolsPDFAnnot3D"]->setEnabled(false);
 #endif




More information about the scribus-commit mailing list