aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Szymon Tomasz Stefanek2010-12-25 03:47:51 +0000
committerGravatar Szymon Tomasz Stefanek2010-12-25 03:47:51 +0000
commitd53ae06c022cc19ac7e6b0f59012974b1243639c (patch)
tree0081d026b632beedd35f5db78d925787bc6177b3
parentMore work on channel autojoin lists (diff)
downloadKVIrc-d53ae06c022cc19ac7e6b0f59012974b1243639c.tar.gz
KVIrc-d53ae06c022cc19ac7e6b0f59012974b1243639c.tar.bz2
KVIrc-d53ae06c022cc19ac7e6b0f59012974b1243639c.zip
More work on the window popup
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5228 17fca916-40b9-46aa-a4ea-0a15b648b75c
-rw-r--r--data/defscript/default.kvc5
-rw-r--r--data/defscript/popups.kvs16
2 files changed, 10 insertions, 11 deletions
diff --git a/data/defscript/default.kvc b/data/defscript/default.kvc
index 9ea89ba62..2c1a1fb8c 100644
--- a/data/defscript/default.kvc
+++ b/data/defscript/default.kvc
@@ -6,8 +6,7 @@ ActionVersion=4.1.1
AddonVersion=4.1.1
AliasVersion=4.1.1.5184
EventVersion=4.1.1.5219
-PopupVersion=4.1.1.5223
+PopupVersion=4.1.1.5227
ClassVersion=4.1.1
RawVersion=4.1.1
-PopupVersion=4.1.1.5159
-ToolbarVersion=4.1.1 \ No newline at end of file
+ToolbarVersion=4.1.1
diff --git a/data/defscript/popups.kvs b/data/defscript/popups.kvs
index e2c924ff7..7050e0438 100644
--- a/data/defscript/popups.kvs
+++ b/data/defscript/popups.kvs
@@ -1419,7 +1419,7 @@ defpopup(windowpopup)
}
}
- item($str.printf($tr("Stop Joining Channel on Server '?s'","defscript"),%:szServer),$icon("part"))(%:bIsChannel && %:bIsAutoJoinedOnServer)
+ item($str.printf($tr("Stop Auto-Joining Channel on Server '?s'","defscript"),%:szServer),$icon("part"))(%:bIsChannel && %:bIsAutoJoinedOnServer)
{
%aChans = $array()
foreach(%szChanAndPass,$serverdb.serverJoinChannels(%:szNetwork,%:szServer))
@@ -1432,7 +1432,7 @@ defpopup(windowpopup)
serverdb.setServerJoinChannels %:szNetwork %:szServer %aChans
}
- item($str.printf($tr("Stop Joining Channel on Network '?s'","defscript"),%:szNetwork),$icon("part"))(%:bIsChannel && %:bIsAutoJoinedOnNetwork)
+ item($str.printf($tr("Stop Auto-Joining Channel on Network '?s'","defscript"),%:szNetwork),$icon("part"))(%:bIsChannel && %:bIsAutoJoinedOnNetwork)
{
%aChans = $array()
foreach(%szChanAndPass,$serverdb.networkJoinChannels(%:szNetwork))
@@ -1449,25 +1449,25 @@ defpopup(windowpopup)
separator(%:bIsConnectedConsole)
- item($tr("Part All Channels","defscript"), 31) (%:bIsConnectedConsole)
+ item($tr("Part All Channels","defscript"), 31) (%:bIsConnectedConsole && ($window.list(channel)))
{
foreach(%x,$window.list(channel))
window.close %x
}
- item($tr("Close All Queries","defscript"), 47) (%:bIsConnectedConsole)
+ item($tr("Close All Queries","defscript"), 47) (%:bIsConnectedConsole && ($window.list(query)))
{
foreach(%x,$window.list(query))
window.close %x
}
- item($tr("Close All Dead Channels" ,"defscript"), 232) (%:bIsConnectedConsole)
+ item($tr("Close All Dead Channels" ,"defscript"), 232) (%:bIsConnectedConsole && ($window.list(deadchannel)))
{
foreach(%x,$window.list(deadchannel))
window.close %x
}
- item($tr("Close All Dead Queries" ,"defscript"), 233) (%:bIsConnectedConsole)
+ item($tr("Close All Dead Queries" ,"defscript"), 233) (%:bIsConnectedConsole && ($window.list(deadquery)))
{
foreach(%x,$window.list(deadquery))
window.close %x
@@ -1481,13 +1481,13 @@ defpopup(windowpopup)
window.highlight 0 %x
}
- item($tr("Unhighlight All Channels" ,"defscript")) (%:bIsConnectedConsole)
+ item($tr("Unhighlight All Channels" ,"defscript")) (%:bIsConnectedConsole && ($window.list(channel)))
{
foreach(%x,$window.list(channel))
window.highlight 0 %x
}
- item($tr("Unhighlight All Queries" ,"defscript")) (%:bIsConnectedConsole)
+ item($tr("Unhighlight All Queries" ,"defscript")) (%:bIsConnectedConsole && ($window.list(query)))
{
foreach(%x,$window.list(query))
window.highlight 0 %x