From fececa45baa53b079c9a1b11866e8f553fad5bff Mon Sep 17 00:00:00 2001 From: Stephen Dranger Date: Fri, 18 Feb 2011 20:02:54 -0600 Subject: [PATCH] derp --- convo.pyc | Bin 25659 -> 25659 bytes dataobjs.pyc | Bin 14331 -> 14331 bytes generic.pyc | Bin 4285 -> 4285 bytes irc.py | 10 ++++--- irc.pyc | Bin 14363 -> 14392 bytes memos.pyc | Bin 32143 -> 32143 bytes menus.pyc | Bin 25786 -> 25786 bytes mispeller.pyc | Bin 2929 -> 2929 bytes oyoyo/__init__.pyc | Bin 333 -> 333 bytes oyoyo/client.py | 9 ++++-- oyoyo/client.pyc | Bin 10336 -> 10425 bytes oyoyo/cmdhandler.pyc | Bin 8312 -> 8312 bytes oyoyo/helpers.pyc | Bin 5020 -> 5020 bytes oyoyo/ircevents.pyc | Bin 5693 -> 5693 bytes oyoyo/parse.pyc | Bin 2869 -> 2869 bytes parsetools.pyc | Bin 11107 -> 11107 bytes pesterchum.py | 55 ++++++++++++++++++---------------- profiles/ghostDunk.js | 2 +- themes/pesterchum2.5/style.js | 2 +- 19 files changed, 44 insertions(+), 34 deletions(-) diff --git a/convo.pyc b/convo.pyc index c5603c49dda375b5b3afbed6af96986a7f63b14d..9c49df271a3fd6d702fae738826a456002c996e8 100644 GIT binary patch delta 18 acmdmef^qi=M)r%Jc)5PE#cyOcNdW**eFvBT delta 18 acmdmef^qi=M)r%Jc)5x>;x@9IqyPX++6NN= diff --git a/dataobjs.pyc b/dataobjs.pyc index 842d57821da34d7eb54fad173b060f089e36fa8d..c5afea25e7d62106d70338547217dc59678ce37d 100644 GIT binary patch delta 16 XcmeyJ|2v=k;wN4%mD|e|QN5uz| delta 16 YcmeyJ|2v=k;wN4%xy?}<*}s?r07&Eq!~g&Q diff --git a/generic.pyc b/generic.pyc index eb2a7f0cd0e1779675ef22b56839585a68bdde8e..c06f5283724144688355a5fd6ea4ed4f99559070 100644 GIT binary patch delta 16 Xcmdn1xL1+=;wN4%mDOJ>QfZ|N{&|gl^J?D2m z@BLrSewo!3ZW}9Cn`b}OMRZk0#@I?SmCogpD|ke=8YmHpA@R$(1e{_l&6sLtph;<9 zFE9oQFi6PLS;la!vc4`~CamKbHJ8kn3TaeTlK89jAv{!J)0YbcgGw;tLd7L$#S;DJ zup7V7Un%p6gFX06N)(N!ExVZ4;YpC zj2d4|CWaP{FD(m>)36V}wb+V^ziElXNsL%87HMx-r{N6t*iH$LPi)qf9WB|aY>X-! z7nOypj;U#7XkkuKl9`v#*LXU(IUl)F*}0Yce`ZwNrY$mb+70kBy6vwF7PBm-7My)&I*6o+z)jFe00QzA0H77S#Zm~Mziqh9OQ%%?jRdlnkCF5^!N%ph)OOe)S6@5EKikg1 zwe=HwEHEsql4db-SS9#hI^vMk$Hjt1#S_N6$liyAc3X`M@I3uLOQ5|d{tg5Dfdd`i zw@{)k*(^C13)zUrjPY865I*Rdgxh%1^&-sRU6)ThFWxiEQRQL_qd z))>}$hRU84iaU7J^Rw{sc%9{PnO?(yZ=h^i9NooNy>CJc+dF$Ct)oQvi9;)uTp~uA zqlq%GKqDA|&)|=p(T3ufd`%b#uTI}E=y1jNo5*sitJ5yqFEh)L!Fhs>p1j?a1w9(O zuYw=1cSps%%>H35wZr(7e++8yWB&z_kZ7K!4q+@X4mNy0kcJ5~?>z_2_{QGzLU#1H z@RluD&aa37yYXyK!aYHunhBN(cBCuYE2kYoQ}01&U!Up?!eoFe9nj&k{-VcJ7% S73#0>m%a684P`Vem8P&=d5eL+e=>xK6~A|*J>+M6eXc&vs%K$N$XM=XdR)yQ9*D*QPT7SWm!=m zsVJi=Zx5+Ogu+c=S_l#u-9UfIgoV`#o-erq4cM~t6KKNkcV4sjNVyxAO9ve+<$cRZ z5`LWXhRV$nl2e*FsOw3idBtP<2P`2{`Ej>>98_Gi_dy6NTpeYGmQ4<7hB1}Wy!eOx zM_ZU#b})3~59Lj^9u^;AP|>#QLFnTE4zrXrhB-BFM)d4)y&sKTZ*>*8vOS+g6u8q; zy^nP=Q5Q>+ET1jqA*l}FNY(v#*>QDKh(wJ$>$*J`V`wqv8L8=e{Mn0d$Z91gk84{Xk2CY_kM zYZiPN3MMAb%VCCs*Gd;?y5vGEubt=w#!*#SWu^h7qC%F;p^iW4}5Ezu_C|t8f@yUO%+res2=~#1FlxI_bMUI3}~` zxhzju9NSwXmP4fY8((Psj=c7@)fda5x`0FeKFd?I^)G(Vb{WPn;_H&M?jrJ|&1ycf zLM=7;c~!s(wO|Kv7=Q7_sy4?I7s-IU4)~*B!3+Ldl%)~yxn%ieW(FIaVYpM1&jLBH zVr%;1OFR$*#`Hm5A;#VDM5E$q@4Q{;Nd4}Yk zE*0YPCA>xvn(&>jWI%AN28KC?E&0m&%67}XT;*5ZE(bG1eWSv|^JBu2 z?El82D(QLp)%EJj<2JHyP5}T*(FaTb diff --git a/mispeller.pyc b/mispeller.pyc index 86893fb72f224de1880d2469a0286b2e61c049f7..e86c8b3dd79ff462dbd3ca1a8a32f482c27b0711 100644 GIT binary patch delta 16 Xcmew;_EC)e;wN4%wc5yy>{;9ZJF5m6 delta 16 Xcmew;_EC)e;wN4%rOi~4$zH1P#{ delta 16 XcmX@hbe4(z;wN4%rOiNiXe&=C{lPx@NA-#v{SNwOojyr z@0Jjcq31QEzsx^M=TA(ie|;}O{ooYOmS>i1I3|Xajw2aNa3>Iq!^y$PW2iJ2XAp^m z3Wh*TxWB5?OV?KrXAxBSL3#2<4elf&6On-^hsPqZxBFSdO{L0AQAQ*M>I?LOI=Zy` zQU3J2t^e%hMMXZ<6X4iha!}q=e67;WWdN+*+uP(#A;A#EkStuSNS3wcs-fYo{3dBqlM?$U6$38_ z7Nmny4|b~HQt05KZ*p)DC+X5s3N3jsja5)H(Yd%?#PK zt*+hpXSaJ1Dg-t{EpSGw%h& delta 16 XcmbQEK1ZGX;wN6NZuYp1>{EpSGzSH^ diff --git a/oyoyo/ircevents.pyc b/oyoyo/ircevents.pyc index f8955a6ac229221d549b48a72f9889bf374405eb..51fd3418d38d855a302b6ac575a6eb79b92bb159 100644 GIT binary patch delta 16 Xcmdn1vsZ`x;wN4%wc5yy>}FyBH=YHw delta 16 Xcmdn1vsZ`x;wN4%rOi@nH^LCOZK delta 16 XcmaDH_Bf3F;wN4%&-Kw8*<-W;LpBEH diff --git a/pesterchum.py b/pesterchum.py index 99a590d..7d20616 100644 --- a/pesterchum.py +++ b/pesterchum.py @@ -168,7 +168,7 @@ class pesterTheme(dict): v = dict.__getitem__(self, keys.pop(0)) for k in keys: v = v[k] - return v + return default if v is None else v except KeyError: if hasattr(self, 'inheritedTheme'): return self.inheritedTheme.get(key, default) @@ -181,7 +181,7 @@ class pesterTheme(dict): v = dict.__getitem__(self, keys.pop(0)) for k in keys: v = v[k] - return True + return False if v is None else True except KeyError: if hasattr(self, 'inheritedTheme'): return self.inheritedTheme.has_key(key) @@ -1667,22 +1667,33 @@ class IRCThread(QtCore.QThread): def run(self): irc = self.irc irc.IRCConnect() - while 1: - if irc.brokenConnection: - irc.brokenConnection = False - self.restartIRC.emit() + timer = QtCore.QTimer(self) + self.connect(timer, QtCore.SIGNAL('timeout()'), + self, QtCore.SLOT('updateIRC()')) + timer.start() + self.exec_() + @QtCore.pyqtSlot() + def updateIRC(self): + irc = self.irc + if irc.brokenConnection: + irc.brokenConnection = False + self.restartIRC.emit() + irc.closeConnection() + irc.IRCConnect() + try: + res = irc.updateIRC() + except socket.timeout, se: + if not irc.registeredIRC: irc.closeConnection() - irc.IRCConnect() - try: - irc.updateIRC() - except socket.error, se: - if irc.connectedIRC: - irc.setConnectionBroken() - else: - irc.closeConnection() - self.failedIRC.emit(str(se)) - except StopIteration: - pass + self.failedIRC.emit("Connection timed out") + except socket.error, se: + if irc.registeredIRC: + irc.setConnectionBroken() + else: + irc.closeConnection() + self.failedIRC.emit(str(se)) + except StopIteration: + pass restartIRC = QtCore.pyqtSignal() failedIRC = QtCore.pyqtSignal(QtCore.QString) @@ -1868,14 +1879,8 @@ class MainProgram(QtCore.QObject): @QtCore.pyqtSlot() def tryAgain(self): - self.ircapp.irc.closeConnection() - self.ircapp.irc.IRCConnect() - labeltxt = self.widget.loadingscreen.loadinglabel.text() - if labeltxt != "R3CONN3CT1NG": - self.widget.loadingscreen.loadinglabel.setText("R3CONN3CTING") - elif labeltxt[0:12] == "R3CONN3CT1NG": - i = int(labeltxt[13:]) - self.widget.loadingscreen.loadinglabel.setText("R3CONN3CTING %d" (i+1)) + self.ircapp.quit() + print "Quit?" @QtCore.pyqtSlot() def restartIRC(self): diff --git a/profiles/ghostDunk.js b/profiles/ghostDunk.js index 338c689..e62866c 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": "pesterchum2.5", "quirks": [], "handle": "ghostDunk"} \ No newline at end of file diff --git a/themes/pesterchum2.5/style.js b/themes/pesterchum2.5/style.js index a9ca07c..1a4f642 100644 --- a/themes/pesterchum2.5/style.js +++ b/themes/pesterchum2.5/style.js @@ -47,7 +47,7 @@ }, "moodlabel": { "style": "font:bold;font-family:'Courier';color:black;", "loc": [12, 466], - "text": "MOODS:" + "text": "MOOD:" }, "moods": [ { "style": "text-align:left; background:#ffff00;border:2px solid #c48a00;color: black; font-family:'Courier'; font:bold; padding-left:3px;",