fixed raise bug and icon update

This commit is contained in:
Stephen Dranger 2011-01-26 04:50:00 -06:00
parent 0363d80af2
commit 90e881ae7f

View file

@ -185,6 +185,9 @@ class PesterTabWindow(QtGui.QFrame):
nexti = (self.tabIndices[self.currentConvo.chum.handle] + 1) % self.tabs.count() nexti = (self.tabIndices[self.currentConvo.chum.handle] + 1) % self.tabs.count()
self.tabs.setCurrentIndex(nexti) self.tabs.setCurrentIndex(nexti)
def updateMood(self, handle, mood):
i = self.tabIndices[handle]
self.tabs.setTabIcon(i, mood.icon(self.theme))
@QtCore.pyqtSlot(int) @QtCore.pyqtSlot(int)
def changeTab(self, i): def changeTab(self, i):
if self.changedTab: if self.changedTab:
@ -196,6 +199,9 @@ class PesterTabWindow(QtGui.QFrame):
self.layout.removeWidget(self.currentConvo) self.layout.removeWidget(self.currentConvo)
self.currentConvo = convo self.currentConvo = convo
self.layout.addWidget(convo) self.layout.addWidget(convo)
self.setWindowIcon(convo.chum.mood.icon(self.theme))
self.activateWindow()
self.raise_()
convo.raiseChat() convo.raiseChat()
class PesterText(QtGui.QTextEdit): class PesterText(QtGui.QTextEdit):
@ -249,6 +255,9 @@ class PesterConvo(QtGui.QFrame):
parent.addChat(self) parent.addChat(self)
def updateMood(self, mood): def updateMood(self, mood):
if self.parent():
self.parent().updateMood(self.chum.handle, mood)
else:
self.setWindowIcon(mood.icon(self.theme)) self.setWindowIcon(mood.icon(self.theme))
# print mood update? # print mood update?
def addMessage(self, text, me=True): def addMessage(self, text, me=True):
@ -336,7 +345,7 @@ class PesterWindow(MovingWindow):
# add pesterchum:begin # add pesterchum:begin
pass pass
return return
if self.config.tabs: if self.config.tabs():
if not self.tabconvo: if not self.tabconvo:
self.tabconvo = PesterTabWindow(self) self.tabconvo = PesterTabWindow(self)
convoWindow = PesterConvo(chum, initiated, self, self.tabconvo) convoWindow = PesterConvo(chum, initiated, self, self.tabconvo)