mirror of
https://github.com/jellyfin/jellyfin-kodi.git
synced 2024-12-26 02:36:10 +00:00
Merge pull request #8 from cvium/fix_rebrand_and_http
Final rebranding and one bug fix
This commit is contained in:
Vasily
GitHub
commit
4e9728ba8a
14 changed files with 24 additions and 24 deletions
|
|
@ -38,7 +38,7 @@
|
|||
</news>
|
||||
<assets>
|
||||
<icon>icon.png</icon>
|
||||
<fanart>fanart.jpg</fanart>
|
||||
<fanart>fanart.png</fanart>
|
||||
</assets>
|
||||
</extension>
|
||||
</addon>
|
||||
|
|
|
|||
BIN
fanart.jpg
BIN
fanart.jpg
Binary file not shown.
|
Before Width: | Height: | Size: 74 KiB |
BIN
fanart.png
Normal file
BIN
fanart.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 76 KiB |
BIN
icon.png
BIN
icon.png
Binary file not shown.
|
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 18 KiB |
|
|
@ -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="-",
|
||||
|
|
|
|||
|
|
@ -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="-")
|
||||
|
|
|
|||
|
|
@ -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):
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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 = {
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@
|
|||
<textoffsetx>20</textoffsetx>
|
||||
<aligny>center</aligny>
|
||||
<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>
|
||||
<pulseonselect>no</pulseonselect>
|
||||
<onup>205</onup>
|
||||
|
|
@ -132,7 +132,7 @@
|
|||
<textoffsetx>20</textoffsetx>
|
||||
<aligny>center</aligny>
|
||||
<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>
|
||||
<pulseonselect>no</pulseonselect>
|
||||
<animation effect="slide" time="0" end="17,0" condition="true">Conditional</animation>
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@
|
|||
<textoffsetx>20</textoffsetx>
|
||||
<aligny>center</aligny>
|
||||
<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>
|
||||
<pulseonselect>no</pulseonselect>
|
||||
<animation effect="slide" time="0" end="17,0" condition="true">Conditional</animation>
|
||||
|
|
@ -131,7 +131,7 @@
|
|||
<textoffsetx>20</textoffsetx>
|
||||
<aligny>center</aligny>
|
||||
<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>
|
||||
<pulseonselect>no</pulseonselect>
|
||||
<animation effect="slide" time="0" end="17,0" condition="true">Conditional</animation>
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@
|
|||
<width>120</width>
|
||||
<height>200</height>
|
||||
<visible>false</visible>
|
||||
<texture colordiffuse="ff52b54b">spinner.gif</texture>
|
||||
<texture colordiffuse="FF00A4DC">spinner.gif</texture>
|
||||
<aspectratio>keep</aspectratio>
|
||||
</control>
|
||||
</control>
|
||||
|
|
@ -172,7 +172,7 @@
|
|||
<textoffsetx>20</textoffsetx>
|
||||
<aligny>center</aligny>
|
||||
<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>
|
||||
<pulseonselect>no</pulseonselect>
|
||||
<onup>155</onup>
|
||||
|
|
@ -191,7 +191,7 @@
|
|||
<aligny>center</aligny>
|
||||
<align>center</align>
|
||||
<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>
|
||||
<pulseonselect>no</pulseonselect>
|
||||
<animation effect="slide" time="0" end="17,0" condition="true">Conditional</animation>
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@
|
|||
<top>-7</top>
|
||||
<width>300</width>
|
||||
<height>300</height>
|
||||
<texture colordiffuse="FF388e3c">items/focus_square.png</texture>
|
||||
<texture colordiffuse="FF00A4DC">items/focus_square.png</texture>
|
||||
<aspectratio>scale</aspectratio>
|
||||
<animation effect="fade" start="0" end="100" time="200" tween="sine">Focus</animation>
|
||||
<animation effect="fade" start="100" end="0" time="0">UnFocus</animation>
|
||||
|
|
@ -186,7 +186,7 @@
|
|||
<textoffsetx>20</textoffsetx>
|
||||
<aligny>center</aligny>
|
||||
<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>
|
||||
<pulseonselect>no</pulseonselect>
|
||||
<onup>155</onup>
|
||||
|
|
@ -204,7 +204,7 @@
|
|||
<textoffsetx>20</textoffsetx>
|
||||
<aligny>center</aligny>
|
||||
<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>
|
||||
<pulseonselect>no</pulseonselect>
|
||||
<onup>155</onup>
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 2 KiB After Width: | Height: | Size: 5.3 KiB |
Loading…
Reference in a new issue