Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support of PVR Artwork #797

Merged
merged 37 commits into from
Jun 24, 2022
Merged

Support of PVR Artwork #797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
3ff91be
Support PVT Artwork
invalid-email-address Mar 7, 2022
5665102
Support PVR Artwork
invalid-email-address Mar 7, 2022
d91a452
Support PVR Artwork
invalid-email-address Mar 7, 2022
19ea2fb
Support PVR Artwork
invalid-email-address Mar 7, 2022
773ab9d
Support PVR Artwork
invalid-email-address Mar 7, 2022
8a7c672
Support PVR Artwork
invalid-email-address Mar 8, 2022
9502a8b
Merge branch 'beatmasterRS:master' into master
kalle2000 Mar 8, 2022
db56e83
Support PVR Artwork
invalid-email-address Mar 8, 2022
6d22aec
Merge branch 'master' of https://github.com/kalle2000/skin.arctic.zep…
invalid-email-address Mar 8, 2022
5c73885
Cleanup
beatmasterRS Mar 9, 2022
8c25076
Support PVR Artwork
invalid-email-address Mar 9, 2022
e4a4911
Merge branch 'master' of https://github.com/kalle2000/skin.arctic.zep…
invalid-email-address Mar 9, 2022
3ae59c0
Support PVR Artwork
invalid-email-address Mar 21, 2022
29a2319
Support PVR Artwork
invalid-email-address Mar 21, 2022
e92c52d
Merge branch 'beatmasterRS:master' into master
kalle2000 Mar 22, 2022
4730abf
Merge branch 'beatmasterRS:master' into master
kalle2000 Mar 27, 2022
fabd067
Merge branch 'beatmasterRS:master' into master
kalle2000 Mar 28, 2022
5cdfb70
Merge branch 'beatmasterRS:master' into master
kalle2000 Mar 29, 2022
571fd1c
[Code] improvements
beatmasterRS Mar 30, 2022
f7e0b81
[Code] improvements
beatmasterRS Mar 30, 2022
3c45084
Update Includes_OSD.xml
beatmasterRS Mar 30, 2022
011a10b
Merge branch 'beatmasterRS:master' into master
kalle2000 Mar 30, 2022
d6e2863
Merge branch 'beatmasterRS:master' into master
kalle2000 Mar 31, 2022
0ddd696
Update MyPVRGuide.xml
kalle2000 Mar 31, 2022
dede4e1
Merge branch 'beatmasterRS:master' into master
kalle2000 Apr 3, 2022
f2708a5
Merge branch 'beatmasterRS:master' into master
kalle2000 Apr 15, 2022
adeefae
PVR artwork - Global Fanart for EPG/Channel Manager
invalid-email-address Apr 18, 2022
35e291a
PVR artwork - Global Fanart for Home Window
invalid-email-address Apr 18, 2022
286c232
Merge branch 'beatmasterRS:master' into master
kalle2000 Apr 28, 2022
f3ecf48
Merge branch 'beatmasterRS:master' into master
kalle2000 Apr 28, 2022
be1fa54
Merge branch 'beatmasterRS:master' into master
kalle2000 Apr 28, 2022
0d7d14b
Merge branch 'beatmasterRS:master' into master
kalle2000 Apr 30, 2022
622aa85
Merge branch 'beatmasterRS:master' into master
kalle2000 May 5, 2022
c7d0e7e
Merge branch 'beatmasterRS:master' into master
kalle2000 May 17, 2022
729aa0a
Merge branch 'beatmasterRS:master' into master
kalle2000 May 21, 2022
57100b7
Merge branch 'beatmasterRS:master' into master
kalle2000 May 25, 2022
9fe1836
Merge branch 'beatmasterRS:master' into master
kalle2000 Jun 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions 1080i/Includes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,7 @@
<value condition="!Skin.HasSetting(home.dontshowfanart) + [[Skin.HasSetting(home.vertical) + Skin.HasSetting(home.vertical.widgets)] | [!Skin.HasSetting(home.vertical) + !Skin.HasSetting(home.classicwidgets) + Skin.HasSetting(home.vertical.widgets)]] + Window.IsVisible(home) + String.IsEmpty(Container(301).ListItem.Property(Background)) + String.IsEmpty(Container(301).ListItem.Property(backgroundPlaylist)) + !String.IsEmpty(Container(301152).ListItem.Art(fanart)) + Integer.IsEqual(Container(301151).NumItems,0) + Control.IsVisible(301152) + !Control.HasFocus(301152) + String.IsEmpty(Container(300).ListItem.Property(background)) + [Control.HasFocus(300) | Control.HasFocus(302) | Control.HasFocus(2011)]">$INFO[Container(301152).ListItem.Art(fanart)]</value>

<!-- Fallback, Other -->
<value condition="Window.IsVisible(home) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + String.IsEmpty(ListItem.Property(fanart)) + Skin.HasSetting(Skin_enablePvrArtwork)">$INFO[Window(Home).Property(PVR.Artwork.fanart)]</value>
<value condition="Window.IsVisible(home) + String.IsEqual(Container(300).ListItem.Property(background),playlistBackground)">$INFO[Container(9988).ListItem.Art(fanart)]</value>
<value condition="Window.IsVisible(home) + !String.IsEmpty(Container(300).ListItem.Property(Background)) + [String.IsEmpty(Skin.String(fanart.fallback)) | Control.HasFocus(300) | Control.HasFocus(302) | Control.HasFocus(2011)]">$INFO[Container(300).ListItem.Property(Background)]</value>
<value condition="Window.IsVisible(home) + !String.IsEmpty(Skin.String(home.slideshowpath)) + [[String.IsEqual(Container(300).ListItem.Property(widget),weatherdaily) | String.IsEqual(Container(300).ListItem.Property(widget),weatherhourly)] | String.IsEmpty(Container(300).ListItem.Property(widget)) | Container(301).IsUpdating | Skin.HasSetting(home.dontshowfanart)]">$INFO[Skin.String(home.slideshowpath)]</value>
Expand All @@ -519,6 +520,8 @@
<value condition="Window.IsVisible(home) + !Container(301).IsUpdating + !String.IsEmpty(Container(301).ListItem.Property(Background))">$INFO[Container(301).ListItem.Property(Background)]</value>
<value condition="Window.IsVisible(home) + !Container(301).IsUpdating + Skin.HasSetting(homemenu.netflix)">common/null.png</value>
<value condition="Window.IsVisible(home) + !Container(301).IsUpdating">pvr/background.jpg</value>
<value condition="Window.IsVisible(tvchannels) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + Skin.HasSetting(Skin_enablePvrArtwork)">$INFO[Window(Home).Property(PVR.Artwork.Fanart)]</value>
<value condition="Window.IsVisible(tvguide) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + Skin.HasSetting(Skin_enablePvrArtwork)">$INFO[Window(Home).Property(PVR.Artwork.Fanart)]</value>
<value condition="!String.IsEmpty(Window(Home).Property(SkinHelper.ExtraFanArtPath)) + Skin.HasSetting(SkinHelper.EnableExtraFanart) + System.AddonIsEnabled(script.skin.helper.service) + Window.IsVisible(MyVideoNav.xml)">$INFO[Window(Home).Property(SkinHelper.ExtraFanArtPath)]</value>
<value condition="!String.IsEmpty(ListItem.Art(fanart))">$INFO[ListItem.Art(fanart)]</value>
<value condition="!String.IsEmpty(Container(9500).ListItem.Art(fanart))">$INFO[Container(9500).ListItem.Art(fanart)]</value>
Expand Down
6 changes: 5 additions & 1 deletion 1080i/Includes_Images.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,13 +323,17 @@
</variable>

<variable name="PVRThumb">
<value condition="!String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + Skin.HasSetting(Skin_enablePvrArtwork)">$INFO[Window(Home).Property(PVR.Artwork.fanart)]</value>
<value condition="!String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(Skin_enablePvrArtwork)">$INFO[Window(Home).Property(PVR.Artwork.poster)]</value>
<value condition="!String.IsEmpty(Window(Home).Property(SkinHelper.ListItem.Art.Fanart))">$INFO[Window(Home).Property(SkinHelper.ListItem.Art.Fanart)]</value>
<value condition="Window.IsVisible(MyPVRRecordings.xml)">$INFO[ListItem.Icon]</value>
<value condition="Window.IsVisible(DialogPVRInfo.xml)">$INFO[ListItem.Icon]</value>
</variable>

<variable name="ChannelListEPGIconVar">
<value condition="!String.IsEmpty(Listitem.EpgEventIcon)">$INFO[ListItem.EpgEventIcon]</value>
<value condition="!String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + Skin.HasSetting(Skin_enablePvrArtwork)">$INFO[Window(Home).Property(PVR.Artwork.fanart)]</value>
<value condition="!String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(Skin_enablePvrArtwork)">$INFO[Window(Home).Property(PVR.Artwork.poster)]</value>
<value condition="!String.IsEmpty(ListItem.EpgEventIcon)">$INFO[ListItem.EpgEventIcon]</value>
<value>$INFO[ListItem.Icon]</value>
</variable>

Expand Down
13 changes: 11 additions & 2 deletions 1080i/Includes_OSD.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2833,7 +2833,7 @@
<aspectratio align="center" aligny="center" scalediffuse="false">scale</aspectratio>
</control>
<control type="image">
<visible>!VideoPlayer.Content(LiveTV) + [!String.IsEmpty(Player.Art(tvshow.poster)) | !String.IsEmpty(Player.Art(poster))]</visible>
<visible>[!VideoPlayer.Content(LiveTV) + [!String.IsEmpty(Player.Art(tvshow.poster)) | !String.IsEmpty(Player.Art(poster))]] | [VideoPlayer.Content(LiveTV) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(Skin_enablePvrArtwork)]</visible>
<left>-51</left>
<top>-241</top>
<width>272</width>
Expand All @@ -2857,14 +2857,23 @@
<texture colordiffuse="Box2" border="4" background="true">common/box21.png</texture>
<visible>VideoPlayer.Content(LiveTV) + !String.IsEmpty(Player.Art(thumb)) + !Skin.HasSetting(osd.disable.icon.background.pvr)</visible>
</control>
<control type="image">
<left>-50</left>
<top>-240</top>
<width>270</width>
<height>390</height>
<aspectratio align="center" aligny="center" scalediffuse="false">scale</aspectratio>
<texture>$INFO[Window(Home).Property(PVR.Artwork.poster)]</texture>
<visible>VideoPlayer.Content(LiveTV) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(Skin_enablePvrArtwork)</visible>
</control>
<control type="image">
<width>230</width>
<height>230</height>
<bottom>70</bottom>
<left>20</left>
<aspectratio>keep</aspectratio>
<texture>$INFO[Player.Art(thumb)]</texture>
<visible>VideoPlayer.Content(LiveTV) + !String.IsEmpty(Player.Art(thumb))</visible>
<visible>VideoPlayer.Content(LiveTV) + !String.IsEmpty(Player.Art(thumb)) + [[String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(Skin_enablePvrArtwork)] | !Skin.HasSetting(Skin_enablePvrArtwork)]</visible>
</control>
</control>
</control>
Expand Down
16 changes: 3 additions & 13 deletions 1080i/Includes_PVR.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,17 +178,7 @@
<aspectratio align="center" aligny="center" scalediffuse="false">scale</aspectratio>
</control>
<control type="image">
<left>10</left>
<top>10</top>
<right>10</right>
<bottom>10</bottom>
<aspectratio align="center" aligny="center" scalediffuse="false">scale</aspectratio>
<texture diffuse="diffuse/pvrinfo.png" background="true">pvr/background.jpg</texture>
<visible>!Player.HasVideo + String.IsEmpty(Listitem.EpgEventIcon) + String.IsEmpty(Listitem.Icon)</visible>
<fadetime>PosterFanartFadetime</fadetime>
</control>
<control type="image">
<visible>!Player.HasVideo + String.IsEmpty(Listitem.EpgEventIcon)</visible>
<visible>!Player.HasVideo + String.IsEmpty(Listitem.EpgEventIcon) + [[String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(Skin_enablePvrArtwork)] | !Skin.HasSetting(Skin_enablePvrArtwork)]</visible>
<left>70</left>
<top>30</top>
<right>70</right>
Expand All @@ -198,13 +188,13 @@
<fadetime>PosterFanartFadetime</fadetime>
</control>
<control type="image">
<visible>!Player.HasVideo + !String.IsEmpty(Listitem.EpgEventIcon)</visible>
<visible>!Player.HasVideo + [!String.IsEmpty(Listitem.EpgEventIcon) | !String.IsEmpty(ListItem.Icon) | [Skin.HasSetting(Skin_enablePvrArtwork) + [!String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) | !String.IsEmpty(Window(Home).Property(PVR.Artwork.poster))]]]</visible>
<left>10</left>
<top>10</top>
<right>10</right>
<bottom>10</bottom>
<aspectratio align="center" aligny="center" scalediffuse="false">keep</aspectratio>
<texture diffuse="diffuse/pvrinfo.png" background="true">$INFO[ListItem.EpgEventIcon]</texture>
<texture diffuse="diffuse/pvrinfo.png" background="true">$VAR[ChannelListEPGIconVar]</texture>
<fadetime>PosterFanartFadetime</fadetime>
</control>
<control type="image">
Expand Down
5 changes: 3 additions & 2 deletions 1080i/MyPVRGuide.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@
<width>240</width>
<bottom>0</bottom>
<aspectratio align="center" aligny="center">keep</aspectratio>
<texture>$INFO[ListItem.Icon]</texture>
<texture>$VAR[ChannelListEPGIconVar]</texture>
<fadetime>PosterFanartFadetime</fadetime>
</control>
</control>
<control type="radiobutton" id="11441">
Expand Down Expand Up @@ -421,4 +422,4 @@
</control>
<include>PVRSideBlade</include>
</controls>
</window>
</window>
15 changes: 14 additions & 1 deletion 1080i/SkinSettings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2090,6 +2090,11 @@
<param name="visible" value="ControlGroup(9100).HasFocus(9113)"/>
<param name="addonname" value="script.module.animated_artwork"/>
</include>
<include content="DefSkinAddons">
<param name="id" value="11023"/>
<param name="visible" value="ControlGroup(9100).HasFocus(9113)"/>
<param name="addonname" value="script.module.pvr.artwork"/>
</include>
</control>

<!-- Furniture -->
Expand Down Expand Up @@ -2467,6 +2472,15 @@
<selected>Skin.HasSetting(dontuselandscapemovies)</selected>
<onclick>Skin.ToggleSetting(dontuselandscapemovies)</onclick>
</control>
<control type="radiobutton" id="11400">
<width>1360</width>
<visible>ControlGroup(9100).HasFocus(9106)</visible>
<include>DefSettingsButtonGradientSkinSettings</include>
<label>$LOCALIZE[31675]</label>
<selected>Skin.HasSetting(Skin_enablePvrArtwork)</selected>
<onclick>Skin.ToggleSetting(Skin_enablePvrArtwork)</onclick>
<visible>System.AddonIsEnabled(script.module.pvr.artwork)</visible>
</control>

<!-- Indicators -->
<control type="button" id="9590">
Expand Down Expand Up @@ -2982,7 +2996,6 @@
<onclick>Skin.ToggleSetting(lock.skinsettings)</onclick>
<enable>!Skin.HasSetting(disable.startup.window)</enable>
</control>

<control type="grouplist" id="12100">
<visible>ControlGroup(9100).HasFocus(9107)</visible>
<orientation>horizontal</orientation>
Expand Down
5 changes: 5 additions & 0 deletions language/resource.language.en_gb/strings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2484,3 +2484,8 @@ msgstr ""
msgctxt "#31674"
msgid "Critics consensus"
msgstr ""

msgctxt "#31675"
msgid "Use artwork module for PVR artwork"
msgstr ""