r21827 by craig - #14673, revert r21806/#14639. Put the Edit Text menu back in for 1.5.3

[scribus-commit]

Author: craig
Date: Thu Mar 16 17:35:26 2017
New Revision: 21827

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21827
Log:
#14673, revert r21806/#14639. Put the Edit Text menu back in for 1.5.3

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=21827&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp	Thu Mar 16 17:35:26 2017
@@ -5056,7 +5056,7 @@
 		return;
 	actionList << "fileImportText";
 	actionList << "fileImportAppendText";
-	actionList << "toolsEditContents";
+	actionList << "toolsEditWithStoryEditor";
 	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=21827&path=/trunk/Scribus/scribus/ui/contextmenu.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/contextmenu.cpp	(original)
+++ trunk/Scribus/scribus/ui/contextmenu.cpp	Thu Mar 16 17:35:26 2017
@@ -161,7 +161,7 @@
 		addSeparator();
 		menuEditContent->addAction(m_ScMW->scrActions["fileImportText"]);
 		menuEditContent->addAction(m_ScMW->scrActions["fileImportAppendText"]);
-		menuEditContent->addAction(m_ScMW->scrActions["toolsEditContents"]);
+		menuEditContent->addAction(m_ScMW->scrActions["toolsEditWithStoryEditor"]);
 		menuEditContent->addAction(m_ScMW->scrActions["insertSampleText"]);
 		menuEditContent->addSeparator();
 	}