diff --git a/syncplay/messages.py b/syncplay/messages.py index 8fd6384..a6833e1 100755 --- a/syncplay/messages.py +++ b/syncplay/messages.py @@ -184,7 +184,6 @@ en = { "shownoncontrollerosd-label" : "Include events from non-controllers in controlled rooms", "showdifferentroomosd-label" : "Include events in other rooms", "showslowdownosd-label" :"Include slowing down / reverting notifications", - "showcontactinfo-label" : "Show contact info box", "language-label" : "Language:", "automatic-language" : "Default ({})", # Default language "showdurationnotification-label" : "Warn about media duration mismatches", @@ -206,7 +205,7 @@ en = { "run-label" : "Run Syncplay", "storeandrun-label" : "Store configuration and run Syncplay", - "contact-label" : "Have an idea, bug report or feedback? E-mail dev@syncplay.pl, chat via the #Syncplay IRC channel on irc.freenode.net or raise an issue via GitHub. Also check out http://syncplay.pl/ for info, help and updates.", + "contact-label" : "Have an idea, bug report or feedback? E-mail dev@syncplay.pl, chat via the #Syncplay IRC channel on irc.freenode.net or raise an issue via GitHub. Also check out http://syncplay.pl/ for info, help and updates.

", "joinroom-guibuttonlabel" : "Join room", "seektime-guibuttonlabel" : "Seek to time", @@ -290,7 +289,6 @@ en = { "shownoncontrollerosd-tooltip" : "Show OSD notifications for events relating to non-controllers who are in controlled rooms.", "showdifferentroomosd-tooltip" : "Show OSD notifications for events relating to room user is not in.", "showslowdownosd-tooltip" :"Show notifications of slowing down / reverting on time difference.", - "showcontactinfo-tooltip" : "Show information box about contacting Syncplay developers in main Syncplay window.", "showdurationnotification-tooltip" : "Useful for when a segment in a multi-part file is missing, but can result in false positives.", "language-tooltip" : u"Language to be used by Syncplay.", @@ -524,7 +522,6 @@ ru = { "shownoncontrollerosd-label" : u"Include events from non-controllers in controlled rooms", # TODO: Translate into Russiann "showdifferentroomosd-label" : u"Показывать события других комнат", "showslowdownosd-label" : u"Показывать уведомления о замедлении/перемотке", - "showcontactinfo-label" : u"Отображать контактную информацию разработчиков", "language-label" : u"Language:", # TODO: Translate into Russian "automatic-language" : u"Default ({})", # Automatic language # TODO: Translate into Russian "showdurationnotification-label" : u"Предупреждать о несовпадении продолжительности видео", @@ -546,7 +543,7 @@ ru = { "run-label" : u"Запустить Syncplay", "storeandrun-label" : u"Сохранить настройки и зап. Syncplay", - "contact-label" : u"Есть идея, нашли ошибку или хотите оставить отзыв? Пишите на dev@syncplay.pl, в IRC канал #Syncplay на irc.freenode.net или задавайте вопросы через GitHub. Кроме того, заходите на http://syncplay.pl/ за инорфмацией, помощью и обновлениями!", + "contact-label" : u"Есть идея, нашли ошибку или хотите оставить отзыв? Пишите на dev@syncplay.pl, в IRC канал #Syncplay на irc.freenode.net или задавайте вопросы через GitHub. Кроме того, заходите на http://syncplay.pl/ за инорфмацией, помощью и обновлениями!

", "joinroom-guibuttonlabel" : u"Зайти в комнату", "seektime-guibuttonlabel" : u"Перемотать", @@ -630,7 +627,6 @@ ru = { "shownoncontrollerosd-tooltip" : u"Show OSD notifications for events relating to non-controllers who are in controllerd rooms.", # TODO: Translate into Russian "showdifferentroomosd-tooltip" : u"Показывать OSD-уведомления о событиях, относящихся к любым другим комнатам.", "showslowdownosd-tooltip" : u"Показывать уведомления о замедлении или перемотке в целях синхронизации.", - "showcontactinfo-tooltip" : u"Показывать информационных блок с контактной информацией разработчиков Syncplay на главном окне Syncplay.", "showdurationnotification-tooltip" : u"Полезно, когда сегмент составного файла отсутствует. Возможны ложные срабатывания.", "language-tooltip" : u"Language to be used by Syncplay.", # TODO: Translate into Russian @@ -862,7 +858,6 @@ de = { "shownoncontrollerosd-label" : u"Zeige Ereignisse von nicht geführten Räumen in geführten Räumen.", "showdifferentroomosd-label" : u"Zeige Ereignisse in anderen Räumen", "showslowdownosd-label" : u"Zeige Verlangsamungs/Zurücksetzungs-Benachrichtigung", - "showcontactinfo-label" : u"Zeige Kontaktinformationen", "language-label" : u"Sprache:", "automatic-language" : u"Automatisch ({})", # Default language # TODO: Change to German translation of "default" "showdurationnotification-label" : u"Zeige Warnung wegen unterschiedlicher Dauer", @@ -884,7 +879,7 @@ de = { "run-label" : u"Syncplay starten", "storeandrun-label" : u"Konfiguration speichern und Syncplay starten", - "contact-label" : u"Du hast eine Idee, einen Bug gefunden oder möchtest Feedback geben? Sende eine E-Mail an dev@syncplay.pl, chatte auf dem #Syncplay IRC-Kanal auf irc.freenode.net oder öffne eine Fehlermeldung auf GitHub. Außerdem findest du auf http://syncplay.pl/ weitere Informationen, Hilfestellungen und Updates.", + "contact-label" : u"Du hast eine Idee, einen Bug gefunden oder möchtest Feedback geben? Sende eine E-Mail an dev@syncplay.pl, chatte auf dem #Syncplay IRC-Kanal auf irc.freenode.net oder öffne eine Fehlermeldung auf GitHub. Außerdem findest du auf http://syncplay.pl/ weitere Informationen, Hilfestellungen und Updates.

", "joinroom-guibuttonlabel" : u"Raum beitreten", "seektime-guibuttonlabel" : u"Spule zu Zeit", @@ -970,7 +965,6 @@ de = { "shownoncontrollerosd-tooltip" : u"OSD-Meldungen bei Ereignissen verursacht durch nicht-Raumleiter in zentral gesteuerten Räumen anzeigen.", "showdifferentroomosd-tooltip" : u"OSD-Meldungen zu anderen Räumen als dem aktuell betretenen anzeigen.", "showslowdownosd-tooltip" : u"Meldungen bei Geschwindigkeitsänderung anzeigen.", - "showcontactinfo-tooltip" : u"Kontaktinformationen zu den Syncplay-Entwicklern im Hauptfenster anzeigen.", "showdurationnotification-tooltip" : u"Nützlich, wenn z.B. ein Teil eines mehrteiligen Videos fehlt, kann jedoch auch fehlerhaft anschlagen.", "language-tooltip" : u"Die verwendete Sprache von Syncplay", diff --git a/syncplay/ui/ConfigurationGetter.py b/syncplay/ui/ConfigurationGetter.py index adcb86a..feabd20 100755 --- a/syncplay/ui/ConfigurationGetter.py +++ b/syncplay/ui/ConfigurationGetter.py @@ -94,7 +94,6 @@ class ConfigurationGetter(object): "showDifferentRoomOSD", "showSameRoomOSD", "showNonControllerOSD", - "showContactInfo" , "showDurationNotification" ] self._tristate = [ @@ -110,7 +109,7 @@ class ConfigurationGetter(object): self._iniStructure = { "server_data": ["host", "port", "password"], "client_settings": ["name", "room", "playerPath", "slowdownThreshold", "rewindThreshold", "fastforwardThreshold", "slowOnDesync", "rewindOnDesync", "fastforwardOnDesync", "dontSlowDownWithMe", "forceGuiPrompt", "filenamePrivacyMode", "filesizePrivacyMode", "pauseOnLeave", "readyAtStart"], - "gui": ["showOSD", "showOSDWarnings", "showSlowdownOSD", "showDifferentRoomOSD", "showSameRoomOSD", "showNonControllerOSD", "showContactInfo" , "showDurationNotification"], + "gui": ["showOSD", "showOSDWarnings", "showSlowdownOSD", "showDifferentRoomOSD", "showSameRoomOSD", "showNonControllerOSD", "showDurationNotification"], "general": ["language", "checkForUpdatesAutomatically", "lastCheckedForUpdates"] } diff --git a/syncplay/ui/GuiConfiguration.py b/syncplay/ui/GuiConfiguration.py index 9fa086e..af1d202 100644 --- a/syncplay/ui/GuiConfiguration.py +++ b/syncplay/ui/GuiConfiguration.py @@ -736,10 +736,6 @@ class ConfigDialog(QtGui.QDialog): self.showDurationNotificationCheckbox.setObjectName("showDurationNotification") self.displaySettingsLayout.addWidget(self.showDurationNotificationCheckbox) - self.showcontactinfoCheckbox = QCheckBox(getMessage("showcontactinfo-label")) - self.showcontactinfoCheckbox.setObjectName("showContactInfo") - self.displaySettingsLayout.addWidget(self.showcontactinfoCheckbox) - self.displaySettingsGroup.setLayout(self.displaySettingsLayout) self.displaySettingsGroup.setMaximumHeight(self.displaySettingsGroup.minimumSizeHint().height()) self.displaySettingsLayout.setAlignment(Qt.AlignTop) diff --git a/syncplay/ui/gui.py b/syncplay/ui/gui.py index d42cc06..f97c6af 100644 --- a/syncplay/ui/gui.py +++ b/syncplay/ui/gui.py @@ -76,8 +76,6 @@ class MainWindow(QtGui.QMainWindow): self.roomInput.setText(self._syncplayClient.getRoom()) self.config = self._syncplayClient.getConfig() try: - if self.contactLabel and not self.config['showContactInfo']: - self.contactLabel.hide() if not constants.SHOW_BUTTON_LABELS: self.hideRoomSeekLabels() self.hideMiscLabels() @@ -96,7 +94,7 @@ class MainWindow(QtGui.QMainWindow): message = message.replace(">", ">") message = message.replace("\n", "
") if noTimestamp: - self.newMessage(message + "
") + self.newMessage("{}
".format(message)) else: self.newMessage(time.strftime(constants.UI_TIME_FORMAT, time.localtime()) + message + "
") @@ -450,8 +448,16 @@ class MainWindow(QtGui.QMainWindow): window.topSplit = self.topSplitter(Qt.Horizontal, self) window.outputLayout = QtGui.QVBoxLayout() - window.outputbox = QtGui.QTextEdit() + window.outputbox = QtGui.QTextBrowser() window.outputbox.setReadOnly(True) + print window.outputbox.textInteractionFlags() + window.outputbox.setTextInteractionFlags(window.outputbox.textInteractionFlags() | Qt.TextSelectableByKeyboard) + window.outputbox.setOpenExternalLinks(True) + window.outputbox.unsetCursor() + window.outputbox.moveCursor(QtGui.QTextCursor.End) + window.outputbox.insertHtml(getMessage("contact-label")) + window.outputbox.moveCursor(QtGui.QTextCursor.End) + window.outputlabel = QtGui.QLabel(getMessage("notifications-heading-label")) window.outputFrame = QtGui.QFrame() window.outputFrame.setLineWidth(0) @@ -498,16 +504,6 @@ class MainWindow(QtGui.QMainWindow): window.listLayout.addWidget(window.autoPlayPushButton, Qt.AlignRight) self.updateAutoPlayIcon() - window.contactLabel = QtGui.QLabel() - window.contactLabel.setWordWrap(True) - window.contactLabel.setFrameStyle(QtGui.QFrame.Box | QtGui.QFrame.Sunken) - window.contactLabel.setLineWidth(1) - window.contactLabel.setMidLineWidth(0) - window.contactLabel.setMargin(2) - window.contactLabel.setText(getMessage("contact-label")) - window.contactLabel.setTextInteractionFlags(Qt.LinksAccessibleByMouse) - window.contactLabel.setOpenExternalLinks(True) - window.listLayout.addWidget(window.contactLabel) window.listFrame.setLayout(window.listLayout) window.topSplit.addWidget(window.outputFrame)