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

Fix room context menu when alone in room

Browse Source
This commit is contained in:
Et0h 2024-07-14 19:44:50 +01:00
parent cccdef33ef
commit 3444e930e0
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
syncplay/client.py
View File

@ -1332,10 +1332,10 @@ class SyncplayUserlist(object):
self._client = client self._client = client
self._roomUsersChanged = True self._roomUsersChanged = True
def isReadinessSupported(self): def isReadinessSupported(self, requiresOtherUsers=True):
if not utils.meetsMinVersion(self._client.serverVersion, constants.USER_READY_MIN_VERSION): if not utils.meetsMinVersion(self._client.serverVersion, constants.USER_READY_MIN_VERSION):
return False return False
elif self.onlyUserInRoomWhoSupportsReadiness(): elif self.onlyUserInRoomWhoSupportsReadiness() and requiresOtherUsers:
return False return False
else: else:
return self._client.serverFeatures["readiness"] return self._client.serverFeatures["readiness"]

5
syncplay/ui/gui.py
View File

@ -820,16 +820,13 @@ class MainWindow(QtWidgets.QMainWindow):
if path: if path:
menu.addAction(QtGui.QPixmap(resourcespath + "folder_film.png"), getMessage('open-containing-folder'), lambda: utils.open_system_file_browser(path)) menu.addAction(QtGui.QPixmap(resourcespath + "folder_film.png"), getMessage('open-containing-folder'), lambda: utils.open_system_file_browser(path))
if roomToJoin == self._syncplayClient.getRoom() and self._syncplayClient.userlist.currentUser.canControl() and self._syncplayClient.userlist.isReadinessSupported(requiresOtherUsers=False) and self._syncplayClient.serverFeatures["setOthersReadiness"]:
if roomToJoin == self._syncplayClient.getRoom() and self._syncplayClient.userlist.currentUser.canControl() and self._syncplayClient.userlist.isReadinessSupported() and self._syncplayClient.serverFeatures["setOthersReadiness"]:
if self._syncplayClient.userlist.isReady(username): if self._syncplayClient.userlist.isReady(username):
addSetUserAsReadyText = getMessage("setasnotready-menu-label").format(shortUsername) addSetUserAsReadyText = getMessage("setasnotready-menu-label").format(shortUsername)
menu.addAction(QtGui.QPixmap(resourcespath + "cross.png"), addSetUserAsReadyText, lambda: self._syncplayClient.setOthersReadiness(username, False)) menu.addAction(QtGui.QPixmap(resourcespath + "cross.png"), addSetUserAsReadyText, lambda: self._syncplayClient.setOthersReadiness(username, False))
else: else:
addSetUserAsNotReadyText = getMessage("setasnotready-menu-label").format(shortUsername) addSetUserAsNotReadyText = getMessage("setasnotready-menu-label").format(shortUsername)
menu.addAction(QtGui.QPixmap(resourcespath + "tick.png"), addSetUserAsNotReadyText, lambda: self._syncplayClient.setOthersReadiness(username, True)) menu.addAction(QtGui.QPixmap(resourcespath + "tick.png"), addSetUserAsNotReadyText, lambda: self._syncplayClient.setOthersReadiness(username, True))
else:
return
menu.exec_(self.listTreeView.viewport().mapToGlobal(position)) menu.exec_(self.listTreeView.viewport().mapToGlobal(position))
def updateListGeometry(self): def updateListGeometry(self):