r21806 by craig - #14639: Include edit in frame vs story editor on text frame context menu

[scribus-commit]

Author: craig
Date: Thu Mar  2 17:38:23 2017
New Revision: 21806

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21806
Log:
#14639: Include edit in frame vs story editor on text frame context menu

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

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21806&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp	Thu Mar  2 17:38:23 2017
@@ -5062,7 +5062,7 @@
 		return;
 	actionList << "fileImportText";
 	actionList << "fileImportAppendText";
-	actionList << "toolsEditWithStoryEditor";
+	actionList << "toolsEditContents";
 	actionList << "insertSampleText";
 	actionList << "itemPDFIsAnnotation";
 	if (doc()->currentPage()->pageName().isEmpty())

Modified: trunk/Scribus/scribus/ui/contextmenu.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21806&path=/trunk/Scribus/scribus/ui/contextmenu.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/contextmenu.cpp	(original)
+++ trunk/Scribus/scribus/ui/contextmenu.cpp	Thu Mar  2 17:38:23 2017
@@ -155,12 +155,13 @@
 	//-->
 
 	//<-- Add Contents Actions
+	//This part only for text frames
 	if (m_actionList.contains("fileImportText"))
 	{
 		addSeparator();
 		menuEditContent->addAction(m_ScMW->scrActions["fileImportText"]);
 		menuEditContent->addAction(m_ScMW->scrActions["fileImportAppendText"]);
-		menuEditContent->addAction(m_ScMW->scrActions["toolsEditWithStoryEditor"]);
+		menuEditContent->addAction(m_ScMW->scrActions["toolsEditContents"]);
 		menuEditContent->addAction(m_ScMW->scrActions["insertSampleText"]);
 		menuEditContent->addSeparator();
 	}