Rezzect/syncplay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Properly update userlist on auth

Browse Source
This commit is contained in:
Et0h 2014-10-21 23:29:20 +01:00
parent aaac02f6fc
commit fc5f1e62c9
3 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
syncplay/client.py
View File

@ -444,10 +444,10 @@ class SyncplayClient(object):
def controllerIdentificationSuccess(self, username, roomname): def controllerIdentificationSuccess(self, username, roomname):
self.userlist.setUserAsController(username) self.userlist.setUserAsController(username)
self.ui.setControllerStatus(username, isController=True)
if self.userlist.isRoomSame(roomname): if self.userlist.isRoomSame(roomname):
hideFromOSD = not constants.SHOW_SAME_ROOM_OSD hideFromOSD = not constants.SHOW_SAME_ROOM_OSD
self.ui.showMessage(u"<{}> authenticated as a room controller".format(username), hideFromOSD) self.ui.showMessage(u"<{}> authenticated as a room controller".format(username), hideFromOSD)
self.ui.userListChange()
# TODO: Mark person as a room controller # TODO: Mark person as a room controller
# TODO: Disable UI's "Create new Controlled Room when in Controlled Room" # TODO: Disable UI's "Create new Controlled Room when in Controlled Room"

3
syncplay/ui/consoleUI.py
View File

@ -39,9 +39,6 @@ class ConsoleUI(threading.Thread):
def updateRoomName(self, room=""): def updateRoomName(self, room=""):
pass pass
def setControllerStatus(self, username, isController):
pass
def promptFor(self, prompt=">", message=""): def promptFor(self, prompt=">", message=""):
if message <> "": if message <> "":
print(message) print(message)

13
syncplay/ui/gui.py
View File

@ -79,19 +79,6 @@ class MainWindow(QtGui.QMainWindow):
# TODO: Prompt user # TODO: Prompt user
return None 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): def showMessage(self, message, noTimestamp=False):
message = unicode(message) message = unicode(message)
message = message.replace("&", "&amp;").replace('"', "&quot;").replace("<", "&lt;").replace(">", "&gt;") message = message.replace("&", "&amp;").replace('"', "&quot;").replace("<", "&lt;").replace(">", "&gt;")