From 10d0ede71d6be5276aa95fc68417255cd42e51f3 Mon Sep 17 00:00:00 2001
From: Stephen Dranger <dranger@gmail.com>
Date: Tue, 8 Feb 2011 01:56:30 -0600
Subject: [PATCH] fdssdf

---
 .gitignore                      |   3 ++-
 TODO                            |  33 +++++++++-------------------
 convo.py                        |  11 +++++-----
 convo.pyc                       | Bin 22491 -> 22476 bytes
 irc.py                          |   2 ++
 irc.pyc                         | Bin 13005 -> 13203 bytes
 logs/chums.js                   |   2 +-
 memos.py                        |  36 +++++++++++++++++++++++++++++--
 memos.pyc                       | Bin 29390 -> 30655 bytes
 menus.py                        |  16 +++++++-------
 menus.pyc                       | Bin 19985 -> 20025 bytes
 parsetools.py                   |   3 +++
 parsetools.pyc                  | Bin 5465 -> 5688 bytes
 pesterchum.ico                  | Bin 0 -> 3638 bytes
 pesterchum.js                   |   2 +-
 pesterchum.py                   |  37 +++++++++++++++++++++++++++-----
 setup.py                        |  12 +++++------
 themes/pesterchum/op.gif        | Bin 0 -> 111 bytes
 themes/pesterchum/style.js      |   6 ++++--
 themes/pesterchum/trollcool.gif | Bin 0 -> 111 bytes
 themes/trollian/op.gif          | Bin 0 -> 111 bytes
 themes/trollian/style.js        |   4 +++-
 22 files changed, 112 insertions(+), 55 deletions(-)
 create mode 100644 pesterchum.ico
 create mode 100644 themes/pesterchum/op.gif
 create mode 100644 themes/pesterchum/trollcool.gif
 create mode 100644 themes/trollian/op.gif

diff --git a/.gitignore b/.gitignore
index 4cf8dd1..0ccc61f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-logs/*
\ No newline at end of file
+logs/*
+build/*
\ No newline at end of file
diff --git a/TODO b/TODO
index f3e1ae1..44efa4f 100644
--- a/TODO
+++ b/TODO
@@ -1,46 +1,33 @@
 Features:
-* dropped messages when chatting
-* X closes to tray
-* color text is not being translated to server?
+* comment history (up button)
+* page up/down scrolling
+* System tray menu
+* troll colors
+* ctrl-tab should prefer new convos
+* Idling
+* More complex quirks: random, spelling, by-sound
+* change profile only once we have confirmation from server
 * convo backgrounds -- make them more like http://www.mspaintadventures.com/storyfiles/hs2/02546_2.gif
-* make other ppl ops
-* turn off sound option!!
 * help button on quirks menu?
 * help menu -- about and forum
+* dropped messages when chatting ?
 -- release alpha
 * scroll bar style?
 * User commands/stop user from sending commands accidentally
 * shared buddy lists - changes to the buddy list should refresh it? 
   multiple clients share buddy list???
-* System tray menu
 * new sound on CEASE and BEGIN?
-* comment history (up button)
-* page up/down scrolling
-* get rid of border on chat window?
-* Idling
-* ctrl-tab should prefer new convos
-* More complex quirks: random, spelling, by-sound
-* Implement TC options
 * chumList not scaling -- QListView + delegate?
 * spell check?
 * Help menu
-* change profile only once we have confirmation from server
 -- release beta
 * log viewer
 * pick your own icon
 * time codes
-* theme elements define, implement
 * Theme checking
 * don't clear new message when clicking away from tab?
 * Spy mode
 * Animated
 * put code into separate files
 * hide offline chums
-* chum list groups
-
-
-
--- MEMOS:
-list has "CREATE" CACNCEL JOIN buttons
-no "--" for sys mesg
-
+* chum list groups
\ No newline at end of file
diff --git a/convo.py b/convo.py
index aa541a7..9bfbbe2 100644
--- a/convo.py
+++ b/convo.py
@@ -343,6 +343,7 @@ class PesterConvo(QtGui.QFrame):
             self.textArea.append(convertTags(msg))
             self.mainwindow.chatlog.log(self.title(), convertTags(msg, "bbcode"))
         self.newmessage = False
+        self.history = []
 
     def title(self):
         return self.chum.handle
@@ -448,21 +449,21 @@ class PesterConvo(QtGui.QFrame):
 
     @QtCore.pyqtSlot()
     def sentMessage(self):
-        text = self.textInput.text()
+        text = unicode(self.textInput.text())
         if text == "":
             return
         # deal with quirks here
         if self.applyquirks:
-            qtext = self.mainwindow.userprofile.quirks.apply(unicode(text))
-            text = QtCore.QString(qtext)
-        self.textInput.setText("")
+            qtext = self.mainwindow.userprofile.quirks.apply(text)
+            text = qtext
         self.addMessage(text, True)
         # if ceased, rebegin
         if hasattr(self, 'chumopen') and not self.chumopen:
             self.mainwindow.newConvoStarted.emit(QtCore.QString(self.title()), True)
         # convert color tags
-        text = convertTags(unicode(text), "ctag")
+        text = convertTags(text, "ctag")
         self.messageSent.emit(text, self.title())
+        self.textInput.setText("")
 
     @QtCore.pyqtSlot()
     def addThisChum(self):
diff --git a/convo.pyc b/convo.pyc
index f1930fca3c00408c16dd388553de0db59b86063f..e375bcfa41a33e18857e929fa58cc84a256569f5 100644
GIT binary patch
delta 324
zcmX|+Jx;?w5QX1N2o4*Y1dt_uIwXoz5h5*jh}WW|K(ZBWfi00O9Z|TV_9>{MC^a{r
zp{9chAt(?BU<M1C(agM^@4bCq(&LhXr?1G|-%VG+_cVS5;DHKo1jnd>ni`WF-gZzP
zgH+gn>%wiq1*k}5EEpAIK`5ww(Nn>1p=OXbO3MVrC?~DnM_7*jVIf=uzYRC|^&PgR
zfA`AtJ2(?!)=`M~Xo_9ElBM?TiJ0jix%ZH1u;x8Eq01(;=S^lOW7fX~Qj*l)xMF5c
yrMErZ_N83s^ZC^*PxHdt7nz%tb#Y7)b=lB985;5tjd(x@>v8(P^tS%E_@p0LFF`c`

delta 326
zcmX@Jp7Hj2M)r%Jc)5Pv@!!b)C4m1E0|P@114AYdF)}nWOcn@~s%K)zH)LQ0i83=}
zvM^+_GGwwbl&~|@09AldEfYft2SX+&Lk$y1q?VB(j}f8)sE3Oo1*`~c05?ce2@gXv
z69Z!jFUY18pcbG7CJ^;}3_SUoaJ%>!G6fh)JRn8`jS>X92xI}&0FWgmLI{_nFoTQ&
z+75E6Fi0=ZG7uZ0k7@FqK-I}?L6(fMlk<Z_SsnqsI@vDBRMHU02;u+|CEP$FH?_Dp
yF+DXnHLqmyqM%GsenwtKRwgb+IYwbd0Y(8PX+}*Z(aj3Mdzl!YZ@w4$ju8NBRzZjW

diff --git a/irc.py b/irc.py
index 70b7b6d..93f7a49 100644
--- a/irc.py
+++ b/irc.py
@@ -229,6 +229,8 @@ class PesterHandler(DefaultCommandHandler):
         self.parent.userPresentUpdate.emit(handle, channel, "join")
         if channel == "#pesterchum":
             self.parent.moodUpdated.emit(handle, Mood("chummy"))
+    def mode(self, op, channel, mode, handle=""):
+        self.parent.userPresentUpdate.emit(handle, channel, mode)
     def nick(self, oldnick, newnick):
         oldhandle = oldnick[0:oldnick.find("!")]
         newchum = PesterProfile(newnick, chumdb=self.mainwindow.chumdb)
diff --git a/irc.pyc b/irc.pyc
index 3bc3deb17ed30e0260f628ec3fbbd0039838d012..e4a65a510087af4df768c7fa422ef6360a2a92cd 100644
GIT binary patch
delta 320
zcmW;Eze@u#7{>AEy&oRA=C17`NYzR3YOVHgs;kmTi(I#YAQ-j9vFqVt|A7)Z3gX}{
zH#>==gXr!m(nYrpqHjX-eE1F_FK7B9c>RgOyN{!XU|OT8zNvK&l)#wK7f>O_KtF^k
z*(gCt8xktA5kbW^VyLo>GE~Jz1z9ht7L8>gFSC6Br#@rm@%DJ56($FUd<jDbxrdx}
zaqWT>&`XG4bQ71&mJG*+0h5@IvdC~{Xd60=eq3wECO&y1he5HEOo+aU=lU(tw?1#o
zX|7K;XY{8Jn=^9t?$$d6MS1&)Nb0v%ovQk`l~PA<q=Us({$YVcQ-s3f<4Rxn(kbrK
Gb@~VWIzIFO

delta 177
zcmbQ7em0f;;wN6NQ&s*O*{4b~c21rv?dQ<Kz!1gBkiy9TVsJ5}aDf@z3@O}T1`k6D
z517HrkirXQ@G+$Dff@V^LBSgQo6Ti7c{YF6n83*RVsneu0!GI7lT~$oGJc;dult7a
z?_?gmH;jyvf9hRfWZisD|1cvX*W^itnv4RI_ZS*Z{$!XUBE!JIz{bd_%gM#b0))&w
MtemWybBxp(0lW1sr2qf`

diff --git a/logs/chums.js b/logs/chums.js
index 4c68cba..48e3171 100644
--- a/logs/chums.js
+++ b/logs/chums.js
@@ -1 +1 @@
-{"macruralAlchemist": {"color": "#700000", "handle": "macruralAlchemist", "mood": "offline"}, "lyricalKeraunoscopic": {"color": "#00c000", "handle": "lyricalKeraunoscopic", "mood": "offline"}, "fireSwallow": {"color": "#80bb9a", "handle": "fireSwallow", "mood": "offline"}, "aquaMarinist": {"color": "#00caca", "handle": "aquaMarinist", "mood": "offline"}, "nitroZealist": {"color": "#ff3737", "handle": "nitroZealist", "mood": "offline"}, "mechanicalSpectacle": {"color": "#000000", "handle": "mechanicalSpectacle", "mood": "offline"}, "greyscalePacifist": {"color": "#7f7f7f", "handle": "greyscalePacifist", "mood": "offline"}, "caffeinatedAnalyst": {"color": "#aa0000", "handle": "caffeinatedAnalyst", "mood": "offline"}, "iw": {"color": "#ff0000", "handle": "iw", "mood": "offline"}, "insipidTranscient": {"color": "#104e68", "handle": "insipidTranscient", "mood": "offline"}, "pesterClient394": {"color": "#ff3737", "handle": "pesterClient394", "mood": "offline"}, "absoluteTranquility": {"color": "#000033", "handle": "absoluteTranquility", "mood": "offline"}, "centaursTesticle": {"color": "#000056", "handle": "centaursTesticle", "mood": "offline"}, "agogPorphyry": {"color": "#522d80", "handle": "agogPorphyry", "mood": "offline"}, "DocScratch": {"color": "#ffffff", "handle": "DocScratch", "mood": "offline"}, "apocalypseArisen": {"color": "#a10000", "handle": "apocalypseArisen", "mood": "offline"}, "radicalApologist": {"color": "#ffaa00", "handle": "radicalApologist", "mood": "offline"}, "microMachines": {"color": "#aa00ff", "handle": "microMachines", "mood": "offline"}, "arachnidsGrip": {"color": "#005682", "handle": "arachnidsGrip", "mood": "offline"}, "illuminatedWax": {"color": "#ffff00", "handle": "illuminatedWax", "mood": "offline"}, "tentacleTherapist": {"color": "#cc66ff", "handle": "tentacleTherapist", "mood": "offline"}, "gamblingGenocider": {"color": "#00ff00", "handle": "gamblingGenocider", "mood": "offline"}, "elegantDiversion": {"color": "#14b40a", "handle": "elegantDiversion", "mood": "offline"}, "madLurker": {"color": "#000000", "handle": "madLurker", "mood": "offline"}, "testOut": {"color": "#c760cc", "handle": "testOut", "mood": "offline"}, "androidTechnician": {"color": "#0000ff", "handle": "androidTechnician", "mood": "offline"}, "recalcitrantDisaster": {"color": "#8b0068", "handle": "recalcitrantDisaster", "mood": "offline"}, "superGhost": {"color": "#800564", "handle": "superGhost", "mood": "offline"}, "arsenicCatnip": {"color": "#006400", "handle": "arsenicCatnip", "mood": "offline"}, "aquaticMarinist": {"color": "#00caca", "handle": "aquaticMarinist", "mood": "offline"}, "captainCaveman": {"color": "#7c414e", "handle": "captainCaveman", "mood": "offline"}, "cuttlefishCuller": {"color": "#77003c", "handle": "cuttlefishCuller", "mood": "offline"}, "carcinoGeneticist": {"color": "#999999", "handle": "carcinoGeneticist", "mood": "offline"}, "masterG": {"color": "#77003c", "handle": "masterG", "mood": "offline"}, "plasmaModerator": {"color": "#5685cc", "handle": "plasmaModerator", "mood": "offline"}, "carcinoGenetecist": {"color": "#7f7f7f", "handle": "carcinoGenetecist", "mood": "offline"}, "remoteBloodbath": {"color": "#c70000", "handle": "remoteBloodbath", "mood": "offline"}, "moirailBunp": {"color": "#6a3d0f", "handle": "moirailBunp", "mood": "offline"}, "rageInducer": {"color": "#00ffff", "handle": "rageInducer", "mood": "offline"}, "gallowsCalibrator": {"color": "#008282", "handle": "gallowsCalibrator", "mood": "offline"}, "greenZephyr": {"color": "#00ca40", "handle": "greenZephyr", "mood": "offline"}, "lawdEngrish": {"color": "#00ff00", "handle": "lawdEngrish", "mood": "offline"}, "adiosToreador": {"color": "#aa5500", "handle": "adiosToreador", "mood": "offline"}, "maxiumumFatness": {"color": "#3366ff", "handle": "maxiumumFatness", "mood": "offline"}, "schlagzeugGator": {"color": "#61821f", "handle": "schlagzeugGator", "mood": "offline"}, "metaliAggressive": {"color": "#9289d5", "handle": "metaliAggressive", "mood": "offline"}, "midnightSparrow": {"color": "#ff55ff", "handle": "midnightSparrow", "mood": "offline"}, "magmaExploiter": {"color": "#d90000", "handle": "magmaExploiter", "mood": "offline"}, "zealousScarecrow": {"color": "#00c882", "handle": "zealousScarecrow", "mood": "offline"}, "gardenGnostic": {"color": "#00ff00", "handle": "gardenGnostic", "mood": "offline"}, "unknownTraveler": {"color": "#006666", "handle": "unknownTraveler", "mood": "offline"}, "utilitarianTurnabout": {"color": "#dd0000", "handle": "utilitarianTurnabout", "mood": "offline"}, "marineAquist": {"color": "#00caca", "handle": "marineAquist", "mood": "offline"}}
\ No newline at end of file
+{"macruralAlchemist": {"color": "#700000", "handle": "macruralAlchemist", "mood": "offline"}, "lyricalKeraunoscopic": {"color": "#00c000", "handle": "lyricalKeraunoscopic", "mood": "offline"}, "fireSwallow": {"color": "#80bb9a", "handle": "fireSwallow", "mood": "offline"}, "aquaMarinist": {"color": "#00caca", "handle": "aquaMarinist", "mood": "offline"}, "nitroZealist": {"color": "#ff3737", "handle": "nitroZealist", "mood": "offline"}, "mechanicalSpectacle": {"color": "#000000", "handle": "mechanicalSpectacle", "mood": "offline"}, "greyscalePacifist": {"color": "#7f7f7f", "handle": "greyscalePacifist", "mood": "offline"}, "caffeinatedAnalyst": {"color": "#aa0000", "handle": "caffeinatedAnalyst", "mood": "offline"}, "iw": {"color": "#ff0000", "handle": "iw", "mood": "offline"}, "insipidTranscient": {"color": "#104e68", "handle": "insipidTranscient", "mood": "offline"}, "pesterClient394": {"color": "#ff3737", "handle": "pesterClient394", "mood": "offline"}, "absoluteTranquility": {"color": "#000033", "handle": "absoluteTranquility", "mood": "offline"}, "centaursTesticle": {"color": "#000056", "handle": "centaursTesticle", "mood": "offline"}, "quintessentialArbalest": {"color": "#999999", "handle": "quintessentialArbalest", "mood": "offline"}, "agogPorphyry": {"color": "#522d80", "handle": "agogPorphyry", "mood": "offline"}, "DocScratch": {"color": "#ffffff", "handle": "DocScratch", "mood": "offline"}, "anguillaNuntia": {"color": "#ff007f", "handle": "anguillaNuntia", "mood": "offline"}, "aceIsm": {"color": "#ffcc66", "handle": "aceIsm", "mood": "offline"}, "apocalypseArisen": {"color": "#a10000", "handle": "apocalypseArisen", "mood": "offline"}, "radicalApologist": {"color": "#ffaa00", "handle": "radicalApologist", "mood": "offline"}, "microMachines": {"color": "#aa00ff", "handle": "microMachines", "mood": "offline"}, "uroborosUnbound": {"color": "#00416a", "handle": "uroborosUnbound", "mood": "offline"}, "arachnidsGrip": {"color": "#005682", "handle": "arachnidsGrip", "mood": "offline"}, "percipientPedestrian": {"color": "#00ffff", "handle": "percipientPedestrian", "mood": "offline"}, "tentacleTherapist": {"color": "#cc66ff", "handle": "tentacleTherapist", "mood": "offline"}, "gamblingGenocider": {"color": "#00ff00", "handle": "gamblingGenocider", "mood": "offline"}, "elegantDiversion": {"color": "#14b40a", "handle": "elegantDiversion", "mood": "offline"}, "moirailBunp": {"color": "#6a3d0f", "handle": "moirailBunp", "mood": "offline"}, "madLurker": {"color": "#000000", "handle": "madLurker", "mood": "offline"}, "testOut": {"color": "#c760cc", "handle": "testOut", "mood": "offline"}, "pesterClient3022": {"color": "#336600", "handle": "pesterClient3022", "mood": "offline"}, "hellerificJefferson": {"color": "#3300ff", "handle": "hellerificJefferson", "mood": "offline"}, "androidTechnician": {"color": "#0000ff", "handle": "androidTechnician", "mood": "offline"}, "recalcitrantDisaster": {"color": "#8b0068", "handle": "recalcitrantDisaster", "mood": "offline"}, "superGhost": {"color": "#800564", "handle": "superGhost", "mood": "offline"}, "arsenicCatnip": {"color": "#006400", "handle": "arsenicCatnip", "mood": "offline"}, "kaleidoscopicMind": {"color": "#ff6666", "handle": "kaleidoscopicMind", "mood": "offline"}, "aquaticMarinist": {"color": "#00caca", "handle": "aquaticMarinist", "mood": "offline"}, "captainCaveman": {"color": "#7c414e", "handle": "captainCaveman", "mood": "offline"}, "cuttlefishCuller": {"color": "#77003c", "handle": "cuttlefishCuller", "mood": "offline"}, "carcinoGeneticist": {"color": "#999999", "handle": "carcinoGeneticist", "mood": "offline"}, "masterG": {"color": "#77003c", "handle": "masterG", "mood": "offline"}, "plasmaModerator": {"color": "#5685cc", "handle": "plasmaModerator", "mood": "offline"}, "carcinoGenetecist": {"color": "#7f7f7f", "handle": "carcinoGenetecist", "mood": "offline"}, "remoteBloodbath": {"color": "#c70000", "handle": "remoteBloodbath", "mood": "offline"}, "oilslickOrchid": {"color": "#743f7e", "handle": "oilslickOrchid", "mood": "offline"}, "acapellaWaterfall": {"color": "#000099", "handle": "acapellaWaterfall", "mood": "offline"}, "rageInducer": {"color": "#00ffff", "handle": "rageInducer", "mood": "offline"}, "gallowsCalibrator": {"color": "#008282", "handle": "gallowsCalibrator", "mood": "offline"}, "greenZephyr": {"color": "#00ca40", "handle": "greenZephyr", "mood": "offline"}, "lawdEngrish": {"color": "#00ff00", "handle": "lawdEngrish", "mood": "offline"}, "adiosToreador": {"color": "#aa5500", "handle": "adiosToreador", "mood": "offline"}, "maxiumumFatness": {"color": "#3366ff", "handle": "maxiumumFatness", "mood": "offline"}, "schlagzeugGator": {"color": "#61821f", "handle": "schlagzeugGator", "mood": "offline"}, "metaliAggressive": {"color": "#9289d5", "handle": "metaliAggressive", "mood": "offline"}, "midnightSparrow": {"color": "#ff55ff", "handle": "midnightSparrow", "mood": "offline"}, "magmaExploiter": {"color": "#d90000", "handle": "magmaExploiter", "mood": "offline"}, "zealousScarecrow": {"color": "#00c882", "handle": "zealousScarecrow", "mood": "offline"}, "gardenGnostic": {"color": "#00ff00", "handle": "gardenGnostic", "mood": "offline"}, "unknownTraveler": {"color": "#006666", "handle": "unknownTraveler", "mood": "offline"}, "utilitarianTurnabout": {"color": "#dd0000", "handle": "utilitarianTurnabout", "mood": "offline"}, "marineAquist": {"color": "#00caca", "handle": "marineAquist", "mood": "offline"}}
\ No newline at end of file
diff --git a/memos.py b/memos.py
index e417e77..7ca4036 100644
--- a/memos.py
+++ b/memos.py
@@ -243,6 +243,9 @@ class MemoText(PesterText):
         if chum is not me:
             if parent.times.has_key(chum.handle):
                 time = parent.times[chum.handle]
+                if not time.getTime():
+                    # MY WAY OR THE HIGHWAY
+                    time.addTime(timedelta(0))
             else:
                 # new chum! time current
                 newtime = timedelta(0)
@@ -309,8 +312,11 @@ class PesterMemo(PesterConvo):
         self.banuserAction = QtGui.QAction(self.mainwindow.theme["main/menus/rclickchumlist/banuser"], self)
         self.connect(self.banuserAction, QtCore.SIGNAL('triggered()'),
                      self, QtCore.SLOT('banSelectedUser()'))
+        self.opAction = QtGui.QAction(self.mainwindow.theme["main/menus/rclickchumlist/opuser"], self)
+        self.connect(self.opAction, QtCore.SIGNAL('triggered()'),
+                     self, QtCore.SLOT('opSelectedUser()'))
         self.userlist.optionsMenu.addAction(self.addchumAction)
-        # ban list added if we are op
+        # ban & op list added if we are op
 
         self.timeslider = TimeSlider(QtCore.Qt.Horizontal, self)
         self.timeinput = TimeInput(self.timeslider, self)
@@ -424,10 +430,12 @@ class PesterMemo(PesterConvo):
         self.channelLabel.setMaximumHeight(theme["memos/label/maxheight"])
         self.channelLabel.setMinimumHeight(theme["memos/label/minheight"])
 
+        self.userlist.optionsMenu.setStyleSheet(theme["main/defaultwindow/style"])
         self.userlist.setStyleSheet(theme["memos/userlist/style"])
         self.userlist.setFixedWidth(theme["memos/userlist/width"])
         self.addchumAction.setText(theme["main/menus/rclickchumlist/addchum"])
         self.banuserAction.setText(theme["main/menus/rclickchumlist/banuser"])
+        self.opAction.setText(theme["main/menus/rclickchumlist/opuser"])
 
         self.timeinput.setFixedWidth(theme["memos/time/text/width"])
         self.timeinput.setStyleSheet(theme["memos/time/text/style"])
@@ -454,6 +462,10 @@ class PesterMemo(PesterConvo):
         margins = theme["memos/margins"]
         self.layout.setContentsMargins(margins["left"], margins["top"],
                                   margins["right"], margins["bottom"])
+        for item in [self.userlist.row(i) for i in range(0,self.userlist.count())]:
+            if item.op:
+                icon = PesterIcon(self.mainwindow.theme["memos/op/icon"])
+                item.setIcon(icon)
 
     def addUser(self, handle):
         chumdb = self.mainwindow.chumdb
@@ -463,6 +475,7 @@ class PesterMemo(PesterConvo):
             op = True
             handle = handle[1:]
             if handle == self.mainwindow.profile().handle:
+                self.userlist.optionsMenu.addAction(self.opAction)
                 self.userlist.optionsMenu.addAction(self.banuserAction)
                 self.op = True
         item = QtGui.QListWidgetItem(handle)
@@ -471,6 +484,10 @@ class PesterMemo(PesterConvo):
         else:
             color = chumdb.getColor(handle, defaultcolor)
         item.setTextColor(color)
+        item.op = op
+        if op:
+            icon = PesterIcon(self.mainwindow.theme["memos/op/icon"])
+            item.setIcon(icon)
         self.userlist.addItem(item)
 
     def timeUpdate(self, handle, cmd):
@@ -561,7 +578,8 @@ class PesterMemo(PesterConvo):
             oldnick = l[0]
             newnick = l[1]
             h = oldnick
-        if (update in ["join","left", "kick"]) and channel != self.channel:
+        if (update in ["join","left", "kick", "+o"]) \
+                and channel != self.channel:
             return
         chums = self.userlist.findItems(h, QtCore.Qt.MatchFlags(0))
         systemColor = QtGui.QColor(self.mainwindow.theme["memos/systemMsgColor"])
@@ -639,6 +657,14 @@ class PesterMemo(PesterConvo):
             time = self.time.getTime()
             serverText = "PESTERCHUM:TIME>"+delta2txt(time, "server")
             self.messageSent.emit(serverText, self.title())
+        elif update == "+o":
+            chums = self.userlist.findItems(h, QtCore.Qt.MatchFlags(0))
+            for c in chums:
+                icon = PesterIcon(self.mainwindow.theme["memos/op/icon"])
+                c.setIcon(icon)
+                if unicode(c.text()) == self.mainwindow.profile().handle:
+                    self.userlist.optionsMenu.addAction(self.opAction)
+                    self.userlist.optionsMenu.addAction(self.banuserAction)
 
     @QtCore.pyqtSlot()
     def addChumSlot(self):
@@ -652,6 +678,12 @@ class PesterMemo(PesterConvo):
             return
         currentHandle = unicode(self.userlist.currentItem().text())
         self.mainwindow.kickUser.emit(currentHandle, self.channel)
+    @QtCore.pyqtSlot()
+    def opSelectedUser(self):
+        if not self.userlist.currentItem():
+            return
+        currentHandle = unicode(self.userlist.currentItem().text())
+        self.mainwindow.setChannelMode.emit(self.channel, "+o", currentHandle)
     def resetSlider(self, time, send=True):
         self.timeinput.setText(delta2txt(time))
         self.timeinput.setSlider()
diff --git a/memos.pyc b/memos.pyc
index 0ba617b3dd5a159825d061657742721b02a433fb..1b0b79841e8abfe0210bf6d413412dca2128d3a9 100644
GIT binary patch
delta 4379
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

delta 3324
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
C_^ICj

diff --git a/menus.py b/menus.py
index 25ab2c4..765babd 100644
--- a/menus.py
+++ b/menus.py
@@ -280,14 +280,13 @@ class PesterOptions(QtGui.QDialog):
         self.theme = theme
         self.setStyleSheet(self.theme["main/defaultwindow/style"])
 
-        self.tabcheck = QtGui.QCheckBox(self)
+        self.tabcheck = QtGui.QCheckBox("Tabbed Conversations", self)
         if self.config.tabs():
             self.tabcheck.setChecked(True)
-        self.tablabel = QtGui.QLabel("Tabbed Conversations", self)
-        layout_1 = QtGui.QHBoxLayout()
-        layout_1.addWidget(self.tablabel)
-        layout_1.addWidget(self.tabcheck)
-        
+
+        self.soundcheck = QtGui.QCheckBox("Sounds On", self)
+        if self.config.soundOn():
+            self.soundcheck.setChecked(True)
         self.ok = QtGui.QPushButton("OK", self)
         self.ok.setDefault(True)
         self.connect(self.ok, QtCore.SIGNAL('clicked()'),
@@ -300,7 +299,8 @@ class PesterOptions(QtGui.QDialog):
         layout_2.addWidget(self.ok)
 
         layout_0 = QtGui.QVBoxLayout()
-        layout_0.addLayout(layout_1)
+        layout_0.addWidget(self.tabcheck)
+        layout_0.addWidget(self.soundcheck)
         layout_0.addLayout(layout_2)
 
         self.setLayout(layout_0)
@@ -410,7 +410,7 @@ class PesterMemoList(QtGui.QDialog):
 
         self.orjoinlabel = QtGui.QLabel("OR MAKE A NEW MEMO:")
         self.newmemo = QtGui.QLineEdit(channel, self)
-        self.secretChannel = QtGui.QCheckBox("HIDDEN?", self)
+        self.secretChannel = QtGui.QCheckBox("HIDDEN CHANNEL?", self)
 
         self.timelabel = QtGui.QLabel("TIMEFRAME:")
         self.timeslider = TimeSlider(QtCore.Qt.Horizontal, self)
diff --git a/menus.pyc b/menus.pyc
index a149307144721a765d4f34daa289c371d10a0491..7cad1d7ab27bf83445d5a0aa677b3ea921651859 100644
GIT binary patch
delta 938
zcmZ9J%TE(g6voeO%M>VW2ZWY~hQ`E%R-n*`sS=2#t+WcQwhI@UfMFCTnxb}GU@(w0
zF>ci0S&(3T1fv@PQ^yz~(Xb$H5EUP+!GxX0=pSIb=T-`FaetZb%=eu+=gxSR&1IQ+
z<+rtT>ie;rdC6mw0Dw-ApY$7C^Tdl41B?J<47hKvceEH3V_p*btVFd4R2yUfhAM%P
zwt{K_tqd{@Sc)Hw*X*E}wgqJoltC@uG*YnQUsc-yY9%N|)PdJYR)Hcx#>*gMDl{~2
zYv>Tsd;^C_Py_61agNgGoiyJyK7k3;YGHMV@wT)qG<j=;w+Ke~UU_dx-doVtg07{G
zv?q;UM-dVVK(e8PUtug=4LEVA7GE~j*wR!<4qZtpX;(ajE}sj3Hm2&dQo3s@51czQ
za9%TSO70nMa${s?O%?r;gpJTj@Dc2|)O4z>ipi|fAjq(Mm%}JCS?_87DzPl?Zku3J
z`g~i!AU~$WlR`F&7XJx0g9HAX-1p0Wi%sie2NdSclI0<xj1VOpA?zWDF8qPFLTmdM
z9{tw-;@}i7h^db!waaR1F!7umGlXfvE5d6IvFXL(OIlJLOr5@vn8*I+PBy9AJA9@J
zJ2yn4p-?#H3Pu94Shxp|2C~vU3g5>cfk*5qj(6>sW~tDPADg<+9=svFC3zdYp&+gW
zqtYVDIo%s-Wm0};JR7cOi+DZkVmXXEJN1q5VdfS-v6$HS|Lv&Dd%_34=Sh6leYO4_
z$z{SFjs_z=i9aGHSjL>mk7JR3{;BoIgnP@qLdH)7M(_|m6ZnBd2|noUG9(uCjcB!z
Xt>T}ayOv3Mu|Qbm7u134y)AzM)!^1T

delta 891
zcmZ9I(MwZt6vxkT+g)33&gIl);$DhP-OPcdm7;Si6;ir;@F78FH{`;S%KK6*4AxVW
zU?&jSB87S=EwmfdATThW%*;@No_g;k`V0D<-^@u5zt6qj-}#>N`+a|fJkI3NzWvAL
zyx%jlV&7<V+W|lkt5>YaW%}7TWXk|#kxn<YOu0ZS1D2AbZZH7!3djQ7u|mcQx`(T}
zTlfJ>+95T2D?zgy7~qw5FX%_WC@(e%Q`O$C;RC%IG%FXxSi@HhdJSkc)>$jy-av&m
z{eh{HOPcHlO~o79AY=P?!`k9u``Rlt5A@443S<<}k8&m%r6}ad$O-GX&J_(H89W3)
zZ@L@kQ?sACqXCN4d8s};a!kD<9?=k0Fj8ab)Y#Ru+9`zEB|wkEp%6c^8fPQ~g8cTX
zo6*XMGAbD7=~sBf<wXxxp%2T&*F&Cqzj-aPqhO9=ZL_#w{%Gqd^E_kw^Zo7|HMI}p
z5@p*T3SVW%G%lL+9U6vmY<bEkXY?}$7{?iMiue(uD13HDw3eNFduBmw7<|V|N#mwI
zF|Mw#V~MfIc*po4U^oS?-@0KW_3?>RS}oAsNEgnTEuB%TlLz$m$K#1Xn(WCdd2V__
z^Whq5jy=GaREV9zSM)o!h3oXOcSc!b!+Uc$-ik^w9Ze@1aE)Fk0=R5$CGKHJdgS$G
zuKzRegiXd5k>)aezi_)@gXL$&BY~iW|K!WB%L1k19rU7aR2<{zpN*8<U%9-^Kt?0u
k8$&Em9gH2BcGYwZ)LL+tPF&0#p5y&h#;z!Kl4J1XUq#2nWdHyG

diff --git a/parsetools.py b/parsetools.py
index b52f567..abacaa1 100644
--- a/parsetools.py
+++ b/parsetools.py
@@ -43,6 +43,9 @@ def convertTags(string, format="html"):
     string = _urlre.sub(urlrep, string)
     if format == "html":
         string = _memore.sub(r" <a href='\1'>\1</a>", string)
+        string = string.replace(" :trollcool:", " <img src='%s' />" % ("themes/pesterchum/trollcool.gif")) # ugh hardcoded, gross i know. but its just 1 smiley
+    elif format == "bbcode":
+        string = string.replace(" :trollcool:", " [img]http://www.mspaintadventures.com/storyfiles/hs2/scraps/trollcool.gif[/img]")
     return string
 
 def escapeBrackets(string):
diff --git a/parsetools.pyc b/parsetools.pyc
index a872cfce57b0db78ff44865e57b80be93d59a0f8..bb5bc725f2ff8d010cd9302b5a432dfb8c94ba81 100644
GIT binary patch
delta 386
zcmY+7%Syvg5Qb+`HKt9PHk2-`U<IWrr3btq6fdt(a8sx*YLYgQ+{`&`5fni;g3BQE
zH6#eG-1r18yK$orATC@fc%q`Xm|^B)zJEqbw^i}sRY?z@8`t7CY7+pE;zeJ0y8tlM
zsEJq2Dj*vNTL2>s#{lO7oIo<zDKIi%$Y3Z?{HER<U?K`|Ab?*4{5#A3h#r2?orPR1
z3m;>rROZjhbr$-Lqx-&7r}+eI*lxE>Lw&O{Pb+1zMQ1o=mg$<51SVx>s9Qak{A#tX
z-Jy-dY;kkXVl1c=G8hbME)CkY$J$2U^jI%6X-)TCLYW^Pb!=yr=UH@_P(5r1^nYH9
zBvFwhK9;6=GN6JvR0|rGu!yRt@m<5I_+30q;acQn7_LT7nM+)ceR+tu5>IAt5clId
X^&ZiV&+;Py`_XRUO<a_SBudIB?*C<Z

delta 145
zcmdm?b5o1`;wN6NqdEQ?+3gvHSQ!`?n1Q%>JCNvLU`XMf9KkqMUW|dUgq0zai6MoH
zp@xB>nTes6fgz8Pff2|F*5KLf%Ji3I@+0<pjAD}ya)@uf$C1a(Xf)ZEr-adP@*$pX
wMw88cyfYXX4K_dL+seoozj>~}VMfNZ&51%cnHY;FTZ?{USL4*@Was1s0CIIEKL7v#

diff --git a/pesterchum.ico b/pesterchum.ico
new file mode 100644
index 0000000000000000000000000000000000000000..5b8fa1c9836a1056eeb39329dd51e2f6997bd136
GIT binary patch
literal 3638
zcmeHIOHRZv41G;f0V{?R&=ukq%yBrzoPay9L!6>#U_TNUKtiloAQeBSNz*13AYc{{
zOK$A<?0nqT0U8)=Hc+{4feW#^&ii-Az>Q#+;xdGA0|7<0jSksk7zRM}cK?F2`#nw`
zp0bz<)C$xJ{J{#CnE*4_$bpS%ol0whYa0>k6fnlAOF#l7-I1k;Psw~gojg6id<MKY
zX8W6G>wYIl-`B#8AxiF~CsKRsN7`$W#y%baujjtcc9O6a4Sja!#3@MavxTBms8--#
zRA6dDxy1tH=!E<P?^kHYW<IubY2n({^$pNo=L2iUb}tRzI@iV-KEpdVW%GvM49pAX
zTjv=iS4q4}m`w?n#G&|jcSXam9M+F;G*bS%HYZKzIGq3c-)DNRrLCXm>L23S^&JMj
p95JyU^NdaRmgWY#%=dsz^%*#&rWkE}QI`2(-Z$WiI`np+z5}>8KF<IE

literal 0
HcmV?d00001

diff --git a/pesterchum.js b/pesterchum.js
index 3f6e37c..23ae945 100644
--- a/pesterchum.js
+++ b/pesterchum.js
@@ -1 +1 @@
-{"tabs": false, "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"], "defaultprofile": "testProfile", "block": []}
\ No newline at end of file
+{"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"], "defaultprofile": "testProfile", "block": []}
\ No newline at end of file
diff --git a/pesterchum.py b/pesterchum.py
index 4b236a1..cebee54 100644
--- a/pesterchum.py
+++ b/pesterchum.py
@@ -6,6 +6,7 @@ from datetime import *
 from string import Template
 import random
 import json
+import codecs
 import re
 import socket
 from PyQt4 import QtGui, QtCore
@@ -61,7 +62,7 @@ class PesterLog(object):
             time = datetime.now().strftime("%Y-%m-%d.%H.%M.txt")
             if not os.path.exists("logs/%s/%s" % (self.handle, handle)):
                 os.mkdir("logs/%s/%s" % (self.handle, handle))
-            fp = open("logs/%s/%s/%s.%s" % (self.handle, handle, handle, time), 'a')
+            fp = codecs.open("logs/%s/%s/%s.%s" % (self.handle, handle, handle, time), encoding='utf-8', mode='a')
             self.convos[handle] = fp
         self.convos[handle].write(msg+"\n")
         self.convos[handle].flush()
@@ -115,11 +116,18 @@ class pesterTheme(dict):
         theme = json.load(fp, object_hook=self.pathHook)
         self.update(theme)
         fp.close()
+        defaultfp = open("themes/pesterchum/style.js") # set default
+        defaultTheme = json.load(defaultfp, object_hook=self.pathHook)
+        self.defaultTheme = defaultTheme
+        defaultfp.close()
     def __getitem__(self, key):
         keys = key.split("/")
         v = dict.__getitem__(self, keys.pop(0))
         for k in keys:
-            v = v[k]
+            try:
+                v = v[k]
+            except KeyError:
+                v = self.defaultTheme[k]
         return v
     def pathHook(self, d):
         for (k, v) in d.iteritems():
@@ -184,6 +192,10 @@ class userConfig(object):
         l = self.getBlocklist()
         l.pop(l.index(handle))
         self.set('block', l)
+    def soundOn(self):
+        if not self.config.has_key('soundon'):
+            self.set('soundon', True)
+        return self.config['soundon']
     def set(self, item, setting):
         self.config[item] = setting
         try:
@@ -671,7 +683,7 @@ class PesterWindow(MovingWindow):
 
         self.closeButton = WMButton(PesterIcon(self.theme["main/close/image"]), self)
         self.connect(self.closeButton, QtCore.SIGNAL('clicked()'),
-                     self, QtCore.SLOT('close()'))
+                     self, QtCore.SLOT('closeToTray()'))
         self.miniButton = WMButton(PesterIcon(self.theme["main/minimize/image"]), self)
         self.connect(self.miniButton, QtCore.SIGNAL('clicked()'),
                      self, QtCore.SLOT('showMinimized()'))
@@ -746,6 +758,10 @@ class PesterWindow(MovingWindow):
         palette.setBrush(QtGui.QPalette.Window, QtGui.QBrush(self.backgroundImage))
         self.setPalette(palette)
 
+    @QtCore.pyqtSlot()
+    def closeToTray(self):
+        self.hide()
+        self.closeToTraySignal.emit()
     def closeEvent(self, event):
         self.closeConversations()
         if hasattr(self, 'trollslum') and self.trollslum:
@@ -770,7 +786,8 @@ class PesterWindow(MovingWindow):
         convo = self.convos[handle]
         convo.addMessage(msg, False)
         # play sound here
-        self.alarm.play()
+        if self.config.soundOn():
+            self.alarm.play()
     def newMemoMsg(self, chan, handle, msg):
         if not self.memos.has_key(chan):
             # silently ignore in case we forgot to /part
@@ -1001,9 +1018,11 @@ class PesterWindow(MovingWindow):
         if len(self.waitingMessages) == 0:
             if self.isMinimized():
                 self.showNormal()
+            elif self.isHidden():
+                self.show()
             else:
                 if self.isActiveWindow():
-                    self.showMinimized()
+                    self.hide()
                 else:
                     self.raise_()
                     self.activateWindow()
@@ -1346,6 +1365,9 @@ class PesterWindow(MovingWindow):
             self.memos = newmemos
             # save options
             self.config.set("tabs", tabsetting)
+        # sound
+        soundsetting = self.optionmenu.soundcheck.isChecked()
+        self.config.set("soundon", soundsetting)
         self.optionmenu = None
 
     @QtCore.pyqtSlot()
@@ -1467,6 +1489,7 @@ class PesterWindow(MovingWindow):
             # show context menu i guess
             pass
 
+    closeToTraySignal = QtCore.pyqtSignal()
     newConvoStarted = QtCore.pyqtSignal(QtCore.QString, bool, name="newConvoStarted")
     sendMessage = QtCore.pyqtSignal(QtCore.QString, QtCore.QString)
     convoClosed = QtCore.pyqtSignal(QtCore.QString)
@@ -1542,6 +1565,10 @@ class MainProgram(QtCore.QObject):
                               QtCore.SIGNAL('trayIconSignal(int)'),
                               self.trayicon,
                               QtCore.SLOT('changeTrayIcon(int)'))
+        self.trayicon.connect(self.widget,
+                              QtCore.SIGNAL('closeToTraySignal()'),
+                              self.trayicon,
+                              QtCore.SLOT('show()'))
 
         self.irc = PesterIRC(self.widget)
         self.connectWidgets(self.irc, self.widget)
diff --git a/setup.py b/setup.py
index 3454796..b2de052 100644
--- a/setup.py
+++ b/setup.py
@@ -19,14 +19,14 @@ setup(
                                   )])
 if sys.platform == "win32":
     os.rename("build/exe.win32-2.6", "build/pesterchum")
+    shutil.copytree("imageformats", "build/pesterchum/imageformats")
+    shutil.copy("C:/Dev/Py26MSdlls-9.0.21022.8/msvc/msvcm90.dll", "build/pesterchum")
+    shutil.copy("C:/Dev/Py26MSdlls-9.0.21022.8/msvc/msvcp90.dll", "build/pesterchum")
+    shutil.copy("C:/Dev/Py26MSdlls-9.0.21022.8/msvc/msvcr90.dll", "build/pesterchum")
+    shutil.copy("C:/Dev/Py26MSdlls-9.0.21022.8/msvc/x86_Microsoft.VC90.CRT_1fc8b3b9a1e18e3b_9.0.21022.8_x-ww_d08d0375.manifest",
+                "build/pesterchum")
 
 shutil.copytree("themes", "build/pesterchum/themes")
-shutil.copytree("imageformats", "build/pesterchum/imageformats")
 shutil.copy("pesterchum.js", "build/pesterchum/")
-shutil.copy("C:/Dev/Py26MSdlls-9.0.21022.8/msvc/msvcm90.dll", "build/pesterchum")
-shutil.copy("C:/Dev/Py26MSdlls-9.0.21022.8/msvc/msvcp90.dll", "build/pesterchum")
-shutil.copy("C:/Dev/Py26MSdlls-9.0.21022.8/msvc/msvcr90.dll", "build/pesterchum")
-shutil.copy("C:/Dev/Py26MSdlls-9.0.21022.8/msvc/x86_Microsoft.VC90.CRT_1fc8b3b9a1e18e3b_9.0.21022.8_x-ww_d08d0375.manifest",
-            "build/pesterchum")
 os.mkdir("build/pesterchum/profiles")
 os.mkdir("build/pesterchum/logs")
diff --git a/themes/pesterchum/op.gif b/themes/pesterchum/op.gif
new file mode 100644
index 0000000000000000000000000000000000000000..25e8ffb7968bcf91cd3ac8acc58216ce6b24e980
GIT binary patch
literal 111
zcmZ?wbhEHb6l4%!Sj58ciGhK^`ah89>gxLcAH;wF#h)yU3=Av`Iv_4cEd#TOhu7tM
z+MC>;E-8IzEA~TPv`3k79^cA&3m&Xekv98aaYEB(VgIedIoux>N(h-A>$un$qb0;(
F4FHAgBEJ9t

literal 0
HcmV?d00001

diff --git a/themes/pesterchum/style.js b/themes/pesterchum/style.js
index 171bd6c..589e99f 100644
--- a/themes/pesterchum/style.js
+++ b/themes/pesterchum/style.js
@@ -34,6 +34,7 @@
                                "addchum": "ADD CHUM",
                                "unblockchum": "UNBLOCK",
                                "banuser": "BAN USER",
+                               "opuser": "MAKE OP",
                                "quirksoff": "QUIRKS OFF"
                               }
            },
@@ -84,7 +85,7 @@
 
 "protective": { "icon": "$path/protective.gif", "color": "#00ff00" },
 
-"blocked": { "icon": "$path/blocked.gif", "color": "black" }
+                 "blocked": { "icon": "$path/blocked.gif", "color": "black" }
 
                       }
            },
@@ -259,6 +260,7 @@
                         "style": " border:0px; margin-top: 5px; margin-right:10px;" 
                       }
           },
-  "systemMsgColor": "#646464"
+  "systemMsgColor": "#646464",
+  "op": { "icon": "$path/op.gif" }
  }
 }
\ No newline at end of file
diff --git a/themes/pesterchum/trollcool.gif b/themes/pesterchum/trollcool.gif
new file mode 100644
index 0000000000000000000000000000000000000000..25e8ffb7968bcf91cd3ac8acc58216ce6b24e980
GIT binary patch
literal 111
zcmZ?wbhEHb6l4%!Sj58ciGhK^`ah89>gxLcAH;wF#h)yU3=Av`Iv_4cEd#TOhu7tM
z+MC>;E-8IzEA~TPv`3k79^cA&3m&Xekv98aaYEB(VgIedIoux>N(h-A>$un$qb0;(
F4FHAgBEJ9t

literal 0
HcmV?d00001

diff --git a/themes/trollian/op.gif b/themes/trollian/op.gif
new file mode 100644
index 0000000000000000000000000000000000000000..25e8ffb7968bcf91cd3ac8acc58216ce6b24e980
GIT binary patch
literal 111
zcmZ?wbhEHb6l4%!Sj58ciGhK^`ah89>gxLcAH;wF#h)yU3=Av`Iv_4cEd#TOhu7tM
z+MC>;E-8IzEA~TPv`3k79^cA&3m&Xekv98aaYEB(VgIedIoux>N(h-A>$un$qb0;(
F4FHAgBEJ9t

literal 0
HcmV?d00001

diff --git a/themes/trollian/style.js b/themes/trollian/style.js
index 6315787..024b86d 100644
--- a/themes/trollian/style.js
+++ b/themes/trollian/style.js
@@ -34,6 +34,7 @@
                                "addchum": "Add Chump",
                                "unblockchum": "Mercy",
                                "banuser": "Ban",
+                               "opuser": "Promote",
                                "quirksoff": "Quirks Off" }
            },
   "chums": { "style": "font-size: 12px; background: white; border:2px solid #c2c2c2; padding: 5px; font-family: 'Arial';selection-background-color:rgb(200,200,200); ",
@@ -309,6 +310,7 @@
                         "style": "width: 19px; height: 19px; border:0px; margin-left: 2px;"
                       }
           },
-  "systemMsgColor": "#646464"
+  "systemMsgColor": "#646464",
+  "op": { "icon": "$path/op.gif" }
  }
 }
\ No newline at end of file