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

Room change now properly displayed.

Browse Source
This commit is contained in:
Uriziel 2013-06-08 15:57:20 +02:00
parent 74549d7178
commit ceef00b74a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
syncplay/client.py
View File

@ -58,6 +58,7 @@ class SyncplayClient(object):
self.ui = UiManager(self, ui) self.ui = UiManager(self, ui)
self.userlist = SyncplayUserlist(self.ui, self) self.userlist = SyncplayUserlist(self.ui, self)
self._protocol = None self._protocol = None
self._player = None
if(config['room'] == None or config['room'] == ''): if(config['room'] == None or config['room'] == ''):
config['room'] = config['name'] # ticket #58 config['room'] = config['name'] # ticket #58
self.defaultRoom = config['room'] self.defaultRoom = config['room']
@ -71,7 +72,6 @@ class SyncplayClient(object):
self.__getUserlistOnLogon = True self.__getUserlistOnLogon = True
else: else:
self.__getUserlistOnLogon = False self.__getUserlistOnLogon = False
self._player = None
self._playerClass = playerClass self._playerClass = playerClass
self._config = config self._config = config
@ -304,6 +304,8 @@ class SyncplayClient(object):
def setRoom(self, roomName): def setRoom(self, roomName):
self.userlist.currentUser.room = roomName self.userlist.currentUser.room = roomName
self.getUserList() self.getUserList()
message = getMessage("en", "room-join-notification").format(self.getUsername(), roomName)
self.ui.showMessage(message)
def sendRoom(self): def sendRoom(self):
room = self.userlist.currentUser.room room = self.userlist.currentUser.room
@ -484,10 +486,12 @@ class SyncplayUserlist(object):
self._roomUsersChanged = True self._roomUsersChanged = True
def __showUserChangeMessage(self, username, room, file_): def __showUserChangeMessage(self, username, room, file_):
if (room and not file_): if(username == self.currentUser.username):
pass
elif(room and not file_):
message = getMessage("en", "room-join-notification").format(username, room) message = getMessage("en", "room-join-notification").format(username, room)
self.ui.showMessage(message) self.ui.showMessage(message)
elif (room and file_ and username != self.currentUser.username): elif (room and file_):
duration = utils.formatTime(file_['duration']) duration = utils.formatTime(file_['duration'])
message = getMessage("en", "playing-notification").format(username, file_['name'], duration) message = getMessage("en", "playing-notification").format(username, file_['name'], duration)
if(self.currentUser.room <> room or self.currentUser.username == username): if(self.currentUser.room <> room or self.currentUser.username == username):