From a2d4950fc81b1526ea3ba903bb8930cf4cd3f346 Mon Sep 17 00:00:00 2001 From: mcarlton00 Date: Tue, 29 Oct 2019 18:55:21 -0400 Subject: [PATCH 1/3] Remove default connection port --- resources/lib/dialogs/servermanual.py | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/lib/dialogs/servermanual.py b/resources/lib/dialogs/servermanual.py index 7f1e8394..b2edf8e7 100644 --- a/resources/lib/dialogs/servermanual.py +++ b/resources/lib/dialogs/servermanual.py @@ -62,7 +62,6 @@ class ServerManual(xbmcgui.WindowXMLDialog): self.host_field = self._add_editcontrol(755, 433, 40, 415) self.port_field = self._add_editcontrol(755, 543, 40, 415) - self.port_field.setText('8096') self.setFocus(self.host_field) self.host_field.controlUp(self.cancel_button) From 460b2ef8898023f25392aa327fde4ba26815d906 Mon Sep 17 00:00:00 2001 From: mcarlton00 Date: Sat, 2 Nov 2019 23:25:15 -0400 Subject: [PATCH 2/3] Remove port field from server setup --- resources/lib/dialogs/servermanual.py | 19 ++++++---------- .../script-jellyfin-connect-server-manual.xml | 22 ------------------- 2 files changed, 7 insertions(+), 34 deletions(-) diff --git a/resources/lib/dialogs/servermanual.py b/resources/lib/dialogs/servermanual.py index b2edf8e7..314e9c28 100644 --- a/resources/lib/dialogs/servermanual.py +++ b/resources/lib/dialogs/servermanual.py @@ -60,15 +60,12 @@ class ServerManual(xbmcgui.WindowXMLDialog): self.error_toggle = self.getControl(ERROR_TOGGLE) self.error_msg = self.getControl(ERROR_MSG) self.host_field = self._add_editcontrol(755, 433, 40, 415) - self.port_field = self._add_editcontrol(755, 543, 40, 415) self.setFocus(self.host_field) self.host_field.controlUp(self.cancel_button) - self.host_field.controlDown(self.port_field) - self.port_field.controlUp(self.host_field) - self.port_field.controlDown(self.connect_button) - self.connect_button.controlUp(self.port_field) + self.host_field.controlDown(self.connect_button) + self.connect_button.controlUp(self.host_field) self.cancel_button.controlDown(self.host_field) def onClick(self, control): @@ -77,14 +74,13 @@ class ServerManual(xbmcgui.WindowXMLDialog): self._disable_error() server = self.host_field.getText() - port = self.port_field.getText() if not server: # Display error self._error(ERROR['Empty'], _('empty_server')) LOG.error("Server cannot be null") - elif self._connect_to_server(server, port): + elif self._connect_to_server(server): self.close() elif control == CANCEL: @@ -93,7 +89,7 @@ class ServerManual(xbmcgui.WindowXMLDialog): def onAction(self, action): - if self.error == ERROR['Empty'] and self.host_field.getText() and self.port_field.getText(): + if self.error == ERROR['Empty'] and self.host_field.getText(): self._disable_error() if action in (ACTION_BACK, ACTION_PARENT_DIR, ACTION_PREVIOUS_MENU): @@ -116,13 +112,12 @@ class ServerManual(xbmcgui.WindowXMLDialog): self.addControl(control) return control - def _connect_to_server(self, server, port): + def _connect_to_server(self, server): if _IPV6_RE.match(server): server = "[%s]" % (server) - server_address = "%s:%s" % (server, port) if port else server - self._message("%s %s..." % (_(30610), server_address)) - result = self.connect_manager.connect_to_address(server_address) + self._message("%s %s..." % (_(30610), server)) + result = self.connect_manager.connect_to_address(server) if result['State'] == CONNECTION_STATE['Unavailable']: self._message(_(30609)) diff --git a/resources/skins/default/1080i/script-jellyfin-connect-server-manual.xml b/resources/skins/default/1080i/script-jellyfin-connect-server-manual.xml index 81d48fe4..d0954ae9 100644 --- a/resources/skins/default/1080i/script-jellyfin-connect-server-manual.xml +++ b/resources/skins/default/1080i/script-jellyfin-connect-server-manual.xml @@ -80,28 +80,6 @@ white.png - - 110 - - - ffe1e1e1 - 66000000 - font12 - top - 20 - - - 50 - - - separator - 20 - 20 - 1 - 90 - white.png - - 426 From 4c0ea3543ed82e8d282dc900562763651dc56567 Mon Sep 17 00:00:00 2001 From: mcarlton00 Date: Sat, 2 Nov 2019 23:42:14 -0400 Subject: [PATCH 3/3] Remove port number dialog from string files --- resources/language/resource.language.de_de/strings.po | 4 ---- resources/language/resource.language.en_gb/strings.po | 4 ---- resources/language/resource.language.es/strings.po | 4 ---- resources/language/resource.language.fr_fr/strings.po | 4 ---- resources/language/resource.language.it_it/strings.po | 4 ---- resources/language/resource.language.ja/strings.po | 4 ---- resources/language/resource.language.kk/strings.po | 4 ---- resources/language/resource.language.ko/strings.po | 4 ---- resources/language/resource.language.nb_NO/strings.po | 4 ---- resources/language/resource.language.nl_nl/strings.po | 4 ---- resources/language/resource.language.pl_pl/strings.po | 4 ---- resources/language/resource.language.pt_BR/strings.po | 4 ---- resources/language/resource.language.pt_PT/strings.po | 4 ---- resources/language/resource.language.ru/strings.po | 4 ---- resources/language/resource.language.sk/strings.po | 4 ---- resources/language/resource.language.zh_Hans/strings.po | 4 ---- resources/language/resource.language.zh_cn/strings.po | 4 ---- 17 files changed, 68 deletions(-) diff --git a/resources/language/resource.language.de_de/strings.po b/resources/language/resource.language.de_de/strings.po index f7ccf433..40be370e 100644 --- a/resources/language/resource.language.de_de/strings.po +++ b/resources/language/resource.language.de_de/strings.po @@ -56,10 +56,6 @@ msgctxt "#30024" msgid "Username" msgstr "Benutzername" -msgctxt "#30030" -msgid "Port number" -msgstr "Portnummer" - msgctxt "#30091" msgid "Confirm file deletion" msgstr "Löschen von Dateien bestätigen" diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po index 5575d01d..b5f81fbf 100644 --- a/resources/language/resource.language.en_gb/strings.po +++ b/resources/language/resource.language.en_gb/strings.po @@ -50,10 +50,6 @@ msgctxt "#30024" msgid "Username" msgstr "" -msgctxt "#30030" -msgid "Port number" -msgstr "" - msgctxt "#30091" msgid "Confirm file deletion" msgstr "" diff --git a/resources/language/resource.language.es/strings.po b/resources/language/resource.language.es/strings.po index e54c0c6e..e09377e2 100644 --- a/resources/language/resource.language.es/strings.po +++ b/resources/language/resource.language.es/strings.po @@ -53,10 +53,6 @@ msgctxt "#30024" msgid "Username" msgstr "Nombre de usuario" -msgctxt "#30030" -msgid "Port number" -msgstr "Puerto" - msgctxt "#30091" msgid "Confirm file deletion" msgstr "Conformar borrado de archivo" diff --git a/resources/language/resource.language.fr_fr/strings.po b/resources/language/resource.language.fr_fr/strings.po index 3f8c9297..36065ec0 100644 --- a/resources/language/resource.language.fr_fr/strings.po +++ b/resources/language/resource.language.fr_fr/strings.po @@ -54,10 +54,6 @@ msgctxt "#30024" msgid "Username" msgstr "Nom d'utilisateur" -msgctxt "#30030" -msgid "Port number" -msgstr "Numéro du port" - msgctxt "#30091" msgid "Confirm file deletion" msgstr "Confirmer la suppression du fichier" diff --git a/resources/language/resource.language.it_it/strings.po b/resources/language/resource.language.it_it/strings.po index 0ba22661..7650cfad 100644 --- a/resources/language/resource.language.it_it/strings.po +++ b/resources/language/resource.language.it_it/strings.po @@ -54,10 +54,6 @@ msgctxt "#30024" msgid "Username" msgstr "Nome utente" -msgctxt "#30030" -msgid "Port number" -msgstr "Numero porta" - msgctxt "#30091" msgid "Confirm file deletion" msgstr "Conferma eliminazione file" diff --git a/resources/language/resource.language.ja/strings.po b/resources/language/resource.language.ja/strings.po index 98bf173c..1f0f2a3a 100644 --- a/resources/language/resource.language.ja/strings.po +++ b/resources/language/resource.language.ja/strings.po @@ -50,10 +50,6 @@ msgctxt "#30024" msgid "Username" msgstr "" -msgctxt "#30030" -msgid "Port number" -msgstr "" - msgctxt "#30091" msgid "Confirm file deletion" msgstr "" diff --git a/resources/language/resource.language.kk/strings.po b/resources/language/resource.language.kk/strings.po index 38216165..ff45b7fa 100644 --- a/resources/language/resource.language.kk/strings.po +++ b/resources/language/resource.language.kk/strings.po @@ -50,10 +50,6 @@ msgctxt "#30024" msgid "Username" msgstr "" -msgctxt "#30030" -msgid "Port number" -msgstr "" - msgctxt "#30091" msgid "Confirm file deletion" msgstr "" diff --git a/resources/language/resource.language.ko/strings.po b/resources/language/resource.language.ko/strings.po index e1c85ec7..bd07fd65 100644 --- a/resources/language/resource.language.ko/strings.po +++ b/resources/language/resource.language.ko/strings.po @@ -53,10 +53,6 @@ msgctxt "#30024" msgid "Username" msgstr "사용자 이름" -msgctxt "#30030" -msgid "Port number" -msgstr "포트" - msgctxt "#30091" msgid "Confirm file deletion" msgstr "파일 삭제 확인" diff --git a/resources/language/resource.language.nb_NO/strings.po b/resources/language/resource.language.nb_NO/strings.po index 3909d3c7..1b6ce9d3 100644 --- a/resources/language/resource.language.nb_NO/strings.po +++ b/resources/language/resource.language.nb_NO/strings.po @@ -53,10 +53,6 @@ msgctxt "#30024" msgid "Username" msgstr "Brukernavn" -msgctxt "#30030" -msgid "Port number" -msgstr "Portnummer" - msgctxt "#30091" msgid "Confirm file deletion" msgstr "Bekreft sletting av fil" diff --git a/resources/language/resource.language.nl_nl/strings.po b/resources/language/resource.language.nl_nl/strings.po index c0e1696a..041dcdff 100644 --- a/resources/language/resource.language.nl_nl/strings.po +++ b/resources/language/resource.language.nl_nl/strings.po @@ -54,10 +54,6 @@ msgctxt "#30024" msgid "Username" msgstr "Gebruikersnaam" -msgctxt "#30030" -msgid "Port number" -msgstr "Poort nummer" - msgctxt "#30091" msgid "Confirm file deletion" msgstr "Bestand verwijderen bevestigen" diff --git a/resources/language/resource.language.pl_pl/strings.po b/resources/language/resource.language.pl_pl/strings.po index f287e8df..90ba2599 100644 --- a/resources/language/resource.language.pl_pl/strings.po +++ b/resources/language/resource.language.pl_pl/strings.po @@ -54,10 +54,6 @@ msgctxt "#30024" msgid "Username" msgstr "Nazwa użytkownika" -msgctxt "#30030" -msgid "Port number" -msgstr "Port" - msgctxt "#30091" msgid "Confirm file deletion" msgstr "Potwierdzanie usuwania plików" diff --git a/resources/language/resource.language.pt_BR/strings.po b/resources/language/resource.language.pt_BR/strings.po index 2acb560a..c780f8ea 100644 --- a/resources/language/resource.language.pt_BR/strings.po +++ b/resources/language/resource.language.pt_BR/strings.po @@ -53,10 +53,6 @@ msgctxt "#30024" msgid "Username" msgstr "Nome de Usuário" -msgctxt "#30030" -msgid "Port number" -msgstr "Número da porta" - msgctxt "#30091" msgid "Confirm file deletion" msgstr "Confirme exclusão de arquivo" diff --git a/resources/language/resource.language.pt_PT/strings.po b/resources/language/resource.language.pt_PT/strings.po index 2e14de90..19438225 100644 --- a/resources/language/resource.language.pt_PT/strings.po +++ b/resources/language/resource.language.pt_PT/strings.po @@ -53,10 +53,6 @@ msgctxt "#30024" msgid "Username" msgstr "Nome de Utilizador" -msgctxt "#30030" -msgid "Port number" -msgstr "Porta" - msgctxt "#30091" msgid "Confirm file deletion" msgstr "Confirme a remoção do ficheiro" diff --git a/resources/language/resource.language.ru/strings.po b/resources/language/resource.language.ru/strings.po index 54bdf769..2f2f5b61 100644 --- a/resources/language/resource.language.ru/strings.po +++ b/resources/language/resource.language.ru/strings.po @@ -54,10 +54,6 @@ msgctxt "#30024" msgid "Username" msgstr "Имя пользователя" -msgctxt "#30030" -msgid "Port number" -msgstr "Номер порта" - msgctxt "#30091" msgid "Confirm file deletion" msgstr "Подтверить удаление файла" diff --git a/resources/language/resource.language.sk/strings.po b/resources/language/resource.language.sk/strings.po index 52324173..4b8f5b46 100644 --- a/resources/language/resource.language.sk/strings.po +++ b/resources/language/resource.language.sk/strings.po @@ -53,10 +53,6 @@ msgctxt "#30024" msgid "Username" msgstr "Používateľské meno" -msgctxt "#30030" -msgid "Port number" -msgstr "Číslo portu" - msgctxt "#30091" msgid "Confirm file deletion" msgstr "Potvrdiť vymazanie súboru" diff --git a/resources/language/resource.language.zh_Hans/strings.po b/resources/language/resource.language.zh_Hans/strings.po index 5b114d08..96af1e05 100644 --- a/resources/language/resource.language.zh_Hans/strings.po +++ b/resources/language/resource.language.zh_Hans/strings.po @@ -53,10 +53,6 @@ msgctxt "#30024" msgid "Username" msgstr "用户名" -msgctxt "#30030" -msgid "Port number" -msgstr "端口号" - msgctxt "#30091" msgid "Confirm file deletion" msgstr "确认删除文件" diff --git a/resources/language/resource.language.zh_cn/strings.po b/resources/language/resource.language.zh_cn/strings.po index c2c66b5f..7e056b09 100644 --- a/resources/language/resource.language.zh_cn/strings.po +++ b/resources/language/resource.language.zh_cn/strings.po @@ -50,10 +50,6 @@ msgctxt "#30024" msgid "Username" msgstr "用户名" -msgctxt "#30030" -msgid "Port number" -msgstr "端口号" - msgctxt "#30091" msgid "Confirm file deletion" msgstr "确认文件删除"