r19150 by craig - #12325: Re-enabled Scribus Scripts menu entries

[scribus-commit]

Author: craig
Date: Tue May 27 21:08:55 2014
New Revision: 19150

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19150
Log:
#12325: Re-enabled Scribus Scripts menu entries

Modified:
    trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp
    trunk/Scribus/scribus/scraction.cpp

Modified: trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19150&path=/trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp Tue May 27 21:08:55 2014
@@ -126,7 +126,7 @@
 		{
 			QFileInfo fs(ds[dc]);
 			QString strippedName=fs.baseName();
-			scrScripterActions.insert(strippedName, new ScrAction( ScrAction::RecentScript, strippedName, QKeySequence(), this));
+			scrScripterActions.insert(strippedName, new ScrAction( ScrAction::RecentScript, strippedName, QKeySequence(), this, strippedName));
 			connect( scrScripterActions[strippedName], SIGNAL(triggeredData(QString)), this, SLOT(StdScript(QString)) );
 			menuMgr->addMenuItemString(strippedName, "ScribusScripts");
 		}

Modified: trunk/Scribus/scribus/scraction.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19150&path=/trunk/Scribus/scribus/scraction.cpp
==============================================================================
--- trunk/Scribus/scribus/scraction.cpp (original)
+++ trunk/Scribus/scribus/scraction.cpp Tue May 27 21:08:55 2014
@@ -112,8 +112,7 @@
 	if (_actionType==ScrAction::RecentPaste)
 		emit triggeredData(data().toString());
 	if (_actionType==ScrAction::RecentScript)
-		qDebug()<<"if (_actionType==ScrAction::RecentScript): please fix in ScrAction::triggeredToTriggeredData()";
-//		emit triggeredData(text());
+		emit triggeredData(data().toString());
 	if (_actionType==ScrAction::UnicodeChar)
 		emit triggeredUnicodeShortcut(data().toInt());
 	if (_actionType==ScrAction::Layer)