Rework /popup so it relays the parameters correctly to /popup.show. Replace the deprecated /popup calls to /popup.show in the default script.

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

2 files changed, 24 insertions, 18 deletions

diff --git a/data/defscript/events.kvs b/data/defscript/events.kvs
index 13f482550..9376143ae 100644
--- a/data/defscript/events.kvs
+++ b/data/defscript/events.kvs
@@ -2,32 +2,32 @@
 
 event(OnDccChatPopupRequest,default)
 {
-	popup dccchat $dcc.remoteNick($0);
+	popup.show dccchat $dcc.remoteNick($0);
 }
 
 event(OnChannelPopupRequest,default)
 {
-	popup channeltextview $target;
+	popup.show channeltextview $target;
 }
 
 event(OnConsolePopupRequest,default)
 {
-	popup consoletextview;
+	popup.show consoletextview;
 }
 
 event(OnChannelLinkPopupRequest,default)
 {
-	if($0 != "") popup channelpopup $0;
+	if($0 != "") popup.show channelpopup.show $0;
 }
 
 event(OnQueryPopupRequest,default)
 {
-	if($target) popup querytextview $target;
+	if($target) popup.show querytextview $target;
 }
 
 event(OnQueryNickPopupRequest,default)
 {
-	if($0 != "") popup querytextview $0;
+	if($0 != "") popup.show querytextview $0;
 }
 
 event(OnQueryFileDropped,default)
@@ -42,7 +42,7 @@ event(OnNickLinkDefaultActionRequest,default)
 
 event(OnNickLinkPopupRequest,default)
 {
-	if($0 != "") popup defaulttextview $0;
+	if($0 != "") popup.show defaulttextview $0;
 }
 
 event(OnNotifyListDefaultActionRequest,default)
@@ -55,19 +55,19 @@ event(OnNotifyListDefaultActionRequest,default)
 
 event(OnNotifyListPopupRequest,default)
 {
-	if($0 != "") popup defaulttextview $0;
+	if($0 != "") popup.show defaulttextview $0;
 };
 
 event(OnWindowPopupRequest,default)
 {
-	popup windowpopup;
+	popup.show windowpopup;
 }
 
 event(OnChannelWindowCreated,default)
 {
 	button(w,Logging,119,Logging)
 	{
-		popup -p=$0,$1 logging;
+		popup.show -p=$0,$1 logging;
 	}
 }
 
@@ -75,7 +75,7 @@ event(OnQueryWindowCreated,default)
 {
 	button(w,Logging,119,Logging)
 	{
-		popup -p=$0,$1 logging;
+		popup.show -p=$0,$1 logging;
 	}
 }
 
@@ -83,7 +83,7 @@ event(OnDCCChatWindowCreated,default)
 {
 	button(w,Logging,119,Logging)
 	{
-		popup -p=$0,$1 logging;
+		popup.show -p=$0,$1 logging;
 	}
 }
 
@@ -99,7 +99,7 @@ event(OnChannelNickLinkClick,default)
 
 event(OnChannelNickPopupRequest,default)
 {
-	if($0 != "") popup channel $0;
+	if($0 != "") popup.show channel $0;
 }
 
 event(OnChannelNickDefaultActionRequest,default)
@@ -114,10 +114,10 @@ event(OnURLLinkClick,default)
 
 event(OnURLLinkPopupRequest,URL popup)
 {
-	popup urlpopup $0
+	popup.show urlpopup.show $0
 }
 
 event(OnHostLinkPopupRequest,default)
 {
-	popup hostpopup $0;
+	popup.show hostpopup.show $0;
 }
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;
 	}