r17145 by fschmid - Fixed the Context Menue code not to insert non existing actions.

[scribus-commit]

Author: fschmid
Date: Thu Dec 29 17:01:11 2011
New Revision: 17145

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17145
Log:
Fixed the Context Menue code not to insert non existing actions.

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

Modified: trunk/Scribus/scribus/ui/contextmenu.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17145&path=/trunk/Scribus/scribus/ui/contextmenu.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/contextmenu.cpp (original)
+++ trunk/Scribus/scribus/ui/contextmenu.cpp Thu Dec 29 17:01:11 2011
@@ -95,7 +95,7 @@
 	QMenu *menuLevel = new QMenu(this);
 	QMenu *menuPDF = new QMenu(this);
 	QMenu *menuResolution = new QMenu(this);
-	QMenu *menuWeld = new QMenu(this);
+//	QMenu *menuWeld = new QMenu(this);
 	
 	//<-- Add Info
 	//Test new method with image frames first
@@ -440,14 +440,15 @@
 		}
 	}
 	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..."));
-	}
+	}*/
 	//-->
 	
 	//<-- Add Properties