From a78c429c8be0d4aea9e0d51e4a8af64018d48bfa Mon Sep 17 00:00:00 2001 From: Stephen Dranger Date: Thu, 3 Feb 2011 03:45:48 -0600 Subject: [PATCH] me message --- logs/chums.js | 2 +- pesterchum.js | 2 +- pesterchum.py | 12 ++++++++++++ pesterdata.py | 3 +++ pesterdata.pyc | Bin 7111 -> 7417 bytes profiles/ghostDunk.js | 2 +- themes/pesterchum/style.js | 2 +- 7 files changed, 19 insertions(+), 4 deletions(-) diff --git a/logs/chums.js b/logs/chums.js index 1a11cb1..bab5721 100644 --- a/logs/chums.js +++ b/logs/chums.js @@ -1 +1 @@ -{"macruralAlchemist": {"color": "#700000", "handle": "macruralAlchemist", "mood": "offline"}, "agogPorphyry": {"color": "#522d80", "handle": "agogPorphyry", "mood": "offline"}, "fireSwallow": {"color": "#80bb9a", "handle": "fireSwallow", "mood": "offline"}, "aquaMarinist": {"color": "#00caca", "handle": "aquaMarinist", "mood": "offline"}, "nitroZealist": {"color": "#ff3737", "handle": "nitroZealist", "mood": "offline"}, "superGhost": {"color": "#800564", "handle": "superGhost", "mood": "offline"}, "tentacleTherapist": {"color": "#cc66ff", "handle": "tentacleTherapist", "mood": "offline"}, "aquaticMarinist": {"color": "#00caca", "handle": "aquaticMarinist", "mood": "offline"}, "captainCaveman": {"color": "#7c414e", "handle": "captainCaveman", "mood": "offline"}, "mechanicalSpectacle": {"color": "#0000ff", "handle": "mechanicalSpectacle", "mood": "offline"}, "gamblingGenocider": {"color": "#00ff00", "handle": "gamblingGenocider", "mood": "offline"}, "centaursTesticle": {"color": "#000056", "handle": "centaursTesticle", "mood": "offline"}, "schlagzeugGator": {"color": "#61821f", "handle": "schlagzeugGator", "mood": "offline"}, "unknownTraveler": {"color": "#006666", "handle": "unknownTraveler", "mood": "offline"}, "marineAquist": {"color": "#00caca", "handle": "marineAquist", "mood": "offline"}} \ No newline at end of file +{"macruralAlchemist": {"color": "#700000", "handle": "macruralAlchemist", "mood": "offline"}, "agogPorphyry": {"color": "#522d80", "handle": "agogPorphyry", "mood": "offline"}, "fireSwallow": {"color": "#80bb9a", "handle": "fireSwallow", "mood": "offline"}, "aquaMarinist": {"color": "#00caca", "handle": "aquaMarinist", "mood": "offline"}, "nitroZealist": {"color": "#ff3737", "handle": "nitroZealist", "mood": "offline"}, "superGhost": {"color": "#800564", "handle": "superGhost", "mood": "offline"}, "tentacleTherapist": {"color": "#cc66ff", "handle": "tentacleTherapist", "mood": "offline"}, "aquaticMarinist": {"color": "#00caca", "handle": "aquaticMarinist", "mood": "offline"}, "captainCaveman": {"color": "#7c414e", "handle": "captainCaveman", "mood": "offline"}, "gamblingGenocider": {"color": "#00ff00", "handle": "gamblingGenocider", "mood": "offline"}, "mechanicalSpectacle": {"color": "#0000ff", "handle": "mechanicalSpectacle", "mood": "offline"}, "absoluteTranquility": {"color": "#000033", "handle": "absoluteTranquility", "mood": "offline"}, "centaursTesticle": {"color": "#000056", "handle": "centaursTesticle", "mood": "offline"}, "schlagzeugGator": {"color": "#61821f", "handle": "schlagzeugGator", "mood": "offline"}, "unknownTraveler": {"color": "#006666", "handle": "unknownTraveler", "mood": "offline"}, "marineAquist": {"color": "#00caca", "handle": "marineAquist", "mood": "offline"}} \ No newline at end of file diff --git a/pesterchum.js b/pesterchum.js index 0f7a8d6..c68bbea 100644 --- a/pesterchum.js +++ b/pesterchum.js @@ -1 +1 @@ -{"tabs": true, "chums": ["aquaMarinist", "marineAquist", "unknownTraveler", "tentacleTherapist", "macruralAlchemist", "vaginalEngineer", "mechanicalSpectacle", "carcinoGeneticist", "schlagzeugGator", "gamblingGenocider", "gardenGnostic", "superGhost", "centaursTesticle", "arachnidsGrip", "fireSwallow", "grimAuxiliatrix"], "defaultprofile": "ghostDunk", "block": []} \ No newline at end of file +{"tabs": true, "chums": ["aquaMarinist", "marineAquist", "unknownTraveler", "tentacleTherapist", "macruralAlchemist", "vaginalEngineer", "mechanicalSpectacle", "carcinoGeneticist", "schlagzeugGator", "gamblingGenocider", "gardenGnostic", "superGhost", "centaursTesticle", "arachnidsGrip", "fireSwallow", "grimAuxiliatrix", "absoluteTranquility", "cypheredBookworm"], "defaultprofile": "ghostDunk", "block": []} \ No newline at end of file diff --git a/pesterchum.py b/pesterchum.py index c7fe656..ce24e29 100644 --- a/pesterchum.py +++ b/pesterchum.py @@ -859,6 +859,18 @@ class PesterText(QtGui.QTextEdit): msg = chum.pestermsg(me, systemColor, window.theme['convo/text/unblocked']) window.chatlog.log(chum.handle, convertTags(msg, "bbcode")) self.append(convertTags(msg)) + elif msg[0:3] == "/me" or msg[0:13] == "PESTERCHUM:ME": + if msg[0:3] == "/me": + start = 3 + else: + start = 13 + space = msg.find(" ") + msg = chum.memsg(systemColor, msg[start:space], msg[space:]) + if chum is me: + window.chatlog.log(parent.chum.handle, convertTags(msg, "bbcode")) + else: + window.chatlog.log(chum.handle, convertTags(msg, "bbcode")) + self.append(convertTags(msg)) else: if not parent.chumopen and chum is not me: beginmsg = chum.pestermsg(me, systemColor, window.theme["convo/text/beganpester"]) diff --git a/pesterdata.py b/pesterdata.py index 6afc9c7..34b5197 100644 --- a/pesterdata.py +++ b/pesterdata.py @@ -108,6 +108,9 @@ class PesterProfile(object): def blocked(self, config): return self.handle in config.getBlocklist() + def memsg(self, syscolor, suffix, msg): + uppersuffix = suffix.upper() + return "-- %s%s [%s%s] %s --" % (syscolor.name(), self.handle, suffix, self.colorhtml(), self.initials(), uppersuffix, msg) def pestermsg(self, otherchum, syscolor, verb): return "-- %s [%s] %s %s [%s] at %s --" % (syscolor.name(), self.handle, self.colorhtml(), self.initials(), verb, otherchum.handle, otherchum.colorhtml(), otherchum.initials(), datetime.now().strftime("%H:%M")) diff --git a/pesterdata.pyc b/pesterdata.pyc index c8d9f77b22d91cb5688a140d4a0d5050f6492f2d..7d212403af3e4178a3715d42a40c2dc9b26a3c62 100644 GIT binary patch delta 453 zcmXw#&q@MO6voe;e>pmqLg|(1}4^8THSuSUi@nyHPB(?j`2#%(dIG8QeN^ab$o7QjFP zhd`fzPk7r0@CBZ75T}kb1_}Bicr%cxnF6k;P!qM-+Aq+OWf=uppvI(YaBdbiS|xN1 z%PPhZP5uV^h&^SqTN7SFBjm55*R&N}1zp?Xj)>Bx=V1cRsMB$~H1a&Z$A+1`1-_&0 zVj3V&2?dBY`pl$>Y&WoBf7vSOva0?_BKD=f5tqH>?)4s@*7&rrNmhtVa#$5}jx`sz zmru~P@p~cU6Er*v{Z`uzF9OH*cy!6CiE{oBvBvXx6ou%js;Gi0s*)5EQJzy*XZRBI{-;32sK-5)PnI#g)a$`8oMTleHuR8S^LCNX}s_ znk*@Gk}+xWW2s)o(#eI=VvKx~JEYBI5`oG~ctCne5=%0Zb5lz)@>7D6fdWD4lLNV( kC7poGV352JkYHn!;N)cEWa4DzWSML$qrezFIZkFa05!ZX=Kufz diff --git a/profiles/ghostDunk.js b/profiles/ghostDunk.js index 338c689..43ce8df 100644 --- a/profiles/ghostDunk.js +++ b/profiles/ghostDunk.js @@ -1 +1 @@ -{"color": "#ff00ff", "theme": "pesterchum", "quirks": [], "handle": "ghostDunk"} \ No newline at end of file +{"color": "#ff00ff", "theme": "trollian", "quirks": [], "handle": "ghostDunk"} \ No newline at end of file diff --git a/themes/pesterchum/style.js b/themes/pesterchum/style.js index 965b2d3..8406246 100644 --- a/themes/pesterchum/style.js +++ b/themes/pesterchum/style.js @@ -35,7 +35,7 @@ "chums": { "style": "border:2px solid yellow; background-color: black;color: white;font: bold;font-family: 'Courier';selection-background-color:#646464; ", "loc": [12, 117], "size": [209, 82], - "userlistcolor": "black", + "userlistcolor": "white", "moods": { "chummy": { "icon": "$path/chummy.gif", "color": "white" },