Jellyfin/jellyfin-kodi
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-kodi.git synced 2024-12-27 03:06:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8 from cvium/fix_rebrand_and_http

Browse source 
Final rebranding and one bug fix
This commit is contained in:
Vasily 2019-02-05 17:09:15 +03:00 committed by GitHub
commit 4e9728ba8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
addon.xml
View file

@ -38,7 +38,7 @@
</news> </news>
<assets> <assets>
<icon>icon.png</icon> <icon>icon.png</icon>
<fanart>fanart.jpg</fanart> <fanart>fanart.png</fanart>
</assets> </assets>
</extension> </extension>
</addon> </addon>

BIN
fanart.jpg
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 74 KiB

BIN
fanart.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 76 KiB

BIN
icon.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 18 KiB

2
resources/lib/dialogs/loginmanual.py
View file

@ -103,7 +103,7 @@ class LoginManual(xbmcgui.WindowXMLDialog):
control = xbmcgui.ControlEdit(0, 0, 0, 0, control = xbmcgui.ControlEdit(0, 0, 0, 0,
label="User", label="User",
font="font13", font="font13",
textColor="FF52b54b", textColor="FF00A4DC",
disabledColor="FF888888", disabledColor="FF888888",
focusTexture="-", focusTexture="-",
noFocusTexture="-", noFocusTexture="-",

2
resources/lib/dialogs/servermanual.py
View file

@ -103,7 +103,7 @@ class ServerManual(xbmcgui.WindowXMLDialog):
control = xbmcgui.ControlEdit(0, 0, 0, 0, control = xbmcgui.ControlEdit(0, 0, 0, 0,
label="User", label="User",
font="font13", font="font13",
textColor="FF52b54b", textColor="FF00A4DC",
disabledColor="FF888888", disabledColor="FF888888",
focusTexture="-", focusTexture="-",
noFocusTexture="-") noFocusTexture="-")

4
resources/lib/downloader.py
View file

@ -51,11 +51,11 @@ def _http(action, url, request={}, server_id=None):
def _get(handler, params=None, 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): 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): def _delete(handler, params=None, server_id=None):

4
resources/lib/entrypoint/default.py
View file

@ -211,8 +211,8 @@ def dir_listitem(label, path, artwork=None, fanart=None):
li = xbmcgui.ListItem(label, path=path) li = xbmcgui.ListItem(label, path=path)
li.setThumbnailImage(artwork or "special://home/addons/plugin.video.jellyfin/icon.png") 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({"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.jpg"}) li.setArt({"landscape": artwork or fanart or "special://home/addons/plugin.video.jellyfin/fanart.png"})
return li return li

6
resources/lib/objects/actions.py
View file

@ -313,7 +313,7 @@ class Actions(object):
if not intro and not obj['Type'] == 'Trailer': if not intro and not obj['Type'] == 'Trailer':
obj['Artwork']['Primary'] = obj['Artwork']['Primary'] or "special://home/addons/plugin.video.jellyfin/icon.png" obj['Artwork']['Primary'] = obj['Artwork']['Primary'] or "special://home/addons/plugin.video.jellyfin/icon.png"
else: 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']['Primary'] += "&KodiTrailer=true" if obj['Type'] == 'Trailer' else "&KodiCinemaMode=true"
obj['Artwork']['Backdrop'] = [obj['Artwork']['Primary']] 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['PlayCount'] = API.get_playcount(obj['Played'], obj['PlayCount']) or 0
obj['Overlay'] = 7 if obj['Played'] else 6 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']['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']['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.jpg"] obj['Artwork']['Backdrop'] = obj['Artwork']['Backdrop'] or ["special://home/addons/plugin.video.jellyfin/fanart.png"]
metadata = { metadata = {

4
resources/skins/default/1080i/script-jellyfin-connect-login-manual.xml
View file

@ -114,7 +114,7 @@
<textoffsetx>20</textoffsetx> <textoffsetx>20</textoffsetx>
<aligny>center</aligny> <aligny>center</aligny>
<align>center</align> <align>center</align>
<texturefocus border="10" colordiffuse="ff52b54b">buttons/shadow_smallbutton.png</texturefocus> <texturefocus border="10" colordiffuse="FF00A4DC">buttons/shadow_smallbutton.png</texturefocus>
<texturenofocus border="10" colordiffuse="ff464646">buttons/shadow_smallbutton.png</texturenofocus> <texturenofocus border="10" colordiffuse="ff464646">buttons/shadow_smallbutton.png</texturenofocus>
<pulseonselect>no</pulseonselect> <pulseonselect>no</pulseonselect>
<onup>205</onup> <onup>205</onup>
@ -132,7 +132,7 @@
<textoffsetx>20</textoffsetx> <textoffsetx>20</textoffsetx>
<aligny>center</aligny> <aligny>center</aligny>
<align>center</align> <align>center</align>
<texturefocus border="10" colordiffuse="ff52b54b">buttons/shadow_smallbutton.png</texturefocus> <texturefocus border="10" colordiffuse="FF00A4DC">buttons/shadow_smallbutton.png</texturefocus>
<texturenofocus border="10" colordiffuse="ff464646">buttons/shadow_smallbutton.png</texturenofocus> <texturenofocus border="10" colordiffuse="ff464646">buttons/shadow_smallbutton.png</texturenofocus>
<pulseonselect>no</pulseonselect> <pulseonselect>no</pulseonselect>
<animation effect="slide" time="0" end="17,0" condition="true">Conditional</animation> <animation effect="slide" time="0" end="17,0" condition="true">Conditional</animation>

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

@ -114,7 +114,7 @@
<textoffsetx>20</textoffsetx> <textoffsetx>20</textoffsetx>
<aligny>center</aligny> <aligny>center</aligny>
<align>center</align> <align>center</align>
<texturefocus border="10" colordiffuse="ff52b54b">buttons/shadow_smallbutton.png</texturefocus> <texturefocus border="10" colordiffuse="FF00A4DC">buttons/shadow_smallbutton.png</texturefocus>
<texturenofocus border="10" colordiffuse="ff464646">buttons/shadow_smallbutton.png</texturenofocus> <texturenofocus border="10" colordiffuse="ff464646">buttons/shadow_smallbutton.png</texturenofocus>
<pulseonselect>no</pulseonselect> <pulseonselect>no</pulseonselect>
<animation effect="slide" time="0" end="17,0" condition="true">Conditional</animation> <animation effect="slide" time="0" end="17,0" condition="true">Conditional</animation>
@ -131,7 +131,7 @@
<textoffsetx>20</textoffsetx> <textoffsetx>20</textoffsetx>
<aligny>center</aligny> <aligny>center</aligny>
<align>center</align> <align>center</align>
<texturefocus border="10" colordiffuse="ff52b54b">buttons/shadow_smallbutton.png</texturefocus> <texturefocus border="10" colordiffuse="FF00A4DC">buttons/shadow_smallbutton.png</texturefocus>
<texturenofocus border="10" colordiffuse="ff464646">buttons/shadow_smallbutton.png</texturenofocus> <texturenofocus border="10" colordiffuse="ff464646">buttons/shadow_smallbutton.png</texturenofocus>
<pulseonselect>no</pulseonselect> <pulseonselect>no</pulseonselect>
<animation effect="slide" time="0" end="17,0" condition="true">Conditional</animation> <animation effect="slide" time="0" end="17,0" condition="true">Conditional</animation>

6
resources/skins/default/1080i/script-jellyfin-connect-server.xml
View file

@ -152,7 +152,7 @@
<width>120</width> <width>120</width>
<height>200</height> <height>200</height>
<visible>false</visible> <visible>false</visible>
<texture colordiffuse="ff52b54b">spinner.gif</texture> <texture colordiffuse="FF00A4DC">spinner.gif</texture>
<aspectratio>keep</aspectratio> <aspectratio>keep</aspectratio>
</control> </control>
</control> </control>
@ -172,7 +172,7 @@
<textoffsetx>20</textoffsetx> <textoffsetx>20</textoffsetx>
<aligny>center</aligny> <aligny>center</aligny>
<align>center</align> <align>center</align>
<texturefocus border="10" colordiffuse="ff52b54b">buttons/shadow_smallbutton.png</texturefocus> <texturefocus border="10" colordiffuse="FF00A4DC">buttons/shadow_smallbutton.png</texturefocus>
<texturenofocus border="10" colordiffuse="ff464646">buttons/shadow_smallbutton.png</texturenofocus> <texturenofocus border="10" colordiffuse="ff464646">buttons/shadow_smallbutton.png</texturenofocus>
<pulseonselect>no</pulseonselect> <pulseonselect>no</pulseonselect>
<onup>155</onup> <onup>155</onup>
@ -191,7 +191,7 @@
<aligny>center</aligny> <aligny>center</aligny>
<align>center</align> <align>center</align>
<onup>155</onup> <onup>155</onup>
<texturefocus border="10" colordiffuse="ff52b54b">buttons/shadow_smallbutton.png</texturefocus> <texturefocus border="10" colordiffuse="FF00A4DC">buttons/shadow_smallbutton.png</texturefocus>
<texturenofocus border="10" colordiffuse="ff464646">buttons/shadow_smallbutton.png</texturenofocus> <texturenofocus border="10" colordiffuse="ff464646">buttons/shadow_smallbutton.png</texturenofocus>
<pulseonselect>no</pulseonselect> <pulseonselect>no</pulseonselect>
<animation effect="slide" time="0" end="17,0" condition="true">Conditional</animation> <animation effect="slide" time="0" end="17,0" condition="true">Conditional</animation>

6
resources/skins/default/1080i/script-jellyfin-connect-users.xml
View file

@ -139,7 +139,7 @@
<top>-7</top> <top>-7</top>
<width>300</width> <width>300</width>
<height>300</height> <height>300</height>
<texture colordiffuse="FF388e3c">items/focus_square.png</texture> <texture colordiffuse="FF00A4DC">items/focus_square.png</texture>
<aspectratio>scale</aspectratio> <aspectratio>scale</aspectratio>
<animation effect="fade" start="0" end="100" time="200" tween="sine">Focus</animation> <animation effect="fade" start="0" end="100" time="200" tween="sine">Focus</animation>
<animation effect="fade" start="100" end="0" time="0">UnFocus</animation> <animation effect="fade" start="100" end="0" time="0">UnFocus</animation>
@ -186,7 +186,7 @@
<textoffsetx>20</textoffsetx> <textoffsetx>20</textoffsetx>
<aligny>center</aligny> <aligny>center</aligny>
<align>center</align> <align>center</align>
<texturefocus border="10" colordiffuse="ff52b54b">buttons/shadow_smallbutton.png</texturefocus> <texturefocus border="10" colordiffuse="FF00A4DC">buttons/shadow_smallbutton.png</texturefocus>
<texturenofocus border="10" colordiffuse="ff464646">buttons/shadow_smallbutton.png</texturenofocus> <texturenofocus border="10" colordiffuse="ff464646">buttons/shadow_smallbutton.png</texturenofocus>
<pulseonselect>no</pulseonselect> <pulseonselect>no</pulseonselect>
<onup>155</onup> <onup>155</onup>
@ -204,7 +204,7 @@
<textoffsetx>20</textoffsetx> <textoffsetx>20</textoffsetx>
<aligny>center</aligny> <aligny>center</aligny>
<align>center</align> <align>center</align>
<texturefocus border="10" colordiffuse="ff52b54b">buttons/shadow_smallbutton.png</texturefocus> <texturefocus border="10" colordiffuse="FF00A4DC">buttons/shadow_smallbutton.png</texturefocus>
<texturenofocus border="10" colordiffuse="ff464646">buttons/shadow_smallbutton.png</texturenofocus> <texturenofocus border="10" colordiffuse="ff464646">buttons/shadow_smallbutton.png</texturenofocus>
<pulseonselect>no</pulseonselect> <pulseonselect>no</pulseonselect>
<onup>155</onup> <onup>155</onup>

BIN
resources/skins/default/media/logo-white.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB