r18959 by fschmid - Fixed Bug #12163: Misleading Context Menu for 3D annotations

[scribus-commit]

Author: fschmid
Date: Sat Mar 29 10:09:02 2014
New Revision: 18959

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18959
Log:
Fixed Bug #12163: Misleading Context Menu for 3D annotations

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

Modified: trunk/Scribus/scribus/ui/contextmenu.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18959&path=/trunk/Scribus/scribus/ui/contextmenu.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/contextmenu.cpp (original)
+++ trunk/Scribus/scribus/ui/contextmenu.cpp Sat Mar 29 10:09:02 2014
@@ -168,7 +168,17 @@
 		if (m_actionList.contains("editEditRenderSource"))
 		{
 			addSeparator();
+#ifdef HAVE_OSG
+			if (currItem->isOSGFrame())
+			{
+				QAction *act = addAction( tr("Edit 3D-Annotation..."));
+				connect(act, SIGNAL(triggered()), m_ScMW, SLOT(callImageEditor()));
+			}
+			else
+				addAction(m_ScMW->scrActions["editEditRenderSource"]);
+#else
 			addAction(m_ScMW->scrActions["editEditRenderSource"]);
+#endif
 		}
 		if (m_doc->appMode == modeEdit)
 		{