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

@ -243,7 +243,7 @@ ru = {
"unpause-ifminusersready-option": "Снять паузу, если все в комнате готовы и присутствует минимум зрителей", "unpause-ifminusersready-option": "Снять паузу, если все в комнате готовы и присутствует минимум зрителей",
"unpause-always": "Всегда снимать паузу", "unpause-always": "Всегда снимать паузу",
"syncplay-trusteddomains-title": "Доверенные сайты (стрим-сервисы, видеохостинги, файлы в сети)", "syncplay-trusteddomains-title": "Доверенные сайты (стрим-сервисы, видеохостинги, файлы в сети)",
"addtrusteddomain-menu-label": "Добавить {} как доверенный сайт", # Domain "addtrusteddomain-menu-label": "Добавить {} как доверенный сайт", # Domain
"chat-title": "Chat message input", # TODO: Translate "chat-title": "Chat message input", # TODO: Translate
"chatinputenabled-label": "Enable chat input via mpv (using enter key)", # TODO: Translate "chatinputenabled-label": "Enable chat input via mpv (using enter key)", # TODO: Translate
@ -387,12 +387,12 @@ ru = {
"unpause-ifminusersready-tooltip": "Когда вы стартуете не готовым, воспроизведение начнется, если остальные готовы и присутствует достаточное число зрителей.", "unpause-ifminusersready-tooltip": "Когда вы стартуете не готовым, воспроизведение начнется, если остальные готовы и присутствует достаточное число зрителей.",
"trusteddomains-arguments-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 "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 "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-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 "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-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-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-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 "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): def setPosition(self, value):
self._lastVLCPositionUpdate = time.time() 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): def setPaused(self, value):
self._paused = value self._paused = value
@ -185,11 +185,11 @@ class VlcPlayer(BasePlayer):
self._listener.sendLine("get-filename") self._listener.sendLine("get-filename")
def lineReceived(self, line): def lineReceived(self, line):
#try: # try:
line = line.decode('utf-8') line = line.decode('utf-8')
self._client.ui.showDebugMessage("player << {}".format(line)) self._client.ui.showDebugMessage("player << {}".format(line))
#except: # except:
#pass # pass
match, name, value = self.RE_ANSWER.match(line), "", "" match, name, value = self.RE_ANSWER.match(line), "", ""
if match: if match:
name, value = match.group('command'), match.group('argument') name, value = match.group('command'), match.group('argument')
@ -210,7 +210,7 @@ class VlcPlayer(BasePlayer):
value = value.lstrip("/") value = value.lstrip("/")
elif utils.isURL(value): elif utils.isURL(value):
value = urllib.parse.unquote(value) value = urllib.parse.unquote(value)
#value = value.decode('utf-8') # value = value.decode('utf-8')
self._filepath = value self._filepath = value
self._pathAsk.set() self._pathAsk.set()
elif name == "duration": elif name == "duration":
@ -258,7 +258,7 @@ class VlcPlayer(BasePlayer):
self._filename = value self._filename = value
self._filenameAsk.set() self._filenameAsk.set()
elif line.startswith("vlc-version: "): 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): if not utils.meetsMinVersion(self._vlcVersion, constants.VLC_MIN_VERSION):
self._client.ui.showErrorMessage(getMessage("vlc-version-mismatch").format(constants.VLC_MIN_VERSION)) self._client.ui.showErrorMessage(getMessage("vlc-version-mismatch").format(constants.VLC_MIN_VERSION))
self._vlcready.set() self._vlcready.set()
@ -493,13 +493,13 @@ class VlcPlayer(BasePlayer):
if not self.requestedVLCVersion: if not self.requestedVLCVersion:
self.requestedVLCVersion = True self.requestedVLCVersion = True
self.sendLine("get-vlc-version") self.sendLine("get-vlc-version")
#try: # try:
lineToSend = line + "\n" lineToSend = line + "\n"
self.push(lineToSend.encode('utf-8')) self.push(lineToSend.encode('utf-8'))
if self.__playerController._client and self.__playerController._client.ui: if self.__playerController._client and self.__playerController._client.ui:
self.__playerController._client.ui.showDebugMessage("player >> {}".format(line)) self.__playerController._client.ui.showDebugMessage("player >> {}".format(line))
#except: # except:
#pass # pass
if line == "close-vlc": if line == "close-vlc":
self._vlcclosed.set() self._vlcclosed.set()
if not self.connected and not self.timeVLCLaunched: if not self.connected and not self.timeVLCLaunched:

View File

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