aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp
index a37b5e222..c3d40880f 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp
@@ -843,11 +843,13 @@ namespace KviKvsCoreSimpleCommands
KVSCSC(popup)
{
- QString szParams;
+ KviKvsVariantList lParameters;
KVSCSC_PARAMETERS_BEGIN
- KVSCSC_PARAMETER("params",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szParams)
+ KVSCSC_PARAMETER("params",KVS_PT_VARIANTLIST,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,lParameters)
KVSCSC_PARAMETERS_END
+ //c->warning(__tr2qs("/popup is deprecated: use /popup.show instead")); <-- do it sometime in the future
+
// We just alias the popup.show function
QString szSwitches="";
KviKvsVariant * pCoords = KVSCSC_pSwitches->find('p',"point");
@@ -858,8 +860,12 @@ namespace KviKvsCoreSimpleCommands
szSwitches.append(QString("-p=\"%1\" ").arg(szCoords));
}
+ QString szParams;
+ for(unsigned int i=0;i<lParameters.count();i++)
+ szParams.append(QString::fromAscii(" $%1 ").arg(i));
+
KviKvsScript s("popup","popup.show " + szSwitches + szParams);
- s.run(KVSCSC_pContext->window());
+ s.run(KVSCSC_pContext->window(),&lParameters,0,KviKvsScript::PreserveParams);
return true;
}