From 87cbeca5dd6943e6dcde2c37f80cf45f42ff1151 Mon Sep 17 00:00:00 2001 From: Stephen Dranger Date: Thu, 10 Feb 2011 12:00:06 -0600 Subject: [PATCH] fdsafd --- TODO | 6 ++---- convo.py | 12 +++++++++--- convo.pyc | Bin 23317 -> 23547 bytes dataobjs.py | 4 ++-- dataobjs.pyc | Bin 11510 -> 11504 bytes generic.pyc | Bin 3575 -> 3575 bytes irc.pyc | Bin 13203 -> 13203 bytes logs/chums.js | 2 +- memos.py | 2 +- memos.pyc | Bin 31005 -> 31005 bytes menus.pyc | Bin 20542 -> 20542 bytes oyoyo/__init__.pyc | Bin 333 -> 333 bytes oyoyo/client.pyc | Bin 9728 -> 9728 bytes oyoyo/cmdhandler.pyc | Bin 8312 -> 8312 bytes oyoyo/helpers.pyc | Bin 5013 -> 5013 bytes oyoyo/ircevents.pyc | Bin 5693 -> 5693 bytes oyoyo/parse.pyc | Bin 2869 -> 2869 bytes parsetools.py | 2 +- parsetools.pyc | Bin 6975 -> 6979 bytes pesterchum.js | 2 +- pesterchum.py | 10 ++++++---- themes/pesterchum/style.js | 2 +- themes/trollian/style.js | 2 +- 23 files changed, 25 insertions(+), 19 deletions(-) diff --git a/TODO b/TODO index 891c637..2562cdd 100644 --- a/TODO +++ b/TODO @@ -1,10 +1,9 @@ Features: * Tray doesn't disappear on windows after close -* Mood switching shows wrong mood! -* ctrl-tab should prefer new convos * Idling +* PESTERCHUM:BLOCKED * new sound on CEASE and BEGIN? -* User commands/stop user from sending commands accidentally +* scroll bar style? * More complex quirks: random, spelling, by-sound * change profile only once we have confirmation from server * convert hex tags ( or ) @@ -13,7 +12,6 @@ Features: * help menu -- about and forum * dropped messages when chatting ? -- release alpha -* scroll bar style? * shared buddy lists - changes to the buddy list should refresh it? multiple clients share buddy list??? * chumList not scaling -- QListView + delegate? diff --git a/convo.py b/convo.py index f90e2c4..f91d105 100644 --- a/convo.py +++ b/convo.py @@ -69,7 +69,13 @@ class PesterTabWindow(QtGui.QFrame): mods = event.modifiers() if ((mods & QtCore.Qt.ControlModifier) and keypress == QtCore.Qt.Key_Tab): - nexti = (self.tabIndices[self.currentConvo.title()] + 1) % self.tabs.count() + handles = self.convos.keys() + waiting = self.mainwindow.waitingMessages.waitingHandles() + waitinghandles = list(set(handles) & set(waiting)) + if len(waitinghandles) > 0: + nexti = self.tabIndices[waitinghandles[0]] + else: + nexti = (self.tabIndices[self.currentConvo.title()] + 1) % self.tabs.count() self.tabs.setCurrentIndex(nexti) def closeSoft(self): @@ -372,7 +378,7 @@ class PesterConvo(QtGui.QFrame): self.mainwindow.chatlog.log(self.title(), convertTags(msg, "bbcode")) self.chumopen = False elif old and old.name() != mood.name(): - msg = self.chum.moodmsg(syscolor, self.mainwindow.theme) + msg = self.chum.moodmsg(mood, syscolor, self.mainwindow.theme) self.textArea.append(convertTags(msg)) self.mainwindow.chatlog.log(self.title(), convertTags(msg, "bbcode")) if self.parent(): @@ -470,7 +476,7 @@ class PesterConvo(QtGui.QFrame): @QtCore.pyqtSlot() def sentMessage(self): text = unicode(self.textInput.text()) - if text == "": + if text == "" or text[0:11] == "PESTERCHUM:": return self.history.add(text) # deal with quirks here diff --git a/convo.pyc b/convo.pyc index d9a88acf7673be8e953367c5279708955adb20d3..69f939dff3bbe06fab1b65153fc2604981c4cb14 100644 GIT binary patch delta 2857 zcmZuz32ap75&mcGT@!p`ud%`21!}<>a|MIa*c|3ChG3iWj4u=ji@n%uFS}-UZP&6L ztAP+gN(oF;#GwSWND-={n7pbKD5Ysao3xD^(vnt9kBF*B>7gXFmD;97oo}8StR%AD zxAV`;KX2~mXTD7zU8J-dcQU7rooT#~)|;L+#Tb(+&pLS$@ABj6WuvyCVV6m|OgP1a z-KN`RVrPYAOxR<>X=cAMBdG?*DJFcM2~Smy+a%LXGQ$j~n*F4N8$`7{BOa5?G{YX8 zJIHjWnwZzImj$k{ii$?kOf=vy>xC=EvrRY$mWw)EW;z(TCOi#{0@0l~=b2&ghYUsK z=`f}-kRo9;gau5P1OoY-ld(Q~mXJwA*%KN}Sh@VPx3D}*jswAPG92yP7>ssALJ8G~ zgcHdmtRzCtZzL4u#*9*$!e7iND@zke*MvIg2@Aw%TViEuwAq-?IGVZxKyv24FcL53mgIc|a@QpEE$)`FzeXs^hBMa5Bf6VU4A*~Jfdnn2d^&f+KBj|h3f{!_8|*2yKllJpVCe1KN2@jXQ^@C{$MVjCFE zfHpuWU?*TV0F||(0C;E>0fu<5-{*mOYd;_J=g}@6+rE--`Dap=eb-+|)X&pr578?& z&)(ps2>*KSEOFtZxnHM~{Omj*J7K98Upu0{{Y}| zz#Kp(0AX10-N_YRZP`eO$9hueA8^m2+Y+I*cq>qb=giOIjyId*%OD zJ{heW(awD7{zmd>{ZDh-(s-FxPSb>o0XJ?t83J`0@IAoGh|CRbA1|$#=l`rI?gg;T z@%^%>d+jR~FM4Pn_f&49IDfzLq0~o(%}c6g+GSPm5gp;Yl?zHw;w9RMI!=8!_5)f0 zI$e)(`^xcj>Y8+Q_F))U&d=4wId>#g&iBPE0Yee*Fo{ZZ&3@j6-ybV286a)36>zAlnzKQCIi=6#J>Qeo8$e zCizq`M@ zS3_vgbU|{6Kdh5gGIH_6Ba4_dV9^H^FopE$S-y#h~6?KJZP?(oMDr~EN+NNi5 zJgHTK_^91mJ4EhoA-};NZ1mRZ#a}|H9IytU?x|VL-ygtx44`SQ1*NaLw>Y}FZqq6^ zuAJbbn_eo_HKS(qa_MJS=;g8IwI1Dl&+`ipZJnWa)RSL{`lQfxedwIN$jzH~cpM$) zdX=c!Om)}jJN$Cp33`Xy>gUSBL9#B@=hJt2ynauqy4(vV)Tdpbf&!m<$!=j@lPf;{ zRznG$;R_5`aEBzl2v!~1Y zkw|2&+xU<*G};GUo#0|nC4hUgET_riK91uxz#9Pd{b!)w1l$0;1^78YJLwmoZUWv0 z{2uUI!0!OB8riMRLPZWIwTf<++tB%=whDIEb^BK13R-?1TwN#VtoCHEGf)6lCqPS~ zeTHqJa}ez4ux@c<)1oEl5uHGtsjgrmm`uhUQ`sVlh6dKfqW!VPWH6qTVGHtwro}l3 zSO4>w=wbe#$)exzy5@-Nnz3e!-shB-Hr+e5{BD+;&$ndK9lqF7Nw@e;%Oj)zkVGWV znZ}jGthUQ1DHM0grIo^-bqa@?X?Yp~0gwj(pZEr8(lPjxKHoaSe+5tHL*vwOkrsY< z;$wxzv{nKB4nSi$yB4Xn;GcC6V8mU^1xOXp^|d<|i&!484ngC;fV+TQyr3;aZ#rL* g>%v*cH`{*bJq($C0Iq<#47e^zyWE$G8jA}52ZPja#sB~S delta 2568 zcmZve32anl5XZk+x?7-!ly-YzcPmtRtyqe*QEU-fY>QI1@V2xC1iNilSS?-J-BwFM z1w=#y(vDZ+g-2qHF~&Xxi6W>GF9eT(#491jDI0h3K+tl4Z#UMHCxD8`w{cqpgDa(Qz*nQWZTrkuAJe5b{H)d#K#I2ga>MSd!xN}2GpJWVou0?gNOr8PVSvVcQ}va zl~c+}Y|aH5`HTD=be9vEw2|^vt?uex!URsO=A?ovJPi=*xVm7gyII5`=feW=Y~`@O zAf*pmKA@2;|8{zYU-Cz0E`VYoum~sumHj)F)|(H(EZr zn|E6S?yy{alYPZM$?^1(9qyQ{PxJ1Qm41CX-nP97XcK4&*dqitA8WW~Kv z#Md}5{X2=WqHHlu;H_m#MLtHLV@ZL;HazL^mukCp{<)y&>v zeWRKy+_cb=qiKS~z#d>9!gJ$vE_=(T7X4o+|3-mxqXCSFc!Bd+`3oM3aGb*)Ez5AwL0X6oX$nhWU=Z>ZTjc2FkQ7!!?g z)x6yNWr;B+11tmc3A0P5+-8^4GtZAK3|&)Jr;h%Ug?N&9(H&Y7wh^T51@u`Ol!m8? zI6o*(uJu=-FXPFA_O58h&EZaaF|KPi1CWqX%L7Rx3_@z+<+XVl<}4rXM^Va{0*3PF zQu)iKiz$r?X%Zi0?=M?09G9PDiq&|hV za$kL4sYap)b$Vz_=nD(+C*0FYdTLu4l21fKgxmHQT{7U1sZnVRG$Fpdw zOR9LMJ;{4e6!sgyo4{LwSQgKy%H$)Jer?!7Iv{Q9P2cljZR zdx5tBb?Y5S?*i`u?*ktIn&88bJ_L>cp8>~!39t{W;HSF3mwHX>Vz_tPaIO@p!L2%(pe? zQY$~$JbeO!v2ba$7WsIyO~<*orAx-ZuDTjN(K3O4>R71fds-*bDSou|D*BvH zwBAttlZ2TlPgmR{b~@w}67IDR!lWjehW#f zS)JG7))H&OMkR1Ha0<|GGv0RMGo!V484qVY+5V!6-l-- %s%s [%s] %s --" % (syscolor.name(), handle, suffix, self.colorhtml(), initials, 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")) - def moodmsg(self, syscolor, theme): - return "-- %s [%s] changed their mood to %s --" % (syscolor.name(), self.handle, self.colorhtml(), self.initials(), self.mood.name().upper(), theme["main/chums/moods"][self.mood.name()]["icon"]) + def moodmsg(self, mood, syscolor, theme): + return "-- %s [%s] changed their mood to %s --" % (syscolor.name(), self.handle, self.colorhtml(), self.initials(), mood.name().upper(), theme["main/chums/moods"][mood.name()]["icon"]) def memoclosemsg(self, syscolor, timeGrammar, verb): return "%s%s%s %s." % (syscolor.name(), self.colorhtml(), timeGrammar.pcf, self.initials(), timeGrammar.number, verb) def memoopenmsg(self, syscolor, td, timeGrammar, verb, channel): diff --git a/dataobjs.pyc b/dataobjs.pyc index 9eee6041413e782bfd92de18ed4b91f3814184b2..042338fd8fd50e9c0aec0a9ce2c895654cdc166b 100644 GIT binary patch delta 114 zcmews`5}`1;wN6N;wix!**{7Pu`n<&fG`ITI|FgC@8sE18sdx$nG6ig3=EkpAhL#; uA%%%SvW9W8zf6-RD^OXG8i?=%5pf_Q7DPk>2@Q~8K}sM(e)BJxKl}in3l>oT delta 153 zcmewm`7M(D;wN4%^%FrG**{8$GczzSfG`ITI|FfXFpx-LWT;_e$Yfw>W?-mcV8{e= zfg}@*%M4?%K-FZjf<>4ZQkWPdK}uOBd&)F1vQ0iCBOxUZG%zR<;wN6N>6-o<*+1|C06yjh$^ZZW delta 16 Ycmew^{au><;wN6NuK9r**+1|C06|#?H2?qr diff --git a/irc.pyc b/irc.pyc index 62a8eb1dacfd9b430f6554df3ecd56d0d78e85b6..e4a65a510087af4df768c7fa422ef6360a2a92cd 100644 GIT binary patch delta 16 YcmbQ7J~^HJ;wN6NMfU?XviBGR06%gE9smFU delta 16 XcmbQ7J~^HJ;wN6NuK9r**?WuuJx>P5 diff --git a/logs/chums.js b/logs/chums.js index efaf589..5a2765e 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"}, "centaursTesticle": {"color": "#000056", "handle": "centaursTesticle", "mood": "offline"}, "mechanicalSpectacle": {"color": "#0000ff", "handle": "mechanicalSpectacle", "mood": "offline"}, "carcinoGeneticist": {"color": "#999999", "handle": "carcinoGeneticist", "mood": "offline"}, "greyscalePacifist": {"color": "#7f7f7f", "handle": "greyscalePacifist", "mood": "offline"}, "aquaticMarinist": {"color": "#00caca", "handle": "aquaticMarinist", "mood": "offline"}, "maxiumumFatness": {"color": "#3366ff", "handle": "maxiumumFatness", "mood": "offline"}, "insipidTranscient": {"color": "#145064", "handle": "insipidTranscient", "mood": "offline"}, "caffeinatedAnalyst": {"color": "#aa0000", "handle": "caffeinatedAnalyst", "mood": "offline"}, "midnightSparrow": {"color": "#ff55ff", "handle": "midnightSparrow", "mood": "offline"}, "absoluteTranquility": {"color": "#000033", "handle": "absoluteTranquility", "mood": "offline"}, "nitroZealist": {"color": "#ff3737", "handle": "nitroZealist", "mood": "offline"}, "quintessentialArbalest": {"color": "#999999", "handle": "quintessentialArbalest", "mood": "offline"}, "agogPorphyry": {"color": "#522d80", "handle": "agogPorphyry", "mood": "offline"}, "androidTechnician": {"color": "#0000ff", "handle": "androidTechnician", "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"}, "sucroseSaboteur": {"color": "#00e700", "handle": "sucroseSaboteur", "mood": "offline"}, "illuminatedWax": {"color": "#000000", "handle": "illuminatedWax", "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"}, "DocScratch": {"color": "#ffffff", "handle": "DocScratch", "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"}, "zealousScarecrow": {"color": "#00c882", "handle": "zealousScarecrow", "mood": "offline"}, "captainCaveman": {"color": "#7c414e", "handle": "captainCaveman", "mood": "offline"}, "gamblingGenocider": {"color": "#00ff00", "handle": "gamblingGenocider", "mood": "offline"}, "cuttlefishCuller": {"color": "#77003c", "handle": "cuttlefishCuller", "mood": "offline"}, "iw": {"color": "#ff0000", "handle": "iw", "mood": "offline"}, "masterG": {"color": "#77003c", "handle": "masterG", "mood": "offline"}, "elegantDiversion": {"color": "#14b40a", "handle": "elegantDiversion", "mood": "offline"}, "plasmaModerator": {"color": "#5685cc", "handle": "plasmaModerator", "mood": "offline"}, "carcinoGenetecist": {"color": "#7f7f7f", "handle": "carcinoGenetecist", "mood": "offline"}, "marineAquist": {"color": "#00caca", "handle": "marineAquist", "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"}, "pretentiousFantasia": {"color": "#ff66cf", "handle": "pretentiousFantasia", "mood": "offline"}, "schlagzeugGator": {"color": "#61821f", "handle": "schlagzeugGator", "mood": "offline"}, "metaliAggressive": {"color": "#9289d5", "handle": "metaliAggressive", "mood": "offline"}, "pesterClient394": {"color": "#ff3737", "handle": "pesterClient394", "mood": "offline"}, "magmaExploiter": {"color": "#d90000", "handle": "magmaExploiter", "mood": "offline"}, "gardenGnostic": {"color": "#00ff00", "handle": "gardenGnostic", "mood": "offline"}, "unknownTraveler": {"color": "#006666", "handle": "unknownTraveler", "mood": "offline"}, "utilitarianTurnabout": {"color": "#dd0000", "handle": "utilitarianTurnabout", "mood": "offline"}, "adiosToreador": {"color": "#aa5500", "handle": "adiosToreador", "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"}, "centaursTesticle": {"color": "#000056", "handle": "centaursTesticle", "mood": "offline"}, "mechanicalSpectacle": {"color": "#0000ff", "handle": "mechanicalSpectacle", "mood": "offline"}, "carcinoGeneticist": {"color": "#999999", "handle": "carcinoGeneticist", "mood": "offline"}, "greyscalePacifist": {"color": "#7f7f7f", "handle": "greyscalePacifist", "mood": "offline"}, "aquaticMarinist": {"color": "#00caca", "handle": "aquaticMarinist", "mood": "offline"}, "maxiumumFatness": {"color": "#3366ff", "handle": "maxiumumFatness", "mood": "offline"}, "insipidTranscient": {"color": "#145064", "handle": "insipidTranscient", "mood": "offline"}, "caffeinatedAnalyst": {"color": "#aa0000", "handle": "caffeinatedAnalyst", "mood": "offline"}, "midnightSparrow": {"color": "#ff55ff", "handle": "midnightSparrow", "mood": "offline"}, "absoluteTranquility": {"color": "#000033", "handle": "absoluteTranquility", "mood": "offline"}, "nitroZealist": {"color": "#ff3737", "handle": "nitroZealist", "mood": "offline"}, "quintessentialArbalest": {"color": "#999999", "handle": "quintessentialArbalest", "mood": "offline"}, "agogPorphyry": {"color": "#522d80", "handle": "agogPorphyry", "mood": "offline"}, "grimAuxiliatrix": {"color": "#008141", "handle": "grimAuxiliatrix", "mood": "offline"}, "androidTechnician": {"color": "#0000ff", "handle": "androidTechnician", "mood": "offline"}, "ardentAbettor": {"color": "#c8b670", "handle": "ardentAbettor", "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"}, "sucroseSaboteur": {"color": "#00e700", "handle": "sucroseSaboteur", "mood": "offline"}, "illuminatedWax": {"color": "#000000", "handle": "illuminatedWax", "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"}, "DocScratch": {"color": "#ffffff", "handle": "DocScratch", "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"}, "zealousScarecrow": {"color": "#00c882", "handle": "zealousScarecrow", "mood": "offline"}, "captainCaveman": {"color": "#7c414e", "handle": "captainCaveman", "mood": "offline"}, "gamblingGenocider": {"color": "#00ff00", "handle": "gamblingGenocider", "mood": "offline"}, "cuttlefishCuller": {"color": "#77003c", "handle": "cuttlefishCuller", "mood": "offline"}, "iw": {"color": "#ff0000", "handle": "iw", "mood": "offline"}, "masterG": {"color": "#77003c", "handle": "masterG", "mood": "offline"}, "elegantDiversion": {"color": "#14b40a", "handle": "elegantDiversion", "mood": "offline"}, "plasmaModerator": {"color": "#5685cc", "handle": "plasmaModerator", "mood": "offline"}, "carcinoGenetecist": {"color": "#7f7f7f", "handle": "carcinoGenetecist", "mood": "offline"}, "marineAquist": {"color": "#00caca", "handle": "marineAquist", "mood": "offline"}, "remoteBloodbath": {"color": "#c70000", "handle": "remoteBloodbath", "mood": "offline"}, "oilslickOrchid": {"color": "#743f7e", "handle": "oilslickOrchid", "mood": "offline"}, "acapellaWaterfall": {"color": "#000099", "handle": "acapellaWaterfall", "mood": "offline"}, "gallowsCalibrator": {"color": "#008282", "handle": "gallowsCalibrator", "mood": "offline"}, "rageInducer": {"color": "#00ffff", "handle": "rageInducer", "mood": "offline"}, "anguillaNuntia": {"color": "#ff007f", "handle": "anguillaNuntia", "mood": "offline"}, "greenZephyr": {"color": "#00ca40", "handle": "greenZephyr", "mood": "offline"}, "lawdEngrish": {"color": "#00ff00", "handle": "lawdEngrish", "mood": "offline"}, "pretentiousFantasia": {"color": "#ff66cf", "handle": "pretentiousFantasia", "mood": "offline"}, "schlagzeugGator": {"color": "#61821f", "handle": "schlagzeugGator", "mood": "offline"}, "metaliAggressive": {"color": "#9289d5", "handle": "metaliAggressive", "mood": "offline"}, "pesterClient394": {"color": "#ff3737", "handle": "pesterClient394", "mood": "offline"}, "magmaExploiter": {"color": "#d90000", "handle": "magmaExploiter", "mood": "offline"}, "gardenGnostic": {"color": "#00ff00", "handle": "gardenGnostic", "mood": "offline"}, "unknownTraveler": {"color": "#006666", "handle": "unknownTraveler", "mood": "offline"}, "utilitarianTurnabout": {"color": "#dd0000", "handle": "utilitarianTurnabout", "mood": "offline"}, "adiosToreador": {"color": "#aa5500", "handle": "adiosToreador", "mood": "offline"}} \ No newline at end of file diff --git a/memos.py b/memos.py index abcff9a..e60313d 100644 --- a/memos.py +++ b/memos.py @@ -541,7 +541,7 @@ class PesterMemo(PesterConvo): @QtCore.pyqtSlot() def sentMessage(self): text = unicode(self.textInput.text()) - if text == "": + if text == "" or text[0:11] == "PESTERCHUM:": return self.history.add(text) if self.time.getTime() == None: diff --git a/memos.pyc b/memos.pyc index 78a2e7472310b324221e91d1ed02cc10cc73db05..0dd44f5aac5ad0eca9cefb5cbe48b4cb6e642469 100644 GIT binary patch delta 17 ZcmbRHiE-{HMz)Kec)7j`Y-AI!1OQ3E2TcF~ delta 17 ZcmbRHiE-{HMz)Kec)8S1Y-AI!1OP~c2R8r! diff --git a/menus.pyc b/menus.pyc index a4bfd9e43db4e7752b84f8f599de194f71758089..53c48cf284a8f3e5def281c8dc48cc5ef48bb3d1 100644 GIT binary patch delta 17 ZcmdnDfN|dfMz)Kec)8TLH?mm-002Lm1`hxL delta 17 ZcmdnDfN|dfMz)Kec)8S1Y-F2m`BH2DTS diff --git a/parsetools.py b/parsetools.py index 34d70cf..1ec90cb 100644 --- a/parsetools.py +++ b/parsetools.py @@ -2,7 +2,7 @@ import re from datetime import timedelta from PyQt4 import QtGui -_ctag_begin = re.compile(r'') +_ctag_begin = re.compile(r'(?i)') _ctag_rgb = re.compile(r'\d+,\d+,\d+') _urlre = re.compile(r"(?i)(http://[^\s<[]+)") _memore = re.compile(r" (#[A-Za-z0-9_]+)") diff --git a/parsetools.pyc b/parsetools.pyc index ed6fb5beb9f4e20c3e942020d6a62eed17eeb895..15d589a55a6cb29c5087bb2a1c45a4532717e6c5 100644 GIT binary patch delta 30 mcmdmQcG!&l;wN6N*1q74?B^Icco`TNH0(1qH{WDTlLP>(l?m4X delta 26 icmX?Xw%?5X;wN6N$lpO5+0QYua56A3Y`)8wCJ6wHxd|Eo diff --git a/pesterchum.js b/pesterchum.js index 011e4d6..c2cec68 100644 --- a/pesterchum.js +++ b/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", "aquaticMarinist"], "defaultprofile": "ghostDunk", "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", "confusedTransient", "pretentiousFantasia", "aquaticMarinist", "ardentAbettor"], "defaultprofile": "ghostDunk", "block": []} \ No newline at end of file diff --git a/pesterchum.py b/pesterchum.py index c2a1391..f4d5312 100644 --- a/pesterchum.py +++ b/pesterchum.py @@ -29,6 +29,8 @@ class waitingMessageHolder(object): self.queue = msgfuncs.keys() if len(self.queue) > 0: self.mainwindow.updateSystemTray() + def waitingHandles(self): + return self.queue def answerMessage(self): func = self.funcs[self.queue[0]] func() @@ -1595,10 +1597,6 @@ class MainProgram(QtCore.QObject): self.trayicon = PesterTray(PesterIcon(self.widget.theme["main/icon"]), self.widget, self.app) self.traymenu = QtGui.QMenu() - exitAction = QtGui.QAction("EXIT", self) - 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): @@ -1608,6 +1606,10 @@ class MainProgram(QtCore.QObject): mobj, QtCore.SLOT('updateMood()')) self.moodactions[i] = mobj moodMenu.addAction(maction) + exitAction = QtGui.QAction("EXIT", self) + self.trayicon.connect(exitAction, QtCore.SIGNAL('triggered()'), + self.widget, QtCore.SLOT('close()')) + self.traymenu.addAction(exitAction) self.trayicon.setContextMenu(self.traymenu) self.trayicon.show() diff --git a/themes/pesterchum/style.js b/themes/pesterchum/style.js index 697b9bf..90f3029 100644 --- a/themes/pesterchum/style.js +++ b/themes/pesterchum/style.js @@ -57,7 +57,7 @@ "distraught": { "icon": "$path/distraught.gif", "color": "white" }, -"unruly": { "icon": "$path/unruly.gif", "color": "white" }, +"pranky": { "icon": "$path/pranky.gif", "color": "white" }, "smooth": { "icon": "$path/smooth.gif", "color": "white" }, diff --git a/themes/trollian/style.js b/themes/trollian/style.js index 024b86d..0affc98 100644 --- a/themes/trollian/style.js +++ b/themes/trollian/style.js @@ -54,7 +54,7 @@ "distraught": { "icon": "$path/distraught.png", "color": "#706eba" }, - "unruly": { "icon": "$path/unruly.png", "color": "blue" }, + "pranky": { "icon": "$path/pranky.png", "color": "blue" }, "smooth": { "icon": "$path/smooth.png", "color": "red" },