Merge pull request #305 from retropc/master

[irc/quakenet/qwebirc.git] / js / ui / theme.js

diff --git a/js/ui/theme.js b/js/ui/theme.js
index 1017cf21d18ec06a4abf577044aca93295e94a35..beffc0b84eab3de9cfd15e1c8350b3b777d9fa84 100644 (file)
--- a/js/ui/theme.js
+++ b/js/ui/theme.js
@@ -3,6 +3,8 @@ qwebirc.ui.themes.ThemeControlCodeMap = {
   "B": "\x02",
   "U": "\x1F",
   "O": "\x0F",
+  "{": "\x00",
+  "}": "\x00",
   "[": "qwebirc://whois/",
   "]": "/",
   "$": "$"
@@ -11,36 +13,38 @@ qwebirc.ui.themes.ThemeControlCodeMap = {
 qwebirc.ui.themes.Default = {
   "PREFIX": ["$C4==$O "],
   "SIGNON": ["Signed on!", true],
-  "CONNECT": ["Connected to server.", true],
+  "CONNECTING": ["Connecting to server, please wait...", true],
+  "CONNECT": ["Logging in, please wait...", true],
+  "CONNECTED": ["Connected and logged in -- ready to go!", true],
   "RAW": ["$m", true],
   "DISCONNECT": ["Disconnected from server: $m", true],
   "ERROR": ["ERROR: $m", true],
   "SERVERNOTICE": ["$m", true],
-  "JOIN": ["$N [$h] has joined $c", true],
-  "OURJOIN": ["$N [$h] has joined $c", true],
-  "PART": ["$N [$h] has left $c [$m]", true],
-  "KICK": ["$v was kicked from $c by $N [$m]", true],
-  "MODE": ["mode/$c [$m] by $N", true],
-  "QUIT": ["$N [$h] has quit [$m]", true],
-  "NICK": ["$n has changed nick to $[$w$]", true],
-  "TOPIC": ["$N changed the topic of $c to: $m", true],
+  "JOIN": ["${$N$} [$h] has joined $c", true],
+  "OURJOIN": ["${$N$} [$h] has joined $c", true],
+  "PART": ["${$N$} [$h] has left $c [$m]", true],
+  "KICK": ["${$v$} was kicked from $c by ${$N$} [$m]", true],
+  "MODE": ["mode/$c [$m] by ${$N$}", true],
+  "QUIT": ["${$N$} [$h] has quit [$m]", true],
+  "NICK": ["${$n$} has changed nick to ${$[$w$]$}", true],
+  "TOPIC": ["${$N$} changed the topic of $c to: $m", true],
   "UMODE": ["Usermode change: $m", true],
   "INVITE": ["$N invites you to join $c", true],
   "HILIGHT": ["$C4"],
   "HILIGHTEND": ["$O"],
-  "CHANMSG": ["<$@$($N$)> $m"],
+  "CHANMSG": ["<$C15$@$O${$($N$)$}> $m"],
   "PRIVMSG": ["<$($N$)> $m"],
-  "CHANNOTICE": ["-$($N$):$c- $m"],
+  "CHANNOTICE": ["-${$($N$)$}:$c- $m"],
   "PRIVNOTICE": ["-$($N$)- $m"],
-  "OURCHANMSG": ["<$@$N> $m"],
-  "OURPRIVMSG": ["<$N> $m"],
+  "OURCHANMSG": ["<$C15$@$O$U$N$O> $m"],
+  "OURPRIVMSG": ["<$U$N$O> $m"],
   "OURTARGETEDMSG": ["*$[$t$]* $m"],
   "OURTARGETEDNOTICE": ["[notice($[$t$])] $m"],
   "OURCHANNOTICE": ["-$N:$t- $m"],
   "OURPRIVNOTICE": ["-$N- $m"],
-  "OURCHANACTION": [" * $N $m"],
-  "OURPRIVACTION": [" * $N $m"],
-  "CHANACTION": [" * $($N$) $m"],
+  "OURCHANACTION": [" * $U$N$O $m"],
+  "OURPRIVACTION": [" * $U$N$O $m"],
+  "CHANACTION": [" * ${$($N$)$} $m"],
   "PRIVACTION": [" * $($N$) $m"],
   "CHANCTCP": ["$N [$h] requested CTCP $x from $c: $m"],
   "PRIVCTCP": ["$N [$h] requested CTCP $x from $-: $m"],
@@ -58,11 +62,33 @@ qwebirc.ui.themes.Default = {
   "WHOISOPER": ["          : $BIRC Operator$B", true],
   "WHOISOPERNAME": [" operedas : $m", true],
   "WHOISACTUALLY": [" realhost : $m [ip: $x]", true],
+  "WHOISGENERICTEXT": ["          : $m", true],
   "WHOISEND": ["End of WHOIS", true],
   "AWAY": ["$N is away: $m", true],
   "GENERICERROR": ["$m: $t", true],
   "GENERICMESSAGE": ["$m", true],
-  "WALLOPS": ["WALLOP $n: $t", true]
+  "WALLOPS": ["WALLOP $n: $t", true],
+  "CHANNELCREATIONTIME": ["Channel $c was created at: $m", true],
+  "CHANNELMODEIS": ["Channel modes on $c are: $m", true],
+  "IGNORED": ["Ignored $n, to unignore type: /UNIGNORE $n", false],
+  "UNIGNORED": ["Unignored $n.", false],
+  "IGNOREHEADER": ["Ignore list:", false],
+  "IGNOREENTRY": ["- $h", false],
+  "IGNOREEMPTY": ["Ignore list is empty.", false],
+  "SILENCE": ["Silenced: $h", false],
+
+  "NOTIFYCHANMSGTITLE": ["Mentioned on $c:", false],
+  "NOTIFYCHANMSGBODY": ["<$@$n> $m", false],
+  "NOTIFYCHANACTIONTITLE": ["Mentioned on $c:", false],
+  "NOTIFYCHANACTIONBODY": [" * $n $m", false],
+  "NOTIFYPRIVMSGTITLE": ["Private message from $n:", false],
+  "NOTIFYPRIVMSGBODY": ["$m", false],
+  "NOTIFYPRIVACTIONTITLE": ["Private message from $n:", false],
+  "NOTIFYPRIVACTIONBODY": [" * $n $m", false],
+  "NOTIFYCHANNOTICETITLE": ["Mentioned on $c:", false],
+  "NOTIFYCHANNOTICEBODY": ["-$n- $m", false],
+  "NOTIFYPRIVNOTICETITLE": ["Private notice from $n:", false],
+  "NOTIFYPRIVNOTICEBODY": ["$m", false]
 };
 
 qwebirc.ui.Theme = new Class({
@@ -88,11 +114,9 @@ qwebirc.ui.Theme = new Class({
     this.__ccmap = qwebirc.util.dictCopy(qwebirc.ui.themes.ThemeControlCodeMap);
     this.__ccmaph = qwebirc.util.dictCopy(this.__ccmap);
 
-    this.__ccmap["("] = "";
-    this.__ccmap[")"] = "";
-    
     this.__ccmaph["("] = this.message("HILIGHT", {}, this.__ccmap);
     this.__ccmaph[")"] = this.message("HILIGHTEND", {}, this.__ccmap);
+    this.__ccmaph["{"] = this.__ccmaph["}"] = "";
   },
   __dollarSubstitute: function(x, h, mapper) {
     var msg = [];