Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Changed: [Confluence] to use all the new ListItem.Art stuff #1600

Merged
merged 1 commit into from

4 participants

@JezzX
Collaborator

@Jmarshall this is basically for you too see if you think I have done it right or maybe missed anything seemed to all work fine for me with a fresh tv scan but old users will get some oddity in the info windows and some of the views they can now use until they get all the art in (banner and poster)

@crash123

Wrong handle. @jmarshallnz

@ghost

jmarshall, i'm surprised if you're not extremely annoyed by everything xbmc by now ;)

@jmarshall

Extremely, and I have a correspondingly jaundiced view of your project that obviously I share with everyone I meet.

Fortunately github now has the facilities to set everything xbmc-related to be automatically ignored, though I didn't expect to have to use them to protect myself from programmers with insufficient attention to detail (which surely should be a contradiction in terms).

@jmarshallnz
Owner

Seems good other than that comment.

@JezzX
Collaborator

I resynced this and fixed up an issue jmarshall spotted

@JezzX JezzX merged commit 6c7beb5 into xbmc:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
View
2  addons/skin.confluence/720p/DialogAlbumInfo.xml
@@ -72,7 +72,7 @@
<posy>0</posy>
<width>675</width>
<height>380</height>
- <texture background="true">$INFO[ListItem.Property(Fanart_Image)]</texture>
+ <texture background="true">$INFO[ListItem.Art(fanart)]</texture>
<bordertexture border="5">button-nofocus.png</bordertexture>
<bordersize>4</bordersize>
<aspectratio>keep</aspectratio>
View
157 addons/skin.confluence/720p/DialogVideoInfo.xml
@@ -73,7 +73,7 @@
<posy>0</posy>
<width>675</width>
<height>380</height>
- <texture background="true">$INFO[ListItem.Property(Fanart_Image)]</texture>
+ <texture background="true">$INFO[ListItem.Art(fanart)]</texture>
<bordertexture border="5">button-nofocus.png</bordertexture>
<bordersize>4</bordersize>
<aspectratio>keep</aspectratio>
@@ -331,155 +331,22 @@
</control>
</control>
<control type="group">
- <visible>[Container.Content(TVShows) + !Skin.HasSetting(TVShowsUsePosters)] + !Control.HasFocus(12)</visible>
+ <visible>Container.Content(TVShows) + !Control.HasFocus(12)</visible>
<posy>90</posy>
<posx>210</posx>
<include>VisibleFadeEffect</include>
<control type="image">
- <posx>177</posx>
- <posy>10</posy>
- <width>675</width>
- <height>124</height>
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>270</width>
+ <height>380</height>
<aspectratio>stretch</aspectratio>
<bordertexture border="5">button-nofocus.png</bordertexture>
<bordersize>4</bordersize>
<texture background="true">$INFO[ListItem.Icon]</texture>
+ <visible>IsEmpty(ListItem.Art(poster))</visible>
</control>
<control type="image">
- <posx>177</posx>
- <posy>10</posy>
- <width>400</width>
- <height>100</height>
- <aspectratio>stretch</aspectratio>
- <texture>GlassOverlay.png</texture>
- <colordiffuse>AAFFFFFF</colordiffuse>
- </control>
- <control type="list" id="49">
- <posx>95</posx>
- <posy>160</posy>
- <width>840</width>
- <height>180</height>
- <onleft>49</onleft>
- <onright>49</onright>
- <onup>9000</onup>
- <ondown>61</ondown>
- <pagecontrol>-</pagecontrol>
- <scrolltime>200</scrolltime>
- <itemlayout height="30">
- <control type="label">
- <posx>165</posx>
- <posy>0</posy>
- <width>160</width>
- <height>30</height>
- <font>font13</font>
- <align>right</align>
- <aligny>center</aligny>
- <textcolor>blue</textcolor>
- <selectedcolor>selected</selectedcolor>
- <info>ListItem.Label</info>
- </control>
- <control type="label">
- <posx>175</posx>
- <posy>0</posy>
- <width>665</width>
- <height>30</height>
- <font>font13</font>
- <align>left</align>
- <aligny>center</aligny>
- <textcolor>white</textcolor>
- <selectedcolor>white</selectedcolor>
- <info>ListItem.Label2</info>
- </control>
- </itemlayout>
- <focusedlayout height="30">
- <control type="image">
- <posx>0</posx>
- <posy>0</posy>
- <width>840</width>
- <height>30</height>
- <visible>Control.HasFocus(49)</visible>
- <texture>MenuItemFO.png</texture>
- <include>VisibleFadeEffect</include>
- </control>
- <control type="label">
- <posx>165</posx>
- <posy>0</posy>
- <width>160</width>
- <height>30</height>
- <font>font13</font>
- <align>right</align>
- <aligny>center</aligny>
- <textcolor>blue</textcolor>
- <selectedcolor>selected</selectedcolor>
- <info>ListItem.Label</info>
- </control>
- <control type="label">
- <posx>175</posx>
- <posy>0</posy>
- <width>665</width>
- <height>30</height>
- <font>font13</font>
- <align>left</align>
- <aligny>center</aligny>
- <textcolor>white</textcolor>
- <selectedcolor>white</selectedcolor>
- <info>ListItem.Label2</info>
- </control>
- </focusedlayout>
- <content>
- <item>
- <label>$LOCALIZE[20360]:</label>
- <label2>$INFO[listitem.episode] [COLOR=grey] ($INFO[ListItem.Property(WatchedEpisodes),, $LOCALIZE[16102]] - $INFO[ListItem.Property(UnWatchedEpisodes), , $LOCALIZE[16101]])[/COLOR]</label2>
- <onclick>-</onclick>
- <visible>!IsEmpty(ListItem.Episode)</visible>
- </item>
- <item>
- <label>$LOCALIZE[31322]:</label>
- <label2>$INFO[ListItem.Premiered]</label2>
- <onclick>-</onclick>
- <visible>!IsEmpty(ListItem.Premiered)</visible>
- </item>
- <item>
- <label>$LOCALIZE[515]:</label>
- <label2>$INFO[ListItem.Genre]</label2>
- <onclick>-</onclick>
- <visible>!IsEmpty(ListItem.Genre)</visible>
- </item>
- <item>
- <label>$LOCALIZE[562]:</label>
- <label2>$INFO[ListItem.Year]</label2>
- <onclick>-</onclick>
- <visible>!IsEmpty(ListItem.Year)</visible>
- </item>
- <item>
- <label>$LOCALIZE[563]:</label>
- <label2>$INFO[ListItem.Rating]</label2>
- <onclick>-</onclick>
- <visible>!IsEmpty(ListItem.Rating)</visible>
- </item>
- <item>
- <label>$LOCALIZE[15311]</label>
- <label2>$INFO[ListItem.FilenameAndPath]</label2>
- <onclick>-</onclick>
- <visible>!IsEmpty(ListItem.FilenameAndPath)</visible>
- </item>
- </content>
- </control>
- <control type="image">
- <posx>0</posx>
- <posy>370</posy>
- <width>1030</width>
- <height>4</height>
- <aspectratio>stretch</aspectratio>
- <texture>separator.png</texture>
- </control>
- </control>
- <control type="group">
- <visible>[Container.Content(TVShows) + Skin.HasSetting(TVShowsUsePosters)] + !Control.HasFocus(12)</visible>
- <posy>90</posy>
- <posx>210</posx>
- <include>VisibleFadeEffect</include>
- <control type="image">
<posx>0</posx>
<posy>0</posy>
<width>270</width>
@@ -487,7 +354,8 @@
<aspectratio>stretch</aspectratio>
<bordertexture border="5">button-nofocus.png</bordertexture>
<bordersize>4</bordersize>
- <texture background="true">$INFO[ListItem.Icon]</texture>
+ <texture background="true">$INFO[ListItem.Art(poster)]</texture>
+ <visible>!IsEmpty(ListItem.Art(poster))</visible>
</control>
<control type="image">
<posx>4</posx>
@@ -1108,12 +976,7 @@
<control type="button" id="10">
<description>Get Thumb</description>
<include>ButtonInfoDialogsCommonValues</include>
- <label>13405</label>
- </control>
- <control type="button" id="12">
- <description>Get Fanart</description>
- <include>ButtonInfoDialogsCommonValues</include>
- <label>20413</label>
+ <label>13511</label>
</control>
<control type="button" id="11">
<description>Play Trailer</description>
View
3  addons/skin.confluence/720p/IncludesBackgroundBuilding.xml
@@ -28,7 +28,7 @@
<width>1280</width>
<height>720</height>
<aspectratio>scale</aspectratio>
- <texture background="true">$INFO[ListItem.Property(Fanart_Image)]</texture>
+ <texture background="true">$INFO[ListItem.Art(fanart)]</texture>
<include>backgroundfade</include>
<fadetime>FanartCrossfadeTime</fadetime>
<visible>!Skin.HasSetting(HideBackGroundFanart) + !IsEmpty(ListItem.Property(Fanart_Image))</visible>
@@ -66,6 +66,7 @@
<height>120</height>
<texture flipy="true">HomeNowPlayingBack.png</texture>
<visible>[Player.HasVideo + !Skin.HasSetting(ShowBackgroundVideo)] | [Player.HasAudio + ![Skin.HasSetting(ShowBackgroundVis) | SubString(Window(videolibrary).Property(TvTunesIsAlive),True)]] | [!Skin.HasSetting(HideBackGroundFanart) + !IsEmpty(ListItem.Property(Fanart_Image))]</visible>
+ <include>VisibleFadeEffect</include>
</control>
</include>
<include name="ContentPanelBackgrounds">
View
6 addons/skin.confluence/720p/MusicVisualisation.xml
@@ -16,9 +16,9 @@
<posy>0</posy>
<width>1280</width>
<height>720</height>
- <texture background="true">$INFO[MusicPlayer.Property(Fanart_Image)]</texture>
+ <texture background="true">$INFO[Player.Art(fanart)]</texture>
<colordiffuse>AAFFFFFF</colordiffuse>
- <visible>!IsEmpty(MusicPlayer.Property(Fanart_Image)) + !Skin.HasSetting(HideVisualizationFanart)</visible>
+ <visible>!IsEmpty(Player.Art(fanart)) + !Skin.HasSetting(HideVisualizationFanart)</visible>
<fadetime>600</fadetime>
</control>
<!-- media infos -->
@@ -87,7 +87,7 @@
<posy>250r</posy>
<width>300</width>
<height>230</height>
- <info>MusicPlayer.Cover</info>
+ <texture fallback="DefaultAlbumCover.png">$INFO[Player.Art(thumb)]</texture>
<aspectratio aligny="bottom">keep</aspectratio>
<bordertexture border="8">ThumbShadow.png</bordertexture>
<bordersize>8</bordersize>
View
4 addons/skin.confluence/720p/VideoFullScreen.xml
@@ -67,7 +67,7 @@
<posy>260r</posy>
<width>300</width>
<height>230</height>
- <info>VideoPlayer.Cover</info>
+ <texture fallback="DefaultVideoCover.png">$INFO[Player.Art(thumb)]</texture>
<aspectratio aligny="bottom">keep</aspectratio>
<bordertexture border="8">ThumbShadow.png</bordertexture>
<bordersize>8</bordersize>
@@ -79,7 +79,7 @@
<posy>350r</posy>
<width>300</width>
<height>330</height>
- <info>VideoPlayer.Cover</info>
+ <texture fallback="DefaultVideoCover.png">$INFO[Player.Art(thumb)]</texture>
<aspectratio aligny="bottom">keep</aspectratio>
<bordertexture border="8">ThumbShadow.png</bordertexture>
<bordersize>8</bordersize>
View
33 addons/skin.confluence/720p/ViewsFileMode.xml
@@ -15,7 +15,6 @@
<viewtype label="535">list</viewtype>
<pagecontrol>60</pagecontrol>
<scrolltime>200</scrolltime>
- <visible>![Window.IsVisible(VideoLibrary) + Container.Content(TVShows) + !Skin.HasSetting(TVShowsUsePosters)]</visible>
<itemlayout height="40" width="580">
<control type="image">
<posx>0</posx>
@@ -240,7 +239,7 @@
<pagecontrol>60</pagecontrol>
<scrolltime>200</scrolltime>
<preloaditems>2</preloaditems>
- <itemlayout condition="!Container.Content(Movies) + !Container.Content(Seasons) + [!Container.Content(TVShows) + !Skin.HasSetting(TVShowsUsePosters)]" height="186" width="216">
+ <itemlayout condition="!Container.Content(Movies) + !Container.Content(Seasons) + !Container.Content(TVShows)" height="186" width="216">
<control type="image">
<posx>1</posx>
<posy>0</posy>
@@ -283,7 +282,7 @@
<texture>$INFO[ListItem.Overlay]</texture>
</control>
</itemlayout>
- <focusedlayout condition="!Container.Content(Movies) + !Container.Content(Seasons) + [!Container.Content(TVShows) + !Skin.HasSetting(TVShowsUsePosters)]" height="186" width="216">
+ <focusedlayout condition="!Container.Content(Movies) + !Container.Content(Seasons) + !Container.Content(TVShows)" height="186" width="216">
<control type="image">
<posx>1</posx>
<posy>0</posy>
@@ -326,7 +325,7 @@
<texture>$INFO[ListItem.Overlay]</texture>
</control>
</focusedlayout>
- <itemlayout condition="Container.Content(Movies) | Container.Content(Seasons) | [Container.Content(TVShows) + Skin.HasSetting(TVShowsUsePosters)]" height="279" width="216">
+ <itemlayout condition="Container.Content(Movies) | Container.Content(Seasons) | Container.Content(TVShows)" height="279" width="216">
<control type="image">
<posx>1</posx>
<posy>0</posy>
@@ -357,7 +356,7 @@
<texture>$INFO[ListItem.Overlay]</texture>
</control>
</itemlayout>
- <focusedlayout condition="Container.Content(Movies) | Container.Content(Seasons) | [Container.Content(TVShows) + Skin.HasSetting(TVShowsUsePosters)]" height="276" width="216">
+ <focusedlayout condition="Container.Content(Movies) | Container.Content(Seasons) | Container.Content(TVShows)" height="276" width="216">
<control type="image">
<posx>1</posx>
<posy>0</posy>
@@ -412,7 +411,7 @@
<visible>Control.IsVisible(505)</visible>
<include>VisibleFadeEffect</include>
<control type="panel" id="505">
- <visible>!Container.Content(LiveTV) + !Container.Content(Movies) + !Container.Content(Episodes) + !Container.Content(Seasons) + !Container.Content(MusicVideos) + !Container.Content(Addons) + !Skin.HasSetting(TVShowsUsePosters)</visible>
+ <visible>!Container.Content(LiveTV) + !Container.Content(Movies) + !Container.Content(Episodes) + !Container.Content(Seasons) + !Container.Content(MusicVideos) + !Container.Content(Addons)</visible>
<posx>95</posx>
<posy>80</posy>
<width>1080</width>
@@ -434,6 +433,17 @@
<bordertexture border="5">button-nofocus.png</bordertexture>
<bordersize>5</bordersize>
<texture background="true">$INFO[Listitem.Icon]</texture>
+ <visible>IsEmpty(ListItem.Art(banner))</visible>
+ </control>
+ <control type="image">
+ <posx>1</posx>
+ <posy>0</posy>
+ <width>538</width>
+ <height>105</height>
+ <bordertexture border="5">button-nofocus.png</bordertexture>
+ <bordersize>5</bordersize>
+ <texture background="true">$INFO[Listitem.Art(banner)]</texture>
+ <visible>!IsEmpty(ListItem.Art(banner))</visible>
</control>
<control type="image">
<posx>500</posx>
@@ -453,6 +463,17 @@
<bordertexture border="5">folder-focus.png</bordertexture>
<bordersize>5</bordersize>
<texture background="true">$INFO[Listitem.Icon]</texture>
+ <visible>IsEmpty(ListItem.Art(banner))</visible>
+ </control>
+ <control type="image">
+ <posx>1</posx>
+ <posy>0</posy>
+ <width>538</width>
+ <height>105</height>
+ <bordertexture border="5">folder-focus.png</bordertexture>
+ <bordersize>5</bordersize>
+ <texture background="true">$INFO[Listitem.Art(banner)]</texture>
+ <visible>!IsEmpty(ListItem.Art(banner))</visible>
</control>
<control type="image">
<posx>500</posx>
View
115 addons/skin.confluence/720p/ViewsVideoLibrary.xml
@@ -11,7 +11,7 @@
<usecontrolcoords>true</usecontrolcoords>
<include>VisibleFadeEffect</include>
<control type="fixedlist" id="501">
- <visible>Container.Content(Movies) | Container.Content(Seasons) | [Container.Content(TVShows) + Skin.HasSetting(TVShowsUsePosters)]</visible>
+ <visible>Container.Content(Movies) | Container.Content(Seasons) | Container.Content(TVShows)</visible>
<visible>!Container.Content(LiveTV)</visible>
<posx>-183</posx>
<posy>0</posy>
@@ -37,6 +37,18 @@
<bordertexture border="5">button-nofocus.png</bordertexture>
<bordersize>4</bordersize>
<texture background="true">$INFO[ListItem.Icon]</texture>
+ <visible>IsEmpty(ListItem.Art(poster))</visible>
+ </control>
+ <control type="image">
+ <posx>2</posx>
+ <posy>40</posy>
+ <width>214</width>
+ <height>310</height>
+ <aspectratio>stretch</aspectratio>
+ <bordertexture border="5">button-nofocus.png</bordertexture>
+ <bordersize>4</bordersize>
+ <texture background="true">$INFO[ListItem.Art(poster)]</texture>
+ <visible>!IsEmpty(ListItem.Art(poster))</visible>
</control>
</itemlayout>
<focusedlayout height="310" width="218">
@@ -51,6 +63,20 @@
<texture background="true">$INFO[ListItem.Icon]</texture>
<animation reversible="false" effect="zoom" start="-2,36,222,318" end="-28,0,284,390" time="200">focus</animation>
<animation reversible="false" effect="zoom" end="-2,36,222,318" start="-28,0,284,390" time="200">unfocus</animation>
+ <visible>!IsEmpty(ListItem.Art(poster))</visible>
+ </control>
+ <control type="image">
+ <posx>-2</posx>
+ <posy>36</posy>
+ <width>222</width>
+ <height>318</height>
+ <aspectratio>stretch</aspectratio>
+ <bordertexture border="8">ThumbBorder.png</bordertexture>
+ <bordersize>8</bordersize>
+ <texture background="true">$INFO[ListItem.Art(poster)]</texture>
+ <animation reversible="false" effect="zoom" start="-2,36,222,318" end="-28,0,284,390" time="200">focus</animation>
+ <animation reversible="false" effect="zoom" end="-2,36,222,318" start="-28,0,284,390" time="200">unfocus</animation>
+ <visible>IsEmpty(ListItem.Art(poster))</visible>
</control>
<control type="image">
<posx>6</posx>
@@ -307,7 +333,7 @@
<posx>0</posx>
<posy>460</posy>
<control type="fixedlist" id="508">
- <visible>Container.Content(Movies) | [Container.Content(TVShows) + Skin.HasSetting(TVShowsUsePosters)]</visible>
+ <visible>Container.Content(Movies) | Container.Content(TVShows)</visible>
<hitrect x="0" y="-10" w="1280" h="190" />
<posx>-20</posx>
<posy>0</posy>
@@ -335,6 +361,19 @@
<bordersize>4</bordersize>
<fadetime>200</fadetime>
<texture background="true">$INFO[ListItem.Icon]</texture>
+ <visible>IsEmpty(ListItem.Art(poster))</visible>
+ </control>
+ <control type="image">
+ <posx>2</posx>
+ <posy>20</posy>
+ <width>120</width>
+ <height>160</height>
+ <aspectratio>stretch</aspectratio>
+ <bordertexture border="5">button-nofocus.png</bordertexture>
+ <bordersize>4</bordersize>
+ <fadetime>200</fadetime>
+ <texture background="true">$INFO[ListItem.art(poster)]</texture>
+ <visible>!IsEmpty(ListItem.Art(poster))</visible>
</control>
<control type="image">
<posx>6</posx>
@@ -370,6 +409,21 @@
<texture background="true">$INFO[ListItem.Icon]</texture>
<animation reversible="false" effect="zoom" start="-2,16,128,168" end="-12,-10,148,198" time="200">focus</animation>
<animation reversible="false" effect="zoom" end="-2,16,128,168" start="-12,-10,148,198" time="200">unfocus</animation>
+ <visible>IsEmpty(ListItem.Art(poster))</visible>
+ </control>
+ <control type="image">
+ <posx>-2</posx>
+ <posy>16</posy>
+ <width>128</width>
+ <height>168</height>
+ <aspectratio>stretch</aspectratio>
+ <bordertexture border="8">ThumbBorder.png</bordertexture>
+ <bordersize>8</bordersize>
+ <fadetime>200</fadetime>
+ <texture background="true">$INFO[ListItem.Art(poster)]</texture>
+ <animation reversible="false" effect="zoom" start="-2,16,128,168" end="-12,-10,148,198" time="200">focus</animation>
+ <animation reversible="false" effect="zoom" end="-2,16,128,168" start="-12,-10,148,198" time="200">unfocus</animation>
+ <visible>!IsEmpty(ListItem.Art(poster))</visible>
</control>
<control type="image">
<posx>90</posx>
@@ -915,7 +969,7 @@
<control type="group">
<posx>710</posx>
<posy>245</posy>
- <visible>Container.Content(TVShows) + !Skin.HasSetting(TVShowsUsePosters)</visible>
+ <visible>Container.Content(TVShows)</visible>
<control type="image">
<posx>0</posx>
<posy>0</posy>
@@ -926,6 +980,19 @@
<texture background="true">$INFO[ListItem.Icon]</texture>
<bordertexture border="8">ThumbShadow.png</bordertexture>
<bordersize>8</bordersize>
+ <visible>IsEmpty(ListItem.Art(banner))</visible>
+ </control>
+ <control type="image">
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>530</width>
+ <height>110</height>
+ <aspectratio>keep</aspectratio>
+ <fadetime>IconCrossfadeTime</fadetime>
+ <texture background="true">$INFO[ListItem.Art(banner)]</texture>
+ <bordertexture border="8">ThumbShadow.png</bordertexture>
+ <bordersize>8</bordersize>
+ <visible>!IsEmpty(ListItem.Art(banner))</visible>
</control>
<control type="label">
<description>Episodes txt</description>
@@ -1086,7 +1153,7 @@
<control type="group">
<posx>710</posx>
<posy>245</posy>
- <visible>Container.Content(Seasons) | [Container.Content(TVShows) + Skin.HasSetting(TVShowsUsePosters)]</visible>
+ <visible>Container.Content(Seasons)</visible>
<control type="image">
<posx>0</posx>
<posy>0</posy>
@@ -1111,19 +1178,6 @@
<autoscroll time="2000" delay="3000" repeat="5000">Skin.HasSetting(AutoScroll)</autoscroll>
<visible>Container.Content(Seasons)</visible>
</control>
- <control type="textbox">
- <description>Description Value for TVShows</description>
- <posx>270</posx>
- <posy>0</posy>
- <width>250</width>
- <height>355</height>
- <font>font12</font>
- <align>justify</align>
- <textcolor>white</textcolor>
- <label>$INFO[ListItem.Plot]</label>
- <autoscroll time="2000" delay="3000" repeat="5000">Skin.HasSetting(AutoScroll)</autoscroll>
- <visible>Container.Content(TVShows) + Skin.HasSetting(TVShowsUsePosters)</visible>
- </control>
<control type="label">
<description>Watched Count</description>
<posx>10</posx>
@@ -1364,7 +1418,7 @@
<height>286</height>
<aspectratio>scale</aspectratio>
<fadetime>IconCrossfadeTime</fadetime>
- <texture background="true" fallback="Fanart_Fallback_Small.jpg" >$INFO[ListItem.Property(fanart_image)]</texture>
+ <texture background="true" fallback="Fanart_Fallback_Small.jpg" >$INFO[ListItem.Art(fanart)]</texture>
<visible>Container.Content(Movies)</visible>
<bordertexture background="true" border="8">ThumbShadow.png</bordertexture>
<bordersize>8</bordersize>
@@ -1376,7 +1430,7 @@
<height>325</height>
<aspectratio>scale</aspectratio>
<fadetime>IconCrossfadeTime</fadetime>
- <texture background="true" fallback="Fanart_Fallback_Small.jpg" >$INFO[ListItem.Property(fanart_image)]</texture>
+ <texture background="true" fallback="Fanart_Fallback_Small.jpg" >$INFO[ListItem.Art(fanart)]</texture>
<visible>Container.Content(TVShows)</visible>
<bordertexture background="true" border="8">ThumbShadow.png</bordertexture>
<bordersize>8</bordersize>
@@ -1708,7 +1762,7 @@
<height>420</height>
<aspectratio scalediffuse="false">scale</aspectratio>
<fadetime>IconCrossfadeTime</fadetime>
- <texture diffuse="Fanart_Diffuse.png" background="true" fallback="Fanart_Fallback_Small.jpg" >$INFO[ListItem.Property(fanart_image)]</texture>
+ <texture diffuse="Fanart_Diffuse.png" background="true" fallback="Fanart_Fallback_Small.jpg" >$INFO[ListItem.Art(fanart)]</texture>
</control>
<control type="label">
<posx>10</posx>
@@ -1771,12 +1825,12 @@
<height>420</height>
<aspectratio scalediffuse="false">scale</aspectratio>
<fadetime>IconCrossfadeTime</fadetime>
- <texture diffuse="Fanart_Diffuse.png" background="true" fallback="Fanart_Fallback_Small.jpg" >$INFO[ListItem.Property(fanart_image)]</texture>
+ <texture diffuse="Fanart_Diffuse.png" background="true" fallback="Fanart_Fallback_Small.jpg" >$INFO[ListItem.Art(fanart)]</texture>
</control>
<control type="label">
<posx>10</posx>
<posy>395</posy>
- <width>730</width>
+ <width>540</width>
<height>30</height>
<font>font24_title</font>
<textcolor>white</textcolor>
@@ -1789,7 +1843,7 @@
<description>Description Value for Video</description>
<posx>10</posx>
<posy>425</posy>
- <width>730</width>
+ <width>540</width>
<height>145</height>
<font>font12</font>
<align>justify</align>
@@ -1797,6 +1851,17 @@
<label>$INFO[ListItem.Plot]</label>
<autoscroll time="2000" delay="3000" repeat="5000">Skin.HasSetting(AutoScroll)</autoscroll>
</control>
+ <control type="image">
+ <posx>560</posx>
+ <posy>140</posy>
+ <width>180</width>
+ <height>440</height>
+ <aspectratio align="left" aligny="bottom">keep</aspectratio>
+ <fadetime>IconCrossfadeTime</fadetime>
+ <texture background="true">$INFO[ListItem.Art(poster)]</texture>
+ <bordertexture border="8">ThumbShadow.png</bordertexture>
+ <bordersize>8</bordersize>
+ </control>
</control>
<control type="group">
<posx>470</posx>
@@ -1809,7 +1874,7 @@
<height>420</height>
<aspectratio scalediffuse="false">scale</aspectratio>
<fadetime>IconCrossfadeTime</fadetime>
- <texture diffuse="Fanart_Diffuse.png" background="true" fallback="Fanart_Fallback_Small.jpg" >$INFO[ListItem.Property(fanart_image)]</texture>
+ <texture diffuse="Fanart_Diffuse.png" background="true" fallback="Fanart_Fallback_Small.jpg" >$INFO[ListItem.Art(fanart)]</texture>
</control>
<control type="label">
<posx>10</posx>
@@ -1858,7 +1923,7 @@
<height>420</height>
<aspectratio scalediffuse="false">scale</aspectratio>
<fadetime>IconCrossfadeTime</fadetime>
- <texture diffuse="Fanart_Diffuse.png" background="true" fallback="Fanart_Fallback_Small.jpg" >$INFO[ListItem.Property(fanart_image)]</texture>
+ <texture diffuse="Fanart_Diffuse.png" background="true" fallback="Fanart_Fallback_Small.jpg" >$INFO[ListItem.Art(fanart)]</texture>
</control>
<control type="label">
<posx>10</posx>
View
12 addons/skin.confluence/720p/custom_SkinSetting_1111.xml
@@ -294,18 +294,6 @@
<align>left</align>
<aligny>center</aligny>
</control>
- <control type="radiobutton" id="105">
- <width>750</width>
- <height>40</height>
- <font>font13</font>
- <label>31123</label>
- <textcolor>grey2</textcolor>
- <focusedcolor>white</focusedcolor>
- <texturefocus>MenuItemFO.png</texturefocus>
- <texturenofocus>MenuItemNF.png</texturenofocus>
- <onclick>Skin.ToggleSetting(TVShowsUsePosters)</onclick>
- <selected>Skin.HasSetting(TVShowsUsePosters)</selected>
- </control>
<control type="radiobutton" id="115">
<width>750</width>
<height>40</height>
View
4 addons/skin.confluence/language/English/strings.po
@@ -248,10 +248,6 @@ msgctxt "#31122"
msgid "Weather Page"
msgstr ""
-msgctxt "#31123"
-msgid "Use \"Posters\" instead of \"Banners\" for TV Shows"
-msgstr ""
-
msgctxt "#31124"
msgid "Show Background \"Now Playing\" Video"
msgstr ""
Something went wrong with that request. Please try again.