r18629 by craig - #11879: Fix menu item order

[scribus-commit]

Author: craig
Date: Mon Dec  9 21:05:50 2013
New Revision: 18629

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18629
Log:
#11879: Fix menu item order

Modified:
    trunk/Scribus/scribus/actionmanager.cpp
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/ui/contextmenu.cpp

Modified: trunk/Scribus/scribus/actionmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18629&path=/trunk/Scribus/scribus/actionmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/actionmanager.cpp (original)
+++ trunk/Scribus/scribus/actionmanager.cpp Mon Dec  9 21:05:50 2013
@@ -1553,9 +1553,9 @@
 	(*scrActions)["itemConvertToPolygon"]->setTexts( tr("&Polygon"));
 	(*scrActions)["itemConvertToTextFrame"]->setTexts( tr("&Text Frame"));
 	(*scrActions)["itemConvertToSymbolFrame"]->setTexts( tr("&Symbol"));
-	(*scrActions)["itemsUnWeld"]->setTexts( tr("Unweld items"));
-	(*scrActions)["itemWeld"]->setTexts( tr("Weld items"));
-	(*scrActions)["itemEditWeld"]->setTexts( tr("Edit weld item"));
+	(*scrActions)["itemsUnWeld"]->setTexts( tr("Unweld Items"));
+	(*scrActions)["itemWeld"]->setTexts( tr("Weld Items"));
+	(*scrActions)["itemEditWeld"]->setTexts( tr("Edit Welded Item"));
 
 	//Insert Menu
 	(*scrActions)["insertFrame"]->setTexts( tr("&Frames..."));

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18629&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Mon Dec  9 21:05:50 2013
@@ -824,12 +824,10 @@
 	scrMenuMgr->addMenuItemString("itemLowerToBottom", "ItemLevel");
 	scrMenuMgr->createMenu("ItemLayer", tr("Send to La&yer"), "",false, true);
 	scrMenuMgr->addMenuItemString("ItemLayer", "Item");
-//	scrMenuMgr->addMenuToMenu("ItemLayer", "Item");
 	scrMenuMgr->createMenu("SendTo", tr("Send to"), "Item");
 	scrMenuMgr->addMenuItemString("SendTo", "Item");
 	scrMenuMgr->createMenu("ItemSendToScrapbook", tr("Scrapbook"),"",false,true);
 	scrMenuMgr->addMenuItemString("ItemSendToScrapbook", "SendTo");
-//	scrMenuMgr->addMenuToMenu("itemSendToScrapbook", "SendTo");
 	scrMenuMgr->addMenuItemString("itemSendToPattern", "SendTo");
 	scrMenuMgr->addMenuItemString("itemSendToInline", "SendTo");
 	scrMenuMgr->createMenu("Adjust", tr("Adjust"), "Item");
@@ -851,7 +849,6 @@
 	scrMenuMgr->addMenuItemString("itemPreviewNormal", "ItemPreviewSettings");
 	scrMenuMgr->addMenuItemString("itemPreviewFull", "ItemPreviewSettings");
 	scrMenuMgr->createMenu("ItemPDFOptions", tr("&PDF Options"));
-//	scrMenuMgr->addMenuToMenu("ItemPDFOptions", "Item");
 	scrMenuMgr->addMenuItemString("ItemPDFOptions", "Item");
 	scrMenuMgr->addMenuItemString("itemPDFIsAnnotation", "ItemPDFOptions");
 	scrMenuMgr->addMenuItemString("itemPDFIsBookmark", "ItemPDFOptions");
@@ -859,11 +856,11 @@
 	scrMenuMgr->addMenuItemString("itemPDFFieldProps", "ItemPDFOptions");
 	scrMenuMgr->createMenu("ItemConvertTo", tr("C&onvert To"), "Item");
 	scrMenuMgr->addMenuItemString("ItemConvertTo", "Item");
+	scrMenuMgr->addMenuItemString("itemConvertToTextFrame", "ItemConvertTo");
+	scrMenuMgr->addMenuItemString("itemConvertToImageFrame", "ItemConvertTo");
+	scrMenuMgr->addMenuItemString("itemConvertToPolygon", "ItemConvertTo");
 	scrMenuMgr->addMenuItemString("itemConvertToBezierCurve", "ItemConvertTo");
-	scrMenuMgr->addMenuItemString("itemConvertToImageFrame", "ItemConvertTo");
 	scrMenuMgr->addMenuItemString("itemConvertToOutlines", "ItemConvertTo");
-	scrMenuMgr->addMenuItemString("itemConvertToPolygon", "ItemConvertTo");
-	scrMenuMgr->addMenuItemString("itemConvertToTextFrame", "ItemConvertTo");
 	scrMenuMgr->addMenuItemString("itemConvertToSymbolFrame", "ItemConvertTo");
 	scrMenuMgr->createMenu("TextLinking", tr("Text Frame Links"), "Item");
 	scrMenuMgr->addMenuItemString("TextLinking", "Item");
@@ -883,8 +880,8 @@
 
 	scrMenuMgr->createMenu("Weld", tr("Welding"), "Item");
 	scrMenuMgr->addMenuItemString("Weld", "Item");
+	scrMenuMgr->addMenuItemString("itemWeld", "Weld");
 	scrMenuMgr->addMenuItemString("itemsUnWeld", "Weld");
-	scrMenuMgr->addMenuItemString("itemWeld", "Weld");
 	scrMenuMgr->addMenuItemString("itemEditWeld", "Weld");
 
 	//scrMenuMgr->addMenuItem(scrActions["editMark"], "Item", false);

Modified: trunk/Scribus/scribus/ui/contextmenu.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18629&path=/trunk/Scribus/scribus/ui/contextmenu.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/contextmenu.cpp (original)
+++ trunk/Scribus/scribus/ui/contextmenu.cpp Mon Dec  9 21:05:50 2013
@@ -406,9 +406,9 @@
 	//<-- Add Level Item
 	if (!currItem->locked())
 	{
-		menuLevel->addAction(m_ScMW->scrActions["itemRaiseToTop"]);
 		menuLevel->addAction(m_ScMW->scrActions["itemRaise"]);
 		menuLevel->addAction(m_ScMW->scrActions["itemLower"]);
+		menuLevel->addAction(m_ScMW->scrActions["itemRaiseToTop"]);
 		menuLevel->addAction(m_ScMW->scrActions["itemLowerToBottom"]);
 		if (menuLevel->actions().count()>0)
 		{