diff --git a/convo.py b/convo.py index 9924f47..60d8025 100644 --- a/convo.py +++ b/convo.py @@ -1,5 +1,6 @@ from string import Template import re +import platform from copy import copy from datetime import datetime, timedelta from PyQt4 import QtGui, QtCore @@ -117,16 +118,12 @@ class PesterTabWindow(QtGui.QFrame): return True else: return False - def activateChat(self): - if platform.system() == "Windows": - self.activateWindow() def notifyNewMessage(self, handle): i = self.tabIndices[handle] self.tabs.setTabTextColor(i, QtGui.QColor(self.mainwindow.theme["%s/tabs/newmsgcolor" % (self.type)])) convo = self.convos[handle] def func(): convo.showChat() - self.activateChat() self.mainwindow.waitingMessages.addMessage(handle, func) # set system tray def clearNewMessage(self, handle): @@ -484,8 +481,6 @@ class PesterConvo(QtGui.QFrame): self.parent().showChat(self.title()) self.raiseChat() def activateChat(self): - if self.parent(): - self.parent().activateChat() if platform.system() == "Windows": self.activateWindow() def contextMenuEvent(self, event): diff --git a/convo.pyc b/convo.pyc index 1578fea..b8f5938 100644 Binary files a/convo.pyc and b/convo.pyc differ diff --git a/irc.py b/irc.py index 7c49931..7a540a8 100644 --- a/irc.py +++ b/irc.py @@ -12,11 +12,14 @@ from generic import PesterList logging.basicConfig(level=logging.INFO) class PesterIRC(QtCore.QObject): - def __init__(self, window): + def __init__(self, config, window): QtCore.QObject.__init__(self) self.mainwindow = window + self.config = config def IRCConnect(self): - self.cli = IRCClient(PesterHandler, host="irc.tymoon.eu", port=6667, nick=self.mainwindow.profile().handle, blocking=True) + server = self.config.server() + port = self.config.port() + self.cli = IRCClient(PesterHandler, host=server, port=int(port), nick=self.mainwindow.profile().handle, blocking=True) self.cli.command_handler.parent = self self.cli.command_handler.mainwindow = self.mainwindow self.conn = self.cli.connect() diff --git a/irc.pyc b/irc.pyc index 4fd91eb..53fdab1 100644 Binary files a/irc.pyc and b/irc.pyc differ diff --git a/pesterchum.js b/pesterchum.js index e8e728a..0a6933e 100644 --- a/pesterchum.js +++ b/pesterchum.js @@ -1 +1 @@ -{"tabs": true, "soundon": true, "chums": ["unknownTraveler", "tentacleTherapist", "vaginalEngineer", "mechanicalSpectacle", "carcinoGeneticist", "schlagzeugGator", "gamblingGenocider", "gardenGnostic", "superGhost", "centaursTesticle", "arachnidsGrip", "grimAuxiliatrix", "remoteBloodbath", "nitroZealist", "greenZephyr", "arsenicCatnip", "adiosToreador", "cuttlefishCuller", "rageInducer", "gallowsCalibrator", "caligulasAquarium", "terminallyCapricious", "illuminatedWax", "aquaMarinist", "elegantDiversion", "moirailBunp", "uroborosUnbound", "androidTechnician", "midnightSparrow", "apocalypseArisen", "anguillaNuntia", "oilslickOrchid", "confusedTransient", "pretentiousFantasia", "aquaticMarinist", "lyricalKeraunoscopic", "counterRealist", "ectoBiologist", "percipientPedestrian", "asceticClinician", "doctectiveMiracles", "noSense"], "defaultprofile": "ghostDunk", "block": []} \ No newline at end of file +{"tabs": true, "soundon": true, "chums": ["unknownTraveler", "tentacleTherapist", "vaginalEngineer", "mechanicalSpectacle", "carcinoGeneticist", "schlagzeugGator", "gamblingGenocider", "gardenGnostic", "superGhost", "centaursTesticle", "arachnidsGrip", "grimAuxiliatrix", "remoteBloodbath", "nitroZealist", "greenZephyr", "arsenicCatnip", "adiosToreador", "cuttlefishCuller", "rageInducer", "gallowsCalibrator", "caligulasAquarium", "terminallyCapricious", "illuminatedWax", "aquaMarinist", "elegantDiversion", "moirailBunp", "uroborosUnbound", "androidTechnician", "midnightSparrow", "apocalypseArisen", "anguillaNuntia", "oilslickOrchid", "confusedTransient", "pretentiousFantasia", "aquaticMarinist", "lyricalKeraunoscopic", "counterRealist", "ectoBiologist", "percipientPedestrian", "asceticClinician", "doctectiveMiracles", "noSense"], "defaultprofile": "ghostDunk", "block": [], "server": "irc.tymoon.eu"} \ No newline at end of file diff --git a/pesterchum.py b/pesterchum.py index 91fa78e..fea4583 100644 --- a/pesterchum.py +++ b/pesterchum.py @@ -211,6 +211,10 @@ class userConfig(object): l = self.getBlocklist() l.pop(l.index(handle)) self.set('block', l) + def server(self): + return self.config.get('server', 'irc.tymoon.eu') + def port(self): + return self.config.get('port', '6667') def soundOn(self): if not self.config.has_key('soundon'): self.set('soundon', True) @@ -1708,7 +1712,7 @@ class MainProgram(QtCore.QObject): self.trayicon, QtCore.SLOT('mainWindowClosed()')) - self.irc = PesterIRC(self.widget) + self.irc = PesterIRC(self.widget.config, self.widget) self.connectWidgets(self.irc, self.widget) self.ircapp = IRCThread(self.irc) self.connect(self.ircapp, QtCore.SIGNAL('finished()'), @@ -1820,7 +1824,7 @@ class MainProgram(QtCore.QObject): def restartIRC(self): self.widget.show() self.widget.activateWindow() - self.irc = PesterIRC(self.widget) + self.irc = PesterIRC(self.widget.config, self.widget) self.connectWidgets(self.irc, self.widget) self.ircapp = IRCThread(self.irc) self.connect(self.ircapp, QtCore.SIGNAL('finished()'),