r19253 by craig - #12361: Fix Item > Image > Preview Settings can not be opened

[scribus-commit]

Author: craig
Date: Wed Jun 18 19:23:50 2014
New Revision: 19253

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19253
Log:
#12361: Fix Item > Image > Preview Settings can not be opened

Modified:
    trunk/Scribus/scribus/menumanager.cpp
    trunk/Scribus/scribus/scribus.cpp

Modified: trunk/Scribus/scribus/menumanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19253&path=/trunk/Scribus/scribus/menumanager.cpp
==============================================================================
--- trunk/Scribus/scribus/menumanager.cpp (original)
+++ trunk/Scribus/scribus/menumanager.cpp Wed Jun 18 19:23:50 2014
@@ -183,7 +183,9 @@
 			{
 				//Add Menu Items
 				if (menuActions.contains(menuStrings[menuName].at(i)))
+				{
 					menuToAddTo->addAction(menuActions[menuStrings[menuName].at(i)]);
+				}
 				else
 				//Add Sub Menus
 				{
@@ -195,8 +197,8 @@
 							if (rememberedMenus.contains(menuStrings[menuName].at(i)))
 							{
 								rememberedMenus.insert(menuStrings[menuName].at(i), subMenu);
-								addMenuItemStringstoMenu(menuStrings[menuName].at(i), subMenu, menuActions);
 							}
+							addMenuItemStringstoMenu(menuStrings[menuName].at(i), subMenu, menuActions);
 						}
 					}
 				}

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19253&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Wed Jun 18 19:23:50 2014
@@ -863,7 +863,7 @@
 	scrMenuMgr->addMenuItemString("styleImageEffects", "Image");
 	scrMenuMgr->addMenuItemString("itemExtendedImageProperties", "Image");
 	scrMenuMgr->addMenuItemString("itemToggleInlineImage", "Image");
-	scrMenuMgr->createMenu("ItemPreviewSettings", tr("Preview Settings"), "Image");
+	scrMenuMgr->createMenu("ItemPreviewSettings", tr("Preview Settings"));
 	scrMenuMgr->addMenuItemString("ItemPreviewSettings", "Image");
 	scrMenuMgr->addMenuItemString("itemImageIsVisible", "ItemPreviewSettings");
 	scrMenuMgr->addMenuItemString("SEPARATOR", "ItemPreviewSettings");