diff --git a/addon.xml b/addon.xml index 6c02034c..0d6ad26d 100644 --- a/addon.xml +++ b/addon.xml @@ -38,7 +38,7 @@ icon.png - fanart.jpg + fanart.png diff --git a/fanart.jpg b/fanart.jpg deleted file mode 100644 index 4f565065..00000000 Binary files a/fanart.jpg and /dev/null differ diff --git a/fanart.png b/fanart.png new file mode 100644 index 00000000..74e7397d Binary files /dev/null and b/fanart.png differ diff --git a/icon.png b/icon.png index 6360cfab..8d69863b 100644 Binary files a/icon.png and b/icon.png differ diff --git a/resources/lib/dialogs/loginmanual.py b/resources/lib/dialogs/loginmanual.py index 525ea355..0ddc44b9 100644 --- a/resources/lib/dialogs/loginmanual.py +++ b/resources/lib/dialogs/loginmanual.py @@ -103,7 +103,7 @@ class LoginManual(xbmcgui.WindowXMLDialog): control = xbmcgui.ControlEdit(0, 0, 0, 0, label="User", font="font13", - textColor="FF52b54b", + textColor="FF00A4DC", disabledColor="FF888888", focusTexture="-", noFocusTexture="-", diff --git a/resources/lib/dialogs/servermanual.py b/resources/lib/dialogs/servermanual.py index a7889cc2..c0b72b6a 100644 --- a/resources/lib/dialogs/servermanual.py +++ b/resources/lib/dialogs/servermanual.py @@ -103,7 +103,7 @@ class ServerManual(xbmcgui.WindowXMLDialog): control = xbmcgui.ControlEdit(0, 0, 0, 0, label="User", font="font13", - textColor="FF52b54b", + textColor="FF00A4DC", disabledColor="FF888888", focusTexture="-", noFocusTexture="-") diff --git a/resources/lib/downloader.py b/resources/lib/downloader.py index f4abb151..b65e4868 100644 --- a/resources/lib/downloader.py +++ b/resources/lib/downloader.py @@ -51,11 +51,11 @@ def _http(action, url, request={}, server_id=None): def _get(handler, params=None, server_id=None): - return http("GET", get_jellyfinserver_url(handler), {'params': params}, server_id) + return _http("GET", get_jellyfinserver_url(handler), {'params': params}, server_id) def _post(handler, json=None, params=None, server_id=None): - return http("POST", get_jellyfinserver_url(handler), {'params': params, 'json': json}, server_id) + return _http("POST", get_jellyfinserver_url(handler), {'params': params, 'json': json}, server_id) def _delete(handler, params=None, server_id=None): diff --git a/resources/lib/entrypoint/default.py b/resources/lib/entrypoint/default.py index aeba133f..d79ebb07 100644 --- a/resources/lib/entrypoint/default.py +++ b/resources/lib/entrypoint/default.py @@ -211,8 +211,8 @@ def dir_listitem(label, path, artwork=None, fanart=None): li = xbmcgui.ListItem(label, path=path) li.setThumbnailImage(artwork or "special://home/addons/plugin.video.jellyfin/icon.png") - li.setArt({"fanart": fanart or "special://home/addons/plugin.video.jellyfin/fanart.jpg"}) - li.setArt({"landscape": artwork or fanart or "special://home/addons/plugin.video.jellyfin/fanart.jpg"}) + li.setArt({"fanart": fanart or "special://home/addons/plugin.video.jellyfin/fanart.png"}) + li.setArt({"landscape": artwork or fanart or "special://home/addons/plugin.video.jellyfin/fanart.png"}) return li diff --git a/resources/lib/objects/actions.py b/resources/lib/objects/actions.py index 2b88ca56..9826d3df 100644 --- a/resources/lib/objects/actions.py +++ b/resources/lib/objects/actions.py @@ -313,7 +313,7 @@ class Actions(object): if not intro and not obj['Type'] == 'Trailer': obj['Artwork']['Primary'] = obj['Artwork']['Primary'] or "special://home/addons/plugin.video.jellyfin/icon.png" else: - obj['Artwork']['Primary'] = obj['Artwork']['Primary'] or obj['Artwork']['Thumb'] or (obj['Artwork']['Backdrop'][0] if len(obj['Artwork']['Backdrop']) else "special://home/addons/plugin.video.jellyfin/fanart.jpg") + obj['Artwork']['Primary'] = obj['Artwork']['Primary'] or obj['Artwork']['Thumb'] or (obj['Artwork']['Backdrop'][0] if len(obj['Artwork']['Backdrop']) else "special://home/addons/plugin.video.jellyfin/fanart.png") obj['Artwork']['Primary'] += "&KodiTrailer=true" if obj['Type'] == 'Trailer' else "&KodiCinemaMode=true" obj['Artwork']['Backdrop'] = [obj['Artwork']['Primary']] @@ -472,8 +472,8 @@ class Actions(object): obj['PlayCount'] = API.get_playcount(obj['Played'], obj['PlayCount']) or 0 obj['Overlay'] = 7 if obj['Played'] else 6 obj['Artwork']['Primary'] = obj['Artwork']['Primary'] or "special://home/addons/plugin.video.jellyfin/icon.png" - obj['Artwork']['Thumb'] = obj['Artwork']['Thumb'] or "special://home/addons/plugin.video.jellyfin/fanart.jpg" - obj['Artwork']['Backdrop'] = obj['Artwork']['Backdrop'] or ["special://home/addons/plugin.video.jellyfin/fanart.jpg"] + obj['Artwork']['Thumb'] = obj['Artwork']['Thumb'] or "special://home/addons/plugin.video.jellyfin/fanart.png" + obj['Artwork']['Backdrop'] = obj['Artwork']['Backdrop'] or ["special://home/addons/plugin.video.jellyfin/fanart.png"] metadata = { diff --git a/resources/skins/default/1080i/script-jellyfin-connect-login-manual.xml b/resources/skins/default/1080i/script-jellyfin-connect-login-manual.xml index d83cb56e..cfc57dbc 100644 --- a/resources/skins/default/1080i/script-jellyfin-connect-login-manual.xml +++ b/resources/skins/default/1080i/script-jellyfin-connect-login-manual.xml @@ -114,7 +114,7 @@ 20 center center - buttons/shadow_smallbutton.png + buttons/shadow_smallbutton.png buttons/shadow_smallbutton.png no 205 @@ -132,7 +132,7 @@ 20 center center - buttons/shadow_smallbutton.png + buttons/shadow_smallbutton.png buttons/shadow_smallbutton.png no Conditional @@ -163,4 +163,4 @@ - \ No newline at end of file + 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 7a436d61..81d48fe4 100644 --- a/resources/skins/default/1080i/script-jellyfin-connect-server-manual.xml +++ b/resources/skins/default/1080i/script-jellyfin-connect-server-manual.xml @@ -114,7 +114,7 @@ 20 center center - buttons/shadow_smallbutton.png + buttons/shadow_smallbutton.png buttons/shadow_smallbutton.png no Conditional @@ -131,7 +131,7 @@ 20 center center - buttons/shadow_smallbutton.png + buttons/shadow_smallbutton.png buttons/shadow_smallbutton.png no Conditional @@ -162,4 +162,4 @@ - \ No newline at end of file + diff --git a/resources/skins/default/1080i/script-jellyfin-connect-server.xml b/resources/skins/default/1080i/script-jellyfin-connect-server.xml index 15056fea..f41ce2d2 100644 --- a/resources/skins/default/1080i/script-jellyfin-connect-server.xml +++ b/resources/skins/default/1080i/script-jellyfin-connect-server.xml @@ -152,7 +152,7 @@ 120 200 false - spinner.gif + spinner.gif keep @@ -172,7 +172,7 @@ 20 center center - buttons/shadow_smallbutton.png + buttons/shadow_smallbutton.png buttons/shadow_smallbutton.png no 155 @@ -191,7 +191,7 @@ center center 155 - buttons/shadow_smallbutton.png + buttons/shadow_smallbutton.png buttons/shadow_smallbutton.png no Conditional @@ -221,4 +221,4 @@ - \ No newline at end of file + diff --git a/resources/skins/default/1080i/script-jellyfin-connect-users.xml b/resources/skins/default/1080i/script-jellyfin-connect-users.xml index dfb2ce91..7594cd5d 100644 --- a/resources/skins/default/1080i/script-jellyfin-connect-users.xml +++ b/resources/skins/default/1080i/script-jellyfin-connect-users.xml @@ -139,7 +139,7 @@ -7 300 300 - items/focus_square.png + items/focus_square.png scale Focus UnFocus @@ -186,7 +186,7 @@ 20 center center - buttons/shadow_smallbutton.png + buttons/shadow_smallbutton.png buttons/shadow_smallbutton.png no 155 @@ -204,7 +204,7 @@ 20 center center - buttons/shadow_smallbutton.png + buttons/shadow_smallbutton.png buttons/shadow_smallbutton.png no 155 @@ -215,4 +215,4 @@ - \ No newline at end of file + diff --git a/resources/skins/default/media/logo-white.png b/resources/skins/default/media/logo-white.png index c4cf11a3..1edd4572 100644 Binary files a/resources/skins/default/media/logo-white.png and b/resources/skins/default/media/logo-white.png differ