mbk/pesterchum
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bug fix: Animations working in memos again (Whoops I broke the everything)

Browse source
This commit is contained in:
Kiooeht 2011-06-23 00:21:35 -07:00
parent 124c93b1d4
commit c45f7ea070
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
convo.py
View file

@ -259,13 +259,13 @@ class PesterText(QtGui.QTextEdit):
for m in self.urls: for m in self.urls:
html = unicode(self.toHtml()) html = unicode(self.toHtml())
if html.find(self.urls[m].toString()) != -1: if html.find(self.urls[m].toString()) != -1:
if movie.frameCount() > 1: if m.frameCount() > 1:
m.start() m.start()
else: else:
for m in self.urls: for m in self.urls:
html = unicode(self.toHtml()) html = unicode(self.toHtml())
if html.find(self.urls[m].toString()) != -1: if html.find(self.urls[m].toString()) != -1:
if movie.frameCount() > 1: if m.frameCount() > 1:
m.stop() m.stop()
@QtCore.pyqtSlot(bool) @QtCore.pyqtSlot(bool)

9
memos.py
View file

@ -256,7 +256,9 @@ class MemoText(PesterText):
self, QtCore.SLOT('textReady(bool)')) self, QtCore.SLOT('textReady(bool)'))
self.urls = {} self.urls = {}
for k in smiledict: for k in smiledict:
self.addAnimation(QtCore.QUrl("smilies/%s" % (smiledict[k])), "smilies/%s" % (smiledict[k])); self.addAnimation(QtCore.QUrl("smilies/%s" % (smiledict[k])), "smilies/%s" % (smiledict[k]))
self.connect(self.mainwindow, QtCore.SIGNAL('animationSetting(bool)'),
self, QtCore.SLOT('animateChanged(bool)'))
def initTheme(self, theme): def initTheme(self, theme):
if theme.has_key("memos/scrollbar"): if theme.has_key("memos/scrollbar"):
@ -272,6 +274,11 @@ class MemoText(PesterText):
parent = self.parent() parent = self.parent()
window = parent.mainwindow window = parent.mainwindow
me = window.profile() me = window.profile()
if self.mainwindow.config.animations():
for m in self.urls:
if convertTags(lexmsg).find(self.urls[m].toString()) != -1:
if m.state() == QtGui.QMovie.NotRunning:
m.start()
chumdb = window.chumdb chumdb = window.chumdb
if chum is not me: # SO MUCH WH1T3SP4C3 >:] if chum is not me: # SO MUCH WH1T3SP4C3 >:]
if type(lexmsg[0]) is colorBegin: # get color tag if type(lexmsg[0]) is colorBegin: # get color tag