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

Remove redundant SHOW_BUTTON_LABELS code, and set ready checkbox sooner

Browse Source
This commit is contained in:
Et0h 2015-01-22 21:53:07 +00:00
parent 14deec4db5
commit 09fb34bd9f
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
syncplay/constants.py
View File

@ -13,7 +13,6 @@ RECENT_CLIENT_THRESHOLD = "1.2.9" #This and higher considered 'recent' clients
WARN_OLD_CLIENTS = True #Use MOTD to inform old clients to upgrade WARN_OLD_CLIENTS = True #Use MOTD to inform old clients to upgrade
LIST_RELATIVE_CONFIGS = True # Print list of relative configs loaded LIST_RELATIVE_CONFIGS = True # Print list of relative configs loaded
SHOW_CONTACT_INFO = True # Displays dev contact details below list in GUI SHOW_CONTACT_INFO = True # Displays dev contact details below list in GUI
SHOW_BUTTON_LABELS = True # If disabled, only shows icons for main GUI buttons
SHOW_TOOLTIPS = True SHOW_TOOLTIPS = True
WARN_ABOUT_MISSING_STRINGS = False # (If debug mode is enabled) WARN_ABOUT_MISSING_STRINGS = False # (If debug mode is enabled)
FALLBACK_INITIAL_LANGUAGE = "en" FALLBACK_INITIAL_LANGUAGE = "en"

3
syncplay/messages.py
View File

@ -1059,9 +1059,6 @@ def isValidLanguage(language):
return messages.has_key(language) return messages.has_key(language)
def getMessage(type_, locale=None): def getMessage(type_, locale=None):
if constants.SHOW_BUTTON_LABELS == False:
if "-guibuttonlabel" in type_:
return ""
if constants.SHOW_TOOLTIPS == False: if constants.SHOW_TOOLTIPS == False:
if "-tooltip" in type_: if "-tooltip" in type_:
return "" return ""

8
syncplay/ui/gui.py
View File

@ -76,10 +76,8 @@ class MainWindow(QtGui.QMainWindow):
self.roomInput.setText(self._syncplayClient.getRoom()) self.roomInput.setText(self._syncplayClient.getRoom())
self.config = self._syncplayClient.getConfig() self.config = self._syncplayClient.getConfig()
try: try:
if not constants.SHOW_BUTTON_LABELS: self.updateReadyState(self.config['readyAtStart'])
self.hideRoomSeekLabels() except:
self.hideMiscLabels()
except ():
pass pass
self.automaticUpdateCheck() self.automaticUpdateCheck()
@ -204,7 +202,9 @@ class MainWindow(QtGui.QMainWindow):
def updateReadyState(self, newState): def updateReadyState(self, newState):
oldState = self.readyPushButton.isChecked() oldState = self.readyPushButton.isChecked()
if newState != oldState and newState != None: if newState != oldState and newState != None:
self.readyPushButton.blockSignals(True)
self.readyPushButton.setChecked(newState) self.readyPushButton.setChecked(newState)
self.readyPushButton.blockSignals(False)
self.updateReadyIcon() self.updateReadyIcon()
def roomClicked(self, item): def roomClicked(self, item):