Final Spacing changes for PR

This commit is contained in:
Daniel Ahn 2018-07-24 09:05:49 -07:00
parent bf8e96010d
commit 2d143aefca
5 changed files with 18 additions and 19 deletions

View File

@ -9,4 +9,4 @@ data = json.load(f)
data['version']['name'] = 'v' + version
g = open('bintray.json', 'w')
json.dump(data, g, indent=4)
json.dump(data, g, indent=4)

View File

@ -243,7 +243,7 @@ ru = {
"unpause-ifminusersready-option": "Снять паузу, если все в комнате готовы и присутствует минимум зрителей",
"unpause-always": "Всегда снимать паузу",
"syncplay-trusteddomains-title": "Доверенные сайты (стрим-сервисы, видеохостинги, файлы в сети)",
"addtrusteddomain-menu-label": "Добавить {} как доверенный сайт", # Domain
"addtrusteddomain-menu-label": "Добавить {} как доверенный сайт", # Domain
"chat-title": "Chat message input", # TODO: Translate
"chatinputenabled-label": "Enable chat input via mpv (using enter key)", # TODO: Translate
@ -387,12 +387,12 @@ ru = {
"unpause-ifminusersready-tooltip": "Когда вы стартуете не готовым, воспроизведение начнется, если остальные готовы и присутствует достаточное число зрителей.",
"trusteddomains-arguments-tooltip": "Сайты, которые разрешены для автоматического воспроизведения из общего списка воспроизведения.",
"chatinputenabled-tooltip": "Enable chat input in mpv (press enter to chat, enter to send, escape to cancel)",# TODO: Translate
"chatinputenabled-tooltip": "Enable chat input in mpv (press enter to chat, enter to send, escape to cancel)", # TODO: Translate
"chatdirectinput-tooltip": "Skip having to press 'enter' to go into chat input mode in mpv. Press TAB in mpv to temporarily disable this feature.", # TODO: Translate
"font-label-tooltip": "Font used for when entering chat messages in mpv. Client-side only, so doesn't affect what other see.",# TODO: Translate
"set-input-font-tooltip": "Font family used for when entering chat messages in mpv. Client-side only, so doesn't affect what other see.",# TODO: Translate
"set-input-colour-tooltip": "Font colour used for when entering chat messages in mpv. Client-side only, so doesn't affect what other see.",# TODO: Translate
"chatinputposition-tooltip": "Location in mpv where chat input text will appear when you press enter and type.",# TODO: Translate
"font-label-tooltip": "Font used for when entering chat messages in mpv. Client-side only, so doesn't affect what other see.", # TODO: Translate
"set-input-font-tooltip": "Font family used for when entering chat messages in mpv. Client-side only, so doesn't affect what other see.", # TODO: Translate
"set-input-colour-tooltip": "Font colour used for when entering chat messages in mpv. Client-side only, so doesn't affect what other see.", # TODO: Translate
"chatinputposition-tooltip": "Location in mpv where chat input text will appear when you press enter and type.", # TODO: Translate
"chatinputposition-top-tooltip": "Place chat input at top of mpv window.", # TODO: Translate
"chatinputposition-middle-tooltip": "Place chat input in dead centre of mpv window.", # TODO: Translate
"chatinputposition-bottom-tooltip": "Place chat input at bottom of mpv window.", # TODO: Translate

View File

@ -145,7 +145,7 @@ class VlcPlayer(BasePlayer):
def setPosition(self, value):
self._lastVLCPositionUpdate = time.time()
self._listener.sendLine("set-position: {}".format(value).replace(".",self.radixChar))
self._listener.sendLine("set-position: {}".format(value).replace(".", self.radixChar))
def setPaused(self, value):
self._paused = value
@ -185,11 +185,11 @@ class VlcPlayer(BasePlayer):
self._listener.sendLine("get-filename")
def lineReceived(self, line):
#try:
# try:
line = line.decode('utf-8')
self._client.ui.showDebugMessage("player << {}".format(line))
#except:
#pass
# except:
# pass
match, name, value = self.RE_ANSWER.match(line), "", ""
if match:
name, value = match.group('command'), match.group('argument')
@ -210,7 +210,7 @@ class VlcPlayer(BasePlayer):
value = value.lstrip("/")
elif utils.isURL(value):
value = urllib.parse.unquote(value)
#value = value.decode('utf-8')
# value = value.decode('utf-8')
self._filepath = value
self._pathAsk.set()
elif name == "duration":
@ -258,7 +258,7 @@ class VlcPlayer(BasePlayer):
self._filename = value
self._filenameAsk.set()
elif line.startswith("vlc-version: "):
self._vlcVersion = line.split(': ')[1].replace(' ','-').split('-')[0]
self._vlcVersion = line.split(': ')[1].replace(' ', '-').split('-')[0]
if not utils.meetsMinVersion(self._vlcVersion, constants.VLC_MIN_VERSION):
self._client.ui.showErrorMessage(getMessage("vlc-version-mismatch").format(constants.VLC_MIN_VERSION))
self._vlcready.set()
@ -493,18 +493,18 @@ class VlcPlayer(BasePlayer):
if not self.requestedVLCVersion:
self.requestedVLCVersion = True
self.sendLine("get-vlc-version")
#try:
# try:
lineToSend = line + "\n"
self.push(lineToSend.encode('utf-8'))
if self.__playerController._client and self.__playerController._client.ui:
self.__playerController._client.ui.showDebugMessage("player >> {}".format(line))
#except:
#pass
# except:
# pass
if line == "close-vlc":
self._vlcclosed.set()
if not self.connected and not self.timeVLCLaunched:
# For circumstances where Syncplay is not connected to VLC and is not reconnecting
try:
self.__process.terminate()
except: # When VLC is already closed
except: # When VLC is already closed
pass

View File

@ -865,7 +865,6 @@ class ConfigDialog(QtWidgets.QDialog):
self.othersyncSettingsLayout.setAlignment(Qt.AlignLeft)
self.othersyncSettingsLayout.addWidget(self.fastforwardCheckbox, 3, 0, 1, 2, Qt.AlignLeft)
## Trusted domains
self.trusteddomainsSettingsGroup = QtWidgets.QGroupBox(getMessage("syncplay-trusteddomains-title"))

View File

@ -198,4 +198,4 @@ class ConsoleUI(threading.Thread):
self.showMessage(getMessage("more-info-notification").format(syncplay.projectURL), True)
def getUserlist(self):
self._syncplayClient.getUserList()
self._syncplayClient.getUserList()