Fix chumroll bugs, can now actually remove and pester chums from right-click menu.

This commit is contained in:
Kiooeht 2011-03-17 16:57:13 -07:00
parent f01874bcfa
commit 3f1f874e6e

View file

@ -550,7 +550,7 @@ class chumArea(RightClickList):
return return
currentChum = self.currentItem().chum currentChum = self.currentItem().chum
self.chums = [c for c in self.chums if c.handle != currentChum.handle] self.chums = [c for c in self.chums if c.handle != currentChum.handle]
self.removeChumSignal.emit(self.currentItem()) self.removeChumSignal.emit(self.currentItem().chum.handle)
oldlist = self.takeItem(self.currentRow()) oldlist = self.takeItem(self.currentRow())
del oldlist del oldlist
@QtCore.pyqtSlot() @QtCore.pyqtSlot()
@ -575,7 +575,7 @@ class chumArea(RightClickList):
self.pesterlogviewer.close() self.pesterlogviewer.close()
self.pesterlogviewer = None self.pesterlogviewer = None
removeChumSignal = QtCore.pyqtSignal(QtGui.QListWidgetItem) removeChumSignal = QtCore.pyqtSignal(QtCore.QString)
blockChumSignal = QtCore.pyqtSignal(QtCore.QString) blockChumSignal = QtCore.pyqtSignal(QtCore.QString)
class trollSlum(chumArea): class trollSlum(chumArea):
@ -913,11 +913,11 @@ class PesterWindow(MovingWindow):
self.connect(self.chumList, self.connect(self.chumList,
QtCore.SIGNAL('itemActivated(QListWidgetItem *)'), QtCore.SIGNAL('itemActivated(QListWidgetItem *)'),
self, self,
QtCore.SLOT('newConversationWindow(QListWidgetItem *)')) QtCore.SLOT('pesterSelectedChum()'))
self.connect(self.chumList, self.connect(self.chumList,
QtCore.SIGNAL('removeChumSignal(QListWidgetItem *)'), QtCore.SIGNAL('removeChumSignal(QString)'),
self, self,
QtCore.SLOT('removeChum(QListWidgetItem *)')) QtCore.SLOT('removeChum(QString)'))
self.connect(self.chumList, self.connect(self.chumList,
QtCore.SIGNAL('blockChumSignal(QString)'), QtCore.SIGNAL('blockChumSignal(QString)'),
self, self,
@ -1430,9 +1430,9 @@ class PesterWindow(MovingWindow):
chum = PesterProfile(handle, chumdb=self.chumdb) chum = PesterProfile(handle, chumdb=self.chumdb)
self.addChum(chum) self.addChum(chum)
self.addchumdialog = None self.addchumdialog = None
@QtCore.pyqtSlot(QtGui.QListWidgetItem) @QtCore.pyqtSlot(QtCore.QString)
def removeChum(self, chumlisting): def removeChum(self, chumlisting):
self.config.removeChum(chumlisting.chum) self.config.removeChum(chumlisting)
@QtCore.pyqtSlot(QtCore.QString) @QtCore.pyqtSlot(QtCore.QString)
def blockChum(self, handle): def blockChum(self, handle):
h = unicode(handle) h = unicode(handle)