Fixed script editor parameters field

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5831 17fca916-40b9-46aa-a4ea-0a15b648b75c

3 files changed, 25 insertions, 4 deletions

diff --git a/src/kvirc/kvs/KviKvsVariantList.cpp b/src/kvirc/kvs/KviKvsVariantList.cpp
index 0074fc11d..69398c17e 100644
--- a/src/kvirc/kvs/KviKvsVariantList.cpp
+++ b/src/kvirc/kvs/KviKvsVariantList.cpp
@@ -24,6 +24,8 @@
 
 #include "KviKvsVariantList.h"
 
+#include <QStringList>
+
 KviKvsVariantList::KviKvsVariantList()
 {
 	m_pList = new KviPointerList<KviKvsVariant>();
@@ -170,6 +172,17 @@ KviKvsVariantList::KviKvsVariantList(QString * pS1, QString * pS2, QString * pS3
 	m_pList->append(new KviKvsVariant(pS7));
 }
 
+KviKvsVariantList::KviKvsVariantList(QStringList * pSL)
+{
+	m_pList = new KviPointerList<KviKvsVariant>();
+	m_pList->setAutoDelete(true);
+	if(!pSL)
+		return;
+	
+	foreach(QString pS, *pSL)
+		m_pList->append(new KviKvsVariant(new QString(pS)));
+}
+
 KviKvsVariantList::~KviKvsVariantList()
 {
 	delete m_pList;
diff --git a/src/kvirc/kvs/KviKvsVariantList.h b/src/kvirc/kvs/KviKvsVariantList.h
index e3557fad9..b140158ca 100644
--- a/src/kvirc/kvs/KviKvsVariantList.h
+++ b/src/kvirc/kvs/KviKvsVariantList.h
@@ -188,6 +188,13 @@ public:
 	KviKvsVariantList(QString * pS1, QString * pS2, QString * pS3, QString * pS4, QString * pS5, QString * pS6, QString * pS7);
 
 	/**
+	* \brief Constructs the KviKvsVariantList object
+	* \param pSL Pointer to a QStringList
+	* \return KviKvsVariantList
+	*/
+	KviKvsVariantList(QStringList * pSL);
+
+	/**
 	* \brief Destroys the KviKvsVariantList object
 	*/
 	~KviKvsVariantList();
diff --git a/src/modules/codetester/CodeTesterWindow.cpp b/src/modules/codetester/CodeTesterWindow.cpp
index 9bd25da69..ed0306428 100644
--- a/src/modules/codetester/CodeTesterWindow.cpp
+++ b/src/modules/codetester/CodeTesterWindow.cpp
@@ -61,6 +61,7 @@ CodeTesterWidget::CodeTesterWidget(QWidget * par)
 	m_pModeLabel = new QLabel(__tr2qs_ctx("Params:","editor"),this);
 	g->addWidget(m_pModeLabel,1,1);
 	m_pParams = new QLineEdit(this);
+	m_pParams->setToolTip(__tr2qs_ctx("Here you can specify a semicolon-separated list of parameters that will be available in the code as $0, $1, $2, ..","editor"));
 	g->addWidget(m_pParams,1,2);
 }
 
@@ -73,12 +74,12 @@ CodeTesterWidget::~CodeTesterWidget()
 
 void CodeTesterWidget::execute()
 {
-	QString parms = m_pParams->text();
 	QString buffer;
 	m_pEditor->getText(buffer);
-	KviConsoleWindow * con = g_pApp->activeConsole();
-	//KviParameterList * l = new KviParameterList(parms.ptr());
-	KviKvsScript::run(buffer,con,new KviKvsVariantList(new QString(parms)));
+	KviConsoleWindow * pConsole = g_pApp->activeConsole();
+	QStringList * pSLParams = new QStringList(m_pParams->text().split(';'));
+	KviKvsScript::run(buffer, pConsole, new KviKvsVariantList(pSLParams));
+	delete pSLParams;
 }
 
 CodeTesterWindow::CodeTesterWindow(KviMainWindow * lpFrm)