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

Updating list in gui actually works now

Browse Source
This commit is contained in:
Uriziel 2013-06-07 21:45:21 +02:00
parent b317a618e0
commit 630166da9b
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
syncplay/client.py
View File

@ -318,6 +318,9 @@ class SyncplayClient(object):
if(self._protocol and self._protocol.logged): if(self._protocol and self._protocol.logged):
self._protocol.sendList() self._protocol.sendList()
def showUserList(self):
self.userlist.showUserList()
def getPassword(self): def getPassword(self):
return self._serverPassword return self._serverPassword
@ -505,7 +508,6 @@ class SyncplayUserlist(object):
self.ui.showMessage(message) self.ui.showMessage(message)
def addUser(self, username, room, file_, position = 0, noMessage = False): def addUser(self, username, room, file_, position = 0, noMessage = False):
self.userListChange()
if(username == self.currentUser.username): if(username == self.currentUser.username):
self.currentUser.lastPosition = position self.currentUser.lastPosition = position
return return
@ -513,14 +515,15 @@ class SyncplayUserlist(object):
self._users[username] = user self._users[username] = user
if(not noMessage): if(not noMessage):
self.__showUserChangeMessage(username, room, file_) self.__showUserChangeMessage(username, room, file_)
self.userListChange()
def removeUser(self, username): def removeUser(self, username):
self.userListChange()
if(self._users.has_key(username)): if(self._users.has_key(username)):
self._users.pop(username) self._users.pop(username)
message = getMessage("en", "left-notification").format(username) message = getMessage("en", "left-notification").format(username)
self.ui.showMessage(message) self.ui.showMessage(message)
self.userListChange()
def __displayModUserMessage(self, username, room, file_, user): def __displayModUserMessage(self, username, room, file_, user):
if (file_ and not user.isFileSame(file_)): if (file_ and not user.isFileSame(file_)):
self.__showUserChangeMessage(username, room, file_) self.__showUserChangeMessage(username, room, file_)
@ -528,7 +531,6 @@ class SyncplayUserlist(object):
self.__showUserChangeMessage(username, room, None) self.__showUserChangeMessage(username, room, None)
def modUser(self, username, room, file_): def modUser(self, username, room, file_):
self.userListChange()
if(self._users.has_key(username)): if(self._users.has_key(username)):
user = self._users[username] user = self._users[username]
self.__displayModUserMessage(username, room, file_, user) self.__displayModUserMessage(username, room, file_, user)
@ -538,7 +540,8 @@ class SyncplayUserlist(object):
self.__showUserChangeMessage(username, room, file_) self.__showUserChangeMessage(username, room, file_)
else: else:
self.addUser(username, room, file_) self.addUser(username, room, file_)
self.userListChange()
def __addUserWithFileToList(self, rooms, user): def __addUserWithFileToList(self, rooms, user):
currentPosition = utils.formatTime(user.lastPosition) currentPosition = utils.formatTime(user.lastPosition)
file_key = '\'{}\' ({}/{})'.format(user.file['name'], currentPosition, utils.formatTime(user.file['duration'])) file_key = '\'{}\' ({}/{})'.format(user.file['name'], currentPosition, utils.formatTime(user.file['duration']))

3
syncplay/ui/gui.py
View File

@ -34,8 +34,7 @@ class MainDialog(QtGui.QDialog):
self._listBuffer = ""; self._listBuffer = "";
def userListChange(self): def userListChange(self):
#self._syncplayClient.getUserList() self._syncplayClient.showUserList()
pass
def showDebugMessage(self, message): def showDebugMessage(self, message):
print(message) print(message)