From 0205d4b4212f8f6f81f5e833d55f384f039e500d Mon Sep 17 00:00:00 2001 From: Et0h Date: Thu, 2 Jun 2016 19:12:37 +0100 Subject: [PATCH] Add label below AddURI and SetMediaDir dialogs & move AddURI message to messages_*.py --- syncplay/messages_de.py | 2 ++ syncplay/messages_en.py | 2 ++ syncplay/messages_ru.py | 2 ++ syncplay/ui/gui.py | 14 +++++++++----- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/syncplay/messages_de.py b/syncplay/messages_de.py index 658ef63..9f1b6c7 100644 --- a/syncplay/messages_de.py +++ b/syncplay/messages_de.py @@ -279,6 +279,8 @@ de = { "promptforstreamurl-msgbox-label" : u"Stream URL öffnen", "promptforstreamurlinfo-msgbox-label" : u"Stream URL", + "adduris-msgbox-label" : u"Add URLs to playlist (one per line)", # TODO: Translate + "createcontrolledroom-msgbox-label" : u"Zentral gesteuerten Raum erstellen", "controlledroominfo-msgbox-label" : u"Namen des zentral gesteuerten Raums eingeben\r\n(siehe http://syncplay.pl/guide/ für eine Anleitung [Englisch]):", diff --git a/syncplay/messages_en.py b/syncplay/messages_en.py index 08347ac..280fd92 100644 --- a/syncplay/messages_en.py +++ b/syncplay/messages_en.py @@ -281,6 +281,8 @@ en = { "promptforstreamurl-msgbox-label" : "Open media stream URL", "promptforstreamurlinfo-msgbox-label" : "Stream URL", + "adduris-msgbox-label" : u"Add URLs to playlist (one per line)", + "createcontrolledroom-msgbox-label" : "Create managed room", "controlledroominfo-msgbox-label" : "Enter name of managed room\r\n(see http://syncplay.pl/guide/ for usage instructions):", diff --git a/syncplay/messages_ru.py b/syncplay/messages_ru.py index 45db12c..2c48970 100644 --- a/syncplay/messages_ru.py +++ b/syncplay/messages_ru.py @@ -281,6 +281,8 @@ ru = { "promptforstreamurl-msgbox-label" : u"Открыть URL потокового вещания", "promptforstreamurlinfo-msgbox-label" : u"URL потока", + "adduris-msgbox-label" : u"Add URLs to playlist (one per line)", # TODO: Translate + "createcontrolledroom-msgbox-label" : u"Создать управляемую комнату", "controlledroominfo-msgbox-label" : u"Введите имя управляемой комнаты\r\n(см. инструкцию на странице http://syncplay.pl/guide/):", diff --git a/syncplay/ui/gui.py b/syncplay/ui/gui.py index 3b1e331..f9570f6 100644 --- a/syncplay/ui/gui.py +++ b/syncplay/ui/gui.py @@ -780,17 +780,19 @@ class MainWindow(QtGui.QMainWindow): @needsClient def OpenAddURIsToPlaylistDialog(self): URIsDialog = QtGui.QDialog() - URIsDialog.setWindowTitle(u"Add URLs to playlist (one per line)") # TODO: Move to messages_*.py + URIsDialog.setWindowTitle(getMessage("adduris-msgbox-label")) URIsLayout = QtGui.QGridLayout() + URIsLabel = QtGui.QLabel(getMessage("adduris-msgbox-label")) + URIsLayout.addWidget(URIsLabel, 0, 0, 1, 1) URIsTextbox = QtGui.QPlainTextEdit() URIsTextbox.setLineWrapMode(QtGui.QPlainTextEdit.NoWrap) - URIsLayout.addWidget(URIsTextbox, 0, 0, 1, 1) + URIsLayout.addWidget(URIsTextbox, 1, 0, 1, 1) URIsButtonBox = QtGui.QDialogButtonBox() URIsButtonBox.setOrientation(Qt.Horizontal) URIsButtonBox.setStandardButtons(QtGui.QDialogButtonBox.Ok|QtGui.QDialogButtonBox.Cancel) URIsButtonBox.accepted.connect(URIsDialog.accept) URIsButtonBox.rejected.connect(URIsDialog.reject) - URIsLayout.addWidget(URIsButtonBox, 1, 0, 1, 1) + URIsLayout.addWidget(URIsButtonBox, 2, 0, 1, 1) URIsDialog.setLayout(URIsLayout) URIsDialog.show() result = URIsDialog.exec_() @@ -805,16 +807,18 @@ class MainWindow(QtGui.QMainWindow): MediaDirectoriesDialog = QtGui.QDialog() MediaDirectoriesDialog.setWindowTitle(getMessage("syncplay-mediasearchdirectories-title")) # TODO: Move to messages_*.py MediaDirectoriesLayout = QtGui.QGridLayout() + MediaDirectoriesLabel = QtGui.QLabel(getMessage("syncplay-mediasearchdirectories-title")) + MediaDirectoriesLayout.addWidget(MediaDirectoriesLabel, 0, 0, 1, 1) MediaDirectoriesTextbox = QtGui.QPlainTextEdit() MediaDirectoriesTextbox.setLineWrapMode(QtGui.QPlainTextEdit.NoWrap) MediaDirectoriesTextbox.setPlainText(utils.getListAsMultilineString(self.config["mediaSearchDirectories"])) - MediaDirectoriesLayout.addWidget(MediaDirectoriesTextbox, 0, 0, 1, 1) + MediaDirectoriesLayout.addWidget(MediaDirectoriesTextbox, 1, 0, 1, 1) MediaDirectoriesButtonBox = QtGui.QDialogButtonBox() MediaDirectoriesButtonBox.setOrientation(Qt.Horizontal) MediaDirectoriesButtonBox.setStandardButtons(QtGui.QDialogButtonBox.Ok|QtGui.QDialogButtonBox.Cancel) MediaDirectoriesButtonBox.accepted.connect(MediaDirectoriesDialog.accept) MediaDirectoriesButtonBox.rejected.connect(MediaDirectoriesDialog.reject) - MediaDirectoriesLayout.addWidget(MediaDirectoriesButtonBox, 1, 0, 1, 1) + MediaDirectoriesLayout.addWidget(MediaDirectoriesButtonBox, 2, 0, 1, 1) MediaDirectoriesDialog.setLayout(MediaDirectoriesLayout) MediaDirectoriesDialog.show() result = MediaDirectoriesDialog.exec_()