r18466 by craig - Fix some more QT5_WRAP_CPP from plugins

scribus-commit scribus-commit at lists.scribus.net
Mon Sep 9 16:41:28 UTC 2013


Author: craig
Date: Mon Sep  9 16:41:28 2013
New Revision: 18466

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18466
Log:
Fix some more QT5_WRAP_CPP from plugins

Modified:
    trunk/Scribus/scribus/actionmanager.cpp
    trunk/Scribus/scribus/designer/CMakeLists.txt
    trunk/Scribus/scribus/designer/smwidgets/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/idml_old/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/pub/CMakeLists.txt
    trunk/Scribus/scribus/plugins/imposition/CMakeLists.txt
    trunk/Scribus/scribus/plugins/myplugin/CMakeLists.txt
    trunk/Scribus/scribus/plugins/newfromtemplateplugin/CMakeLists.txt
    trunk/Scribus/scribus/plugins/scripter/CMakeLists.txt
    trunk/Scribus/scribus/scraction.cpp
    trunk/Scribus/scribus/scraction.h
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/scribus.h
    trunk/Scribus/scribus/tests/CMakeLists.txt
    trunk/Scribus/scribus/ui/contextmenu.cpp
    trunk/Scribus/scribus/ui/contextmenu.h

Modified: trunk/Scribus/scribus/actionmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18466&path=/trunk/Scribus/scribus/actionmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/actionmanager.cpp (original)
+++ trunk/Scribus/scribus/actionmanager.cpp Mon Sep  9 16:41:28 2013
@@ -184,6 +184,8 @@
 	
 	
 	(*scrActions)["fileClose"]->setShortcutContext(Qt::WidgetShortcut);
+
+	(*scrActions)["fileNew"]->setStatusTip(tr("Create a new document"));
 }
 
 void ActionManager::initEditMenuActions()
@@ -1693,6 +1695,281 @@
 	(*scrActions)["specialToggleAllPalettes"]->setTexts( tr("Toggle Palettes"));
 	(*scrActions)["specialToggleAllGuides"]->setTexts( tr("Toggle Guides"));
 	(*scrActions)["specialUnicodeSequenceBegin"]->setTexts( tr("Insert Unicode Character Begin Sequence"));
+
+
+	//////
+	//File Menu
+	(*scrActions)["fileNew"]->setStatusTextAndShortcut( tr("&New"));
+	(*scrActions)["fileNewFromTemplate"]->setStatusTextAndShortcut( tr("New &from Template..."));
+	(*scrActions)["fileOpen"]->setStatusTextAndShortcut( tr("&Open..."));
+	(*scrActions)["fileClose"]->setStatusTextAndShortcut( tr("&Close"));
+	(*scrActions)["fileSave"]->setStatusTextAndShortcut( tr("&Save"));
+	(*scrActions)["fileSaveAs"]->setStatusTextAndShortcut( tr("Save &As..."));
+	(*scrActions)["fileRevert"]->setStatusTextAndShortcut( tr("Re&vert to Saved"));
+	(*scrActions)["fileCollect"]->setStatusTextAndShortcut( tr("Collect for O&utput..."));
+	(*scrActions)["fileImportText"]->setStatusTextAndShortcut( tr("Get Text..."));
+	(*scrActions)["fileImportAppendText"]->setStatusTextAndShortcut( tr("Append &Text..."));
+	(*scrActions)["fileImportImage"]->setStatusTextAndShortcut( tr("Get Image..."));
+	(*scrActions)["fileImportVector"]->setStatusTextAndShortcut( tr("Get Vector File..."));
+
+	(*scrActions)["fileExportText"]->setStatusTextAndShortcut( tr("Save &Text..."));
+	(*scrActions)["fileExportAsEPS"]->setStatusTextAndShortcut( tr("Save as &EPS..."));
+	(*scrActions)["fileExportAsPDF"]->setStatusTextAndShortcut( tr("Save as P&DF..."));
+//	(*scrActions)["fileDocSetup"]->setStatusTextAndShortcut( tr("Document &Setup (old)..."));
+	(*scrActions)["fileDocSetup150"]->setStatusTextAndShortcut( tr("Document &Setup..."));
+//	(*scrActions)["filePreferences"]->setStatusTextAndShortcut( tr("P&references (old)..."));
+	(*scrActions)["filePreferences150"]->setStatusTextAndShortcut( tr("P&references..."));
+	(*scrActions)["filePrint"]->setStatusTextAndShortcut( tr("&Print..."));
+	(*scrActions)["PrintPreview"]->setStatusTextAndShortcut( tr("Print Previe&w"));
+	(*scrActions)["fileQuit"]->setStatusTextAndShortcut( tr("&Quit"));
+	//Edit Menu
+	(*scrActions)["editUndoAction"]->setStatusTextAndShortcut( tr("&Undo"));
+	(*scrActions)["editRedoAction"]->setStatusTextAndShortcut( tr("&Redo"));
+	(*scrActions)["editActionMode"]->setStatusTextAndShortcut( tr("&Item Action Mode"));
+	(*scrActions)["editCut"]->setStatusTextAndShortcut( tr("Cu&t"));
+	(*scrActions)["editCopy"]->setStatusTextAndShortcut( tr("&Copy"));
+	(*scrActions)["editPaste"]->setStatusTextAndShortcut( tr("&Paste"));
+	(*scrActions)["editCopyContents"]->setStatusTextAndShortcut( tr("&Copy"));
+	(*scrActions)["editPasteContents"]->setStatusTextAndShortcut( tr("&Paste"));
+	(*scrActions)["editPasteContentsAbs"]->setStatusTextAndShortcut( tr("Paste (&Absolute)"));
+	(*scrActions)["editPasteImageFromClipboard"]->setStatusTextAndShortcut( tr("Paste Image from Clipboard"));
+	(*scrActions)["editClearContents"]->setStatusTextAndShortcut( tr("C&lear"));
+	(*scrActions)["editSelectAll"]->setStatusTextAndShortcut( tr("Select &All"));
+	(*scrActions)["editSelectAllOnLayer"]->setStatusTextAndShortcut( tr("Advanced Select All..."));
+	(*scrActions)["editDeselectAll"]->setStatusTextAndShortcut( tr("&Deselect All"));
+	(*scrActions)["editSearchReplace"]->setStatusTextAndShortcut( tr("&Search/Replace..."));
+	(*scrActions)["editEditWithImageEditor"]->setStatusTextAndShortcut( tr("Edit Image..."));
+	(*scrActions)["editEditRenderSource"]->setStatusTextAndShortcut( tr("Edit Source..."));
+	(*scrActions)["editColors"]->setStatusTextAndShortcut( tr("Colors and Fills..."));
+	(*scrActions)["editReplaceColors"]->setStatusTextAndShortcut( tr("Replace Colors..."));
+	(*scrActions)["editStyles"]->setStatusTextAndShortcut( tr("S&tyles..."));
+	(*scrActions)["editMarks"]->setStatusTextAndShortcut( tr("Marks..."));
+	(*scrActions)["editNotesStyles"]->setStatusTextAndShortcut( tr("Notes Styles..."));
+	(*scrActions)["editMasterPages"]->setStatusTextAndShortcut( tr("&Master Pages..."));
+	(*scrActions)["editJavascripts"]->setStatusTextAndShortcut( tr("&JavaScripts..."));
+
+	(*scrActions)["fontSizeOther"]->setStatusTextAndShortcut( tr("&Other..."));
+	(*scrActions)["alignLeft"]->setStatusTextAndShortcut( tr("&Left"));
+	(*scrActions)["alignCenter"]->setStatusTextAndShortcut( tr("&Center"));
+	(*scrActions)["alignRight"]->setStatusTextAndShortcut( tr("&Right"));
+	(*scrActions)["alignBlock"]->setStatusTextAndShortcut( tr("&Block"));
+	(*scrActions)["alignForced"]->setStatusTextAndShortcut( tr("&Forced"));
+
+	(*scrActions)["typeEffectNormal"]->setStatusTextAndShortcut( tr("&Normal"));
+	(*scrActions)["typeEffectUnderline"]->setStatusTextAndShortcut( tr("&Underline"));
+	(*scrActions)["typeEffectUnderlineWords"]->setStatusTextAndShortcut( tr("Underline &Words"));
+	(*scrActions)["typeEffectStrikeThrough"]->setStatusTextAndShortcut( tr("&Strike Through"));
+	(*scrActions)["typeEffectAllCaps"]->setStatusTextAndShortcut( tr("&All Caps"));
+	(*scrActions)["typeEffectSmallCaps"]->setStatusTextAndShortcut( tr("Small &Caps"));
+	(*scrActions)["typeEffectSuperscript"]->setStatusTextAndShortcut( tr("Su&perscript"));
+	(*scrActions)["typeEffectSubscript"]->setStatusTextAndShortcut( tr("Su&bscript"));
+	(*scrActions)["typeEffectOutline"]->setStatusTextAndShortcut( tr("&Outline", "type effect"));
+	(*scrActions)["typeEffectShadow"]->setStatusTextAndShortcut( tr("S&hadow"));
+
+	(*scrActions)["styleImageEffects"]->setStatusTextAndShortcut( tr("&Image Effects"));
+	(*scrActions)["styleTabulators"]->setStatusTextAndShortcut( tr("&Tabulators..."));
+
+	//Item Menu
+	(*scrActions)["itemDuplicate"]->setStatusTextAndShortcut( tr("D&uplicate"));
+	(*scrActions)["itemMulDuplicate"]->setStatusTextAndShortcut( tr("&Multiple Duplicate"));
+	(*scrActions)["itemTransform"]->setStatusTextAndShortcut( tr("&Transform"));
+	(*scrActions)["itemDelete"]->setStatusTextAndShortcut( tr("&Delete"));
+	(*scrActions)["itemGroup"]->setStatusTextAndShortcut( tr("&Group"));
+	(*scrActions)["itemUngroup"]->setStatusTextAndShortcut( tr("&Ungroup"));
+	(*scrActions)["itemGroupAdjust"]->setStatusTextAndShortcut( tr("Adjust Group"));
+	(*scrActions)["itemLock"]->setStatusTextAndShortcut( tr("Is &Locked"));
+	(*scrActions)["itemLockSize"]->setStatusTextAndShortcut( tr("Si&ze is Locked"));
+	(*scrActions)["itemPrintingEnabled"]->setStatusTextAndShortcut( tr("&Printing Enabled"));
+	(*scrActions)["itemFlipH"]->setStatusTextAndShortcut( tr("&Flip Horizontally"));
+	(*scrActions)["itemFlipV"]->setStatusTextAndShortcut( tr("&Flip Vertically"));
+	(*scrActions)["itemLowerToBottom"]->setStatusTextAndShortcut( tr("Lower to &Bottom"));
+	(*scrActions)["itemRaiseToTop"]->setStatusTextAndShortcut( tr("Raise to &Top"));
+	(*scrActions)["itemLower"]->setStatusTextAndShortcut( tr("&Lower"));
+	(*scrActions)["itemRaise"]->setStatusTextAndShortcut( tr("&Raise"));
+	(*scrActions)["itemSendToPattern"]->setStatusTextAndShortcut( tr("Patterns"));
+	(*scrActions)["itemSendToInline"]->setStatusTextAndShortcut( tr("Inline Items"));
+	(*scrActions)["itemAttributes"]->setStatusTextAndShortcut( tr("&Attributes..."));
+	(*scrActions)["itemImageInfo"]->setStatusTextAndShortcut( tr("More Info..."));
+	(*scrActions)["itemImageIsVisible"]->setStatusTextAndShortcut( tr("I&mage Visible"));
+	(*scrActions)["itemUpdateImage"]->setStatusTextAndShortcut( tr("&Update Image"));
+	(*scrActions)["tableInsertRows"]->setStatusTextAndShortcut(tr("Insert Rows..."));
+	(*scrActions)["tableInsertColumns"]->setStatusTextAndShortcut(tr("Insert Columns..."));
+	(*scrActions)["tableDeleteRows"]->setStatusTextAndShortcut(tr("Delete Rows"));
+	(*scrActions)["tableDeleteColumns"]->setStatusTextAndShortcut(tr("Delete Columns"));
+	(*scrActions)["tableMergeCells"]->setStatusTextAndShortcut(tr("Merge Cells"));
+	(*scrActions)["tableSplitCells"]->setStatusTextAndShortcut(tr("Split Cells..."));
+	(*scrActions)["tableSetRowHeights"]->setStatusTextAndShortcut(tr("Set Row Heights..."));
+	(*scrActions)["tableSetColumnWidths"]->setStatusTextAndShortcut(tr("Set Column Widths..."));
+	(*scrActions)["tableDistributeRowsEvenly"]->setStatusTextAndShortcut(tr("Distribute Rows Evenly"));
+	(*scrActions)["tableDistributeColumnsEvenly"]->setStatusTextAndShortcut(tr("Distribute Columns Evenly"));
+	(*scrActions)["tableAdjustFrameToTable"]->setStatusTextAndShortcut(tr("Adjust Frame to Table"));
+	(*scrActions)["tableAdjustTableToFrame"]->setStatusTextAndShortcut(tr("Adjust Table to Frame"));
+	(*scrActions)["itemAdjustFrameHeightToText"]->setStatusTextAndShortcut( tr("Adjust Frame Height to Text"));
+	(*scrActions)["itemAdjustFrameToImage"]->setStatusTextAndShortcut( tr("Adjust Frame to Image"));
+	(*scrActions)["itemAdjustImageToFrame"]->setStatusTextAndShortcut( tr("Adjust Image to Frame"));
+	(*scrActions)["itemToggleInlineImage"]->setStatusTextAndShortcut( tr("Embed Image"));
+	(*scrActions)["itemExtendedImageProperties"]->setStatusTextAndShortcut( tr("Extended Image Properties"));
+	(*scrActions)["itemPreviewLow"]->setStatusTextAndShortcut( tr("&Low Resolution"));
+	(*scrActions)["itemPreviewNormal"]->setStatusTextAndShortcut( tr("&Normal Resolution"));
+	(*scrActions)["itemPreviewFull"]->setStatusTextAndShortcut( tr("&Full Resolution"));
+	(*scrActions)["itemPDFIsBookmark"]->setStatusTextAndShortcut( tr("Is PDF &Bookmark"));
+	(*scrActions)["itemPDFIsAnnotation"]->setStatusTextAndShortcut( tr("Is PDF A&nnotation"));
+	(*scrActions)["itemPDFAnnotationProps"]->setStatusTextAndShortcut( tr("Annotation P&roperties"));
+	(*scrActions)["itemPDFFieldProps"]->setStatusTextAndShortcut( tr("Field P&roperties"));
+	(*scrActions)["itemShapeEdit"]->setStatusTextAndShortcut( tr("&Edit Shape..."));
+	(*scrActions)["itemAttachTextToPath"]->setStatusTextAndShortcut( tr("&Attach Text to Path"));
+	(*scrActions)["itemDetachTextFromPath"]->setStatusTextAndShortcut( tr("&Detach Text from Path"));
+	(*scrActions)["itemCombinePolygons"]->setStatusTextAndShortcut( tr("&Combine Polygons"));
+	(*scrActions)["itemSplitPolygons"]->setStatusTextAndShortcut( tr("Split &Polygons"));
+	(*scrActions)["itemConvertToBezierCurve"]->setStatusTextAndShortcut( tr("&Bezier Curve"));
+	(*scrActions)["itemConvertToImageFrame"]->setStatusTextAndShortcut( tr("&Image Frame"));
+	(*scrActions)["itemConvertToOutlines"]->setStatusTextAndShortcut( tr("&Outlines", "Convert to oulines"));
+	(*scrActions)["itemConvertToPolygon"]->setStatusTextAndShortcut( tr("&Polygon"));
+	(*scrActions)["itemConvertToTextFrame"]->setStatusTextAndShortcut( tr("&Text Frame"));
+	(*scrActions)["itemConvertToSymbolFrame"]->setStatusTextAndShortcut( tr("&Symbol"));
+	(*scrActions)["itemsUnWeld"]->setStatusTextAndShortcut( tr("Unweld items"));
+	(*scrActions)["itemWeld"]->setStatusTextAndShortcut( tr("Weld items"));
+	(*scrActions)["itemEditWeld"]->setStatusTextAndShortcut( tr("Edit weld item"));
+
+	//Insert Menu
+	(*scrActions)["insertFrame"]->setStatusTextAndShortcut( tr("&Frames..."));
+	(*scrActions)["insertGlyph"]->setStatusTextAndShortcut( tr("&Glyph..."));
+	(*scrActions)["insertSampleText"]->setStatusTextAndShortcut( tr("Sample Text"));
+	(*scrActions)["stickyTools"]->setStatusTextAndShortcut( tr("Sticky Tools"));
+	(*scrActions)["insertMarkAnchor"]->setStatusTextAndShortcut( tr("Anchor Mark"));
+	(*scrActions)["insertMarkVariableText"]->setStatusTextAndShortcut( tr("Variable Text"));
+	(*scrActions)["insertMarkItem"]->setStatusTextAndShortcut( tr("Reference to Item"));
+	(*scrActions)["insertMark2Mark"]->setStatusTextAndShortcut( tr("Reference to Mark"));
+	(*scrActions)["insertMarkNote"]->setStatusTextAndShortcut( tr("Foot/Endnote"));
+//	(*scrActions)["insertMarkIndex"]->setStatusTextAndShortcut( tr("Index entry"));
+	(*scrActions)["editMark"]->setStatusTextAndShortcut( tr("Edit Mark"));
+	(*scrActions)["itemUpdateMarks"]->setStatusTextAndShortcut( tr("Update Marks"));
+
+	//Page menu
+	(*scrActions)["pageInsert"]->setStatusTextAndShortcut( tr("&Insert..."));
+	(*scrActions)["pageImport"]->setStatusTextAndShortcut( tr("Im&port..."));
+	(*scrActions)["pageDelete"]->setStatusTextAndShortcut( tr("&Delete..."));
+	(*scrActions)["pageCopy"]->setStatusTextAndShortcut( tr("&Copy..."));
+	(*scrActions)["pageMove"]->setStatusTextAndShortcut( tr("&Move..."));
+	(*scrActions)["pageApplyMasterPage"]->setStatusTextAndShortcut( tr("&Apply Master Page..."));
+	(*scrActions)["pageCopyToMasterPage"]->setStatusTextAndShortcut( tr("Convert to Master Page..."));
+	(*scrActions)["pageManageGuides"]->setStatusTextAndShortcut( tr("Manage &Guides..."));
+	(*scrActions)["pageManageMargins"]->setStatusTextAndShortcut( tr("Manage Page Properties..."));
+
+	//View Menu
+	(*scrActions)["viewFitInWindow"]->setStatusTextAndShortcut( tr("&Fit to Height"));
+	(*scrActions)["viewFitWidth"]->setStatusTextAndShortcut( tr("Fit to Width"));
+	(*scrActions)["viewFit50"]->setStatusTextAndShortcut( tr("&50%"));
+	(*scrActions)["viewFit75"]->setStatusTextAndShortcut( tr("&75%"));
+	(*scrActions)["viewFit100"]->setStatusTextAndShortcut( tr("&100%"));
+	(*scrActions)["viewFit200"]->setStatusTextAndShortcut( tr("&200%"));
+	(*scrActions)["viewFit400"]->setStatusTextAndShortcut( tr("&400%"));
+	(*scrActions)["viewPreviewMode"]->setStatusTextAndShortcut( tr("Preview Mode"));
+	(*scrActions)["viewShowMargins"]->setStatusTextAndShortcut( tr("Show &Margins"));
+	(*scrActions)["viewShowBleeds"]->setStatusTextAndShortcut( tr("Show Bleeds"));
+	(*scrActions)["viewShowFrames"]->setStatusTextAndShortcut( tr("Show &Frames"));
+	(*scrActions)["viewShowLayerMarkers"]->setStatusTextAndShortcut( tr("Show Layer Indicators"));
+	(*scrActions)["viewShowImages"]->setStatusTextAndShortcut( tr("Show &Images"));
+	(*scrActions)["viewShowGrid"]->setStatusTextAndShortcut( tr("Show &Grid"));
+	(*scrActions)["viewShowGuides"]->setStatusTextAndShortcut( tr("Show G&uides"));
+	(*scrActions)["viewShowColumnBorders"]->setStatusTextAndShortcut( tr("Show Text Frame Columns"));
+	(*scrActions)["viewShowBaseline"]->setStatusTextAndShortcut( tr("Show &Baseline Grid"));
+	(*scrActions)["viewShowTextChain"]->setStatusTextAndShortcut( tr("Show &Text Chain"));
+	(*scrActions)["viewShowTextControls"]->setStatusTextAndShortcut( tr("Show Control Characters"));
+	(*scrActions)["viewShowRulers"]->setStatusTextAndShortcut( tr("Show Rulers"));
+	(*scrActions)["viewRulerMode"]->setStatusTextAndShortcut( tr("Rulers Relative to Page"));
+	(*scrActions)["viewSnapToGrid"]->setStatusTextAndShortcut( tr("Sn&ap to Grid"));
+	(*scrActions)["viewSnapToGuides"]->setStatusTextAndShortcut( tr("Sna&p to Guides"));
+	(*scrActions)["viewSnapToElements"]->setStatusTextAndShortcut( tr("Snap to Items"));
+	(*scrActions)["viewShowContextMenu"]->setStatusTextAndShortcut( tr("Show Context Menu"));
+//	(*scrActions)["viewNewView"]->setStatusTextAndShortcut( tr("New View"));
+
+	//Tool menu
+	(*scrActions)["toolsProperties"]->setStatusTextAndShortcut( tr("&Properties"));
+	(*scrActions)["toolsOutline"]->setStatusTextAndShortcut( tr("&Outline", "Document Outline Palette"));
+	(*scrActions)["toolsScrapbook"]->setStatusTextAndShortcut( tr("&Scrapbook"));
+	(*scrActions)["toolsLayers"]->setStatusTextAndShortcut( tr("&Layers"));
+	(*scrActions)["toolsPages"]->setStatusTextAndShortcut( tr("&Arrange Pages"));
+	(*scrActions)["toolsBookmarks"]->setStatusTextAndShortcut( tr("&Bookmarks"));
+	(*scrActions)["toolsMeasurements"]->setStatusTextAndShortcut( tr("&Measurements"));
+	(*scrActions)["toolsActionHistory"]->setStatusTextAndShortcut( tr("Action &History"));
+	(*scrActions)["toolsPreflightVerifier"]->setStatusTextAndShortcut( tr("Preflight &Verifier"));
+	(*scrActions)["toolsAlignDistribute"]->setStatusTextAndShortcut( tr("&Align and Distribute"));
+	(*scrActions)["toolsSymbols"]->setStatusTextAndShortcut( tr("Symbols"));
+	(*scrActions)["toolsInline"]->setStatusTextAndShortcut( tr("Inline Frames"));
+	(*scrActions)["toolsToolbarTools"]->setStatusTextAndShortcut( tr("&Tools"));
+	(*scrActions)["toolsToolbarPDF"]->setStatusTextAndShortcut( tr("P&DF Tools"));
+
+	//toolbar only items
+	(*scrActions)["toolsSelect"]->setStatusTextAndShortcut( tr("Select Item"));
+	(*scrActions)["toolsRotate"]->setStatusTextAndShortcut( tr("Rotate Item"));
+	(*scrActions)["toolsZoom"]->setStatusTextAndShortcut( tr("Zoom in or out"));
+	(*scrActions)["toolsZoomIn"]->setStatusTextAndShortcut( tr("Zoom in"));
+	(*scrActions)["toolsZoomOut"]->setStatusTextAndShortcut( tr("Zoom out"));
+	(*scrActions)["toolsEditContents"]->setStatusTextAndShortcut( tr("Edit Contents of Frame"));
+	(*scrActions)["toolsEditWithStoryEditor"]->setText( tr("Edit Text..."));
+	(*scrActions)["toolsLinkTextFrame"]->setStatusTextAndShortcut( tr("Link Text Frames"));
+	(*scrActions)["toolsUnlinkTextFrame"]->setStatusTextAndShortcut( tr("Unlink Text Frames"));
+	(*scrActions)["toolsUnlinkTextFrameWithTextCopy"]->setStatusTextAndShortcut( tr("Unlink Text Frame with Text Copy"));
+	(*scrActions)["toolsUnlinkTextFrameWithTextCut"]->setStatusTextAndShortcut( tr("Unlink Text Frame with Text Cut"));
+	(*scrActions)["toolsEyeDropper"]->setStatusTextAndShortcut( tr("&Eye Dropper"));
+	(*scrActions)["toolsCopyProperties"]->setStatusTextAndShortcut( tr("Copy Item Properties"));
+
+	(*scrActions)["toolsInsertTextFrame"]->setText( tr("Insert &Text Frame"));
+	(*scrActions)["toolsInsertImageFrame"]->setText( tr("Insert &Image Frame"));
+	(*scrActions)["toolsInsertRenderFrame"]->setText( tr("Insert &Render Frame"));
+	(*scrActions)["toolsInsertTable"]->setText( tr("Insert T&able"));
+	(*scrActions)["toolsInsertShape"]->setText( tr("Insert &Shape"));
+	(*scrActions)["toolsInsertPolygon"]->setText( tr("Insert &Polygon"));
+	(*scrActions)["toolsInsertArc"]->setText( tr("Insert Arc"));
+	(*scrActions)["toolsInsertSpiral"]->setText( tr("Insert Spiral"));
+	(*scrActions)["toolsInsertLine"]->setText( tr("Insert &Line"));
+	(*scrActions)["toolsInsertCalligraphicLine"]->setText( tr("Insert Calligraphic Line"));
+	(*scrActions)["toolsInsertBezier"]->setText( tr("Insert &Bezier Curve"));
+	(*scrActions)["toolsInsertFreehandLine"]->setText( tr("Insert &Freehand Line"));
+
+	(*scrActions)["toolsPDFPushButton"]->setStatusTextAndShortcut( tr("Insert PDF Push Button"));
+	(*scrActions)["toolsPDFRadioButton"]->setStatusTextAndShortcut( tr("Insert PDF Radio Button"));
+	(*scrActions)["toolsPDFTextField"]->setStatusTextAndShortcut( tr("Insert PDF Text Field"));
+	(*scrActions)["toolsPDFCheckBox"]->setStatusTextAndShortcut( tr("Insert PDF Check Box"));
+	(*scrActions)["toolsPDFComboBox"]->setStatusTextAndShortcut( tr("Insert PDF Combo Box"));
+	(*scrActions)["toolsPDFListBox"]->setStatusTextAndShortcut( tr("Insert PDF List Box"));
+	(*scrActions)["toolsPDFAnnotText"]->setStatusTextAndShortcut( tr("Insert Text Annotation"));
+	(*scrActions)["toolsPDFAnnotLink"]->setStatusTextAndShortcut( tr("Insert Link Annotation"));
+#ifdef HAVE_OSG
+	(*scrActions)["toolsPDFAnnot3D"]->setStatusTextAndShortcut( tr("Insert 3D Annotation"));
+#endif
+
+
+	//Extras Menu
+	(*scrActions)["extrasManageImages"]->setStatusTextAndShortcut( tr("&Manage Images"));
+	(*scrActions)["extrasHyphenateText"]->setStatusTextAndShortcut( tr("&Hyphenate Text"));
+	(*scrActions)["extrasDeHyphenateText"]->setStatusTextAndShortcut( tr("Dehyphenate Text"));
+	(*scrActions)["extrasGenerateTableOfContents"]->setStatusTextAndShortcut( tr("&Generate Table Of Contents"));
+	(*scrActions)["extrasUpdateDocument"]->setStatusTextAndShortcut( tr("&Update Document"));
+
+	//Windows Menu
+	(*scrActions)["windowsCascade"]->setText( tr("&Cascade"));
+	(*scrActions)["windowsTile"]->setText( tr("&Tile"));
+
+	//Help Menu
+	(*scrActions)["helpAboutScribus"]->setStatusTextAndShortcut( tr("&About Scribus"));
+	(*scrActions)["helpAboutPlugins"]->setStatusTextAndShortcut( tr("&About Plugins"));
+	(*scrActions)["helpAboutQt"]->setStatusTextAndShortcut( tr("About &Qt"));
+	(*scrActions)["helpTooltips"]->setStatusTextAndShortcut( tr("Toolti&ps"));
+	(*scrActions)["showMouseCoordinates"]->setStatusTextAndShortcut( tr("Move/Resize Value Indicator"));
+	(*scrActions)["helpManual"]->setStatusTextAndShortcut( tr("Scribus &Manual..."));
+	(*scrActions)["helpOnlineWWW"]->setStatusTextAndShortcut( tr("Scribus Homepage"));
+	(*scrActions)["helpOnlineDocs"]->setStatusTextAndShortcut( tr("Scribus Online Documentation"));
+	(*scrActions)["helpOnlineWiki"]->setStatusTextAndShortcut( tr("Scribus Wiki"));
+	(*scrActions)["helpOnlineTutorial1"]->setStatusTextAndShortcut( tr("Getting Started with Scribus"));
+	(*scrActions)["helpCheckUpdates"]->setStatusTextAndShortcut( tr("Check for Updates"));
+
+	//GUI and specials
+	(*scrActions)["specialToggleAllPalettes"]->setStatusTextAndShortcut( tr("Toggle Palettes"));
+	(*scrActions)["specialToggleAllGuides"]->setStatusTextAndShortcut( tr("Toggle Guides"));
+	(*scrActions)["specialUnicodeSequenceBegin"]->setStatusTextAndShortcut( tr("Insert Unicode Character Begin Sequence"));
+	//////
 	languageChangeUnicodeActions(scrActions);
 	languageChangeActions();
 }

Modified: trunk/Scribus/scribus/designer/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18466&path=/trunk/Scribus/scribus/designer/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/designer/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/designer/CMakeLists.txt Mon Sep  9 16:41:28 2013
@@ -46,15 +46,9 @@
 SET(SCRIBUS_SCTABLEWIDGET_PLUGIN "scribus_sctablewidget")
 SET(SCRIBUS_SCTEXTBROWSER_PLUGIN "scribus_sctextbrowser")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(SCRIBUS_SCRSPINBOX_PLUGIN_MOC_SOURCES ${SCRIBUS_SCRSPINBOX_PLUGIN_MOC_CLASSES})
-	QT5_WRAP_CPP(SCRIBUS_SCTABLEWIDGET_PLUGIN_MOC_SOURCES ${SCRIBUS_SCTABLEWIDGET_PLUGIN_MOC_CLASSES})
-	QT5_WRAP_CPP(SCRIBUS_SCTEXTBROWSER_PLUGIN_MOC_SOURCES ${SCRIBUS_SCTEXTBROWSER_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(SCRIBUS_SCRSPINBOX_PLUGIN_MOC_SOURCES ${SCRIBUS_SCRSPINBOX_PLUGIN_MOC_CLASSES})
-	QT4_WRAP_CPP(SCRIBUS_SCTABLEWIDGET_PLUGIN_MOC_SOURCES ${SCRIBUS_SCTABLEWIDGET_PLUGIN_MOC_CLASSES})
-	QT4_WRAP_CPP(SCRIBUS_SCTEXTBROWSER_PLUGIN_MOC_SOURCES ${SCRIBUS_SCTEXTBROWSER_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(SCRIBUS_SCRSPINBOX_PLUGIN_MOC_SOURCES ${SCRIBUS_SCRSPINBOX_PLUGIN_MOC_CLASSES})
+QT5_WRAP_CPP(SCRIBUS_SCTABLEWIDGET_PLUGIN_MOC_SOURCES ${SCRIBUS_SCTABLEWIDGET_PLUGIN_MOC_CLASSES})
+QT5_WRAP_CPP(SCRIBUS_SCTEXTBROWSER_PLUGIN_MOC_SOURCES ${SCRIBUS_SCTEXTBROWSER_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_SCRSPINBOX_PLUGIN} SHARED ${SCRIBUS_SCRSPINBOX_PLUGIN_SOURCES} ${SCRIBUS_SCRSPINBOX_PLUGIN_MOC_SOURCES})
 TARGET_LINK_LIBRARIES(${SCRIBUS_SCRSPINBOX_PLUGIN}

Modified: trunk/Scribus/scribus/designer/smwidgets/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18466&path=/trunk/Scribus/scribus/designer/smwidgets/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/designer/smwidgets/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/designer/smwidgets/CMakeLists.txt Mon Sep  9 16:41:28 2013
@@ -133,15 +133,15 @@
 SET(SCRIBUS_SMSPINBOXPLUGIN_PLUGIN "scribus_smspinboxplugin")
 SET(SCRIBUS_SMSTYLESELECTPLUGIN_PLUGIN "scribus_smstyleselectplugin")
 SET(SCRIBUS_SMTABRULERPLUGIN_PLUGIN "scribus_smtabrulerplugin")
-QT4_WRAP_CPP(SCRIBUS_SMALIGNSELECTPLUGIN_PLUGIN_MOC_SOURCES ${SCRIBUS_SMALIGNSELECTPLUGIN_PLUGIN_MOC_CLASSES})
-QT4_WRAP_CPP(SCRIBUS_SMCOLORCOMBOPLUGIN_PLUGIN_MOC_SOURCES ${SCRIBUS_SMCOLORCOMBOPLUGIN_PLUGIN_MOC_CLASSES})
-QT4_WRAP_CPP(SCRIBUS_SMFONTCOMBOHPLUGIN_PLUGIN_MOC_SOURCES ${SCRIBUS_SMFONTCOMBOHPLUGIN_PLUGIN_MOC_CLASSES})
-QT4_WRAP_CPP(SCRIBUS_SMSCCOMBOBOXPLUGIN_PLUGIN_MOC_SOURCES ${SCRIBUS_SMSCCOMBOBOXPLUGIN_PLUGIN_MOC_CLASSES})
-QT4_WRAP_CPP(SCRIBUS_SMSCRSPINBOXPLUGIN_PLUGIN_MOC_SOURCES ${SCRIBUS_SMSCRSPINBOXPLUGIN_PLUGIN_MOC_CLASSES})
-QT4_WRAP_CPP(SCRIBUS_SMSHADEBUTTONPLUGIN_PLUGIN_MOC_SOURCES ${SCRIBUS_SMSHADEBUTTONPLUGIN_PLUGIN_MOC_CLASSES})
-QT4_WRAP_CPP(SCRIBUS_SMSPINBOXPLUGIN_PLUGIN_MOC_SOURCES ${SCRIBUS_SMSPINBOXPLUGIN_PLUGIN_MOC_CLASSES})
-QT4_WRAP_CPP(SCRIBUS_SMSTYLESELECTPLUGIN_PLUGIN_MOC_SOURCES ${SCRIBUS_SMSTYLESELECTPLUGIN_PLUGIN_MOC_CLASSES})
-QT4_WRAP_CPP(SCRIBUS_SMTABRULERPLUGIN_PLUGIN_MOC_SOURCES ${SCRIBUS_SMTABRULERPLUGIN_PLUGIN_MOC_CLASSES})
+QT5_WRAP_CPP(SCRIBUS_SMALIGNSELECTPLUGIN_PLUGIN_MOC_SOURCES ${SCRIBUS_SMALIGNSELECTPLUGIN_PLUGIN_MOC_CLASSES})
+QT5_WRAP_CPP(SCRIBUS_SMCOLORCOMBOPLUGIN_PLUGIN_MOC_SOURCES ${SCRIBUS_SMCOLORCOMBOPLUGIN_PLUGIN_MOC_CLASSES})
+QT5_WRAP_CPP(SCRIBUS_SMFONTCOMBOHPLUGIN_PLUGIN_MOC_SOURCES ${SCRIBUS_SMFONTCOMBOHPLUGIN_PLUGIN_MOC_CLASSES})
+QT5_WRAP_CPP(SCRIBUS_SMSCCOMBOBOXPLUGIN_PLUGIN_MOC_SOURCES ${SCRIBUS_SMSCCOMBOBOXPLUGIN_PLUGIN_MOC_CLASSES})
+QT5_WRAP_CPP(SCRIBUS_SMSCRSPINBOXPLUGIN_PLUGIN_MOC_SOURCES ${SCRIBUS_SMSCRSPINBOXPLUGIN_PLUGIN_MOC_CLASSES})
+QT5_WRAP_CPP(SCRIBUS_SMSHADEBUTTONPLUGIN_PLUGIN_MOC_SOURCES ${SCRIBUS_SMSHADEBUTTONPLUGIN_PLUGIN_MOC_CLASSES})
+QT5_WRAP_CPP(SCRIBUS_SMSPINBOXPLUGIN_PLUGIN_MOC_SOURCES ${SCRIBUS_SMSPINBOXPLUGIN_PLUGIN_MOC_CLASSES})
+QT5_WRAP_CPP(SCRIBUS_SMSTYLESELECTPLUGIN_PLUGIN_MOC_SOURCES ${SCRIBUS_SMSTYLESELECTPLUGIN_PLUGIN_MOC_CLASSES})
+QT5_WRAP_CPP(SCRIBUS_SMTABRULERPLUGIN_PLUGIN_MOC_SOURCES ${SCRIBUS_SMTABRULERPLUGIN_PLUGIN_MOC_CLASSES})
 ADD_LIBRARY(${SCRIBUS_SMALIGNSELECTPLUGIN_PLUGIN}
 	SHARED ${SCRIBUS_SMALIGNSELECTPLUGIN_PLUGIN_SOURCES}
 	${SCRIBUS_SMALIGNSELECTPLUGIN_PLUGIN_MOC_SOURCES})

Modified: trunk/Scribus/scribus/plugins/import/idml_old/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18466&path=/trunk/Scribus/scribus/plugins/import/idml_old/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/idml_old/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/idml_old/CMakeLists.txt Mon Sep  9 16:41:28 2013
@@ -17,7 +17,7 @@
 
 SET(SCRIBUS_IMPORTIDML_PLUGIN "importidml")
 
-QT4_WRAP_CPP(IMPORTIDML_PLUGIN_MOC_SOURCES ${IMPORTIDML_PLUGIN_MOC_CLASSES})
+QT5_WRAP_CPP(IMPORTIDML_PLUGIN_MOC_SOURCES ${IMPORTIDML_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_IMPORTIDML_PLUGIN} MODULE ${IMPORTIDML_PLUGIN_SOURCES} ${IMPORTIDML_PLUGIN_MOC_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/import/pub/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18466&path=/trunk/Scribus/scribus/plugins/import/pub/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pub/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/pub/CMakeLists.txt Mon Sep  9 16:41:28 2013
@@ -11,11 +11,7 @@
 				SET(IMPORTPUB_PLUGIN_MOC_CLASSES importpub.h importpubplugin.h)
 				SET(IMPORTPUB_PLUGIN_SOURCES importpub.cpp importpubplugin.cpp)
 				SET(SCRIBUS_IMPORTPUB_PLUGIN "importpub")
-				IF(USE_QT5)
-					QT5_WRAP_CPP(IMPORTPUB_PLUGIN_MOC_SOURCES ${IMPORTPUB_PLUGIN_MOC_CLASSES})
-				ELSE(USE_QT5)
-					QT4_WRAP_CPP(IMPORTPUB_PLUGIN_MOC_SOURCES ${IMPORTPUB_PLUGIN_MOC_CLASSES})
-				ENDIF(USE_QT5)
+				QT5_WRAP_CPP(IMPORTPUB_PLUGIN_MOC_SOURCES ${IMPORTPUB_PLUGIN_MOC_CLASSES})
 				ADD_LIBRARY(${SCRIBUS_IMPORTPUB_PLUGIN} MODULE ${IMPORTPUB_PLUGIN_SOURCES} ${IMPORTPUB_PLUGIN_MOC_SOURCES})
 				TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTPUB_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBWPG_LDFLAGS} ${LIBWPD_LDFLAGS} ${LIBWPD_STREAM_LDFLAGS} ${LIBMSPUB_LDFLAGS})
 				INSTALL(TARGETS ${SCRIBUS_IMPORTPUB_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})

Modified: trunk/Scribus/scribus/plugins/imposition/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18466&path=/trunk/Scribus/scribus/plugins/imposition/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/imposition/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/imposition/CMakeLists.txt Mon Sep  9 16:41:28 2013
@@ -19,13 +19,8 @@
 
 SET(SCRIBUS_IMPOSITION_PLUGIN "imposition")
 
-IF(USE_QT5)
-	QT5_WRAP_UI(IMPOSITION_PLUGIN_UI_SOURCES ${IMPOSITION_PLUGIN_UI_SRC} )
-	QT5_WRAP_CPP(IMPOSITION_PLUGIN_MOC_SOURCES ${IMPOSITION_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_UI(IMPOSITION_PLUGIN_UI_SOURCES ${IMPOSITION_PLUGIN_UI_SRC} )
-	QT4_WRAP_CPP(IMPOSITION_PLUGIN_MOC_SOURCES ${IMPOSITION_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_UI(IMPOSITION_PLUGIN_UI_SOURCES ${IMPOSITION_PLUGIN_UI_SRC} )
+QT5_WRAP_CPP(IMPOSITION_PLUGIN_MOC_SOURCES ${IMPOSITION_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_IMPOSITION_PLUGIN} MODULE ${IMPOSITION_PLUGIN_SOURCES} ${IMPOSITION_PLUGIN_MOC_SOURCES} ${IMPOSITION_PLUGIN_UI_CPP} ${IMPOSITION_PLUGIN_UI_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/myplugin/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18466&path=/trunk/Scribus/scribus/plugins/myplugin/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/myplugin/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/myplugin/CMakeLists.txt Mon Sep  9 16:41:28 2013
@@ -15,11 +15,7 @@
 
 SET(SCRIBUS_MY_PLUGIN "myplugin")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(MY_PLUGIN_MOC_SOURCES ${MY_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(MY_PLUGIN_MOC_SOURCES ${MY_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(MY_PLUGIN_MOC_SOURCES ${MY_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_MY_PLUGIN} MODULE ${MY_PLUGIN_SOURCES} ${MY_PLUGIN_MOC_SOURCES})
 

Modified: trunk/Scribus/scribus/plugins/newfromtemplateplugin/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18466&path=/trunk/Scribus/scribus/plugins/newfromtemplateplugin/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/newfromtemplateplugin/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/newfromtemplateplugin/CMakeLists.txt Mon Sep  9 16:41:28 2013
@@ -22,13 +22,8 @@
 
 SET(SCRIBUS_NEWFROMTEMPLATE_PLUGIN "newfromtemplateplugin")
 
-IF(USE_QT5)
-	QT5_WRAP_UI(NEWFROMTEMPLATE_PLUGIN_UI_SOURCES ${NEWFROMTEMPLATE_PLUGIN_UI_SRC} )
-	QT5_WRAP_CPP(NEWFROMTEMPLATE_PLUGIN_MOC_SOURCES ${NEWFROMTEMPLATE_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_UI(NEWFROMTEMPLATE_PLUGIN_UI_SOURCES ${NEWFROMTEMPLATE_PLUGIN_UI_SRC} )
-	QT4_WRAP_CPP(NEWFROMTEMPLATE_PLUGIN_MOC_SOURCES ${NEWFROMTEMPLATE_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_UI(NEWFROMTEMPLATE_PLUGIN_UI_SOURCES ${NEWFROMTEMPLATE_PLUGIN_UI_SRC} )
+QT5_WRAP_CPP(NEWFROMTEMPLATE_PLUGIN_MOC_SOURCES ${NEWFROMTEMPLATE_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_NEWFROMTEMPLATE_PLUGIN} MODULE
   ${NEWFROMTEMPLATE_PLUGIN_SOURCES}

Modified: trunk/Scribus/scribus/plugins/scripter/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18466&path=/trunk/Scribus/scribus/plugins/scripter/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/scripter/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/scripter/CMakeLists.txt Mon Sep  9 16:41:28 2013
@@ -54,11 +54,7 @@
 
 SET(SCRIBUS_SCRIPTER_PLUGIN "scripter")
 
-IF(USE_QT5)
-	QT5_WRAP_CPP(SCRIPTER_PLUGIN_MOC_SOURCES ${SCRIPTER_PLUGIN_MOC_CLASSES})
-ELSE(USE_QT5)
-	QT4_WRAP_CPP(SCRIPTER_PLUGIN_MOC_SOURCES ${SCRIPTER_PLUGIN_MOC_CLASSES})
-ENDIF(USE_QT5)
+QT5_WRAP_CPP(SCRIPTER_PLUGIN_MOC_SOURCES ${SCRIPTER_PLUGIN_MOC_CLASSES})
 
 ADD_LIBRARY(${SCRIBUS_SCRIPTER_PLUGIN} MODULE ${SCRIPTER_PLUGIN_SOURCES} ${SCRIPTER_PLUGIN_MOC_SOURCES})
 

Modified: trunk/Scribus/scribus/scraction.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18466&path=/trunk/Scribus/scribus/scraction.cpp
==============================================================================
--- trunk/Scribus/scribus/scraction.cpp (original)
+++ trunk/Scribus/scribus/scraction.cpp Mon Sep  9 16:41:28 2013
@@ -247,6 +247,15 @@
 		QAction::setToolTip("<qt>" + cleanMenuText() + " (" + sct + ")" + "</qt>");
 }
 
+void ScrAction::setStatusTextAndShortcut(const QString& statusText)
+{
+	QString sct(shortcut().toString());
+	if (sct.isEmpty())
+		QAction::setStatusTip("<qt>" + statusText + "</qt>");
+	else
+		QAction::setStatusTip("<qt>" + statusText + " (" + sct + ")" + "</qt>");
+}
+
 int ScrAction::getMenuIndex() const
 {
 	return menuIndex;

Modified: trunk/Scribus/scribus/scraction.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18466&path=/trunk/Scribus/scribus/scraction.h
==============================================================================
--- trunk/Scribus/scribus/scraction.h (original)
+++ trunk/Scribus/scribus/scraction.h Mon Sep  9 16:41:28 2013
@@ -114,6 +114,7 @@
 	QString cleanMenuText();
 
 	void setToolTipFromTextAndShortcut();
+	void setStatusTextAndShortcut(const QString& statusText);
 
 	/*!
 		\author Craig Bradney

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18466&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Mon Sep  9 16:41:28 2013
@@ -8632,6 +8632,11 @@
 	bookmarkPalette->BView->rebuildTree();
 }
 
+QStringList ScribusMainWindow::scrapbookNames()
+{
+	return scrapbookPalette->getOpenScrapbooksNames();
+}
+
 //CB-->Doc, stop _storing_ bookmarks in the palette
 void ScribusMainWindow::StoreBookmarks()
 {

Modified: trunk/Scribus/scribus/scribus.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18466&path=/trunk/Scribus/scribus/scribus.h
==============================================================================
--- trunk/Scribus/scribus/scribus.h (original)
+++ trunk/Scribus/scribus/scribus.h Mon Sep  9 16:41:28 2013
@@ -165,6 +165,7 @@
 	void recalcColors(QProgressBar *dia = 0);
 	void SwitchWin();
 	void RestoreBookMarks();
+	QStringList  scrapbookNames();
 
 	void emergencySave();
 

Modified: trunk/Scribus/scribus/tests/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18466&path=/trunk/Scribus/scribus/tests/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/tests/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/tests/CMakeLists.txt Mon Sep  9 16:41:28 2013
@@ -17,9 +17,7 @@
 testStoryText.cpp
 )
 
-# IF(QT4_WRAP_CPP)
-  QT4_WRAP_CPP(SCRIBUS_TEST_MOC_SOURCES ${SCRIBUS_TEST_MOC_CLASSES})
-# ENDIF(QT4_WRAP_CPP)
+  QT5_WRAP_CPP(SCRIBUS_TEST_MOC_SOURCES ${SCRIBUS_TEST_MOC_CLASSES})
 
 SET(SCRIBUS_TESTS_LIB "scribus_tests_lib")
 ADD_LIBRARY(${SCRIBUS_TESTS_LIB} STATIC ${SCRIBUS_TEST_SOURCES} ${SCRIBUS_TEST_MOC_SOURCES})
@@ -43,7 +41,7 @@
 # Unit tests for CellArea
 SET(CELLAREATESTS_CLASSES cellareatests.h)
 SET(CELLAREATESTS_SOURCES cellareatests.cpp ../cellarea.cpp)
-QT4_WRAP_CPP(CELLAREATESTS_SOURCES ${CELLAREATESTS_CLASSES})
+QT5_WRAP_CPP(CELLAREATESTS_SOURCES ${CELLAREATESTS_CLASSES})
 ADD_EXECUTABLE(cellareatests ${CELLAREATESTS_SOURCES})
 TARGET_LINK_LIBRARIES(cellareatests ${TESTS_LIBRARIES})
 ADD_TEST(NAME cellareatests COMMAND cellareatests)

Modified: trunk/Scribus/scribus/ui/contextmenu.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18466&path=/trunk/Scribus/scribus/ui/contextmenu.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/contextmenu.cpp (original)
+++ trunk/Scribus/scribus/ui/contextmenu.cpp Mon Sep  9 16:41:28 2013
@@ -39,7 +39,7 @@
 ContextMenu::ContextMenu(Selection & sel, ScribusMainWindow *actionsParent, ScribusDoc* doc, QWidget * parent) :
 	QMenu(parent),
 	m_Sel(sel),
-	m_AP(actionsParent),
+	m_ScMW(actionsParent),
 	m_doc(doc),
 	onAPage(false)
 {
@@ -55,7 +55,7 @@
 ContextMenu::ContextMenu(ScribusMainWindow *actionsParent, ScribusDoc* doc, double mx, double my, QWidget * parent) :
 	QMenu(parent),
 	m_Sel(Selection(this)),
-	m_AP(actionsParent),
+	m_ScMW(actionsParent),
 	m_doc(doc)
 {
 	createMenuItems_NoSelection(mx, my);
@@ -97,8 +97,11 @@
 	QMenu *menuPDF = new QMenu(this);
 	QMenu *menuMark = new QMenu(this);
 	QMenu *menuResolution = new QMenu(this);
+	QMenu *menuLocking = new QMenu(this);
+	QMenu *menuSendTo = new QMenu(this);
+	QMenu *menuScrapbook = new QMenu(this);
 //	QMenu *menuWeld = new QMenu(this);
-	
+
 	//<-- Add Info
 	//Test new method with image frames first
 	if (selectedItemCount==1 && currItem->asImageFrame())
@@ -150,22 +153,22 @@
 		}
 	}
 	//-->
-	
+
 	//<-- Add undo
 	UndoManager * const undoManager(UndoManager::instance());
 	if (undoManager->hasUndoActions())
-		addAction(m_AP->scrActions["editUndoAction"]);
+		addAction(m_ScMW->scrActions["editUndoAction"]);
 	if (undoManager->hasRedoActions())
-		addAction(m_AP->scrActions["editRedoAction"]);
-	//-->
-	
+		addAction(m_ScMW->scrActions["editRedoAction"]);
+	//-->
+
 	//<-- Item specific actions
 	if (itemsAreSameType)
 	{
 		if (m_actionList.contains("editEditRenderSource"))
 		{
 			addSeparator();
-			addAction(m_AP->scrActions["editEditRenderSource"]);
+			addAction(m_ScMW->scrActions["editEditRenderSource"]);
 		}
 		if (m_doc->appMode == modeEdit)
 		{
@@ -173,104 +176,104 @@
 			addSeparator();
 			QAction *act2 = addMenu(menuMark);
 			act2->setText( ScribusView::tr("Insert Mark"));
-			menuMark->addAction(m_AP->scrActions["insertMarkVariableText"]);
+			menuMark->addAction(m_ScMW->scrActions["insertMarkVariableText"]);
 			if (m_actionList.contains("insertMarkAnchor"))
 			{
-				menuMark->addAction(m_AP->scrActions["insertMarkAnchor"]);
-				menuMark->addAction(m_AP->scrActions["insertMarkItem"]);
-				menuMark->addAction(m_AP->scrActions["insertMark2Mark"]);
+				menuMark->addAction(m_ScMW->scrActions["insertMarkAnchor"]);
+				menuMark->addAction(m_ScMW->scrActions["insertMarkItem"]);
+				menuMark->addAction(m_ScMW->scrActions["insertMark2Mark"]);
 				if (!currItem->isNoteFrame())
-					menuMark->addAction(m_AP->scrActions["insertMarkNote"]);
+					menuMark->addAction(m_ScMW->scrActions["insertMarkNote"]);
 				//	menuMark->addAction(m_AP->scrActions["insertMarkIndex"]);
 			}
 			if (currItem->itemText.cursorPosition() < currItem->itemText.length())
 			{
 				ScText *hl = currItem->itemText.item(currItem->itemText.cursorPosition());
 				if (hl->hasMark())
-					addAction(m_AP->scrActions["editMark"]);
+					addAction(m_ScMW->scrActions["editMark"]);
 			}
 		}
 		if (!m_doc->marksList().isEmpty())
 		{
 			addSeparator();
-			addAction(m_AP->scrActions["itemUpdateMarks"]);
+			addAction(m_ScMW->scrActions["itemUpdateMarks"]);
 		}
 		if (m_actionList.contains("fileImportText"))
 		{
 			addSeparator();
-			addAction(m_AP->scrActions["fileImportText"]);
-			addAction(m_AP->scrActions["fileImportAppendText"]);
-			addAction(m_AP->scrActions["toolsEditWithStoryEditor"]);
-			addAction(m_AP->scrActions["insertSampleText"]);
+			addAction(m_ScMW->scrActions["fileImportText"]);
+			addAction(m_ScMW->scrActions["fileImportAppendText"]);
+			addAction(m_ScMW->scrActions["toolsEditWithStoryEditor"]);
+			addAction(m_ScMW->scrActions["insertSampleText"]);
 		}
 		else //enable this for, eg, text on a path
 			if (m_actionList.contains("toolsEditWithStoryEditor"))
 			{
 				addSeparator();
-				addAction(m_AP->scrActions["toolsEditWithStoryEditor"]);
+				addAction(m_ScMW->scrActions["toolsEditWithStoryEditor"]);
 			}
 		addSeparator();
 		if (m_actionList.contains("fileImportImage"))
-			addAction(m_AP->scrActions["fileImportImage"]);
+			addAction(m_ScMW->scrActions["fileImportImage"]);
 		if (selectedItemCount==1 && currItem->asImageFrame())
 		{
 			if (QApplication::clipboard()->mimeData()->hasImage())
-				addAction(m_AP->scrActions["editPasteImageFromClipboard"]);
+				addAction(m_ScMW->scrActions["editPasteImageFromClipboard"]);
 		}
 		if (m_actionList.contains("itemAdjustFrameToImage"))
-			addAction(m_AP->scrActions["itemAdjustFrameToImage"]);
+			addAction(m_ScMW->scrActions["itemAdjustFrameToImage"]);
 		if (m_actionList.contains("itemAdjustImageToFrame"))
-			addAction(m_AP->scrActions["itemAdjustImageToFrame"]);
+			addAction(m_ScMW->scrActions["itemAdjustImageToFrame"]);
 
 		if (m_actionList.contains("tableInsertRows"))
-			addAction(m_AP->scrActions["tableInsertRows"]);
+			addAction(m_ScMW->scrActions["tableInsertRows"]);
 		if (m_actionList.contains("tableInsertColumns"))
-			addAction(m_AP->scrActions["tableInsertColumns"]);
+			addAction(m_ScMW->scrActions["tableInsertColumns"]);
 		if (m_actionList.contains("tableDeleteRows"))
-			addAction(m_AP->scrActions["tableDeleteRows"]);
+			addAction(m_ScMW->scrActions["tableDeleteRows"]);
 		if (m_actionList.contains("tableDeleteColumns"))
-			addAction(m_AP->scrActions["tableDeleteColumns"]);
+			addAction(m_ScMW->scrActions["tableDeleteColumns"]);
 		if (m_actionList.contains("tableMergeCells"))
-			addAction(m_AP->scrActions["tableMergeCells"]);
+			addAction(m_ScMW->scrActions["tableMergeCells"]);
 		if (m_actionList.contains("tableSplitCells"))
-			addAction(m_AP->scrActions["tableSplitCells"]);
+			addAction(m_ScMW->scrActions["tableSplitCells"]);
 		if (m_actionList.contains("tableSetRowHeights"))
-			addAction(m_AP->scrActions["tableSetRowHeights"]);
+			addAction(m_ScMW->scrActions["tableSetRowHeights"]);
 		if (m_actionList.contains("tableSetColumnWidths"))
-			addAction(m_AP->scrActions["tableSetColumnWidths"]);
+			addAction(m_ScMW->scrActions["tableSetColumnWidths"]);
 		if (m_actionList.contains("tableDistributeRowsEvenly"))
-			addAction(m_AP->scrActions["tableDistributeRowsEvenly"]);
+			addAction(m_ScMW->scrActions["tableDistributeRowsEvenly"]);
 		if (m_actionList.contains("tableDistributeColumnsEvenly"))
-			addAction(m_AP->scrActions["tableDistributeColumnsEvenly"]);
+			addAction(m_ScMW->scrActions["tableDistributeColumnsEvenly"]);
 		if (m_actionList.contains("tableAdjustFrameToTable"))
-			addAction(m_AP->scrActions["tableAdjustFrameToTable"]);
+			addAction(m_ScMW->scrActions["tableAdjustFrameToTable"]);
 		if (m_actionList.contains("tableAdjustTableToFrame"))
-			addAction(m_AP->scrActions["tableAdjustTableToFrame"]);
+			addAction(m_ScMW->scrActions["tableAdjustTableToFrame"]);
 		if (m_actionList.contains("itemAdjustFrameHeightToText"))
-			addAction(m_AP->scrActions["itemAdjustFrameHeightToText"]);
+			addAction(m_ScMW->scrActions["itemAdjustFrameHeightToText"]);
 		if (m_actionList.contains("itemExtendedImageProperties"))
-			addAction(m_AP->scrActions["itemExtendedImageProperties"]);
+			addAction(m_ScMW->scrActions["itemExtendedImageProperties"]);
 		if (m_actionList.contains("itemAdjustFrameToImage"))
 		{
 			if (currItem->PictureIsAvailable)
-				addAction(m_AP->scrActions["itemToggleInlineImage"]);
+				addAction(m_ScMW->scrActions["itemToggleInlineImage"]);
 		}
 		if (m_actionList.contains("itemImageInfo"))
-			addAction(m_AP->scrActions["itemImageInfo"]);
+			addAction(m_ScMW->scrActions["itemImageInfo"]);
 		if (m_actionList.contains("itemUpdateImage"))
-			addAction(m_AP->scrActions["itemUpdateImage"]);
+			addAction(m_ScMW->scrActions["itemUpdateImage"]);
 		
 		if (m_actionList.contains("itemPreviewLow"))
 		{
 			if (m_actionList.contains("itemImageIsVisible"))
-				menuResolution->addAction(m_AP->scrActions["itemImageIsVisible"]);
+				menuResolution->addAction(m_ScMW->scrActions["itemImageIsVisible"]);
 			menuResolution->addSeparator();
 			if (m_actionList.contains("itemPreviewLow"))
-				menuResolution->addAction(m_AP->scrActions["itemPreviewLow"]);
+				menuResolution->addAction(m_ScMW->scrActions["itemPreviewLow"]);
 			if (m_actionList.contains("itemPreviewNormal"))
-				menuResolution->addAction(m_AP->scrActions["itemPreviewNormal"]);
+				menuResolution->addAction(m_ScMW->scrActions["itemPreviewNormal"]);
 			if (m_actionList.contains("itemPreviewFull"))
-				menuResolution->addAction(m_AP->scrActions["itemPreviewFull"]);
+				menuResolution->addAction(m_ScMW->scrActions["itemPreviewFull"]);
 			if (menuResolution->actions().count()>0)
 			{
 				QAction *act = addMenu(menuResolution);
@@ -279,24 +282,24 @@
 		}
 		
 		if (m_actionList.contains("styleImageEffects"))
-			addAction(m_AP->scrActions["styleImageEffects"]);
+			addAction(m_ScMW->scrActions["styleImageEffects"]);
 		if (m_actionList.contains("editEditWithImageEditor"))
-			addAction(m_AP->scrActions["editEditWithImageEditor"]);
+			addAction(m_ScMW->scrActions["editEditWithImageEditor"]);
 		if (selectedItemCount==1 && currItem->asImageFrame())
 		{
 			if (currItem->PictureIsAvailable)
 			{
-				m_AP->scrActions["itemAdjustFrameToImage"]->setEnabled(true);
-				m_AP->scrActions["itemAdjustImageToFrame"]->setEnabled(true);
+				m_ScMW->scrActions["itemAdjustFrameToImage"]->setEnabled(true);
+				m_ScMW->scrActions["itemAdjustImageToFrame"]->setEnabled(true);
 				if (currItem->pixm.imgInfo.valid)
-					m_AP->scrActions["itemExtendedImageProperties"]->setEnabled(true);
+					m_ScMW->scrActions["itemExtendedImageProperties"]->setEnabled(true);
 				if (currItem->pixm.imgInfo.exifDataValid)
-					m_AP->scrActions["itemImageInfo"]->setEnabled(true);
-				m_AP->scrActions["itemUpdateImage"]->setEnabled(true);
+					m_ScMW->scrActions["itemImageInfo"]->setEnabled(true);
+				m_ScMW->scrActions["itemUpdateImage"]->setEnabled(true);
 				if (currItem->isRaster)
 				{
-					m_AP->scrActions["styleImageEffects"]->setEnabled(true);
-					m_AP->scrActions["editEditWithImageEditor"]->setEnabled(true);
+					m_ScMW->scrActions["styleImageEffects"]->setEnabled(true);
+					m_ScMW->scrActions["editEditWithImageEditor"]->setEnabled(true);
 				}
 			}
 		}
@@ -304,48 +307,74 @@
 		if ((selectedItemCount==1) && currItem->asTextFrame())
 		{
 			if (currItem->itemText.length() > 0)
-				m_AP->scrActions["itemAdjustFrameHeightToText"]->setEnabled(true);
-		}
-	}
-	//-->
-	
+				m_ScMW->scrActions["itemAdjustFrameHeightToText"]->setEnabled(true);
+		}
+	}
+	//-->
+
 	//<-- Item Attributes
 	if (selectedItemCount == 1)
 	{
 		addSeparator();
-		addAction(m_AP->scrActions["itemAttributes"]);
-	}
-	//-->
+		addAction(m_ScMW->scrActions["itemAttributes"]);
+	}
+	//-->
+
 	//<-- Item PDF Options
 	if (currItem->itemType() == PageItem::TextFrame)
 	{
 		QAction *act = addMenu(menuPDF);
 		act->setText( ScribusView::tr("&PDF Options"));
-		menuPDF->addAction(m_AP->scrActions["itemPDFIsAnnotation"]);
+		menuPDF->addAction(m_ScMW->scrActions["itemPDFIsAnnotation"]);
 		if (!m_doc->masterPageMode())
-			menuPDF->addAction(m_AP->scrActions["itemPDFIsBookmark"]);
+			menuPDF->addAction(m_ScMW->scrActions["itemPDFIsBookmark"]);
 		if (selectedItemCount == 1)
 		{
 			menuPDF->addSeparator();
 			if (m_actionList.contains("itemPDFAnnotationProps"))
-				menuPDF->addAction(m_AP->scrActions["itemPDFAnnotationProps"]);
+				menuPDF->addAction(m_ScMW->scrActions["itemPDFAnnotationProps"]);
 			if (m_actionList.contains("itemPDFFieldProps"))
-				menuPDF->addAction(m_AP->scrActions["itemPDFFieldProps"]);
-		}
-	}
-	//-->
-	
+				menuPDF->addAction(m_ScMW->scrActions["itemPDFFieldProps"]);
+		}
+	}
+	//-->
+
 	//<-- Item Locking
 	addSeparator();
 	//-->
 	
 	if (selectedItemCount>0)
 	{
-		QAction *actSl = addMenu(m_AP->scrMenuMgr->getLocalPopupMenu("Locking"));
-		actSl->setText( ScribusView::tr("Locking"));
-		QAction *actSc = addMenu(m_AP->scrMenuMgr->getLocalPopupMenu("SendTo"));
-		actSc->setText( ScribusView::tr("Send to"));
+		menuLocking->addAction(m_ScMW->scrActions["itemLock"]);
+		menuLocking->addAction(m_ScMW->scrActions["itemLockSize"]);
+		QAction *actL = addMenu(menuLocking);
+		actL->setText( ScribusView::tr("Locking"));
+
+		//menuSendTo->addAction(m_AP->scrActions["itemSendToScrapbook"]);
+
+		QAction *actST = addMenu(menuSendTo);
+		actST->setText( ScribusView::tr("Send to"));
+		QAction *actScr = menuSendTo->addMenu(menuScrapbook);
+		actScr->setText( ScribusView::tr("Scrapbook"));
+		menuSendTo->addAction(m_ScMW->scrActions["itemSendToPattern"]);
+		menuSendTo->addAction(m_ScMW->scrActions["itemSendToInline"]);
+
+		QStringList scrapNames = m_ScMW->scrapbookNames();
+		scrapNames.removeAt(1);
+		for (int i = 0; i < scrapNames.count(); i++)
+		{
+			ScrAction *act = new ScrAction( ScrAction::DataInt, QPixmap(), QPixmap(), scrapNames[i], QKeySequence(), this, i);
+			menuScrapbook->addAction(act);
+			//scrScrapActions.insert(scrapNames[i], act);
+			//scrMenuMgr->addMenuItem(act, "itemSendToScrapbook", true);
+			connect(act, SIGNAL(triggeredData(int)), m_ScMW, SLOT(PutScrap(int)));
+		}
+		//QAction *actSl = addMenu(m_AP->scrMenuMgr->getLocalPopupMenu("Locking"));
+		//actSl->setText( ScribusView::tr("Locking"));
+		//QAction *actSc = addMenu(m_AP->scrMenuMgr->getLocalPopupMenu("SendTo"));
+		//actSc->setText( ScribusView::tr("Send to"));
 		//<-- Add Layer Items
+
 		if (m_doc->layerCount() > 1)
 		{
 			QMap<int,int> layerMap;
@@ -355,13 +384,13 @@
 			while (i>=0)
 			{
 				if (m_doc->layerLocked(layerMap[i]))
-					m_AP->scrLayersActions[QString::number(layerMap[i])]->setEnabled(false);
+					m_ScMW->scrLayersActions[QString::number(layerMap[i])]->setEnabled(false);
 				else
-					m_AP->scrLayersActions[QString::number(layerMap[i])]->setEnabled(true);
+					m_ScMW->scrLayersActions[QString::number(layerMap[i])]->setEnabled(true);
 				QPixmap pm(20,15);
 				pm.fill(m_doc->layerMarker(layerMap[i]));
-				m_AP->scrLayersActions[QString::number(layerMap[i])]->setIcon(pm);
-				menuLayer->addAction(m_AP->scrLayersActions[QString::number(layerMap[i--])]);
+				m_ScMW->scrLayersActions[QString::number(layerMap[i])]->setIcon(pm);
+				menuLayer->addAction(m_ScMW->scrLayersActions[QString::number(layerMap[i--])]);
 			}
 			QAction *act = addMenu(menuLayer);
 			act->setText( ScribusView::tr("Send to La&yer"));
@@ -372,14 +401,14 @@
 	if (selectedItemCount > 1)
 	{
 		if (m_Sel.objectsLayer() != -1)
-			addAction(m_AP->scrActions["itemGroup"]);
+			addAction(m_ScMW->scrActions["itemGroup"]);
 	}
 	else
 	{
 		if (currItem->isGroup())
 		{
-			addAction(m_AP->scrActions["itemUngroup"]);
-			addAction(m_AP->scrActions["itemGroupAdjust"]);
+			addAction(m_ScMW->scrActions["itemUngroup"]);
+			addAction(m_ScMW->scrActions["itemGroupAdjust"]);
 		}
 	}
 	//-->
@@ -387,10 +416,10 @@
 	//<-- Add Level Item
 	if (!currItem->locked())
 	{
-		menuLevel->addAction(m_AP->scrActions["itemRaiseToTop"]);
-		menuLevel->addAction(m_AP->scrActions["itemRaise"]);
-		menuLevel->addAction(m_AP->scrActions["itemLower"]);
-		menuLevel->addAction(m_AP->scrActions["itemLowerToBottom"]);
+		menuLevel->addAction(m_ScMW->scrActions["itemRaiseToTop"]);
+		menuLevel->addAction(m_ScMW->scrActions["itemRaise"]);
+		menuLevel->addAction(m_ScMW->scrActions["itemLower"]);
+		menuLevel->addAction(m_ScMW->scrActions["itemLowerToBottom"]);
 		if (menuLevel->actions().count()>0)
 		{
 			QAction *act = addMenu(menuLevel);
@@ -402,18 +431,18 @@
 	//<-- Add Convert To Items
 	if (m_doc->appMode != modeEdit && (itemsAreSameType || currItem->isSingleSel)) //Create convertTo Menu
 	{
-		if (m_AP->scrActions["itemConvertToBezierCurve"]->isEnabled() && m_actionList.contains("itemConvertToBezierCurve"))
-			menuConvertTo->addAction(m_AP->scrActions["itemConvertToBezierCurve"]);
-		if (m_AP->scrActions["itemConvertToImageFrame"]->isEnabled() && m_actionList.contains("itemConvertToImageFrame"))
-			menuConvertTo->addAction(m_AP->scrActions["itemConvertToImageFrame"]);
-		if (m_AP->scrActions["itemConvertToOutlines"]->isEnabled() && m_actionList.contains("itemConvertToOutlines"))
-			menuConvertTo->addAction(m_AP->scrActions["itemConvertToOutlines"]);
-		if (m_AP->scrActions["itemConvertToPolygon"]->isEnabled() && m_actionList.contains("itemConvertToPolygon"))
-			menuConvertTo->addAction(m_AP->scrActions["itemConvertToPolygon"]);
-		if (m_AP->scrActions["itemConvertToTextFrame"]->isEnabled() && m_actionList.contains("itemConvertToTextFrame"))
-			menuConvertTo->addAction(m_AP->scrActions["itemConvertToTextFrame"]);
-		if (m_AP->scrActions["itemConvertToSymbolFrame"]->isEnabled() && !currItem->isSymbol())
-			menuConvertTo->addAction(m_AP->scrActions["itemConvertToSymbolFrame"]);
+		if (m_ScMW->scrActions["itemConvertToBezierCurve"]->isEnabled() && m_actionList.contains("itemConvertToBezierCurve"))
+			menuConvertTo->addAction(m_ScMW->scrActions["itemConvertToBezierCurve"]);
+		if (m_ScMW->scrActions["itemConvertToImageFrame"]->isEnabled() && m_actionList.contains("itemConvertToImageFrame"))
+			menuConvertTo->addAction(m_ScMW->scrActions["itemConvertToImageFrame"]);
+		if (m_ScMW->scrActions["itemConvertToOutlines"]->isEnabled() && m_actionList.contains("itemConvertToOutlines"))
+			menuConvertTo->addAction(m_ScMW->scrActions["itemConvertToOutlines"]);
+		if (m_ScMW->scrActions["itemConvertToPolygon"]->isEnabled() && m_actionList.contains("itemConvertToPolygon"))
+			menuConvertTo->addAction(m_ScMW->scrActions["itemConvertToPolygon"]);
+		if (m_ScMW->scrActions["itemConvertToTextFrame"]->isEnabled() && m_actionList.contains("itemConvertToTextFrame"))
+			menuConvertTo->addAction(m_ScMW->scrActions["itemConvertToTextFrame"]);
+		if (m_ScMW->scrActions["itemConvertToSymbolFrame"]->isEnabled() && !currItem->isSymbol())
+			menuConvertTo->addAction(m_ScMW->scrActions["itemConvertToSymbolFrame"]);
 		if (menuConvertTo->actions().count()>0)
 		{
 			QAction *act = addMenu(menuConvertTo);
@@ -425,27 +454,27 @@
 	//<-- Add Copy/Paste Actions
 	addSeparator();
 	if (!currItem->locked() && !(currItem->isSingleSel))
-		addAction(m_AP->scrActions["editCut"]);
+		addAction(m_ScMW->scrActions["editCut"]);
 	if (!(currItem->isSingleSel))
-		addAction(m_AP->scrActions["editCopy"]);
+		addAction(m_ScMW->scrActions["editCopy"]);
 	if ((m_doc->appMode == modeEdit) && (ScMimeData::clipboardHasScribusText()||ScMimeData::clipboardHasPlainText()) && (currItem->itemType() == PageItem::TextFrame))
-		addAction(m_AP->scrActions["editPaste"]);
+		addAction(m_ScMW->scrActions["editPaste"]);
 	if (!currItem->locked() && (m_doc->appMode != modeEdit) && (!(currItem->isSingleSel)))
-		addAction(m_AP->scrActions["itemDelete"]);
+		addAction(m_ScMW->scrActions["itemDelete"]);
 	//-->
 	
 	//<-- Add Contents Actions
 	if (itemsAreSameType)
 	{
 		if (m_actionList.contains("editCopyContents"))
-			menuEditContents->addAction(m_AP->scrActions["editCopyContents"]);
+			menuEditContents->addAction(m_ScMW->scrActions["editCopyContents"]);
 		if (m_actionList.contains("editPasteContents"))
-			menuEditContents->addAction(m_AP->scrActions["editPasteContents"]);
+			menuEditContents->addAction(m_ScMW->scrActions["editPasteContents"]);
 		if (currItem->asImageFrame() && m_actionList.contains("editPasteContentsAbs"))
-			menuEditContents->addAction(m_AP->scrActions["editPasteContentsAbs"]);
+			menuEditContents->addAction(m_ScMW->scrActions["editPasteContentsAbs"]);
 	}
 	if (m_actionList.contains("editClearContents"))
-		menuEditContents->addAction(m_AP->scrActions["editClearContents"]);
+		menuEditContents->addAction(m_ScMW->scrActions["editClearContents"]);
 	if (menuEditContents->actions().count()>0)
 	{
 		QAction *act = addMenu(menuEditContents);
@@ -463,27 +492,28 @@
 			currItem = m_Sel.itemAt(a);
 			if (currItem->isWelded())
 			{
-				addAction(m_AP->scrActions["itemsUnWeld"]);
+				addAction(m_ScMW->scrActions["itemsUnWeld"]);
 				break;
 			}
 		}
 	}
 	if (selectedItemCount == 2 && m_doc->appMode != modeEdit)
-		addAction(m_AP->scrActions["itemWeld"]);
-/*	{
-		menuWeld->addAction(m_AP->scrActions["itemWeld17"]);
-		menuWeld->addAction(m_AP->scrActions["itemWeld71"]);
-		menuWeld->addAction(m_AP->scrActions["itemWeld13"]);
-		menuWeld->addAction(m_AP->scrActions["itemWeld31"]);
-		QAction *act = addMenu(menuWeld);
-		act->setText( ScribusView::tr("Weld to last..."));
-	}*/
+		addAction(m_ScMW->scrActions["itemWeld"]);
+//	{
+//		menuWeld->addAction(m_AP->scrActions["itemWeld17"]);
+//		menuWeld->addAction(m_AP->scrActions["itemWeld71"]);
+//		menuWeld->addAction(m_AP->scrActions["itemWeld13"]);
+//		menuWeld->addAction(m_AP->scrActions["itemWeld31"]);
+//		QAction *act = addMenu(menuWeld);
+//		act->setText( ScribusView::tr("Weld to last..."));
+//	}
 	//-->
 	
 	//<-- Add Properties
 	addSeparator();
-	addAction(m_AP->scrActions["toolsProperties"]);
-	//-->
+	addAction(m_ScMW->scrActions["toolsProperties"]);
+	//-->
+
 }
 
 void ContextMenu::createMenuItems_NoSelection(double mx, double my)
@@ -498,7 +528,7 @@
 		m_doc->view()->dragY = my;
 		addAction( ScribusView::tr("&Paste") , m_doc->view(), SLOT(PasteToPage()));
 	}
-	if (m_AP->scrRecentPasteActions.count()>0)
+	if (m_ScMW->scrRecentPasteActions.count()>0)
 	{
 		m_doc->view()->dragX = mx;
 		m_doc->view()->dragY = my;
@@ -508,7 +538,7 @@
 		
 		QMap<QString, QPointer<ScrAction> > scrRecentPasteActions;
 		ScrAction *recentPasteAction;
-		foreach (recentPasteAction, m_AP->scrRecentPasteActions)
+		foreach (recentPasteAction, m_ScMW->scrRecentPasteActions)
 			menuPasteRecent->addAction(recentPasteAction);
 		addSeparator();
 	}
@@ -516,44 +546,44 @@
 	connect(act, SIGNAL(triggered()), dynamic_cast<QObject*>(m_doc->view()->m_canvasMode), SLOT(importToPage()));
 	addSeparator();
 
-	addAction(m_AP->scrActions["editUndoAction"]);
-	addAction(m_AP->scrActions["editRedoAction"]);
-	addSeparator();
-	addAction(m_AP->scrActions["viewShowMargins"]);
-	addAction(m_AP->scrActions["viewShowFrames"]);
-	addAction(m_AP->scrActions["viewShowLayerMarkers"]);
-	addAction(m_AP->scrActions["viewShowImages"]);
-	addAction(m_AP->scrActions["viewShowGrid"]);
-	addAction(m_AP->scrActions["viewShowGuides"]);
-	addAction(m_AP->scrActions["viewShowColumnBorders"]);
-	addAction(m_AP->scrActions["viewShowBaseline"]);
-	addAction(m_AP->scrActions["viewShowTextChain"]);
-	addAction(m_AP->scrActions["viewShowRulers"]);
-	addAction(m_AP->scrActions["viewRulerMode"]);
-	addSeparator();
-	addAction(m_AP->scrActions["viewSnapToGrid"]);
-	addAction(m_AP->scrActions["viewSnapToGuides"]);
-	addAction(m_AP->scrActions["viewSnapToElements"]);
+	addAction(m_ScMW->scrActions["editUndoAction"]);
+	addAction(m_ScMW->scrActions["editRedoAction"]);
+	addSeparator();
+	addAction(m_ScMW->scrActions["viewShowMargins"]);
+	addAction(m_ScMW->scrActions["viewShowFrames"]);
+	addAction(m_ScMW->scrActions["viewShowLayerMarkers"]);
+	addAction(m_ScMW->scrActions["viewShowImages"]);
+	addAction(m_ScMW->scrActions["viewShowGrid"]);
+	addAction(m_ScMW->scrActions["viewShowGuides"]);
+	addAction(m_ScMW->scrActions["viewShowColumnBorders"]);
+	addAction(m_ScMW->scrActions["viewShowBaseline"]);
+	addAction(m_ScMW->scrActions["viewShowTextChain"]);
+	addAction(m_ScMW->scrActions["viewShowRulers"]);
+	addAction(m_ScMW->scrActions["viewRulerMode"]);
+	addSeparator();
+	addAction(m_ScMW->scrActions["viewSnapToGrid"]);
+	addAction(m_ScMW->scrActions["viewSnapToGuides"]);
+	addAction(m_ScMW->scrActions["viewSnapToElements"]);
 	
 	onAPage = (m_doc->OnPage(mx, my) != -1);
 	if (onAPage)
 	{
 		addSeparator();
-		addAction(m_AP->scrActions["pageApplyMasterPage"]);
-		addAction(m_AP->scrActions["pageManageGuides"]);
-		addAction(m_AP->scrActions["pageManageMargins"]);
-		if (m_AP->scrActions["pageDelete"]->isEnabled())
+		addAction(m_ScMW->scrActions["pageApplyMasterPage"]);
+		addAction(m_ScMW->scrActions["pageManageGuides"]);
+		addAction(m_ScMW->scrActions["pageManageMargins"]);
+		if (m_ScMW->scrActions["pageDelete"]->isEnabled())
 		{
 			addSeparator();
-			pageDeletePrimaryString=m_AP->scrActions["pageDelete"]->text();
-			m_AP->scrActions["pageDelete"]->setText(tr("Delete Page"));
-			addAction(m_AP->scrActions["pageDelete"]);
+			pageDeletePrimaryString=m_ScMW->scrActions["pageDelete"]->text();
+			m_ScMW->scrActions["pageDelete"]->setText(tr("Delete Page"));
+			addAction(m_ScMW->scrActions["pageDelete"]);
 		}
 	}
 }
 
 ContextMenu::~ContextMenu()
 {
-	if (onAPage && m_AP->scrActions["pageDelete"]->isEnabled())
-		m_AP->scrActions["pageDelete"]->setText(pageDeletePrimaryString);
+	if (onAPage && m_ScMW->scrActions["pageDelete"]->isEnabled())
+		m_ScMW->scrActions["pageDelete"]->setText(pageDeletePrimaryString);
 }

Modified: trunk/Scribus/scribus/ui/contextmenu.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18466&path=/trunk/Scribus/scribus/ui/contextmenu.h
==============================================================================
--- trunk/Scribus/scribus/ui/contextmenu.h (original)
+++ trunk/Scribus/scribus/ui/contextmenu.h Mon Sep  9 16:41:28 2013
@@ -41,7 +41,7 @@
 	
 	Selection m_Sel;
 	QStringList m_actionList;
-	ScribusMainWindow *m_AP;
+	ScribusMainWindow *m_ScMW;
 	ScribusDoc *m_doc;
 	
 	QString pageDeletePrimaryString;




More information about the scribus-commit mailing list