popups: cleanup + add more conditions + fix missed renamed

Why doesnt KVIrc use alphabetical order to organize popups intead of doing whatever it wants?
Why doesnt the export function remove trailing spaces automatically?

1 files changed, 146 insertions, 140 deletions

diff --git a/data/defscript/popups.kvs b/data/defscript/popups.kvs
index cd4732127..2c305c89b 100644
--- a/data/defscript/popups.kvs
+++ b/data/defscript/popups.kvs
@@ -100,7 +100,7 @@ defpopup(dccchat)
 
 	separator($server)
 
-	item($tr("Notify Avatar","defscript"),57)
+	item($tr("Notify Avatar","defscript"),57) ($server)
 	{
 		avatar.notify $0
 	}
@@ -140,12 +140,12 @@ defpopup(querytextview)
 
 	separator(!$window.isDocked())
 
-	item($str.printf($tr("/WHOIS ?s (idle time)","defscript"),$0),88) (!%:multiple)
+	item($str.printf($tr("/WHOIS ?s (idle time)","defscript"),$0),88) (!%:multiple && $server)
 	{
 		whois $0 $0
 	}
 
-	separator
+	separator($server)
 
 	popup($tr("&Information","defscript"),317) ($server)
 	{
@@ -171,30 +171,32 @@ defpopup(querytextview)
 			foreach(%i,$str.split(",",$0))dns %i
 		}
 
-		item($tr("Mask for","defscript") $0,15) (!%:multiple)
+		item($tr("Mask for","defscript") $0,15) (!%:multiple && $server)
 		{
 			echo $mask($0,11)
 		}
 	}
 
-	separator
+	separator($server)
 
 	extpopup(C&TCP,ctcp,162) ($server)
 
 	extpopup(&DCC,dcc,325) ($server)
 
-	separator
+	separator($server)
 
-	extpopup($tr("&Ignore","defscript"),ignore,203) (!%:multiple)
+	extpopup($tr("&Ignore","defscript"),ignore,203) (!%:multiple && $server)
 
-	extpopup($tr("&Registration","defscript"),registration,113) (!%:multiple)
+	extpopup($tr("&Registration","defscript"),registration,113) (!%:multiple && $server)
 
 	item($tr("Notify Avatar","defscript"),57) ($server)
 	{
 		avatar.notify $0
 	}
 
-	separator
+	separator($server)
+
+	label($tr("You're not connected to a server","defscript")) (!$server)
 
 	item($tr("Clear Buffer","defscript"),120)
 	{
@@ -410,6 +412,124 @@ defpopup(consoletextview)
 	}
 }
 
+defpopup(serverpopup)
+{
+	popup($tr("&Information","defscript"),317) ($server)
+	{
+		item(/MOTD,30)
+		{
+			motd
+		}
+
+		item(/INFO,317)
+		{
+			info
+		}
+
+		item(/LUSERS,178)
+		{
+			lusers
+		}
+
+		popup(/STATS,205)
+		{
+			item($tr("d (Debug/DNS?)","defscript"))
+			{
+				stats d
+			}
+
+			item($tr("l (Connections)","defscript"))
+			{
+				stats l
+			}
+
+			item($tr("m (Command Usage)","defscript"))
+			{
+				stats m
+			}
+
+			item($tr("o (Operators)","defscript"))
+			{
+				stats o
+			}
+
+			item($tr("t (Connection Stats?)","defscript"))
+			{
+				stats t
+			}
+
+			item($tr("u (Uptime)","defscript"))
+			{
+				stats u
+			}
+
+			item($tr("y (Y-Lines)","defscript"))
+			{
+				stats y
+			}
+
+			item($tr("z (Debug Stats?)","defscript"))
+			{
+				stats z
+			}
+		}
+
+		item(/TIME,93)
+		{
+			time
+		}
+
+		item(/ADMIN,261)
+		{
+			admin
+		}
+
+		item(/VERSION,16)
+		{
+			version
+		}
+
+		item(/HELP,49)
+		{
+			raw help
+		}
+	}
+
+	separator($server)
+
+	item($tr("Traceroute to ","defscript")$0,36) ($server)
+	{
+		if("$system.ostype" == "unix") system.runcmd traceroute $0
+		else system.runcmd tracert $0
+	}
+
+	item($tr("Traceroute6 to ","defscript")$0,36) ($server)
+	{
+		if("$system.ostype" == "unix") system.runcmd traceroute6 $0
+		else system.runcmd tracert -6 $0
+	}
+
+	item("Ping "$0,36) ($server)
+	{
+		system.runcmd ping $0
+	}
+
+	item("Ping6 "$0,36) ($server)
+	{
+		if("$system.ostype" == "unix") system.runcmd ping6 $0
+		else system.runcmd ping -6 $0
+	}
+
+	separator($server)
+
+	label($tr("You're not connected to a server","defscript")) (!$server)
+
+	item($tr("Clear Buffer","defscript"),120)
+	{
+		clear
+	}
+}
+
 defpopup(windowpopup)
 {
 	prologue
@@ -616,7 +736,7 @@ defpopup(defaulttextview)
 		}
 	}
 
-	item($str.printf($tr("/WHOIS ?s (idle time)","defscript"),$0),90) (!%:multiple)
+	item($str.printf($tr("/WHOIS ?s (idle time)","defscript"),$0),90) (!%:multiple && $server)
 	{
 		whois $0 $0
 	}
@@ -657,24 +777,26 @@ defpopup(defaulttextview)
 
 	separator
 
-	extpopup(C&TCP,ctcp,162)
+	extpopup(C&TCP,ctcp,162) ($server)
 
-	extpopup(&DCC,dcc,325)
+	extpopup(&DCC,dcc,325) ($server)
 
 	separator
 
-	extpopup($tr("&Registration","defscript"),registration,113) (!%:multiple)
+	extpopup($tr("&Registration","defscript"),registration,113) (!%:multiple && $server)
 
-	extpopup($tr("&Highlight","defscript"),highlight,269) (!%:multiple)
+	extpopup($tr("&Highlight","defscript"),highlight,269) (!%:multiple && $server)
 
-	extpopup($tr("Ig&nore","defscript"),ignore,203) (!%:multiple)
+	extpopup($tr("Ig&nore","defscript"),ignore,203) (!%:multiple && $server)
 
-	item($tr("Notify avatar","defscript"),57)
+	item($tr("Notify avatar","defscript"),57) ($server)
 	{
 		avatar.notify $0
 	}
 
-	separator
+	separator($server)
+
+	label($tr("You're not connected to a server","defscript")) (!$server)
 
 	item($tr("Clear Buffer","defscript"),120)
 	{
@@ -856,7 +978,7 @@ defpopup(channeltextview)
 
 	separator(!$window.isDocked() $server)
 
-	extpopup($tr("Channels","defscript"),channels,31) ($server)
+	extpopup($tr("Default Channels","defscript"),channels,31) ($server)
 
 	item($tr("&Join Channels...","defscript"),31) ($server)
 	{
@@ -910,6 +1032,8 @@ defpopup(channeltextview)
 		str.toClipboard $chan.getUrl
 	}
 
+	separator($server)
+
 	label($tr("You're not connected to a server","defscript")) (!$server)
 
 	item($tr("Clear Buffer","defscript"),120)
@@ -1548,15 +1672,15 @@ defpopup(channel)
 
 	extpopup(C&TCP,ctcp,162) ($server)
 
-	extpopup(&DCC,dcc,325) (!%:multiple)
+	extpopup(&DCC,dcc,325) (!%:multiple && $server)
 
 	separator
 
-	extpopup($tr("&Registration","defscript"),registration,113) (!%:multiple)
+	extpopup($tr("&Registration","defscript"),registration,113) (!%:multiple && $server)
 
-	extpopup($tr("&Highlight","defscript"),highlight,269) (!%:multiple)
+	extpopup($tr("&Highlight","defscript"),highlight,269) (!%:multiple && $server)
 
-	extpopup($tr("Ig&nore","defscript"),ignore,203) (!%:multiple)
+	extpopup($tr("Ig&nore","defscript"),ignore,203) (!%:multiple && $server)
 
 	item($tr("Notify Avatar","defscript"),57) ($server)
 	{
@@ -1564,121 +1688,3 @@ defpopup(channel)
 	}
 }
 
-defpopup(serverpopup)
-{
-	popup($tr("&Information","defscript"),317) ($server)
-	{
-		item(/MOTD,30)
-		{
-			motd
-		}
-
-		item(/INFO,317)
-		{
-			info
-		}
-
-		item(/LUSERS,178)
-		{
-			lusers
-		}
-
-		popup(/STATS,205)
-		{
-			item($tr("d (Debug/DNS?)","defscript"))
-			{
-				stats d
-			}
-
-			item($tr("l (Connections)","defscript"))
-			{
-				stats l
-			}
-
-			item($tr("m (Command Usage)","defscript"))
-			{
-				stats m
-			}
-
-			item($tr("o (Operators)","defscript"))
-			{
-				stats o
-			}
-
-			item($tr("t (Connection Stats?)","defscript"))
-			{
-				stats t
-			}
-
-			item($tr("u (Uptime)","defscript"))
-			{
-				stats u
-			}
-
-			item($tr("y (Y-Lines)","defscript"))
-			{
-				stats y
-			}
-
-			item($tr("z (Debug Stats?)","defscript"))
-			{
-				stats z
-			}
-		}
-
-		item(/TIME,93)
-		{
-			time
-		}
-
-		item(/ADMIN,261)
-		{
-			admin
-		}
-
-		item(/VERSION,16)
-		{
-			version
-		}
-
-		item(/HELP,49)
-		{
-			raw help
-		}
-	}
-
-	separator($server)
-
-	item($tr("Traceroute to ","defscript")$0,36) ($server)
-	{
-		if("$system.ostype" == "unix") system.runcmd traceroute $0
-		else system.runcmd tracert $0
-	}
-
-	item($tr("Traceroute6 to ","defscript")$0,36) ($server)
-	{
-		if("$system.ostype" == "unix") system.runcmd traceroute6 $0
-		else system.runcmd tracert -6 $0
-	}
-
-	item("Ping "$0,36) ($server)
-	{
-		system.runcmd ping $0
-	}
-
-	item("Ping6 "$0,36) ($server)
-	{
-		if("$system.ostype" == "unix") system.runcmd ping6 $0
-		else system.runcmd ping -6 $0
-	}
-
-	separator($server)
-
-	label($tr("You're not connected to a server","defscript")) (!$server)
-
-	item($tr("Clear Buffer","defscript"),120)
-	{
-		clear
-	}
-}
-