r18070 by fschmid - Fixed Bug #11346: The Item menu is too bloated
scribus-commit
scribus-commit at lists.scribus.net
Mon Jan 7 13:17:31 UTC 2013
Author: fschmid
Date: Mon Jan 7 13:17:31 2013
New Revision: 18070
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18070
Log:
Fixed Bug #11346: The Item menu is too bloated
Modified:
trunk/Scribus/scribus/actionmanager.cpp
trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellplugin.cpp
trunk/Scribus/scribus/plugins/tools/spellcheck/aspellplugin.cpp
trunk/Scribus/scribus/scribus.cpp
Modified: trunk/Scribus/scribus/actionmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18070&path=/trunk/Scribus/scribus/actionmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/actionmanager.cpp (original)
+++ trunk/Scribus/scribus/actionmanager.cpp Mon Jan 7 13:17:31 2013
@@ -1510,8 +1510,8 @@
(*scrActions)["itemRaiseToTop"]->setTexts( tr("Raise to &Top"));
(*scrActions)["itemLower"]->setTexts( tr("&Lower"));
(*scrActions)["itemRaise"]->setTexts( tr("&Raise"));
- (*scrActions)["itemSendToPattern"]->setTexts( tr("Send to Patterns"));
- (*scrActions)["itemSendToInline"]->setTexts( tr("Send to Inline Items"));
+ (*scrActions)["itemSendToPattern"]->setTexts( tr("Patterns"));
+ (*scrActions)["itemSendToInline"]->setTexts( tr("Inline Items"));
(*scrActions)["itemAttributes"]->setTexts( tr("&Attributes..."));
(*scrActions)["itemImageInfo"]->setTexts( tr("More Info..."));
(*scrActions)["itemImageIsVisible"]->setTexts( tr("I&mage Visible"));
@@ -1873,6 +1873,7 @@
defMenuNames.append(QPair<QString, QStringList>("Insert", QStringList()));
defMenuNames.append(QPair<QString, QStringList>("Page", QStringList()));
defMenuNames.append(QPair<QString, QStringList>("View", QStringList()));
+ defMenuNames.append(QPair<QString, QStringList>("Table", QStringList()));
defMenuNames.append(QPair<QString, QStringList>("Extras", QStringList()));
defMenuNames.append(QPair<QString, QStringList>("Windows", QStringList()));
defMenuNames.append(QPair<QString, QStringList>("Help", QStringList()));
@@ -1891,6 +1892,8 @@
itMenuNames->second << tr("Page") << "&Page" << tr("&Page");
++itMenuNames;
itMenuNames->second << tr("View") << "&View" << tr("&View");
+ ++itMenuNames;
+ itMenuNames->second << tr("Table") << "&Table" << tr("&Table");
++itMenuNames;
itMenuNames->second << tr("Extras") << "E&xtras" << tr("E&xtras");
++itMenuNames;
@@ -2007,19 +2010,7 @@
<< "itemLock"
<< "itemLockSize"
<< "itemImageIsVisible"
- << "itemUpdateImage"
- << "tableInsertRows"
- << "tableInsertColumns"
- << "tableDeleteRows"
- << "tableDeleteColumns"
- << "tableMergeCells"
- << "tableSplitCells"
- << "tableSetRowHeights"
- << "tableSetColumnWidths"
- << "tableDistributeRowsEvenly"
- << "tableDistributeColumnsEvenly"
- << "tableAdjustFrameToTable"
- << "tableAdjustTableToFrame"
+ << "itemUpdateImage"
<< "itemAdjustFrameHeightToText"
<< "itemAdjustFrameToImage"
<< "itemAdjustImageToFrame"
@@ -2193,6 +2184,20 @@
<< "viewShowRulers"
<< "viewRulerMode"
<< "showMouseCoordinates";
+ ++itmenu;
+ itmenu->second
+ << "tableInsertRows"
+ << "tableInsertColumns"
+ << "tableDeleteRows"
+ << "tableDeleteColumns"
+ << "tableMergeCells"
+ << "tableSplitCells"
+ << "tableSetRowHeights"
+ << "tableSetColumnWidths"
+ << "tableDistributeRowsEvenly"
+ << "tableDistributeColumnsEvenly"
+ << "tableAdjustFrameToTable"
+ << "tableAdjustTableToFrame";
//Extras
++itmenu;
itmenu->second
Modified: trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18070&path=/trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellplugin.cpp Mon Jan 7 13:17:31 2013
@@ -32,7 +32,7 @@
// Action text for menu, including &accel
m_actionInfo.text = tr("Check Spelling...");
// Menu
- m_actionInfo.menu = "Item";
+ m_actionInfo.menu = "Extras";
// Story Editor Menu
m_actionInfo.seMenu = "Edit";
// If needed, what item to add the menu item after
@@ -48,6 +48,10 @@
m_actionInfo.notSuitableFor.append(PageItem::ImageFrame);
m_actionInfo.notSuitableFor.append(PageItem::PathText);
m_actionInfo.notSuitableFor.append(PageItem::LatexFrame);
+ m_actionInfo.notSuitableFor.append(PageItem::Symbol);
+ m_actionInfo.notSuitableFor.append(PageItem::RegularPolygon);
+ m_actionInfo.notSuitableFor.append(PageItem::Arc);
+ m_actionInfo.notSuitableFor.append(PageItem::Spiral);
m_actionInfo.needsNumObjects = 1;
}
Modified: trunk/Scribus/scribus/plugins/tools/spellcheck/aspellplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18070&path=/trunk/Scribus/scribus/plugins/tools/spellcheck/aspellplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/spellcheck/aspellplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/tools/spellcheck/aspellplugin.cpp Mon Jan 7 13:17:31 2013
@@ -37,12 +37,16 @@
// Action text for menu, including &accel
m_actionInfo.text = tr("Spell Checker");
// Menu
- m_actionInfo.menu = "Item";
+ m_actionInfo.menu = "Extras";
m_actionInfo.notSuitableFor.append(PageItem::Line);
m_actionInfo.notSuitableFor.append(PageItem::LatexFrame);
m_actionInfo.notSuitableFor.append(PageItem::Polygon);
m_actionInfo.notSuitableFor.append(PageItem::PolyLine);
m_actionInfo.notSuitableFor.append(PageItem::ImageFrame);
+ m_actionInfo.notSuitableFor.append(PageItem::Symbol);
+ m_actionInfo.notSuitableFor.append(PageItem::RegularPolygon);
+ m_actionInfo.notSuitableFor.append(PageItem::Arc);
+ m_actionInfo.notSuitableFor.append(PageItem::Spiral);
m_actionInfo.forAppMode.append(modeNormal);
m_actionInfo.needsNumObjects = 1;
// If needed, what item to add the menu item after
Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18070&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Mon Jan 7 13:17:31 2013
@@ -772,6 +772,7 @@
scrMenuMgr->addMenuItem(scrActions["editPasteContents"], "EditContents", false);
scrMenuMgr->addMenuItem(scrActions["editPasteContentsAbs"], "EditContents", false);
scrMenuMgr->addMenuItem(scrActions["editClearContents"], "EditContents", false);
+ scrMenuMgr->addMenuItem(scrActions["itemDelete"], "Edit", false);
scrMenuMgr->addMenuSeparator("Edit");
scrMenuMgr->addMenuItem(scrActions["editSelectAll"], "Edit", false);
scrMenuMgr->addMenuItem(scrActions["editSelectAllOnLayer"], "Edit", false);
@@ -792,90 +793,46 @@
scrMenuMgr->setMenuEnabled("EditPasteRecent", false);
scrMenuMgr->setMenuEnabled("EditContents", false);
-
-
-// scrActions["itemDuplicate"]->setEnabled(false);
-// scrActions["itemMulDuplicate"]->setEnabled(false);
-// scrActions["itemDelete"]->setEnabled(false);
-// scrActions["itemRaise"]->setEnabled(false);
-// scrActions["itemLower"]->setEnabled(false);
-// scrActions["itemRaiseToTop"]->setEnabled(false);
-// scrActions["itemLowerToBottom"]->setEnabled(false);
-// scrActions["itemSendToScrapbook"]->setEnabled(false);
-// scrActions["itemSendToPattern"]->setEnabled(false);
-// scrActions["itemAdjustFrameToImage"]->setEnabled(false);
-// scrActions["itemAdjustImageToFrame"]->setEnabled(false);
-// scrActions["itemExtendedImageProperties"]->setEnabled(false);
-// scrActions["itemUpdateImage"]->setEnabled(false);
-// scrActions["itemPreviewLow"]->setEnabled(false);
-// scrActions["itemPreviewNormal"]->setEnabled(false);
-// scrActions["itemPreviewFull"]->setEnabled(false);
-// scrActions["itemAttributes"]->setEnabled(false);
-// scrActions["itemPreviewLow"]->setEnabled(false);
-
-
//Item Menu
scrMenuMgr->createMenu("Item", ActionManager::defaultMenuNameEntryTranslated("Item"));
- scrMenuMgr->addMenuItem(scrActions["itemDuplicate"], "Item", false);
- scrMenuMgr->addMenuItem(scrActions["itemMulDuplicate"], "Item", false);
- scrMenuMgr->addMenuItem(scrActions["itemTransform"], "Item", false);
- scrMenuMgr->addMenuItem(scrActions["itemDelete"], "Item", false);
- scrMenuMgr->addMenuSeparator("Item");
- scrMenuMgr->addMenuItem(scrActions["itemGroup"], "Item", false);
- scrMenuMgr->addMenuItem(scrActions["itemUngroup"], "Item", false);
- scrMenuMgr->addMenuItem(scrActions["itemGroupAdjust"], "Item", false);
- scrMenuMgr->addMenuItem(scrActions["itemLock"], "Item", false);
- scrMenuMgr->addMenuItem(scrActions["itemLockSize"], "Item", false);
- scrMenuMgr->addMenuSeparator("Item");
- scrMenuMgr->createMenu("ItemLevel", tr("Level"));
- scrMenuMgr->addMenuToMenu("ItemLevel", "Item");
+ scrMenuMgr->createMenu("DuplicateTransform", tr("Duplicate/Transform"), "Item");
+ scrMenuMgr->addMenuItem(scrActions["itemDuplicate"], "DuplicateTransform", false);
+ scrMenuMgr->addMenuItem(scrActions["itemMulDuplicate"], "DuplicateTransform", false);
+ scrMenuMgr->addMenuItem(scrActions["itemTransform"], "DuplicateTransform", false);
+ scrMenuMgr->createMenu("Grouping", tr("Grouping"), "Item");
+ scrMenuMgr->addMenuItem(scrActions["itemGroup"], "Grouping", false);
+ scrMenuMgr->addMenuItem(scrActions["itemUngroup"], "Grouping", false);
+ scrMenuMgr->addMenuItem(scrActions["itemGroupAdjust"], "Grouping", false);
+ scrMenuMgr->createMenu("Locking", tr("Locking"), "Item");
+ scrMenuMgr->addMenuItem(scrActions["itemLock"], "Locking", false);
+ scrMenuMgr->addMenuItem(scrActions["itemLockSize"], "Locking", false);
+ scrMenuMgr->createMenu("ItemLevel", tr("Level"), "Item");
scrMenuMgr->addMenuItem(scrActions["itemRaise"], "ItemLevel", false);
scrMenuMgr->addMenuItem(scrActions["itemLower"], "ItemLevel", false);
scrMenuMgr->addMenuItem(scrActions["itemRaiseToTop"], "ItemLevel", false);
scrMenuMgr->addMenuItem(scrActions["itemLowerToBottom"], "ItemLevel", false);
scrMenuMgr->createMenu("ItemLayer", tr("Send to La&yer"));
scrMenuMgr->addMenuToMenu("ItemLayer", "Item");
- scrMenuMgr->createMenu("itemSendToScrapbook", tr("Send to Scrapbook"));
- scrMenuMgr->addMenuToMenu("itemSendToScrapbook", "Item");
-// scrMenuMgr->addMenuItem(scrActions["itemSendToScrapbook"], "Item", false);
- scrMenuMgr->addMenuItem(scrActions["itemSendToPattern"], "Item", false);
- scrMenuMgr->addMenuItem(scrActions["itemSendToInline"], "Item", false);
- // Table submenu.
- scrMenuMgr->addMenuSeparator("Item");
- scrMenuMgr->createMenu("ItemTable", tr("Table"));
- scrMenuMgr->addMenuToMenu("ItemTable", "Item");
- scrMenuMgr->addMenuItem(scrActions["tableInsertRows"], "ItemTable", false);
- scrMenuMgr->addMenuItem(scrActions["tableInsertColumns"], "ItemTable", false);
- scrMenuMgr->addMenuItem(scrActions["tableDeleteRows"], "ItemTable", false);
- scrMenuMgr->addMenuItem(scrActions["tableDeleteColumns"], "ItemTable", false);
- scrMenuMgr->addMenuSeparator("ItemTable");
- scrMenuMgr->addMenuItem(scrActions["tableMergeCells"], "ItemTable", false);
- scrMenuMgr->addMenuItem(scrActions["tableSplitCells"], "ItemTable", false);
- scrMenuMgr->addMenuSeparator("ItemTable");
- scrMenuMgr->addMenuItem(scrActions["tableSetRowHeights"], "ItemTable", false);
- scrMenuMgr->addMenuItem(scrActions["tableSetColumnWidths"], "ItemTable", false);
- scrMenuMgr->addMenuItem(scrActions["tableDistributeRowsEvenly"], "ItemTable", false);
- scrMenuMgr->addMenuItem(scrActions["tableDistributeColumnsEvenly"], "ItemTable", false);
- scrMenuMgr->addMenuSeparator("ItemTable");
- scrMenuMgr->addMenuItem(scrActions["tableAdjustFrameToTable"], "ItemTable", false);
- scrMenuMgr->addMenuItem(scrActions["tableAdjustTableToFrame"], "ItemTable", false);
- scrMenuMgr->addMenuSeparator("Item");
- // End Table submenu.
- scrMenuMgr->addMenuSeparator("Item");
- scrMenuMgr->addMenuItem(scrActions["itemAdjustFrameHeightToText"], "Item", false);
- scrMenuMgr->addMenuItem(scrActions["itemAdjustFrameToImage"], "Item", false);
- scrMenuMgr->addMenuItem(scrActions["itemAdjustImageToFrame"], "Item", false);
- scrMenuMgr->addMenuItem(scrActions["itemUpdateImage"], "Item", false);
- scrMenuMgr->addMenuItem(scrActions["styleImageEffects"], "Item", false);
- scrMenuMgr->addMenuItem(scrActions["itemExtendedImageProperties"], "Item", false);
- scrMenuMgr->addMenuItem(scrActions["itemToggleInlineImage"], "Item", false);
- scrMenuMgr->createMenu("ItemPreviewSettings", tr("Preview Settings"), "Item");
+ scrMenuMgr->createMenu("SendTo", tr("Send to"), "Item");
+ scrMenuMgr->createMenu("itemSendToScrapbook", tr("Scrapbook"));
+ scrMenuMgr->addMenuToMenu("itemSendToScrapbook", "SendTo");
+ scrMenuMgr->addMenuItem(scrActions["itemSendToPattern"], "SendTo", false);
+ scrMenuMgr->addMenuItem(scrActions["itemSendToInline"], "SendTo", false);
+ scrMenuMgr->createMenu("Adjust", tr("Adjust"), "Item");
+ scrMenuMgr->addMenuItem(scrActions["itemAdjustFrameHeightToText"], "Adjust", false);
+ scrMenuMgr->addMenuItem(scrActions["itemAdjustFrameToImage"], "Adjust", false);
+ scrMenuMgr->addMenuItem(scrActions["itemAdjustImageToFrame"], "Adjust", false);
+ scrMenuMgr->createMenu("Image", tr("Image"), "Item");
+ scrMenuMgr->addMenuItem(scrActions["itemUpdateImage"], "Image", false);
+ scrMenuMgr->addMenuItem(scrActions["styleImageEffects"], "Image", false);
+ scrMenuMgr->addMenuItem(scrActions["itemExtendedImageProperties"], "Image", false);
+ scrMenuMgr->addMenuItem(scrActions["itemToggleInlineImage"], "Image", false);
+ scrMenuMgr->createMenu("ItemPreviewSettings", tr("Preview Settings"), "Image");
scrMenuMgr->addMenuItem(scrActions["itemImageIsVisible"], "ItemPreviewSettings", false);
scrMenuMgr->addMenuSeparator("ItemPreviewSettings");
scrMenuMgr->addMenuItem(scrActions["itemPreviewLow"], "ItemPreviewSettings", false);
scrMenuMgr->addMenuItem(scrActions["itemPreviewNormal"], "ItemPreviewSettings", false);
scrMenuMgr->addMenuItem(scrActions["itemPreviewFull"], "ItemPreviewSettings", false);
- scrMenuMgr->addMenuSeparator("Item");
scrMenuMgr->addMenuItem(scrActions["itemAttributes"], "Item", false);
scrMenuMgr->createMenu("ItemPDFOptions", tr("&PDF Options"));
scrMenuMgr->addMenuToMenu("ItemPDFOptions", "Item");
@@ -890,27 +847,26 @@
scrMenuMgr->addMenuItem(scrActions["itemConvertToPolygon"], "ItemConvertTo", false);
scrMenuMgr->addMenuItem(scrActions["itemConvertToTextFrame"], "ItemConvertTo", false);
scrMenuMgr->addMenuItem(scrActions["itemConvertToSymbolFrame"], "ItemConvertTo", false);
- scrMenuMgr->addMenuSeparator("Item");
- scrMenuMgr->addMenuItem(scrActions["toolsLinkTextFrame"], "Item", false);
- scrMenuMgr->addMenuItem(scrActions["toolsUnlinkTextFrame"], "Item", false);
- scrMenuMgr->addMenuItem(scrActions["toolsUnlinkTextFrameWithTextCopy"], "Item", false);
- scrMenuMgr->addMenuItem(scrActions["toolsUnlinkTextFrameWithTextCut"], "Item", false);
- scrMenuMgr->addMenuSeparator("Item");
- scrMenuMgr->addMenuItem(scrActions["itemAttachTextToPath"], "Item", false);
- scrMenuMgr->addMenuItem(scrActions["itemDetachTextFromPath"], "Item", false);
-// scrMenuMgr->createMenu("ItemPathOps", tr("Path Tools"), "Item");
- scrMenuMgr->addMenuItem(scrActions["itemCombinePolygons"], "Item", false);
- scrMenuMgr->addMenuItem(scrActions["itemSplitPolygons"], "Item", false);
+ scrMenuMgr->createMenu("TextLinking", tr("Text Frame Links"), "Item");
+ scrMenuMgr->addMenuItem(scrActions["toolsLinkTextFrame"], "TextLinking", false);
+ scrMenuMgr->addMenuItem(scrActions["toolsUnlinkTextFrame"], "TextLinking", false);
+ scrMenuMgr->addMenuItem(scrActions["toolsUnlinkTextFrameWithTextCopy"], "TextLinking", false);
+ scrMenuMgr->addMenuItem(scrActions["toolsUnlinkTextFrameWithTextCut"], "TextLinking", false);
+ scrMenuMgr->createMenu("ItemPathOps", tr("Path Tools"), "Item");
+ scrMenuMgr->addMenuItem(scrActions["itemCombinePolygons"], "ItemPathOps", false);
+ scrMenuMgr->addMenuItem(scrActions["itemSplitPolygons"], "ItemPathOps", false);
+ scrMenuMgr->addMenuItem(scrActions["itemAttachTextToPath"], "ItemPathOps", false);
+ scrMenuMgr->addMenuItem(scrActions["itemDetachTextFromPath"], "ItemPathOps", false);
scrActions["itemPrintingEnabled"]->setEnabled(false);
scrMenuMgr->setMenuEnabled("ItemConvertTo", false);
- scrMenuMgr->addMenuItem(scrActions["itemsUnWeld"], "Item", false);
- scrMenuMgr->addMenuItem(scrActions["itemWeld"], "Item", false);
- scrMenuMgr->addMenuItem(scrActions["itemEditWeld"], "Item", false);
+ scrMenuMgr->createMenu("Weld", tr("Welding"), "Item");
+ scrMenuMgr->addMenuItem(scrActions["itemsUnWeld"], "Weld", false);
+ scrMenuMgr->addMenuItem(scrActions["itemWeld"], "Weld", false);
+ scrMenuMgr->addMenuItem(scrActions["itemEditWeld"], "Weld", false);
scrMenuMgr->addMenuItem(scrActions["editMark"], "Item", false);
- scrMenuMgr->addMenuItem(scrActions["itemUpdateMarks"], "Item", true);
//Insert menu
scrMenuMgr->createMenu("Insert", ActionManager::defaultMenuNameEntryTranslated("Insert"));
@@ -1057,23 +1013,23 @@
//CB If this is viewNewView imeplemented, it should be on the windows menu
// scrMenuMgr->addMenuItem(scrActions["viewNewView"], "View");
- //Tool menu
- /*
- scrMenuMgr->createMenu("Tools", tr("&Tools"));
- scrMenuMgr->addMenuItem(scrActions["toolsProperties"], "Tools");
- scrMenuMgr->addMenuItem(scrActions["toolsOutline"], "Tools");
- scrMenuMgr->addMenuItem(scrActions["toolsScrapbook"], "Tools");
- scrMenuMgr->addMenuItem(scrActions["toolsLayers"], "Tools");
- scrMenuMgr->addMenuItem(scrActions["toolsPages"], "Tools");
- scrMenuMgr->addMenuItem(scrActions["toolsBookmarks"], "Tools");
- scrMenuMgr->addMenuItem(scrActions["toolsMeasurements"], "Tools");
- scrMenuMgr->addMenuItem(scrActions["toolsActionHistory"], "Tools");
- scrMenuMgr->addMenuItem(scrActions["toolsPreflightVerifier"], "Tools");
- scrMenuMgr->addMenuItem(scrActions["toolsAlignDistribute"], "Tools");
- scrMenuMgr->addMenuSeparator("Tools");
- scrMenuMgr->addMenuItem(scrActions["toolsToolbarTools"], "Tools");
- scrMenuMgr->addMenuItem(scrActions["toolsToolbarPDF"], "Tools");
- //scrActions["toolsPreflightVerifier"]->setEnabled(false);*/
+ // Table menu.
+ scrMenuMgr->createMenu("ItemTable", ActionManager::defaultMenuNameEntryTranslated("Table"));
+ scrMenuMgr->addMenuItem(scrActions["tableInsertRows"], "ItemTable", false);
+ scrMenuMgr->addMenuItem(scrActions["tableInsertColumns"], "ItemTable", false);
+ scrMenuMgr->addMenuItem(scrActions["tableDeleteRows"], "ItemTable", false);
+ scrMenuMgr->addMenuItem(scrActions["tableDeleteColumns"], "ItemTable", false);
+ scrMenuMgr->addMenuSeparator("ItemTable");
+ scrMenuMgr->addMenuItem(scrActions["tableMergeCells"], "ItemTable", false);
+ scrMenuMgr->addMenuItem(scrActions["tableSplitCells"], "ItemTable", false);
+ scrMenuMgr->addMenuSeparator("ItemTable");
+ scrMenuMgr->addMenuItem(scrActions["tableSetRowHeights"], "ItemTable", false);
+ scrMenuMgr->addMenuItem(scrActions["tableSetColumnWidths"], "ItemTable", false);
+ scrMenuMgr->addMenuItem(scrActions["tableDistributeRowsEvenly"], "ItemTable", false);
+ scrMenuMgr->addMenuItem(scrActions["tableDistributeColumnsEvenly"], "ItemTable", false);
+ scrMenuMgr->addMenuSeparator("ItemTable");
+ scrMenuMgr->addMenuItem(scrActions["tableAdjustFrameToTable"], "ItemTable", false);
+ scrMenuMgr->addMenuItem(scrActions["tableAdjustTableToFrame"], "ItemTable", false);
//Extra menu
scrMenuMgr->createMenu("Extras", ActionManager::defaultMenuNameEntryTranslated("Extras"));
@@ -1082,6 +1038,7 @@
scrMenuMgr->addMenuItem(scrActions["extrasDeHyphenateText"], "Extras", false);
scrMenuMgr->addMenuItem(scrActions["extrasGenerateTableOfContents"], "Extras", false);
scrMenuMgr->addMenuItem(scrActions["extrasUpdateDocument"], "Extras", false);
+ scrMenuMgr->addMenuItem(scrActions["itemUpdateMarks"], "Extras", true);
connect(scrMenuMgr->getLocalPopupMenu("Extras"), SIGNAL(aboutToShow()), this, SLOT(extrasMenuAboutToShow()));
//Window menu
@@ -1112,11 +1069,10 @@
scrMenuMgr->addMenuToMenuBar("Edit");
scrMenuMgr->addMenuToMenuBar("Item");
scrMenuMgr->addMenuToMenuBar("Insert");
- //scrMenuMgr->setMenuEnabled("Insert", false);
scrMenuMgr->addMenuToMenuBar("Page");
scrMenuMgr->addMenuToMenuBar("View");
+ scrMenuMgr->addMenuToMenuBar("ItemTable");
scrMenuMgr->addMenuToMenuBar("Extras");
- //scrMenuMgr->setMenuEnabled("Extras", false);
scrMenuMgr->addMenuToMenuBar("Windows");
menuBar()->addSeparator();
scrMenuMgr->addMenuToMenuBar("Help");
More information about the scribus-commit
mailing list