From fc5f1e62c93ff391d21e86cacf53b5e2b89577f5 Mon Sep 17 00:00:00 2001 From: Et0h Date: Tue, 21 Oct 2014 23:29:20 +0100 Subject: [PATCH] Properly update userlist on auth --- syncplay/client.py | 2 +- syncplay/ui/consoleUI.py | 3 --- syncplay/ui/gui.py | 13 ------------- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/syncplay/client.py b/syncplay/client.py index 0e2c50f..6b786e5 100644 --- a/syncplay/client.py +++ b/syncplay/client.py @@ -444,10 +444,10 @@ class SyncplayClient(object): def controllerIdentificationSuccess(self, username, roomname): self.userlist.setUserAsController(username) - self.ui.setControllerStatus(username, isController=True) if self.userlist.isRoomSame(roomname): hideFromOSD = not constants.SHOW_SAME_ROOM_OSD self.ui.showMessage(u"<{}> authenticated as a room controller".format(username), hideFromOSD) + self.ui.userListChange() # TODO: Mark person as a room controller # TODO: Disable UI's "Create new Controlled Room when in Controlled Room" diff --git a/syncplay/ui/consoleUI.py b/syncplay/ui/consoleUI.py index 70acede..1b060ef 100644 --- a/syncplay/ui/consoleUI.py +++ b/syncplay/ui/consoleUI.py @@ -39,9 +39,6 @@ class ConsoleUI(threading.Thread): def updateRoomName(self, room=""): pass - def setControllerStatus(self, username, isController): - pass - def promptFor(self, prompt=">", message=""): if message <> "": print(message) diff --git a/syncplay/ui/gui.py b/syncplay/ui/gui.py index db015a4..70c3804 100644 --- a/syncplay/ui/gui.py +++ b/syncplay/ui/gui.py @@ -79,19 +79,6 @@ class MainWindow(QtGui.QMainWindow): # TODO: Prompt user return None - def setControllerStatus(self, username, isController): - roomtocheck = 0 - while self.listTreeModel.item(roomtocheck): - itemtocheck = 0 - while self.listTreeModel.item(roomtocheck).child(itemtocheck): - item = self.listTreeModel.item(roomtocheck).child(itemtocheck) - if item.data(0) == username: - item.setData(isController, Qt.UserRole + constants.USERITEM_CONTROLLER_ROLE) - return - itemtocheck = itemtocheck + 1 - roomtocheck += 1 - self.listTreeView.resizeColumnToContents(True) - def showMessage(self, message, noTimestamp=False): message = unicode(message) message = message.replace("&", "&").replace('"', """).replace("<", "<").replace(">", ">")