Author: jghali
Date: Wed Aug 28 13:49:28 2019
New Revision: 23167
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23167
Log:
code style fixes for actionmanager: add some spaces where missing
Modified:
trunk/Scribus/scribus/actionmanager.cpp
Modified: trunk/Scribus/scribus/actionmanager.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23167&path=/trunk/Scribus/scribus/actionmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/actionmanager.cpp (original)
+++ trunk/Scribus/scribus/actionmanager.cpp Wed Aug 28 13:49:28 2019
@@ -114,57 +114,57 @@
{
QString name;
//File Menu
- name="fileNew";
+ name = "fileNew";
scrActions->insert(name, new
ScrAction(im.loadPixmap("16/document-new.png"),
im.loadPixmap("22/document-new.png"), "", defaultKey(name), mainWindow));
- name="fileNewFromTemplate";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="fileOpen";
+ name = "fileNewFromTemplate";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "fileOpen";
scrActions->insert(name, new
ScrAction(im.loadPixmap("16/document-open.png"),
im.loadPixmap("22/document-open.png"), "", defaultKey(name), mainWindow));
- name="fileClose";
+ name = "fileClose";
scrActions->insert(name, new ScrAction(im.loadPixmap("16/close.png"),
im.loadPixmap("22/close.png"), "", defaultKey(name), mainWindow));
- name="fileSave";
+ name = "fileSave";
scrActions->insert(name, new
ScrAction(im.loadPixmap("16/document-save.png"),
im.loadPixmap("22/document-save.png"), "", defaultKey(name), mainWindow));
- name="fileSaveAs";
+ name = "fileSaveAs";
scrActions->insert(name, new
ScrAction(im.loadPixmap("16/document-save-as.png"),
im.loadPixmap("22/document-save-as.png"), "", defaultKey(name), mainWindow));
- name="fileRevert";
+ name = "fileRevert";
scrActions->insert(name, new ScrAction(im.loadPixmap("revert.png"),
QPixmap(), "", defaultKey(name), mainWindow));
- name="fileCollect";
+ name = "fileCollect";
scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
//File Import Menu
- name="fileImportText";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="fileImportText2";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="fileImportAppendText";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="fileImportImage";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="fileImportVector";
+ name = "fileImportText";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "fileImportText2";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "fileImportAppendText";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "fileImportImage";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "fileImportVector";
scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
//File Export Menu
- name="fileExportText";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="fileExportAsEPS";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="fileExportAsPDF";
+ name = "fileExportText";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "fileExportAsEPS";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "fileExportAsPDF";
scrActions->insert(name, new ScrAction(im.loadPixmap("acroread16.png"),
im.loadPixmap("acroread22.png"), "", defaultKey(name), mainWindow));
//Rest of File Menu
-// name="fileDocSetup";
+// name = "fileDocSetup";
// scrActions->insert(name, new
ScrAction(im.loadPixmap("16/document-properties.png"),
im.loadPixmap("22/document-properties.png"), "", defaultKey(name), mainWindow));
- name="fileDocSetup150";
+ name = "fileDocSetup150";
scrActions->insert(name, new
ScrAction(im.loadPixmap("16/document-properties.png"),
im.loadPixmap("22/document-properties.png"), "", defaultKey(name), mainWindow));
-// name="filePreferences";
+// name = "filePreferences";
// scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
// (*scrActions)[name]->setMenuRole(QAction::NoRole);
- name="filePreferences150";
+ name = "filePreferences150";
scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
(*scrActions)[name]->setMenuRole(QAction::PreferencesRole);
- name="filePrint";
+ name = "filePrint";
scrActions->insert(name, new
ScrAction(im.loadPixmap("16/document-print.png"),
im.loadPixmap("22/document-print.png"), "", defaultKey(name), mainWindow));
- name="PrintPreview";
+ name = "PrintPreview";
scrActions->insert(name, new
ScrAction(im.loadPixmap("16/document-print-preview.png"),
im.loadPixmap("22/document-print-preview.png"), "", defaultKey(name),
mainWindow));
- name="fileQuit";
+ name = "fileQuit";
scrActions->insert(name, new ScrAction(im.loadPixmap("exit.png"),
QPixmap(), "", defaultKey(name), mainWindow));
(*scrActions)[name]->setMenuRole(QAction::QuitRole);
@@ -203,57 +203,57 @@
{
QString name;
//Edit Menu
- name="editUndoAction";
+ name = "editUndoAction";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,
im.loadPixmap("16/edit-undo.png"), im.loadPixmap("22/edit-undo.png"), "",
defaultKey(name), mainWindow, 1));
- name="editRedoAction";
+ name = "editRedoAction";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,
im.loadPixmap("16/edit-redo.png"), im.loadPixmap("22/edit-redo.png"), "",
defaultKey(name), mainWindow, 1));
- name="editActionMode";
+ name = "editActionMode";
scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
(*scrActions)["editActionMode"]->setToggleAction(true);
- name="editCut";
+ name = "editCut";
scrActions->insert(name, new
ScrAction(im.loadPixmap("16/edit-cut.png"), im.loadPixmap("22/edit-cut.png"),
"", defaultKey(name), mainWindow));
- name="editCopy";
+ name = "editCopy";
scrActions->insert(name, new
ScrAction(im.loadPixmap("16/edit-copy.png"), im.loadPixmap("22/edit-copy.png"),
"", defaultKey(name), mainWindow));
- name="editPaste";
+ name = "editPaste";
scrActions->insert(name, new
ScrAction(im.loadPixmap("16/edit-paste.png"),
im.loadPixmap("22/edit-paste.png"), "", defaultKey(name), mainWindow));
- name="editCopyContents";
+ name = "editCopyContents";
scrActions->insert(name, new
ScrAction(im.loadPixmap("16/edit-copy.png"), im.loadPixmap("22/edit-copy.png"),
"", defaultKey(name), mainWindow));
- name="editPasteContents";
+ name = "editPasteContents";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,
im.loadPixmap("16/edit-paste.png"), QPixmap(), "", defaultKey(name),
mainWindow, 0));
- name="editPasteContentsAbs";
+ name = "editPasteContentsAbs";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,
im.loadPixmap("16/edit-paste.png"), QPixmap(), "", defaultKey(name),
mainWindow, 1));
- name="editPasteImageFromClipboard";
+ name = "editPasteImageFromClipboard";
scrActions->insert(name, new
ScrAction(im.loadPixmap("16/edit-paste.png"),
im.loadPixmap("22/edit-paste.png"), "", defaultKey(name), mainWindow));
- name="editClearContents";
+ name = "editClearContents";
scrActions->insert(name, new
ScrAction(im.loadPixmap("16/edit-delete.png"),
im.loadPixmap("22/edit-delete.png"), "", defaultKey(name), mainWindow));
- name="editTruncateContents";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="editSelectAll";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="editSelectAllOnLayer";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="editDeselectAll";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="editSearchReplace";
+ name = "editTruncateContents";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "editSelectAll";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "editSelectAllOnLayer";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "editDeselectAll";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "editSearchReplace";
scrActions->insert(name, new
ScrAction(im.loadPixmap("16/edit-find-replace.png"),
im.loadPixmap("22/edit-find-replace.png"), "", defaultKey(name), mainWindow));
- name="editEditWithImageEditor";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="editEditRenderSource";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="editColorsAndFills";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="editReplaceColors";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="editStyles";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="editMasterPages";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="editJavascripts";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="editMarks";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="editNotesStyles";
+ name = "editEditWithImageEditor";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "editEditRenderSource";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "editColorsAndFills";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "editReplaceColors";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "editStyles";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "editMasterPages";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "editJavascripts";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "editMarks";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "editNotesStyles";
scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
(*scrActions)["editStyles"]->setToggleAction(true);
@@ -301,15 +301,15 @@
}
//Alignment actions
- name="alignLeft";
+ name = "alignLeft";
scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(),
QPixmap(), "", defaultKey(name), mainWindow, 0));
- name="alignCenter";
+ name = "alignCenter";
scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(),
QPixmap(), "", defaultKey(name), mainWindow, 1));
- name="alignRight";
+ name = "alignRight";
scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(),
QPixmap(), "", defaultKey(name), mainWindow, 2));
- name="alignBlock";
+ name = "alignBlock";
scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(),
QPixmap(), "", defaultKey(name), mainWindow, 3));
- name="alignForced";
+ name = "alignForced";
scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(),
QPixmap(), "", defaultKey(name), mainWindow, 4));
(*scrActions)["alignLeft"]->setToggleAction(true);
@@ -327,7 +327,7 @@
//Shade actions
/*
scrActionGroups->insert("shade", new QActionGroup(mainWindow));
- name="shadeOther";
+ name = "shadeOther";
scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(),
QPixmap(), "", defaultKey(name), scrActionGroups->value("shade"), -1));
connect( (*scrActions)["shadeOther"], SIGNAL(triggeredData(int)),
mainWindow, SLOT(setItemShade(int)));
for (uint i=0; i<=100 ; i+=10)
@@ -341,25 +341,25 @@
//Type Effects actions
scrActionGroups->insert("typeEffects", new QActionGroup(mainWindow));
- name="typeEffectNormal";
+ name = "typeEffectNormal";
scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(),
QPixmap(), "", defaultKey(name), scrActionGroups->value("typeEffects"), 0));
- name="typeEffectUnderline";
+ name = "typeEffectUnderline";
scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(),
QPixmap(), "", defaultKey(name), scrActionGroups->value("typeEffects"), 1));
- name="typeEffectUnderlineWords";
+ name = "typeEffectUnderlineWords";
scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(),
QPixmap(), "", defaultKey(name), scrActionGroups->value("typeEffects"), 8));
- name="typeEffectStrikeThrough";
+ name = "typeEffectStrikeThrough";
scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(),
QPixmap(), "", defaultKey(name), scrActionGroups->value("typeEffects"), 2));
- name="typeEffectAllCaps";
+ name = "typeEffectAllCaps";
scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(),
QPixmap(), "", defaultKey(name), scrActionGroups->value("typeEffects"), 7));
- name="typeEffectSmallCaps";
+ name = "typeEffectSmallCaps";
scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(),
QPixmap(), "", defaultKey(name), scrActionGroups->value("typeEffects"), 3));
- name="typeEffectSuperscript";
+ name = "typeEffectSuperscript";
scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(),
QPixmap(), "", defaultKey(name), scrActionGroups->value("typeEffects"), 4));
- name="typeEffectSubscript";
+ name = "typeEffectSubscript";
scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(),
QPixmap(), "", defaultKey(name), scrActionGroups->value("typeEffects"), 5));
- name="typeEffectOutline";
+ name = "typeEffectOutline";
scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(),
QPixmap(), "", defaultKey(name), scrActionGroups->value("typeEffects"), 6));
- name="typeEffectShadow";
+ name = "typeEffectShadow";
scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(),
QPixmap(), "", defaultKey(name), scrActionGroups->value("typeEffects"), 9));
(*scrActions)["typeEffectNormal"]->setToggleAction(true);
(*scrActions)["typeEffectUnderline"]->setToggleAction(true);
@@ -383,9 +383,9 @@
connect( (*scrActions)["typeEffectShadow"], SIGNAL(triggeredData(int)),
mainWindow, SLOT(setItemTypeStyle(int)));
//Other Style menu items that get added in various places
- name="styleImageEffects";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="styleTabulators";
+ name = "styleImageEffects";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "styleTabulators";
scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
connect( (*scrActions)["styleImageEffects"], SIGNAL(triggered()),
mainWindow, SLOT(ImageEffects()));
connect( (*scrActions)["styleTabulators"], SIGNAL(triggered()),
mainWindow, SLOT(EditTabs()));
@@ -395,64 +395,64 @@
{
QString name;
//Item Menu
- name="itemDuplicate";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="itemMulDuplicate";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="itemTransform";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="itemDelete";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="itemGroup";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="itemUngroup";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="itemGroupAdjust";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="itemLock";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="itemLockSize";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="itemPrintingEnabled";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="itemFlipH";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="itemFlipV";
+ name = "itemDuplicate";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "itemMulDuplicate";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "itemTransform";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "itemDelete";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "itemGroup";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "itemUngroup";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "itemGroupAdjust";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "itemLock";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "itemLockSize";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "itemPrintingEnabled";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "itemFlipH";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "itemFlipV";
scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
(*scrActions)["itemLock"]->setToggleAction(true, true);
(*scrActions)["itemLockSize"]->setToggleAction(true, true);
(*scrActions)["itemPrintingEnabled"]->setToggleAction(true, true);
(*scrActions)["itemFlipH"]->setToggleAction(true, true);
(*scrActions)["itemFlipV"]->setToggleAction(true, true);
- name="itemLowerToBottom";
+ name = "itemLowerToBottom";
scrActions->insert(name, new
ScrAction(im.loadPixmap("16/go-bottom.png"), im.loadPixmap("22/go-bottom.png"),
"", defaultKey(name), mainWindow));
- name="itemRaiseToTop";
+ name = "itemRaiseToTop";
scrActions->insert(name, new ScrAction(im.loadPixmap("16/go-top.png"),
im.loadPixmap("22/go-top.png"), "", defaultKey(name), mainWindow));
- name="itemLower";
+ name = "itemLower";
scrActions->insert(name, new ScrAction(im.loadPixmap("16/go-down.png"),
im.loadPixmap("22/go-down.png"), "", defaultKey(name), mainWindow));
- name="itemRaise";
+ name = "itemRaise";
scrActions->insert(name, new ScrAction(im.loadPixmap("16/go-up.png"),
im.loadPixmap("22/go-up.png"), "", defaultKey(name), mainWindow));
- name="itemSendToPattern";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="itemSendToInline";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="itemImageInfo";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="itemAttributes";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="itemImageIsVisible";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="itemUpdateImage";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="itemAdjustFrameHeightToText";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="itemAdjustFrameToImage";
+ name = "itemSendToPattern";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "itemSendToInline";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "itemImageInfo";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "itemAttributes";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "itemImageIsVisible";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "itemUpdateImage";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "itemAdjustFrameHeightToText";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "itemAdjustFrameToImage";
scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
name = "itemAdjustImageToFrame";
scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="itemExtendedImageProperties";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="itemToggleInlineImage";
+ name = "itemExtendedImageProperties";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "itemToggleInlineImage";
scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
QActionGroup* itemPreviewGroup = new QActionGroup(mainWindow);
@@ -471,46 +471,46 @@
(*scrActions)["itemPreviewLow"]->setToggleAction(true);
(*scrActions)["itemToggleInlineImage"]->setToggleAction(true);
- name="itemPDFIsBookmark";
+ name = "itemPDFIsBookmark";
scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
(*scrActions)["itemPDFIsBookmark"]->setToggleAction(true);
- name="itemPDFIsAnnotation";
+ name = "itemPDFIsAnnotation";
scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
(*scrActions)["itemPDFIsAnnotation"]->setToggleAction(true);
- name="itemPDFAnnotationProps";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="itemPDFFieldProps";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
-
- name="itemShapeEdit";
+ name = "itemPDFAnnotationProps";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "itemPDFFieldProps";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+
+ name = "itemShapeEdit";
scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
(*scrActions)["itemShapeEdit"]->setToggleAction(true);
- name="itemAttachTextToPath";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="itemDetachTextFromPath";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="itemCombinePolygons";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="itemSplitPolygons";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="itemConvertToBezierCurve";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="itemConvertToImageFrame";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="itemConvertToOutlines";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="itemConvertToPolygon";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="itemConvertToTextFrame";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="itemConvertToSymbolFrame";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
-
- name="itemsUnWeld";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="itemWeld";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="itemEditWeld";
+ name = "itemAttachTextToPath";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "itemDetachTextFromPath";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "itemCombinePolygons";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "itemSplitPolygons";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "itemConvertToBezierCurve";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "itemConvertToImageFrame";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "itemConvertToOutlines";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "itemConvertToPolygon";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "itemConvertToTextFrame";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "itemConvertToSymbolFrame";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+
+ name = "itemsUnWeld";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "itemWeld";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "itemEditWeld";
scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
connect( (*scrActions)["itemDuplicate"], SIGNAL(triggered()),
mainWindow, SLOT(duplicateItem()) );
@@ -534,40 +534,40 @@
{
QString name;
//Insert Menu
- name="insertFrame";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="insertGlyph";
+ name = "insertFrame";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "insertGlyph";
scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
(*scrActions)["insertGlyph"]->setToggleAction(true);
- name="insertSampleText";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="stickyTools";
+ name = "insertSampleText";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "stickyTools";
scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
(*scrActions)["stickyTools"]->setToggleAction(true);
//Marks
- name="insertMarkAnchor";
+ name = "insertMarkAnchor";
scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
(*scrActions)[name]->setEnabled(true);
- name="insertMarkVariableText";
+ name = "insertMarkVariableText";
scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
(*scrActions)[name]->setEnabled(true);
- name="insertMarkItem";
+ name = "insertMarkItem";
scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
(*scrActions)[name]->setEnabled(true);
- name="insertMark2Mark";
+ name = "insertMark2Mark";
scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
(*scrActions)[name]->setEnabled(true);
- name="insertMarkNote";
+ name = "insertMarkNote";
scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
(*scrActions)[name]->setEnabled(true);
-// name="insertMarkIndex";
+// name = "insertMarkIndex";
// scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
// (*scrActions)[name]->setEnabled(true);
- name="editMark";
+ name = "editMark";
scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
(*scrActions)[name]->setEnabled(false);
- name="itemUpdateMarks";
+ name = "itemUpdateMarks";
scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
(*scrActions)[name]->setEnabled(false);
@@ -590,24 +590,24 @@
{
QString name;
//Page menu
- name="pageInsert";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="pageImport";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="pageDelete";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="pageCopy";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="pageMove";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="pageApplyMasterPage";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="pageCopyToMasterPage";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="pageManageGuides";
+ name = "pageInsert";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "pageImport";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "pageDelete";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "pageCopy";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "pageMove";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "pageApplyMasterPage";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "pageCopyToMasterPage";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "pageManageGuides";
scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
(*scrActions)["pageManageGuides"]->setToggleAction(true);
- name="pageManageProperties";
+ name = "pageManageProperties";
scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
connect( (*scrActions)["pageInsert"], SIGNAL(triggered()), mainWindow,
SLOT(slotNewPageM()) );
@@ -653,70 +653,70 @@
void ActionManager::initViewMenuActions()
{
QString name;
- name="viewFitInWindow";
+ name = "viewFitInWindow";
scrActions->insert(name, new ScrAction(ScrAction::DataDouble,
QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, -100.0));
- name="viewFitWidth";
+ name = "viewFitWidth";
scrActions->insert(name, new ScrAction(ScrAction::DataDouble,
QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, -200.0));
- name="viewFit50";
+ name = "viewFit50";
scrActions->insert(name, new ScrAction(ScrAction::DataDouble,
QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, 50.0));
- name="viewFit75";
+ name = "viewFit75";
scrActions->insert(name, new ScrAction(ScrAction::DataDouble,
QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, 75.0));
- name="viewFit100";
+ name = "viewFit100";
scrActions->insert(name, new ScrAction(ScrAction::DataDouble,
im.loadPixmap("16/zoom-original.png"), im.loadPixmap("22/zoom-original.png"),
"", defaultKey(name), mainWindow, 100.0));
- name="viewFit200";
+ name = "viewFit200";
scrActions->insert(name, new ScrAction(ScrAction::DataDouble,
QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, 200.0));
- name="viewFit400";
+ name = "viewFit400";
scrActions->insert(name, new ScrAction(ScrAction::DataDouble,
QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, 400.0));
- name="viewPreviewMode";
+ name = "viewPreviewMode";
scrActions->insert(name, new ScrAction(im.loadPixmap("previewOn.png"),
im.loadPixmap("previewOn.png"), "", defaultKey(name), mainWindow));
- name="viewEditInPreview";
+ name = "viewEditInPreview";
scrActions->insert(name, new ScrAction(im.loadPixmap("16/editdoc.png"),
im.loadPixmap("16/editdoc.png"), "", defaultKey(name), mainWindow));
- name="viewToggleCMS";
+ name = "viewToggleCMS";
scrActions->insert(name, new ScrAction(im.loadPixmap("cmsOn.png"),
im.loadPixmap("cmsOn.png"), "", defaultKey(name), mainWindow));
- name="viewShowMargins";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="viewShowBleeds";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="viewShowFrames";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="viewShowLayerMarkers";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="viewShowImages";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="viewShowGrid";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="viewShowGuides";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="viewShowColumnBorders";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="viewShowBaseline";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="viewShowTextChain";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="viewShowTextControls";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="viewShowRulers";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="viewRulerMode";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="viewSnapToGrid";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="viewSnapToGuides";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="viewSnapToElements";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="viewShowContextMenu";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="showMouseCoordinates";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
-
- name="viewToggleCM";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
-// name="viewVisionNormal";
-// name="viewVisionProtanopia";
-// name="viewVisionDeuteranopia";
-// name="viewVisionTritanopia";
-// name="viewVisionFullColorBlind";
+ name = "viewShowMargins";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "viewShowBleeds";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "viewShowFrames";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "viewShowLayerMarkers";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "viewShowImages";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "viewShowGrid";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "viewShowGuides";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "viewShowColumnBorders";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "viewShowBaseline";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "viewShowTextChain";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "viewShowTextControls";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "viewShowRulers";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "viewRulerMode";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "viewSnapToGrid";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "viewSnapToGuides";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "viewSnapToElements";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "viewShowContextMenu";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "showMouseCoordinates";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+
+ name = "viewToggleCM";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+// name = "viewVisionNormal";
+// name = "viewVisionProtanopia";
+// name = "viewVisionDeuteranopia";
+// name = "viewVisionTritanopia";
+// name = "viewVisionFullColorBlind";
// scrActions->insert("viewNewView", new ScrAction("", defaultKey(name),
mainWindow));
@@ -787,112 +787,112 @@
{
QString name;
//Tool menu
- name="toolsProperties";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="toolsText";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="toolsOutline";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="toolsScrapbook";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="toolsLayers";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="toolsPages";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="toolsBookmarks";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="toolsDownloads";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="toolsResources";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="toolsMeasurements";
+ name = "toolsProperties";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "toolsText";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "toolsOutline";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "toolsScrapbook";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "toolsLayers";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "toolsPages";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "toolsBookmarks";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "toolsDownloads";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "toolsResources";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "toolsMeasurements";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,
im.loadPixmap("16/measure.png"), im.loadPixmap("22/measure.png"), "",
defaultKey(name), mainWindow, modeMeasurementTool));
- name="toolsActionHistory";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="toolsPreflightVerifier";
+ name = "toolsActionHistory";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "toolsPreflightVerifier";
scrActions->insert(name, new
ScrAction(im.loadPixmap("16/preflight-verifier.png"),
im.loadPixmap("22/preflight-verifier.png"),"", defaultKey(name), mainWindow));
- name="toolsAlignDistribute";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="toolsSymbols";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="toolsInline";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="toolsToolbarTools";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="toolsToolbarPDF";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="toolsToolbarView";
+ name = "toolsAlignDistribute";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "toolsSymbols";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "toolsInline";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "toolsToolbarTools";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "toolsToolbarPDF";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "toolsToolbarView";
scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
//toolbar only items
- name="toolsSelect";
+ name = "toolsSelect";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,
im.loadPixmap("16/pointer.png"), im.loadPixmap("22/pointer.png"), "",
defaultKey(name), mainWindow, modeNormal));
- name="toolsInsertTextFrame";
+ name = "toolsInsertTextFrame";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,
im.loadPixmap("16/insert-text-frame.png"),
im.loadPixmap("22/insert-text-frame.png"), "", defaultKey(name), mainWindow,
modeDrawText));
- name="toolsInsertImageFrame";
+ name = "toolsInsertImageFrame";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,
im.loadPixmap("16/insert-image.png"), im.loadPixmap("22/insert-image.png"), "",
defaultKey(name), mainWindow, modeDrawImage));
- name="toolsInsertRenderFrame";
+ name = "toolsInsertRenderFrame";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,
im.loadPixmap("16/insert-renderframe.png"),
im.loadPixmap("22/insert-renderframe.png"), "", defaultKey(name), mainWindow,
modeDrawLatex));
- name="toolsInsertTable";
+ name = "toolsInsertTable";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,
im.loadPixmap("16/insert-table.png"), im.loadPixmap("22/insert-table.png"), "",
defaultKey(name), mainWindow, modeDrawTable2));
- name="toolsInsertShape";
+ name = "toolsInsertShape";
scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(),
QPixmap(), "", defaultKey(name), mainWindow, modeDrawShapes));
- name="toolsInsertPolygon";
+ name = "toolsInsertPolygon";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,
im.loadPixmap("16/draw-polygon.png"), im.loadPixmap("22/draw-polygon.png"), "",
defaultKey(name), mainWindow, modeDrawRegularPolygon));
- name="toolsInsertArc";
+ name = "toolsInsertArc";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,
im.loadPixmap("16/draw-arc.png"), im.loadPixmap("22/draw-arc.png"), "",
defaultKey(name), mainWindow, modeDrawArc));
- name="toolsInsertSpiral";
+ name = "toolsInsertSpiral";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,
im.loadPixmap("16/draw-spiral.png"), im.loadPixmap("22/draw-spiral.png"), "",
defaultKey(name), mainWindow, modeDrawSpiral));
- name="toolsInsertLine";
+ name = "toolsInsertLine";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,
im.loadPixmap("Stift16.png"), im.loadPixmap("stift.png"), "", defaultKey(name),
mainWindow, modeDrawLine));
- name="toolsInsertBezier";
+ name = "toolsInsertBezier";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,
im.loadPixmap("16/draw-path.png"), im.loadPixmap("22/draw-path.png"), "",
defaultKey(name), mainWindow, modeDrawBezierLine));
- name="toolsInsertFreehandLine";
+ name = "toolsInsertFreehandLine";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,
im.loadPixmap("16/draw-freehand.png"), im.loadPixmap("22/draw-freehand.png"),
"", defaultKey(name), mainWindow, modeDrawFreehandLine));
- name="toolsInsertCalligraphicLine";
+ name = "toolsInsertCalligraphicLine";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,
im.loadPixmap("16/draw-calligraphic.png"),
im.loadPixmap("22/draw-calligraphic.png"), "", defaultKey(name), mainWindow,
modeDrawCalligraphicLine));
- name="toolsRotate";
+ name = "toolsRotate";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,
im.loadPixmap("16/transform-rotate.png"),
im.loadPixmap("22/transform-rotate.png"), "", defaultKey(name), mainWindow,
modeRotation));
- name="toolsZoom";
+ name = "toolsZoom";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,
im.loadPixmap("16/zoom.png"), im.loadPixmap("22/zoom.png"), "",
defaultKey(name), mainWindow, modeMagnifier));
- name="toolsZoomIn";
+ name = "toolsZoomIn";
scrActions->insert(name, new ScrAction(im.loadPixmap("16/zoom-in.png"),
im.loadPixmap("22/zoom-in.png"), "", defaultKey(name), mainWindow));
- name="toolsZoomOut";
+ name = "toolsZoomOut";
scrActions->insert(name, new
ScrAction(im.loadPixmap("16/zoom-out.png"), im.loadPixmap("22/zoom-out.png"),
"", defaultKey(name), mainWindow));
- name="toolsEditContents";
+ name = "toolsEditContents";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,
im.loadPixmap("Editm16.png"), im.loadPixmap("editm.png"), "", defaultKey(name),
mainWindow, modeEdit));
- name="toolsEditWithStoryEditor";
+ name = "toolsEditWithStoryEditor";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,
im.loadPixmap("16/story-editor.png"), im.loadPixmap("22/story-editor.png"), "",
defaultKey(name), mainWindow, modeStoryEditor));
- name="toolsLinkTextFrame";
+ name = "toolsLinkTextFrame";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,
im.loadPixmap("16/text-frame-link.png"),
im.loadPixmap("22/text-frame-link.png"), "", defaultKey(name), mainWindow,
modeLinkFrames));
- name="toolsUnlinkTextFrame";
+ name = "toolsUnlinkTextFrame";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,
im.loadPixmap("16/text-frame-unlink.png"),
im.loadPixmap("22/text-frame-unlink.png"), "", defaultKey(name), mainWindow,
modeUnlinkFrames));
- name="toolsEyeDropper";
+ name = "toolsEyeDropper";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,
im.loadPixmap("16/color-picker.png"), im.loadPixmap("22/color-picker.png"), "",
defaultKey(name), mainWindow, modeEyeDropper));
- name="toolsCopyProperties";
+ name = "toolsCopyProperties";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,
im.loadPixmap("wizard16.png"), im.loadPixmap("wizard.png"), "",
defaultKey(name), mainWindow, modeCopyProperties));
- name="toolsUnlinkTextFrameAndCutText";
+ name = "toolsUnlinkTextFrameAndCutText";
scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(),
QPixmap(), "", defaultKey(name), mainWindow, modeUnlinkFrames));
//PDF toolbar
- name="toolsPDFPushButton";
+ name = "toolsPDFPushButton";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,
im.loadPixmap("16/insert-button.png"), im.loadPixmap("22/insert-button.png"),
"", defaultKey(name), mainWindow, modeInsertPDFButton));
- name="toolsPDFRadioButton";
+ name = "toolsPDFRadioButton";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,
im.loadPixmap("16/radiobutton.png"), im.loadPixmap("22/radiobutton.png"), "",
defaultKey(name), mainWindow, modeInsertPDFRadioButton));
- name="toolsPDFTextField";
+ name = "toolsPDFTextField";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,
im.loadPixmap("16/text-field.png"), im.loadPixmap("22/text-field.png"), "",
defaultKey(name), mainWindow, modeInsertPDFTextfield));
- name="toolsPDFCheckBox";
+ name = "toolsPDFCheckBox";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,
im.loadPixmap("16/checkbox.png"), im.loadPixmap("22/checkbox.png"), "",
defaultKey(name), mainWindow, modeInsertPDFCheckbox));
- name="toolsPDFComboBox";
+ name = "toolsPDFComboBox";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,
im.loadPixmap("16/combobox.png"), im.loadPixmap("22/combobox.png"), "",
defaultKey(name), mainWindow, modeInsertPDFCombobox));
- name="toolsPDFListBox";
+ name = "toolsPDFListBox";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,
im.loadPixmap("16/list-box.png"), im.loadPixmap("22/list-box.png"), "",
defaultKey(name), mainWindow, modeInsertPDFListbox));
- name="toolsPDFAnnotText";
+ name = "toolsPDFAnnotText";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,
im.loadPixmap("16/pdf-annotations.png"),
im.loadPixmap("22/pdf-annotations.png"), "", defaultKey(name), mainWindow,
modeInsertPDFTextAnnotation));
- name="toolsPDFAnnotLink";
+ name = "toolsPDFAnnotLink";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,
im.loadPixmap("goto16.png"), im.loadPixmap("goto.png"), "", defaultKey(name),
mainWindow, modeInsertPDFLinkAnnotation));
#ifdef HAVE_OSG
- name="toolsPDFAnnot3D";
+ name = "toolsPDFAnnot3D";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,
im.loadPixmap("16/annot3d.png"), im.loadPixmap("22/annot3d.png"), "",
defaultKey(name), mainWindow, modeInsertPDF3DAnnotation));
#endif
//Set the applicaton wide palette shortcuts
@@ -954,15 +954,15 @@
void ActionManager::initExtrasMenuActions()
{
QString name;
- name="extrasManageImages";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="extrasHyphenateText";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="extrasDeHyphenateText";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="extrasGenerateTableOfContents";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="extrasUpdateDocument";
+ name = "extrasManageImages";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "extrasHyphenateText";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "extrasDeHyphenateText";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "extrasGenerateTableOfContents";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "extrasUpdateDocument";
scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
connect( (*scrActions)["extrasManageImages"], SIGNAL(triggered()),
mainWindow, SLOT(StatusPic()) );
connect( (*scrActions)["extrasGenerateTableOfContents"],
SIGNAL(triggered()), mainWindow, SLOT(generateTableOfContents()) );
@@ -973,9 +973,9 @@
void ActionManager::initWindowsMenuActions()
{
QString name;
- name="windowsCascade";
+ name = "windowsCascade";
scrActions->insert(name, new ScrAction( "", defaultKey(name),
mainWindow));
- name="windowsTile";
+ name = "windowsTile";
scrActions->insert(name, new ScrAction( "", defaultKey(name),
mainWindow));
}
@@ -986,32 +986,32 @@
void ActionManager::initHelpMenuActions()
{
QString name;
- name="helpAboutScribus";
+ name = "helpAboutScribus";
scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
(*scrActions)[name]->setMenuRole(QAction::AboutRole);
- name="helpAboutPlugins";
+ name = "helpAboutPlugins";
scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
(*scrActions)[name]->setMenuRole(QAction::ApplicationSpecificRole);
- name="helpAboutQt";
+ name = "helpAboutQt";
scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
(*scrActions)[name]->setMenuRole(QAction::AboutQtRole);
- name="helpActionSearch";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="helpTooltips";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="helpManual";
+ name = "helpActionSearch";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "helpTooltips";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "helpManual";
scrActions->insert(name, new
ScrAction(im.loadPixmap("16/help-browser.png"), QPixmap(), "",
defaultKey(name), mainWindow));
- name="helpOnlineWWW";
+ name = "helpOnlineWWW";
scrActions->insert(name, new ScrAction(ScrAction::DataQString,
QPixmap(), QPixmap(), "", defaultKey(name), mainWindow,
"http://www.scribus.net";));
- name="helpOnlineDocs";
+ name = "helpOnlineDocs";
scrActions->insert(name, new ScrAction(ScrAction::DataQString,
QPixmap(), QPixmap(), "", defaultKey(name), mainWindow,
"http://docs.scribus.net";));
- name="helpOnlineWiki";
+ name = "helpOnlineWiki";
scrActions->insert(name, new ScrAction(ScrAction::DataQString,
QPixmap(), QPixmap(), "", defaultKey(name), mainWindow,
"http://wiki.scribus.net";));
- name="helpOnlineTutorial1";
+ name = "helpOnlineTutorial1";
scrActions->insert(name, new ScrAction(ScrAction::DataQString,
QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, ""));
- name="helpChat";
+ name = "helpChat";
scrActions->insert(name, new ScrAction(ScrAction::DataQString,
QPixmap(), QPixmap(), "", defaultKey(name), mainWindow,
"http://webchat.freenode.net/?channels=scribus";));
- name="helpCheckUpdates";
+ name = "helpCheckUpdates";
scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
(*scrActions)["helpTooltips"]->setToggleAction(true);
@@ -1036,117 +1036,117 @@
{
QString name;
//typography
- name="unicodeZWNJ";
+ name = "unicodeZWNJ";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
SpecialChars::ZWNJ.unicode()));
- name="unicodeZWJ";
+ name = "unicodeZWJ";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
SpecialChars::ZWJ.unicode()));
- name="unicodeSoftHyphen";
+ name = "unicodeSoftHyphen";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
SpecialChars::SHYPHEN.unicode()));
- name="unicodeNonBreakingHyphen";
+ name = "unicodeNonBreakingHyphen";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
SpecialChars::NBHYPHEN.unicode()));
- name="unicodeNonBreakingSpace";
+ name = "unicodeNonBreakingSpace";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
SpecialChars::NBSPACE.unicode()));
- name="unicodePageNumber";
+ name = "unicodePageNumber";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
SpecialChars::PAGENUMBER.unicode()));
- name="unicodePageCount";
+ name = "unicodePageCount";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
SpecialChars::PAGECOUNT.unicode()));
//Spaces
- name="unicodeSpaceEN";
+ name = "unicodeSpaceEN";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0x2002));
- name="unicodeSpaceEM";
+ name = "unicodeSpaceEM";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0x2003));
- name="unicodeSpaceThin";
+ name = "unicodeSpaceThin";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0x2009));
- name="unicodeSpaceThick";
+ name = "unicodeSpaceThick";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0x2004));
- name="unicodeSpaceMid";
+ name = "unicodeSpaceMid";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0x2005));
- name="unicodeSpaceHair";
+ name = "unicodeSpaceHair";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0x200A));
//Breaks
- name="unicodeNewLine";
+ name = "unicodeNewLine";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
SpecialChars::LINEBREAK.unicode()));
- name="unicodeFrameBreak";
+ name = "unicodeFrameBreak";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
SpecialChars::FRAMEBREAK.unicode()));
- name="unicodeColumnBreak";
+ name = "unicodeColumnBreak";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
SpecialChars::COLBREAK.unicode()));
- name="unicodeZerowidthSpace";
+ name = "unicodeZerowidthSpace";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
SpecialChars::ZWSPACE.unicode()));
- name="unicodeZerowidthNonBreakingSpace";
+ name = "unicodeZerowidthNonBreakingSpace";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
SpecialChars::ZWNBSPACE.unicode()));
//Special
- name="unicodeCopyRight";
+ name = "unicodeCopyRight";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0x0A9));
- name="unicodeRegdTM";
+ name = "unicodeRegdTM";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0x00AE));
- name="unicodeTM";
+ name = "unicodeTM";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0x2122));
- name="unicodeBullet";
+ name = "unicodeBullet";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0x2022));
- name="unicodeMidpoint";
+ name = "unicodeMidpoint";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0x00B7));
- name="unicodeSolidus";
+ name = "unicodeSolidus";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0x2044));
//Dashes
- name="unicodeDashEm";
+ name = "unicodeDashEm";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0x2014));
- name="unicodeDashEn";
+ name = "unicodeDashEn";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0x2013));
- name="unicodeDashFigure";
+ name = "unicodeDashFigure";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0x2012));
- name="unicodeDashQuotation";
+ name = "unicodeDashQuotation";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0x2015));
//Quotes
- name="unicodeQuoteApostrophe";
+ name = "unicodeQuoteApostrophe";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0x0027));
- name="unicodeQuoteStraight";
+ name = "unicodeQuoteStraight";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0x0022));
- name="unicodeQuoteSingleLeft";
+ name = "unicodeQuoteSingleLeft";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0x2018));
- name="unicodeQuoteSingleRight";
+ name = "unicodeQuoteSingleRight";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0x2019));
- name="unicodeQuoteDoubleLeft";
+ name = "unicodeQuoteDoubleLeft";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0x201C));
- name="unicodeQuoteDoubleRight";
+ name = "unicodeQuoteDoubleRight";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0x201D));
- name="unicodeQuoteSingleReversed";
+ name = "unicodeQuoteSingleReversed";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0x201B));
- name="unicodeQuoteDoubleReversed";
+ name = "unicodeQuoteDoubleReversed";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0x201F));
- name="unicodeQuoteSingleLeftGuillemet";
+ name = "unicodeQuoteSingleLeftGuillemet";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0x2039));
- name="unicodeQuoteSingleRightGuillemet";
+ name = "unicodeQuoteSingleRightGuillemet";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0x203A));
- name="unicodeQuoteDoubleLeftGuillemet";
+ name = "unicodeQuoteDoubleLeftGuillemet";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0x00AB));
- name="unicodeQuoteDoubleRightGuillemet";
+ name = "unicodeQuoteDoubleRightGuillemet";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0x00BB));
- name="unicodeQuoteLowSingleComma";
+ name = "unicodeQuoteLowSingleComma";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0x201A));
- name="unicodeQuoteLowDoubleComma";
+ name = "unicodeQuoteLowDoubleComma";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0x201E));
- name="unicodeQuoteCJKSingleLeft";
+ name = "unicodeQuoteCJKSingleLeft";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0x300C));
- name="unicodeQuoteCJKSingleRight";
+ name = "unicodeQuoteCJKSingleRight";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0x300D));
- name="unicodeQuoteCJKDoubleLeft";
+ name = "unicodeQuoteCJKDoubleLeft";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0x300E));
- name="unicodeQuoteCJKDoubleRight";
+ name = "unicodeQuoteCJKDoubleRight";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0x300F));
//Ligatures
- name="unicodeLigature_ff";
+ name = "unicodeLigature_ff";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0xFB00));
- name="unicodeLigature_fi";
+ name = "unicodeLigature_fi";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0xFB01));
- name="unicodeLigature_fl";
+ name = "unicodeLigature_fl";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0xFB02));
- name="unicodeLigature_ffi";
+ name = "unicodeLigature_ffi";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0xFB03));
- name="unicodeLigature_ffl";
+ name = "unicodeLigature_ffl";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0xFB04));
- name="unicodeLigature_ft";
+ name = "unicodeLigature_ft";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0xFB05));
- name="unicodeLigature_st";
+ name = "unicodeLigature_st";
actionMap->insert(name, new ScrAction(defaultKey(name), actionParent,
0xFB06));
//Spaces and special characters
@@ -1186,11 +1186,11 @@
{
QString name;
//GUI
- name="specialToggleAllPalettes";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="specialToggleAllGuides";
- scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
- name="specialUnicodeSequenceBegin";
+ name = "specialToggleAllPalettes";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "specialToggleAllGuides";
+ scrActions->insert(name, new ScrAction("", defaultKey(name),
mainWindow));
+ name = "specialUnicodeSequenceBegin";
scrActions->insert(name, new ScrAction( "", defaultKey(name),
mainWindow));
connect( (*scrActions)["specialToggleAllPalettes"],
SIGNAL(triggered()), mainWindow, SLOT(ToggleAllPalettes()) );
connect( (*scrActions)["specialToggleAllGuides"], SIGNAL(triggered()),
mainWindow, SLOT(ToggleAllGuides()) );
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
