This commit is contained in:
illuminatedwax 2011-03-05 20:25:52 -06:00
parent 44f1a6e5fd
commit c1ade40eb0
3 changed files with 20 additions and 1 deletions

View file

@ -736,5 +736,5 @@ class AboutPesterchum(QtGui.QMessageBox):
def __init__(self, parent=None): def __init__(self, parent=None):
QtGui.QMessageBox.__init__(self, parent) QtGui.QMessageBox.__init__(self, parent)
self.setText("P3ST3RCHUM V. 3.14") self.setText("P3ST3RCHUM V. 3.14")
self.setInformativeText("Programming by illuminatedwax (ghostDunk), art by Grimlive (aquaMarinist)") self.setInformativeText("Programming by illuminatedwax (ghostDunk), art by Grimlive (aquaMarinist). Special thanks to ABT and gamblingGenocider.")
self.mainwindow = parent self.mainwindow = parent

View file

@ -849,8 +849,12 @@ class PesterWindow(MovingWindow):
self.aboutAction = QtGui.QAction(self.theme["main/menus/help/about"], self) self.aboutAction = QtGui.QAction(self.theme["main/menus/help/about"], self)
self.connect(self.aboutAction, QtCore.SIGNAL('triggered()'), self.connect(self.aboutAction, QtCore.SIGNAL('triggered()'),
self, QtCore.SLOT('aboutPesterchum()')) self, QtCore.SLOT('aboutPesterchum()'))
self.helpAction = QtGui.QAction("HELP", self)
self.connect(self.helpAction, QtCore.SIGNAL('triggered()'),
self, QtCore.SLOT('launchHelp()'))
helpmenu = self.menu.addMenu(self.theme["main/menus/help/_name"]) helpmenu = self.menu.addMenu(self.theme["main/menus/help/_name"])
self.helpmenu = helpmenu self.helpmenu = helpmenu
self.helpmenu.addAction(self.helpAction)
self.helpmenu.addAction(self.aboutAction) self.helpmenu.addAction(self.aboutAction)
@ -1752,6 +1756,9 @@ class PesterWindow(MovingWindow):
self.aboutwindow = AboutPesterchum(self) self.aboutwindow = AboutPesterchum(self)
self.aboutwindow.exec_() self.aboutwindow.exec_()
self.aboutwindow = None self.aboutwindow = None
@QtCore.pyqtSlot()
def launchHelp(self):
QtGui.QDesktopServices.openUrl(QtCore.QUrl("http://nova.xzibition.com/~illuminatedwax/help.html", QtCore.QUrl.TolerantMode))
@QtCore.pyqtSlot(QtCore.QString, QtCore.QString) @QtCore.pyqtSlot(QtCore.QString, QtCore.QString)
def nickCollision(self, handle, tmphandle): def nickCollision(self, handle, tmphandle):

View file

@ -555,3 +555,15 @@ Here's a list of smilies:
:befuddled: :befuddled:
:pumpkin: :pumpkin:
:trollcool: :trollcool:
:jadecry:
:ecstatic:
:relaxed:
:discontent:
:devious:
:sleek:
:detestful:
:mirthful:
:manipulative:
:vigorous:
:perky:
:acceptant: