From 3c7ca9706d7dfb00d7e1a84ebae7a534d54d42b9 Mon Sep 17 00:00:00 2001 From: et0h Date: Sun, 13 Sep 2020 14:26:06 +0100 Subject: [PATCH] Rename room history to room list & re-work GUI --- syncplay/client.py | 7 +++ syncplay/messages_de.py | 3 + syncplay/messages_en.py | 3 + syncplay/messages_es.py | 3 + syncplay/messages_it.py | 3 + syncplay/messages_pt_BR.py | 3 + syncplay/messages_pt_PT.py | 3 + syncplay/messages_ru.py | 3 + syncplay/resources/bullet_edit_centered.png | Bin 0 -> 632 bytes syncplay/resources/door_open_edit.png | Bin 0 -> 743 bytes syncplay/ui/ConfigurationGetter.py | 6 +- syncplay/ui/GuiConfiguration.py | 42 +++++++------ syncplay/ui/gui.py | 63 ++++++++++++++++---- 13 files changed, 108 insertions(+), 31 deletions(-) create mode 100644 syncplay/resources/bullet_edit_centered.png create mode 100644 syncplay/resources/door_open_edit.png diff --git a/syncplay/client.py b/syncplay/client.py index a712390..6a2a5ae 100755 --- a/syncplay/client.py +++ b/syncplay/client.py @@ -533,6 +533,13 @@ class SyncplayClient(object): # TODO: Properly add message for setting trusted domains! # TODO: Handle cases where users add www. to start of domain + def setRoomList(self, newRoomList): + from syncplay.ui.ConfigurationGetter import ConfigurationGetter + ConfigurationGetter().setConfigOption("roomList", newRoomList) + oldRoomList = self._config['roomList'] + if oldRoomList != newRoomList: + self._config['roomList'] = newRoomList + def isUntrustedTrustableURI(self, URIToTest): if utils.isURL(URIToTest): for trustedProtocol in constants.TRUSTABLE_WEB_PROTOCOLS: diff --git a/syncplay/messages_de.py b/syncplay/messages_de.py index fea05f3..0354e46 100755 --- a/syncplay/messages_de.py +++ b/syncplay/messages_de.py @@ -184,6 +184,7 @@ de = { "name-label": "Benutzername (optional):", "password-label": "Server-Passwort (falls nötig):", "room-label": "Standard-Raum:", + "roomlist-msgbox-label": "Edit room list (one per line)", # TODO: Translate "media-setting-title": "Media-Player Einstellungen", "executable-path-label": "Pfad zum Media-Player:", @@ -373,6 +374,8 @@ de = { "password-tooltip": "Passwörter sind nur bei Verbindung zu privaten Servern nötig.", "room-tooltip": "Der Raum, der betreten werden soll, kann ein x-beliebiger sein. Allerdings werden nur Clients im selben Raum synchronisiert.", + "edit-rooms-tooltip": "Edit room list.", # TO DO: Translate + "executable-path-tooltip": "Pfad zum ausgewählten, unterstützten Mediaplayer (mpv, mpv.net, VLC, MPC-HC/BE or mplayer2).", "media-path-tooltip": "Pfad zum wiederzugebenden Video oder Stream. Notwendig für mplayer2.", "player-arguments-tooltip": "Zusätzliche Kommandozeilenparameter/-schalter für diesen Mediaplayer.", diff --git a/syncplay/messages_en.py b/syncplay/messages_en.py index 548f42a..aed1a40 100755 --- a/syncplay/messages_en.py +++ b/syncplay/messages_en.py @@ -184,6 +184,7 @@ en = { "name-label": "Username (optional):", "password-label": "Server password (if any):", "room-label": "Default room: ", + "roomlist-msgbox-label": "Edit room list (one per line)", "media-setting-title": "Media player settings", "executable-path-label": "Path to media player:", @@ -374,6 +375,8 @@ en = { "password-tooltip": "Passwords are only needed for connecting to private servers.", "room-tooltip": "Room to join upon connection can be almost anything, but you will only be synchronised with people in the same room.", + "edit-rooms-tooltip": "Edit room list.", + "executable-path-tooltip": "Location of your chosen supported media player (mpv, mpv.net, VLC, MPC-HC/BE or mplayer2).", "media-path-tooltip": "Location of video or stream to be opened. Necessary for mplayer2.", "player-arguments-tooltip": "Additional command line arguments / switches to pass on to this media player.", diff --git a/syncplay/messages_es.py b/syncplay/messages_es.py index edd2878..e286294 100644 --- a/syncplay/messages_es.py +++ b/syncplay/messages_es.py @@ -184,6 +184,7 @@ es = { "name-label": "Nombre de usuario (opcional):", "password-label": "Contraseña del servidor (si corresponde):", "room-label": "Sala por defecto: ", + "roomlist-msgbox-label": "Edit room list (one per line)", # TODO: Translate "media-setting-title": "Configuración del reproductor multimedia", "executable-path-label": "Ruta al reproductor multimedia:", @@ -374,6 +375,8 @@ es = { "password-tooltip": "Las contraseñas son sólo necesarias para conectarse a servidores privados.", "room-tooltip": "La sala para unirse en la conexión puede ser casi cualquier cosa, pero sólo se sincronizará con las personas en la misma sala.", + "edit-rooms-tooltip": "Edit room list.", # TO DO: Translate + "executable-path-tooltip": "Ubicación de tu reproductor multimedia compatible elegido (mpv, mpv.net, VLC, MPC-HC/BE o mplayer2).", "media-path-tooltip": "Ubicación del video o flujo que se abrirá. Necesario para mplayer2.", "player-arguments-tooltip": "Arguementos de línea de comandos adicionales / parámetros para pasar a este reproductor multimedia.", diff --git a/syncplay/messages_it.py b/syncplay/messages_it.py index 6eae224..9976a63 100755 --- a/syncplay/messages_it.py +++ b/syncplay/messages_it.py @@ -184,6 +184,7 @@ it = { "name-label": "Username (opzionale):", "password-label": "Password del server (se necessaria):", "room-label": "Stanza di default: ", + "roomlist-msgbox-label": "Edit room list (one per line)", # TODO: Translate "media-setting-title": "Impostazioni del media player", "executable-path-label": "Percorso del media player:", @@ -374,6 +375,8 @@ it = { "password-tooltip": "La password è necessaria solo in caso di connessione a server privati.", "room-tooltip": "La stanza in cui entrare dopo la connessione. Può assumere qualsiasi nome, ma ricorda che sarai sincronizzato solo con gli utenti nella stessa stanza.", + "edit-rooms-tooltip": "Edit room list.", # TO DO: Translate + "executable-path-tooltip": "Percorso del media player desiderato (scegliere tra mpv, mpv.net, VLC, MPC-HC/BE or mplayer2).", "media-path-tooltip": "Percorso del video o stream da aprire. Necessario per mplayer2.", "player-arguments-tooltip": "Argomenti da linea di comando aggiuntivi da passare al media player scelto.", diff --git a/syncplay/messages_pt_BR.py b/syncplay/messages_pt_BR.py index 8631499..199be1b 100644 --- a/syncplay/messages_pt_BR.py +++ b/syncplay/messages_pt_BR.py @@ -184,6 +184,7 @@ pt_BR = { "name-label": "Nome de usuário (opcional): ", "password-label": "Senha do servidor (se existir): ", "room-label": "Sala padrão: ", + "roomlist-msgbox-label": "Edit room list (one per line)", # TODO: Translate "media-setting-title": "Configurações do reprodutor de mídia", "executable-path-label": "Executável do reprodutor:", @@ -374,6 +375,8 @@ pt_BR = { "password-tooltip": "Senhas são necessárias apenas para servidores privados.", "room-tooltip": "O nome da sala para se conectar pode ser praticamente qualquer coisa, mas você só irá se sincronizar com pessoas na mesma sala.", + "edit-rooms-tooltip": "Edit room list.", # TO DO: Translate + "executable-path-tooltip": "Localização do seu reprodutor de mídia preferido (mpv, mpv.net, VLC, MPC-HC/BE ou mplayer2).", "media-path-tooltip": "Localização do vídeo ou transmissão a ser aberto. Necessário com o mplayer2.", "player-arguments-tooltip": "Argumentos de comando de linha adicionais para serem repassados ao reprodutor de mídia.", diff --git a/syncplay/messages_pt_PT.py b/syncplay/messages_pt_PT.py index 5c4e10a..1138e76 100644 --- a/syncplay/messages_pt_PT.py +++ b/syncplay/messages_pt_PT.py @@ -184,6 +184,7 @@ pt_PT = { "name-label": "Nome de utilizador (opcional): ", "password-label": "Senha do servidor (se existir): ", "room-label": "Sala padrão: ", + "roomlist-msgbox-label": "Edit room list (one per line)", # TODO: Translate "media-setting-title": "Configurações do reprodutor de mídia", "executable-path-label": "Executável do reprodutor:", @@ -374,6 +375,8 @@ pt_PT = { "password-tooltip": "Senhas são necessárias apenas para servidores privados.", "room-tooltip": "O nome da sala para se conectar pode ser praticamente qualquer coisa, mas você só irá se sincronizar com utilizadores na mesma sala.", + "edit-rooms-tooltip": "Edit room list.", # TO DO: Translate + "executable-path-tooltip": "Localização do seu reprodutor de mídia preferido (mpv, mpv.net, VLC, MPC-HC/BE ou mplayer2).", "media-path-tooltip": "Localização do vídeo ou transmissão a ser aberto. Necessário com o mplayer2.", "player-arguments-tooltip": "Argumentos de comando de linha adicionais para serem repassados ao reprodutor de mídia.", diff --git a/syncplay/messages_ru.py b/syncplay/messages_ru.py index db66581..225c49e 100755 --- a/syncplay/messages_ru.py +++ b/syncplay/messages_ru.py @@ -185,6 +185,7 @@ ru = { "name-label": "Имя пользователя (не обязательно):", "password-label": "Пароль сервера (если требуется):", "room-label": "Комната:", + "roomlist-msgbox-label": "Edit room list (one per line)", # TODO: Translate "media-setting-title": "Воспроизведение", "executable-path-label": "Путь к проигрывателю:", @@ -377,6 +378,8 @@ ru = { "password-tooltip": "Пароли нужны для подключения к приватным серверам.", "room-tooltip": "Комната, в которую Вы попадете сразу после подключения. Синхронизация возможна только между людьми в одной и той же комнате.", + "edit-rooms-tooltip": "Edit room list.", # TO DO: Translate + "executable-path-tooltip": "Расположение Вашего видеопроигрывателя (mpv, mpv.net, VLC, MPC-HC/BE или mplayer2).", "media-path-tooltip": "Расположение видеофайла или потока для просмотра. Обязательно для mplayer2.", # TODO: Confirm translation "player-arguments-tooltip": "Передавать дополнительные аргументы командной строки этому проигрывателю.", diff --git a/syncplay/resources/bullet_edit_centered.png b/syncplay/resources/bullet_edit_centered.png new file mode 100644 index 0000000000000000000000000000000000000000..99d91fa7ccb472b9045f560ca825fb6bb6650bd7 GIT binary patch literal 632 zcmV-;0*C#HP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGyzyJUqzyT31wzmKP0u4z-K~y+TV`Lx` z{Qv(SOf!K=3IN3hz`X!-5(v08Tw?hD?=Qo@zkeC_wwf^9+h7*{`Ki`2OxX!}kX#8F=|582E%`c%aG|SfDh+cfSCJ zO@hV@|0P`*{{H{RFiF?PLqsiS8^5wU!s~Hv~9|_i|GU~{CGN@fr<4G!>`YZ46hF!|NQs+7bmsilV_k>zyKu{wzo(H zE0{(tQ@8VH`}J}m10(Y}99CtyTQ!sGy~Ntt-SzyJUo)6bzM S)q<1&0000?P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0(?nCK~y+Tm6P8~ zQ(+j#zdL8=c-(fT8@eVg*K!v9(DXtGRD`_Kw5J3`l zllFs(LPj>-GH|-A;pQ|=c7DC@+j|bpZC(UE@bJ7G&iC{DdS4e~49B(9qg!_ktxjJ0eEK|wAY0;Z>@8Ko2zCxjfv8y6V_P{=J|_+oKTLh)t(Dg4w` z1x!s%u}CE1oLw$gT^vy6AqWJbuNw!&1;`#1>v<6#!zu{QAKdIrw$+MlZ&lV1XpbP= zeGTy|*AeZXKylLoqXed@^UD624XB7J9+bXgs7FMwYXIfa3d-4!Q2k-3fi@1HFbu5< zuq>-i+$3Z$+~-Df*9eI5l9#=K_2eu*y?6}S?{xsCSp%r8z{i$xwci$xLi_m;E@=mn zPep^a!Lus}w-vyc#Ve?3p;AGk^%cXt5}M*;&^8}HkW3hRr?9o~8D(!L)Mg#Q=50t~ zxxNA$plB)dbchID7=@9afhaTRdr{=)KY(@&!V+ZcmPBN;Ezk|Aeux2*MQ=<2K?J{+ z?(wZ_I4HGa^K}wyMSyWJA__3J5R%i^m+yaAVcEmhVp4E27 zjsTW2dE8Ch$D3DkD5_zQ%ab6DC!E3Bz1mqlfs^nAqmVoS-V@`S^Ocp3$M!8sCXeO9!PQn_W$f+BePh23;(m3n;jvZt&