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

Jump to bottom

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

Merged
merged 1 commit into from Oct 12, 2012
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/skin.confluence/720p/DialogAlbumInfo.xml
View file
Open in desktop
Expand Up @@ -72,7 +72,7 @@
<posy>0</posy> <posy>0</posy>
<width>675</width> <width>675</width>
<height>380</height> <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> <bordertexture border="5">button-nofocus.png</bordertexture>
<bordersize>4</bordersize> <bordersize>4</bordersize>
<aspectratio>keep</aspectratio> <aspectratio>keep</aspectratio>
Expand Down
157 changes: 10 additions & 147 deletions addons/skin.confluence/720p/DialogVideoInfo.xml
View file
Open in desktop
Expand Up @@ -73,7 +73,7 @@
<posy>0</posy> <posy>0</posy>
<width>675</width> <width>675</width>
<height>380</height> <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> <bordertexture border="5">button-nofocus.png</bordertexture>
<bordersize>4</bordersize> <bordersize>4</bordersize>
<aspectratio>keep</aspectratio> <aspectratio>keep</aspectratio>
Expand Down Expand Up @@ -331,154 +331,21 @@
</control> </control>
</control> </control>
<control type="group"> <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> <posy>90</posy>
<posx>210</posx> <posx>210</posx>
<include>VisibleFadeEffect</include> <include>VisibleFadeEffect</include>
<control type="image"> <control type="image">
<posx>177</posx> <posx>0</posx>
<posy>10</posy> <posy>0</posy>
<width>675</width> <width>270</width>
<height>124</height> <height>380</height>
<aspectratio>stretch</aspectratio> <aspectratio>stretch</aspectratio>
<bordertexture border="5">button-nofocus.png</bordertexture> <bordertexture border="5">button-nofocus.png</bordertexture>
<bordersize>4</bordersize> <bordersize>4</bordersize>
<texture background="true">$INFO[ListItem.Icon]</texture> <texture background="true">$INFO[ListItem.Icon]</texture>
<visible>IsEmpty(ListItem.Art(poster))</visible>
</control> </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"> <control type="image">
<posx>0</posx> <posx>0</posx>
<posy>0</posy> <posy>0</posy>
Expand All @@ -487,7 +354,8 @@
<aspectratio>stretch</aspectratio> <aspectratio>stretch</aspectratio>
<bordertexture border="5">button-nofocus.png</bordertexture> <bordertexture border="5">button-nofocus.png</bordertexture>
<bordersize>4</bordersize> <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>
<control type="image"> <control type="image">
<posx>4</posx> <posx>4</posx>
Expand Down Expand Up @@ -1108,12 +976,7 @@
<control type="button" id="10"> <control type="button" id="10">
<description>Get Thumb</description> <description>Get Thumb</description>
<include>ButtonInfoDialogsCommonValues</include> <include>ButtonInfoDialogsCommonValues</include>
<label>13405</label> <label>13511</label>
</control>
<control type="button" id="12">
<description>Get Fanart</description>
<include>ButtonInfoDialogsCommonValues</include>
<label>20413</label>
</control> </control>
<control type="button" id="11"> <control type="button" id="11">
<description>Play Trailer</description> <description>Play Trailer</description>
Expand Down
3 changes: 2 additions & 1 deletion addons/skin.confluence/720p/IncludesBackgroundBuilding.xml
View file
Open in desktop
Expand Up @@ -28,7 +28,7 @@
<width>1280</width> <width>1280</width>
<height>720</height> <height>720</height>
<aspectratio>scale</aspectratio> <aspectratio>scale</aspectratio>
<texture background="true">$INFO[ListItem.Property(Fanart_Image)]</texture> <texture background="true">$INFO[ListItem.Art(fanart)]</texture>
<include>backgroundfade</include> <include>backgroundfade</include>
<fadetime>FanartCrossfadeTime</fadetime> <fadetime>FanartCrossfadeTime</fadetime>
<visible>!Skin.HasSetting(HideBackGroundFanart) + !IsEmpty(ListItem.Property(Fanart_Image))</visible> <visible>!Skin.HasSetting(HideBackGroundFanart) + !IsEmpty(ListItem.Property(Fanart_Image))</visible>
Expand Down Expand Up @@ -66,6 +66,7 @@
<height>120</height> <height>120</height>
<texture flipy="true">HomeNowPlayingBack.png</texture> <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> <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> </control>
</include> </include>
<include name="ContentPanelBackgrounds"> <include name="ContentPanelBackgrounds">
Expand Down
6 changes: 3 additions & 3 deletions addons/skin.confluence/720p/MusicVisualisation.xml
View file
Open in desktop
Expand Up @@ -16,9 +16,9 @@
<posy>0</posy> <posy>0</posy>
<width>1280</width> <width>1280</width>
<height>720</height> <height>720</height>
<texture background="true">$INFO[MusicPlayer.Property(Fanart_Image)]</texture> <texture background="true">$INFO[Player.Art(fanart)]</texture>
<colordiffuse>AAFFFFFF</colordiffuse> <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> <fadetime>600</fadetime>
</control> </control>
<!-- media infos --> <!-- media infos -->
Expand Down Expand Up @@ -87,7 +87,7 @@
<posy>250r</posy> <posy>250r</posy>
<width>300</width> <width>300</width>
<height>230</height> <height>230</height>
<info>MusicPlayer.Cover</info> <texture fallback="DefaultAlbumCover.png">$INFO[Player.Art(thumb)]</texture>
<aspectratio aligny="bottom">keep</aspectratio> <aspectratio aligny="bottom">keep</aspectratio>
<bordertexture border="8">ThumbShadow.png</bordertexture> <bordertexture border="8">ThumbShadow.png</bordertexture>
<bordersize>8</bordersize> <bordersize>8</bordersize>
Expand Down
4 changes: 2 additions & 2 deletions addons/skin.confluence/720p/VideoFullScreen.xml
View file
Open in desktop
Expand Up @@ -67,7 +67,7 @@
<posy>260r</posy> <posy>260r</posy>
<width>300</width> <width>300</width>
<height>230</height> <height>230</height>
<info>VideoPlayer.Cover</info> <texture fallback="DefaultVideoCover.png">$INFO[Player.Art(thumb)]</texture>
<aspectratio aligny="bottom">keep</aspectratio> <aspectratio aligny="bottom">keep</aspectratio>
<bordertexture border="8">ThumbShadow.png</bordertexture> <bordertexture border="8">ThumbShadow.png</bordertexture>
<bordersize>8</bordersize> <bordersize>8</bordersize>
Expand All @@ -79,7 +79,7 @@
<posy>350r</posy> <posy>350r</posy>
<width>300</width> <width>300</width>
<height>330</height> <height>330</height>
<info>VideoPlayer.Cover</info> <texture fallback="DefaultVideoCover.png">$INFO[Player.Art(thumb)]</texture>
<aspectratio aligny="bottom">keep</aspectratio> <aspectratio aligny="bottom">keep</aspectratio>
<bordertexture border="8">ThumbShadow.png</bordertexture> <bordertexture border="8">ThumbShadow.png</bordertexture>
<bordersize>8</bordersize> <bordersize>8</bordersize>
Expand Down
33 changes: 27 additions & 6 deletions addons/skin.confluence/720p/ViewsFileMode.xml
View file
Open in desktop
Expand Up @@ -15,7 +15,6 @@
<viewtype label="535">list</viewtype> <viewtype label="535">list</viewtype>
<pagecontrol>60</pagecontrol> <pagecontrol>60</pagecontrol>
<scrolltime>200</scrolltime> <scrolltime>200</scrolltime>
<visible>![Window.IsVisible(VideoLibrary) + Container.Content(TVShows) + !Skin.HasSetting(TVShowsUsePosters)]</visible>
<itemlayout height="40" width="580"> <itemlayout height="40" width="580">
<control type="image"> <control type="image">
<posx>0</posx> <posx>0</posx>
Expand Down Expand Up @@ -240,7 +239,7 @@
<pagecontrol>60</pagecontrol> <pagecontrol>60</pagecontrol>
<scrolltime>200</scrolltime> <scrolltime>200</scrolltime>
<preloaditems>2</preloaditems> <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"> <control type="image">
<posx>1</posx> <posx>1</posx>
<posy>0</posy> <posy>0</posy>
Expand Down Expand Up @@ -283,7 +282,7 @@
<texture>$INFO[ListItem.Overlay]</texture> <texture>$INFO[ListItem.Overlay]</texture>
</control> </control>
</itemlayout> </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"> <control type="image">
<posx>1</posx> <posx>1</posx>
<posy>0</posy> <posy>0</posy>
Expand Down Expand Up @@ -326,7 +325,7 @@
<texture>$INFO[ListItem.Overlay]</texture> <texture>$INFO[ListItem.Overlay]</texture>
</control> </control>
</focusedlayout> </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"> <control type="image">
<posx>1</posx> <posx>1</posx>
<posy>0</posy> <posy>0</posy>
Expand Down Expand Up @@ -357,7 +356,7 @@
<texture>$INFO[ListItem.Overlay]</texture> <texture>$INFO[ListItem.Overlay]</texture>
</control> </control>
</itemlayout> </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"> <control type="image">
<posx>1</posx> <posx>1</posx>
<posy>0</posy> <posy>0</posy>
Expand Down Expand Up @@ -412,7 +411,7 @@
<visible>Control.IsVisible(505)</visible> <visible>Control.IsVisible(505)</visible>
<include>VisibleFadeEffect</include> <include>VisibleFadeEffect</include>
<control type="panel" id="505"> <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> <posx>95</posx>
<posy>80</posy> <posy>80</posy>
<width>1080</width> <width>1080</width>
Expand All @@ -434,6 +433,17 @@
<bordertexture border="5">button-nofocus.png</bordertexture> <bordertexture border="5">button-nofocus.png</bordertexture>
<bordersize>5</bordersize> <bordersize>5</bordersize>
<texture background="true">$INFO[Listitem.Icon]</texture> <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>
<control type="image"> <control type="image">
<posx>500</posx> <posx>500</posx>
Expand All @@ -453,6 +463,17 @@
<bordertexture border="5">folder-focus.png</bordertexture> <bordertexture border="5">folder-focus.png</bordertexture>
<bordersize>5</bordersize> <bordersize>5</bordersize>
<texture background="true">$INFO[Listitem.Icon]</texture> <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>
<control type="image"> <control type="image">
<posx>500</posx> <posx>500</posx>
Expand Down