X-Git-Url: https://jfr.im/git/irc/quakenet/qwebirc.git/blobdiff_plain/6f8a20dfdc051aefe645f0738f842f23910b7de3..69d01d1d260b2f37dd8f69b801a1d0ff5d25c953:/js/ui/baseui.js diff --git a/js/ui/baseui.js b/js/ui/baseui.js index deb3a04..0d9ec12 100644 --- a/js/ui/baseui.js +++ b/js/ui/baseui.js @@ -12,9 +12,9 @@ qwebirc.ui.BaseUI = new Class({ initialize: function(parentElement, windowClass, uiName, options) { this.options = options; - this.windows = {}; - this.clients = {}; - this.windows[qwebirc.ui.CUSTOM_CLIENT] = {}; + this.windows = new QHash(); + this.clients = new QHash(); + this.windows.put(qwebirc.ui.CUSTOM_CLIENT, new QHash()); this.windowArray = []; this.windowClass = windowClass; this.parentElement = parentElement; @@ -49,17 +49,19 @@ qwebirc.ui.BaseUI = new Class({ } }, newClient: function(client) { - client.id = this.clientId++; + client.id = String(this.clientId++); client.hilightController = new qwebirc.ui.HilightController(client); - - this.windows[client.id] = {} - this.clients[client.id] = client; + client.addEvent("signedOn", function() { + this.fireEvent("signedOn", client); + }.bind(this)); + this.windows.put(client.id, new QHash()); + this.clients.put(client.id, client); var w = this.newWindow(client, qwebirc.ui.WINDOW_STATUS, "Status"); this.selectWindow(w); if(!this.firstClient) { this.firstClient = true; w.addLine("", "qwebirc v" + qwebirc.VERSION); - w.addLine("", "Copyright (C) 2008-2011 Chris Porter and the qwebirc project."); + w.addLine("", "Copyright (C) 2008-2014 Chris Porter and the qwebirc project."); w.addLine("", "http://www.qwebirc.org"); w.addLine("", "Licensed under the GNU General Public License, Version 2."); } @@ -89,13 +91,14 @@ qwebirc.ui.BaseUI = new Class({ return w; var wId = this.getWindowIdentifier(client, type, name); - var w = this.windows[this.getClientId(client)][wId] = new this.windowClass(this, client, type, name, wId); + var w = new this.windowClass(this, client, type, name, wId); + this.windows.get(this.getClientId(client)).put(wId, w); this.windowArray.push(w); return w; }, getWindow: function(client, type, name) { - var c = this.windows[this.getClientId(client)]; + var c = this.windows.get(this.getClientId(client)); if(!$defined(c)) return null; @@ -106,7 +109,7 @@ qwebirc.ui.BaseUI = new Class({ }, getActiveIRCWindow: function(client) { if(!this.active || this.active.type == qwebirc.ui.WINDOW_CUSTOM) { - return this.windows[this.getClientId(client)][this.getWindowIdentifier(client, qwebirc.ui.WINDOW_STATUS)]; + return this.windows.get(this.getClientId(client)).get(this.getWindowIdentifier(client, qwebirc.ui.WINDOW_STATUS)); } else { return this.active; } @@ -114,6 +117,29 @@ qwebirc.ui.BaseUI = new Class({ __setActiveWindow: function(window) { this.active = window; }, + renameWindow: function(window, name) { + if(this.getWindow(window.client, window.type, name)) + return null; + + var clientId = this.getClientId(window.client); + var index = this.windowArray.indexOf(window); + if(index == -1) + return null; + + this.windows.get(clientId).remove(window.identifier); + + var window = this.windowArray[index]; + window.name = name; + window.identifier = this.getWindowIdentifier(window.client, window.type, window.name); + + this.windows.get(clientId).put(window.identifier, this.windowArray[index]); + + if(window.active) + this.updateTitle(window.name + " - " + this.options.appTitle); + + window.rename(window.name); + return window; + }, selectWindow: function(window) { if(this.active) this.active.deselect(); @@ -164,7 +190,7 @@ qwebirc.ui.BaseUI = new Class({ } this.windowArray = this.windowArray.erase(window); - delete this.windows[this.getClientId(window.client)][window.identifier]; + this.windows.get(this.getClientId(window.client)).remove(window.identifier); }, /* this shouldn't be called by overriding classes! @@ -191,35 +217,29 @@ qwebirc.ui.StandardUI = new Class({ this.tabCompleter = new qwebirc.ui.TabCompleterFactory(this); this.uiOptions = new qwebirc.ui.DefaultOptionsClass(this, options.uiOptionsArg); - this.customWindows = {}; + this.customWindows = new QHash(); - this.__styleValues = {hue: this.uiOptions.STYLE_HUE, saturation: 0, lightness: 0}; + this.__styleValues = {hue: this.uiOptions.STYLE_HUE, saturation: 0, lightness: 0, textHue: this.uiOptions.STYLE_HUE, textSaturation: 0, textLightness: 0}; if($defined(this.options.hue)) this.__styleValues.hue = this.options.hue; if($defined(this.options.saturation)) this.__styleValues.saturation = this.options.saturation; if($defined(this.options.lightness)) this.__styleValues.lightness = this.options.lightness; + if($defined(this.options.thue)) this.__styleValues.textHue = this.options.thue; + if($defined(this.options.tsaturation)) this.__styleValues.textSaturation = this.options.tsaturation; + if($defined(this.options.tlightness)) this.__styleValues.textLightness = this.options.tlightness; - var ev; - if(Browser.Engine.trident) { - ev = "keydown"; - } else { - ev = "keypress"; - } - document.addEvent(ev, this.__handleHotkey.bind(this)); + document.addEvent("keydown", this.__handleHotkey.bind(this)); }, __handleHotkey: function(x) { - if(!x.alt || x.control) { - if(x.key == "backspace" || x.key == "/") - if(!this.getInputFocused(x)) - new Event(x).stop(); - return; - } var success = false; - if(x.key == "a" || x.key == "A") { + if(!x.alt || x.control) { + if((x.key == "backspace" || x.key == "/") && !this.getInputFocused(x)) { + success = true; + } + } else if(x.key == "a" || x.key == "A") { var highestNum = 0; var highestIndex = -1; success = true; - - new Event(x).stop(); + for(var i=0;i highestNum) { @@ -249,8 +269,10 @@ qwebirc.ui.StandardUI = new Class({ this.nextWindow(); success = true; } - if(success) + if(success) { new Event(x).stop(); + x.preventDefault(); + } }, getInputFocused: function(x) { if($$("input").indexOf(x.target) == -1 && $$("textarea").indexOf(x.target) == -1) @@ -263,7 +285,7 @@ qwebirc.ui.StandardUI = new Class({ var w = this.newWindow(qwebirc.ui.CUSTOM_CLIENT, type, name); w.addEvent("close", function(w) { - delete this.windows[qwebirc.ui.CUSTOM_CLIENT][w.identifier]; + this.windows.get(qwebirc.ui.CUSTOM_CLIENT).remove(w.identifier); }.bind(this)); if(select) @@ -275,16 +297,16 @@ qwebirc.ui.StandardUI = new Class({ if(!$defined(options)) options = {}; - if(this.customWindows[windowName]) { - this.selectWindow(this.customWindows[windowName]); + if(this.customWindows.contains(windowName)) { + this.selectWindow(this.customWindows.get(windowName)); return; } var d = this.newCustomWindow(windowName, true); - this.customWindows[windowName] = d; + this.customWindows.put(windowName, d); d.addEvent("close", function() { - this.customWindows[windowName] = null; + this.customWindows.remove(windowName); }.bind(this)); if(cssClass) @@ -314,8 +336,8 @@ qwebirc.ui.StandardUI = new Class({ feedbackWindow: function() { this.addCustomWindow("Feedback", qwebirc.ui.FeedbackPane, "feedbackpane", this.uiOptions); }, - faqWindow: function() { - this.addCustomWindow("FAQ", qwebirc.ui.FAQPane, "faqpane", this.uiOptions); + helpWindow: function() { + this.addCustomWindow("Help!", qwebirc.ui.HelpPane, "helppane", this.uiOptions); }, urlDispatcher: function(name, window) { if(name == "embedded") @@ -354,13 +376,23 @@ qwebirc.ui.StandardUI = new Class({ if(!$defined(this.__styleSheet)) return; - var hue = this.__styleValues.hue, lightness = this.__styleValues.lightness, saturation = this.__styleValues.saturation; - + var back = {hue: this.__styleValues.hue, lightness: this.__styleValues.lightness, saturation: this.__styleValues.saturation}; + var front = {hue: this.__styleValues.textHue, lightness: this.__styleValues.textLightness, saturation: this.__styleValues.textSaturation}; + + if(!this.__styleValues.textHue && !this.__styleValues.textLightness && !this.__styleValues.textSaturation) + front = back; + + var colours = { + back: back, + front: front + }; + this.__styleSheet.set(function() { var mode = arguments[0]; if(mode == "c") { + var t = colours[arguments[2]]; var x = new Color(arguments[1]); - var c = x.setHue(hue).setSaturation(x.hsb[1] + saturation).setBrightness(x.hsb[2] + lightness); + var c = x.setHue(t.hue).setSaturation(x.hsb[1] + t.saturation).setBrightness(x.hsb[2] + t.lightness); if(c == "255,255,255") /* IE confuses white with transparent... */ c = "255,255,254"; @@ -379,16 +411,25 @@ qwebirc.ui.NotificationUI = new Class({ this.__beeper = new qwebirc.ui.Beeper(this.uiOptions); this.__flasher = new qwebirc.ui.Flasher(this.uiOptions); - - this.beep = this.__beeper.beep.bind(this.__beeper); - - this.flash = this.__flasher.flash.bind(this.__flasher); + this.__notifier = new qwebirc.ui.Notifier(this.uiOptions); + this.cancelFlash = this.__flasher.cancelFlash.bind(this.__flasher); }, + beep: function() { + this.__beeper.beep(); + }, + notify: function(title, message, callback) { + this.__beeper.beep(); + this.__flasher.flash(); + this.__notifier.notify(title, message, callback); + }, setBeepOnMention: function(value) { if(value) this.__beeper.soundInit(); }, + setNotifications: function(value) { + this.__notifier.setEnabled(value); + }, updateTitle: function(text) { if(this.__flasher.updateTitle(text)) this.parent(text); @@ -396,6 +437,7 @@ qwebirc.ui.NotificationUI = new Class({ focusChange: function(value) { this.parent(value); this.__flasher.focusChange(value); + this.__notifier.focusChange(value); } }); @@ -405,7 +447,7 @@ qwebirc.ui.NewLoginUI = new Class({ this.postInitialize(); /* I'd prefer something shorter and snappier! */ - var w = this.newCustomWindow("Connection details", true, qwebirc.ui.WINDOW_CONNECT); + var w = this.newCustomWindow("Connect", true, qwebirc.ui.WINDOW_CONNECT); var callback = function(args) { w.close(); callbackfn(args); @@ -429,9 +471,9 @@ qwebirc.ui.QuakeNetUI = new Class({ if(!qwebirc.auth.loggedin()) return; if(confirm("Log out?")) { - for(var client in this.clients) { - this.clients[client].quit("Logged out"); - }; + this.clients.each(function(k, v) { + v.quit("Logged out"); + }, this); /* HACK */ var foo = function() { document.location = qwebirc.global.dynamicBaseURL + "auth?logout=1"; };