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.

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

Fix Episode Thumb #116

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
*~
.gitattributes
Thumbs.db
/.vs
18 changes: 8 additions & 10 deletions 16x9/Includes_Image.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<value condition="!String.IsEmpty(ListItem.Art(season.poster))">$INFO[ListItem.Art(season.poster)]</value>
<value condition="!String.IsEmpty(ListItem.Art(poster))">$INFO[ListItem.Art(poster)]</value>
<value condition="!String.IsEmpty(ListItem.Art(tvshow.poster))">$INFO[ListItem.Art(tvshow.poster)]</value>

<value>$INFO[ListItem.Icon]</value>
</variable>

Expand All @@ -48,6 +48,7 @@
</variable>

<variable name="Image_Thumb">
<value condition="String.IsEqual(ListItem.DBType,episode) + [String.IsEqual(ListItem.Icon,ListItem.Art(fanart)) | String.IsEqual(ListItem.Icon,OverlaySpoiler.png)]">$VAR[Image_Thumb_Spoiler]</value>
<value condition="[Container.Content(episodes) | Window.IsVisible(MyPics.xml) | Container.Content(videos) | Window.IsVisible(1131)] + !String.IsEmpty(ListItem.Art(thumb))">$INFO[ListItem.Art(thumb)]</value>
<value condition="Skin.HasSetting(artwork.landscape) + !String.IsEmpty(ListItem.Art(landscape))">$INFO[ListItem.Art(landscape)]</value>
<value condition="Skin.HasSetting(artwork.landscape) + !String.IsEmpty(ListItem.Art(tvshow.landscape))">$INFO[ListItem.Art(tvshow.landscape)]</value>
Expand All @@ -57,6 +58,11 @@
<value>$INFO[ListItem.Icon]</value>
</variable>

<variable name="Image_Thumb_Spoiler">
<value condition="!String.IsEmpty(ListItem.Art(tvshow.fanart))">$INFO[ListItem.Art(tvshow.fanart)]</value>
<value>common/black.png</value>
</variable>

<variable name="Image_PVRThumb">
<value condition="!String.IsEmpty(Window(Home).Property(TMDBbHelper.ListItem.Fanart))">$INFO[Window(Home).Property(TMDBbHelper.ListItem.Fanart)]</value>
<value condition="!String.IsEmpty(Skin.String(background.fallback))">$INFO[Skin.String(background.fallback)]</value>
Expand Down Expand Up @@ -94,9 +100,6 @@
<value>star0</value>
</variable>




<variable name="Image_Fanart">
<value condition="!String.IsEmpty(ListItem.Art(fanart))">$INFO[ListItem.Art(fanart)]</value>
</variable>
Expand All @@ -106,15 +109,12 @@
<value condition="!String.IsEmpty(ListItem.Art(thumb))">$INFO[ListItem.Art(thumb)]</value>
</variable>



<variable name="Image_Banner">
<value condition="!String.IsEmpty(ListItem.Art(banner))">$INFO[ListItem.Art(banner)]</value>
<value condition="!String.IsEmpty(ListItem.Art(tvshow.banner))">$INFO[ListItem.Art(tvshow.banner)]</value>
<value>$VAR[Image_Fanart]</value>
</variable>


<variable name="Image_RSS_Icon">
<value condition="Player.HasMedia + Player.Paused">common/pause.png</value>
<value condition="Player.HasMedia + !Player.Paused">common/play.png</value>
Expand Down Expand Up @@ -143,7 +143,7 @@
<value condition="!String.IsEmpty(Window(home).Property(TMDBbHelper.ListItem.Fanart)) + !Skin.HasSetting(global.fanart)">$INFO[Window(home).Property(TMDBbHelper.ListItem.Fanart)]</value>

<value condition="!String.IsEmpty(Skin.String(background.fallback))">$INFO[Skin.String(background.fallback)]</value>

<value>common/black.png</value>
</variable>

Expand All @@ -158,7 +158,6 @@
<value condition="String.IsEqual(ListItem.Overlay,OverlayWatched.png)">indicator/checkmark.png</value>
<value condition="[String.Contains(ListItem.Overlay,OverlayUnwatched.png) + [[Container.Content(movies) + [String.IsEqual(Window(Home).Property(LatestMovie.1.Title),ListItem.Label) | String.IsEqual(Window(Home).Property(LatestMovie.2.Title),ListItem.Label) | String.IsEqual(Window(Home).Property(LatestMovie.3.Title),ListItem.Label) | String.IsEqual(Window(Home).Property(LatestMovie.4.Title),ListItem.Label) | String.IsEqual(Window(Home).Property(LatestMovie.5.Title),ListItem.Label) | String.IsEqual(Window(Home).Property(LatestMovie.6.Title),ListItem.Label) | String.IsEqual(Window(Home).Property(LatestMovie.7.Title),ListItem.Label) | String.IsEqual(Window(Home).Property(LatestMovie.8.Title),ListItem.Label) | String.IsEqual(Window(Home).Property(LatestMovie.9.Title),ListItem.Label) | String.IsEqual(Window(Home).Property(LatestMovie.10.Title),ListItem.Label)]] | [[Container.Content(tvshows)] + [String.IsEqual(Window(Home).Property(LatestEpisode.1.ShowTitle),ListItem.TvShowTitle) | String.IsEqual(Window(Home).Property(LatestEpisode.2.ShowTitle),ListItem.TvShowTitle) | String.IsEqual(Window(Home).Property(LatestEpisode.3.ShowTitle),ListItem.TvShowTitle) | String.IsEqual(Window(Home).Property(LatestEpisode.4.ShowTitle),ListItem.TvShowTitle) | String.IsEqual(Window(Home).Property(LatestEpisode.5.ShowTitle),ListItem.TvShowTitle) | String.IsEqual(Window(Home).Property(LatestEpisode.6.ShowTitle),ListItem.TvShowTitle) | String.IsEqual(Window(Home).Property(LatestEpisode.7.ShowTitle),ListItem.TvShowTitle) | String.IsEqual(Window(Home).Property(LatestEpisode.8.ShowTitle),ListItem.TvShowTitle) | String.IsEqual(Window(Home).Property(LatestEpisode.9.ShowTitle),ListItem.TvShowTitle) | String.IsEqual(Window(Home).Property(LatestEpisode.10.ShowTitle),ListItem.TvShowTitle)]] | [Container.Content(episodes) + [String.IsEqual(Window(Home).Property(LatestEpisode.1.EpisodeTitle),ListItem.Title) | String.IsEqual(Window(Home).Property(LatestEpisode.2.EpisodeTitle),ListItem.Title) | String.IsEqual(Window(Home).Property(LatestEpisode.3.EpisodeTitle),ListItem.Title) | String.IsEqual(Window(Home).Property(LatestEpisode.4.EpisodeTitle),ListItem.Title) | String.IsEqual(Window(Home).Property(LatestEpisode.5.EpisodeTitle),ListItem.Title) | String.IsEqual(Window(Home).Property(LatestEpisode.6.EpisodeTitle),ListItem.Title) | String.IsEqual(Window(Home).Property(LatestEpisode.7.EpisodeTitle),ListItem.Title) | String.IsEqual(Window(Home).Property(LatestEpisode.8.EpisodeTitle),ListItem.Title) | String.IsEqual(Window(Home).Property(LatestEpisode.9.EpisodeTitle),ListItem.Title) | String.IsEqual(Window(Home).Property(LatestEpisode.10.EpisodeTitle),ListItem.Title)]]]]">indicator/new.png</value>
</variable>

<variable name="Image_Indicator_List">
<value condition="ListItem.IsRecording">indicator/record.png</value>
<value condition="ListItem.IsPlaying">indicator/play.png</value>
Expand All @@ -172,5 +171,4 @@
<value condition="String.IsEqual(ListItem.Overlay,OverlayUnwatched.png) + !ListItem.IsParentFolder">indicator/unwatched.png</value>
</variable>


</includes>