Merge pull request #128 from mcarlton00/remove-default-port

Remove default connection port

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"

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 ""

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"

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"

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"

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 ""

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 ""

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 "파일 삭제 확인"

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"

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"

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"

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"

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"

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 "Подтверить удаление файла"

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"

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 "确认删除文件"

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 "确认文件删除"

resources/lib/dialogs/servermanual.py

@@ -60,16 +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.port_field.setText('8096')
         self.setFocus(self.host_field)
 
         self.host_field.controlUp(self.cancel_button)
-        self.host_field.controlDown(self.port_field)
+        self.host_field.controlDown(self.connect_button)
-        self.port_field.controlUp(self.host_field)
+        self.connect_button.controlUp(self.host_field)
-        self.port_field.controlDown(self.connect_button)
-        self.connect_button.controlUp(self.port_field)
         self.cancel_button.controlDown(self.host_field)
 
     def onClick(self, control):
@@ -78,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:
@@ -94,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):
@@ -117,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))
-        self._message("%s %s..." % (_(30610), server_address))
+        result = self.connect_manager.connect_to_address(server)
-        result = self.connect_manager.connect_to_address(server_address)
 
         if result['State'] == CONNECTION_STATE['Unavailable']:
             self._message(_(30609))

resources/skins/default/1080i/script-jellyfin-connect-server-manual.xml

@@ -80,28 +80,6 @@
 								<texture colordiffuse="ff525252">white.png</texture>
 							</control>
 						</control>
-						<control type="group" id="102">
-							<height>110</height>
-							<control type="label">
-								<label>$ADDON[plugin.video.jellyfin 30030]</label>
-								<textcolor>ffe1e1e1</textcolor>
-								<textshadow>66000000</textshadow>
-								<font>font12</font>
-								<aligny>top</aligny>
-								<textoffsetx>20</textoffsetx>
-							</control>
-							<control type="label">
-								<height>50</height>
-							</control>
-							<control type="image">
-								<description>separator</description>
-								<left>20</left>
-								<right>20</right>
-								<height>1</height>
-								<top>90</top>
-								<texture colordiffuse="ff525252">white.png</texture>
-							</control>
-						</control>
 						<control type="button" id="200">
 							<label>[B]$ADDON[plugin.video.jellyfin 30616][/B]</label>
 							<width>426</width>