fdssfa

TODO

@@ -1,13 +1,13 @@
 Features:
 * Tray doesn't disappear on windows after close
-* System tray menu - Moods
-* troll colors
+* Mood switching shows wrong mood!
 * ctrl-tab should prefer new convos
 * Idling
 * new sound on CEASE and BEGIN?
 * User commands/stop user from sending commands accidentally
 * More complex quirks: random, spelling, by-sound
 * change profile only once we have confirmation from server
+* convert hex tags (<GFFFFFF> or <GFF0000>)
 * convo backgrounds -- make them more like http://www.mspaintadventures.com/storyfiles/hs2/02546_2.gif
 * help button on quirks menu?
 * help menu -- about and forum

convo.py

@@ -236,8 +236,8 @@ class PesterText(QtGui.QTextEdit):
                 window.chatlog.log(chum.handle, convertTags(beginmsg, "bbcode"))
                 self.append(convertTags(beginmsg))
 
-            msg = "<c=%s>%s: %s</c>" % (color, initials, msg)
             msg = escapeBrackets(msg)
+            msg = "<c=%s>%s: %s</c>" % (color, initials, msg)
             self.append(convertTags(msg))
             if chum is me:
                 window.chatlog.log(parent.chum.handle, convertTags(msg, "bbcode"))

pesterchum.js

@@ -1 +1 @@
-{"tabs": true, "soundon": true, "chums": ["marineAquist", "unknownTraveler", "tentacleTherapist", "macruralAlchemist", "vaginalEngineer", "mechanicalSpectacle", "carcinoGeneticist", "schlagzeugGator", "gamblingGenocider", "gardenGnostic", "superGhost", "centaursTesticle", "arachnidsGrip", "grimAuxiliatrix", "remoteBloodbath", "nitroZealist", "greenZephyr", "arsenicCatnip", "adiosToreador", "cuttlefishCuller", "rageInducer", "gallowsCalibrator", "caligulasAquarium", "terminallyCapricious", "illuminatedWax", "aquaMarinist", "maxiumumFatness", "elegantDiversion", "moirailBunp", "uroborosUnbound", "androidTechnician", "midnightSparrow", "apocalypseArisen", "acapellaWaterfall", "anguillaNuntia", "oilslickOrchid", "confusedTransient", "pretentiousFantasia"], "defaultprofile": "ghostDunk", "block": []}
+{"tabs": true, "soundon": true, "chums": ["marineAquist", "unknownTraveler", "tentacleTherapist", "macruralAlchemist", "vaginalEngineer", "mechanicalSpectacle", "carcinoGeneticist", "schlagzeugGator", "gamblingGenocider", "gardenGnostic", "superGhost", "centaursTesticle", "arachnidsGrip", "grimAuxiliatrix", "remoteBloodbath", "nitroZealist", "greenZephyr", "arsenicCatnip", "adiosToreador", "cuttlefishCuller", "rageInducer", "gallowsCalibrator", "caligulasAquarium", "terminallyCapricious", "illuminatedWax", "aquaMarinist", "maxiumumFatness", "elegantDiversion", "moirailBunp", "uroborosUnbound", "androidTechnician", "midnightSparrow", "apocalypseArisen", "acapellaWaterfall", "anguillaNuntia", "oilslickOrchid", "confusedTransient", "pretentiousFantasia", "aquaticMarinist"], "defaultprofile": "ghostDunk", "block": []}

pesterchum.py

@@ -521,6 +521,15 @@ class TrollSlumWindow(QtGui.QFrame):
     blockChumSignal = QtCore.pyqtSignal(QtCore.QString)
     unblockChumSignal = QtCore.pyqtSignal(QtCore.QString)
 
+class PesterMoodAction(QtCore.QObject):
+    def __init__(self, m, func):
+        QtCore.QObject.__init__(self)
+        self.mood = m
+        self.func = func
+    @QtCore.pyqtSlot()
+    def updateMood(self):
+        self.func(self.mood)
+
 class PesterMoodHandler(QtCore.QObject):
     def __init__(self, parent, *buttons):
         QtCore.QObject.__init__(self)
@@ -549,8 +558,11 @@ class PesterMoodHandler(QtCore.QObject):
             oldbutton.setSelected(False)
         except KeyError:
             pass
-        newbutton = self.buttons[m]
-        newbutton.setSelected(True)
+        try:
+            newbutton = self.buttons[m]
+            newbutton.setSelected(True)
+        except KeyError:
+            pass
         newmood = Mood(m)
         self.mainwindow.userprofile.chat.mood = newmood
         if self.mainwindow.currentMoodIcon:
@@ -1587,6 +1599,16 @@ class MainProgram(QtCore.QObject):
         self.trayicon.connect(exitAction, QtCore.SIGNAL('triggered()'),
                               self.widget, QtCore.SLOT('close()'))
         self.traymenu.addAction(exitAction)
+        moodMenu = self.traymenu.addMenu("SET MOOD")
+        self.moodactions = {}
+        for (i,m) in enumerate(Mood.moods):
+            maction = QtGui.QAction(m.upper(), self)
+            mobj = PesterMoodAction(i, self.widget.moods.updateMood)
+            self.trayicon.connect(maction, QtCore.SIGNAL('triggered()'),
+                                  mobj, QtCore.SLOT('updateMood()'))
+            self.moodactions[i] = mobj
+            moodMenu.addAction(maction)
+
         self.trayicon.setContextMenu(self.traymenu)
         self.trayicon.show()
         self.trayicon.connect(self.trayicon,