diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn index 1f0dc5c..4455722 100644 --- a/CHANGELOG.mkdn +++ b/CHANGELOG.mkdn @@ -21,6 +21,7 @@ CHANGELOG * Italics, bold, and underline - Kiooeht [evacipatedBox] * FTP and Magnet links - oakwhiz * Userlist search - oakwhiz +* Chanserv in menus - Cerxi [binaryCabalist] * Bug fixes * Don't require pygame (it's kind of optional, you just don't get sound) - Kiooeht [evacipatedBox] * Allow add chum dialog to open after adding an existing chum - Kiooeht [evacipatedBox] diff --git a/menus.py b/menus.py index acca2c0..98ce597 100644 --- a/menus.py +++ b/menus.py @@ -1716,10 +1716,11 @@ class AboutPesterchum(QtGui.QDialog): Lexi (lexicalNuance)\n\ oakwhiz\n\ alGore\n\ + Cerxi (binaryCabalist)\n\ \n\ Art by:\n\ Grimlive (aquaMarinist)\n\ - binaryCabalist\n\ + Cerxi (binaryCabalist)\n\ \n\ Special Thanks:\n\ ABT\n\ diff --git a/parsetools.py b/parsetools.py index 9681530..cc16d6b 100644 --- a/parsetools.py +++ b/parsetools.py @@ -548,7 +548,7 @@ def themeChecker(theme): "convo/text/closememo", "convo/text/kickedmemo", \ "main/chums/userlistcolor", "main/defaultwindow/style", \ "main/chums/moods", "main/chums/moods/chummy/icon", "main/menus/help/help", \ - "main/menus/help/calsprite", "main/menus/help/nickserv", \ + "main/menus/help/calsprite", "main/menus/help/nickserv", "main/menus/help/chanserv", \ "main/menus/rclickchumlist/invitechum", "main/menus/client/randen", \ "main/menus/rclickchumlist/memosetting", "main/menus/rclickchumlist/memonoquirk", \ "main/menus/rclickchumlist/memohidden", "main/menus/rclickchumlist/memoinvite", \ diff --git a/pesterchum.py b/pesterchum.py index f2beb74..34e4706 100644 --- a/pesterchum.py +++ b/pesterchum.py @@ -1130,6 +1130,9 @@ class PesterWindow(MovingWindow): self.nickServAction = QtGui.QAction(self.theme["main/menus/help/nickserv"], self) self.connect(self.nickServAction, QtCore.SIGNAL('triggered()'), self, QtCore.SLOT('loadNickServ()')) + self.chanServAction = QtGui.QAction(self.theme["main/menus/help/chanserv"], self) + self.connect(self.chanServAction, QtCore.SIGNAL('triggered()'), + self, QtCore.SLOT('loadChanServ()')) self.aboutAction = QtGui.QAction(self.theme["main/menus/help/about"], self) self.connect(self.aboutAction, QtCore.SIGNAL('triggered()'), self, QtCore.SLOT('aboutPesterchum()')) @@ -1140,6 +1143,7 @@ class PesterWindow(MovingWindow): self.helpmenu = helpmenu self.helpmenu.addAction(self.helpAction) self.helpmenu.addAction(self.botAction) + self.helpmenu.addAction(self.chanServAction) self.helpmenu.addAction(self.nickServAction) self.helpmenu.addAction(self.aboutAction) self.helpmenu.addAction(self.reportBugAction) @@ -1409,8 +1413,8 @@ class PesterWindow(MovingWindow): self.connect(convoWindow, QtCore.SIGNAL('windowClosed(QString)'), self, QtCore.SLOT('closeConvo(QString)')) self.convos[chum.handle] = convoWindow - if unicode(chum.handle).upper() == "NICKSERV" or \ - unicode(chum.handle).upper() == "CHANSERV" or \ + if unicode(chum.handle).upper() == "CHANSERV" or \ + unicode(chum.handle).upper() == "NICKSERV" or \ unicode(chum.handle).upper() == "MEMOSERV" or \ unicode(chum.handle).upper() == "OPERSERV" or \ unicode(chum.handle).upper() == "HELPSERV": @@ -1545,6 +1549,7 @@ class PesterWindow(MovingWindow): self.aboutAction.setText(self.theme["main/menus/help/about"]) self.helpAction.setText(self.theme["main/menus/help/help"]) self.botAction.setText(self.theme["main/menus/help/calsprite"]) + self.chanServAction.setText(self.theme["main/menus/help/chanserv"]) self.nickServAction.setText(self.theme["main/menus/help/nickserv"]) self.helpmenu.setTitle(self.theme["main/menus/help/_name"]) @@ -2583,6 +2588,9 @@ class PesterWindow(MovingWindow): def loadCalsprite(self): self.newConversation("calSprite") @QtCore.pyqtSlot() + def loadChanServ(self): + self.newConversation("chanServ") + @QtCore.pyqtSlot() def loadNickServ(self): self.newConversation("nickServ") @QtCore.pyqtSlot() diff --git a/themes/pesterchum/style.js b/themes/pesterchum/style.js index 4f00714..33ff6f3 100644 --- a/themes/pesterchum/style.js +++ b/themes/pesterchum/style.js @@ -41,6 +41,7 @@ "about": "ABOUT", "help": "HELP", "calsprite": "CALSPRITE", + "chanserv": "CHANSERV", "nickserv": "NICKSERV" }, "rclickchumlist": {"pester": "PESTER", "removechum": "REMOVE CHUM", diff --git a/themes/trollian/style.js b/themes/trollian/style.js index 4bca751..7e72a0b 100644 --- a/themes/trollian/style.js +++ b/themes/trollian/style.js @@ -39,10 +39,11 @@ "about": "About", "help": "Help", "calsprite": "CalSprite", + "chanserv": "ChanServ", "nickserv": "NickServ" }, "rclickchumlist": {"pester": "Troll", "removechum": "Trash", - "report": "Remove", + "report": "Tattle", "blockchum": "Block", "addchum": "Add Chump", "viewlog": "View Pesterlog", @@ -349,7 +350,8 @@ "systemMsgColor": "#646464", "op": { "icon": "$path/op.png" }, "halfop": { "icon": "$path/halfop.png" }, - "voice": { "icon": "$path/voice.png" } + "voice": { "icon": "$path/voice.png" }, + "founder": { "icon": "$path/founder.png" } }, "toasts": {