diff options
Diffstat (limited to 'addons/skin.confluence')
-rw-r--r-- | addons/skin.confluence/720p/AddonBrowser.xml | 11 | ||||
-rw-r--r-- | addons/skin.confluence/720p/Font.xml | 6 | ||||
-rw-r--r-- | addons/skin.confluence/720p/Home.xml | 32 | ||||
-rw-r--r-- | addons/skin.confluence/720p/MyMusicNav.xml | 33 | ||||
-rw-r--r-- | addons/skin.confluence/720p/MyMusicPlaylist.xml | 4 | ||||
-rw-r--r-- | addons/skin.confluence/720p/MyMusicSongs.xml | 1 | ||||
-rw-r--r-- | addons/skin.confluence/720p/MyPics.xml | 3 | ||||
-rw-r--r-- | addons/skin.confluence/720p/MyPrograms.xml | 1 | ||||
-rw-r--r-- | addons/skin.confluence/720p/MyVideo.xml | 32 | ||||
-rw-r--r-- | addons/skin.confluence/720p/MyVideoNav.xml | 80 | ||||
-rw-r--r-- | addons/skin.confluence/720p/MyVideoPlaylist.xml | 4 | ||||
-rw-r--r-- | addons/skin.confluence/720p/MyWeather.xml | 3 | ||||
-rw-r--r-- | addons/skin.confluence/720p/custom_SkinSetting_1111.xml | 12 | ||||
-rw-r--r-- | addons/skin.confluence/720p/includes.xml | 61 | ||||
-rw-r--r-- | addons/skin.confluence/language/English/strings.xml | 2 |
15 files changed, 108 insertions, 177 deletions
diff --git a/addons/skin.confluence/720p/AddonBrowser.xml b/addons/skin.confluence/720p/AddonBrowser.xml index 8de224a7f0..b631461d52 100644 --- a/addons/skin.confluence/720p/AddonBrowser.xml +++ b/addons/skin.confluence/720p/AddonBrowser.xml @@ -4,16 +4,6 @@ <views>50,51,550</views> <controls> <include>CommonSettingsBackground</include> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>1280</width> - <height>720</height> - <texture background="true">$INFO[ListItem.Property(Fanart_Image)]</texture> - <include>backgroundfade</include> - <fadetime>FanartCrossfadeTime</fadetime> - <include>Window_OpenClose_Animation</include> - </control> <include>CommonMediaPlayingBackground</include> <control type="group"> <include>Window_OpenClose_Animation</include> @@ -125,6 +115,7 @@ <description>View As button</description> <posx>0</posx> <posy>0</posy> + <textwidth>235</textwidth> <include>ButtonCommonValues</include> <label>-</label> <onleft>50</onleft> diff --git a/addons/skin.confluence/720p/Font.xml b/addons/skin.confluence/720p/Font.xml index 7b4df46dac..025b638efd 100644 --- a/addons/skin.confluence/720p/Font.xml +++ b/addons/skin.confluence/720p/Font.xml @@ -82,7 +82,7 @@ <font> <name>font50caps_title</name> <filename>DejaVuSans-Bold-Caps.ttf</filename> - <size>50</size> + <size>43</size> </font> <font> <name>font45caps_title</name> @@ -185,7 +185,7 @@ <font> <name>font50caps_title</name> <filename>DejaVuSans-Bold.ttf</filename> - <size>50</size> + <size>43</size> </font> <font> @@ -278,7 +278,7 @@ <font> <name>font50caps_title</name> <filename>Arial.ttf</filename> - <size>50</size> + <size>43</size> </font> <font> <name>font45caps_title</name> diff --git a/addons/skin.confluence/720p/Home.xml b/addons/skin.confluence/720p/Home.xml index ccd308214c..4ed5cc1501 100644 --- a/addons/skin.confluence/720p/Home.xml +++ b/addons/skin.confluence/720p/Home.xml @@ -767,7 +767,7 @@ <align>right</align> <aligny>center</aligny> <label>$INFO[ListItem.Label]</label> - <animation effect="zoom" start="65" end="65" center="380,51" time="0" condition="true">Conditional</animation> + <animation effect="zoom" start="75" end="75" center="380,51" time="0" condition="true">Conditional</animation> <animation effect="fade" start="100" end="30" time="200" condition="Window.IsVisible(1113) | ControlGroup(9001).HasFocus | ControlGroup(10).HasFocus | Control.HasFocus(9002)">conditional</animation> </control> </itemlayout> @@ -781,8 +781,8 @@ <textcolor>white</textcolor> <align>right</align> <aligny>center</aligny> - <animation effect="zoom" start="65" end="100" center="380,51" time="200">Focus</animation> - <animation effect="zoom" start="100" end="65" center="380,51" time="200">UnFocus</animation> + <animation effect="zoom" start="75" end="100" center="380,51" time="200">Focus</animation> + <animation effect="zoom" start="100" end="75" center="380,51" time="200">UnFocus</animation> <label>$INFO[ListItem.Label]</label> </control> </focusedlayout> @@ -803,6 +803,13 @@ <visible>!Skin.HasSetting(HomeMenuNoWeatherButton)</visible> <visible>Skin.HasSetting(ShowWeatherFanart) + !IsEmpty(Skin.String(WeatherFanartDir))</visible> </item> + <item id="1"> + <label>0</label> + <onclick>ActivateWindow(Programs,Addons,return)</onclick> + <icon>special://skin/backgrounds/programs.jpg</icon> + <thumb>$INFO[Skin.String(Home_Custom_Back_Programs_Folder)]</thumb> + <visible>!Skin.HasSetting(HomeMenuNoProgramsButton)</visible> + </item> <item id="4"> <label>1</label> <onclick>ActivateWindow(Pictures)</onclick> @@ -810,13 +817,6 @@ <thumb>$INFO[Skin.String(Home_Custom_Back_Pictures_Folder)]</thumb> <visible>!Skin.HasSetting(HomeMenuNoPicturesButton)</visible> </item> - <item id="3"> - <label>2</label> - <onclick>ActivateWindow(Music)</onclick> - <icon>special://skin/backgrounds/music.jpg</icon> - <thumb>$INFO[Skin.String(Home_Custom_Back_Music_Folder)]</thumb> - <visible>!Skin.HasSetting(HomeMenuNoMusicButton)</visible> - </item> <item id="2"> <label>3</label> <onclick>ActivateWindow(Videos)</onclick> @@ -852,12 +852,12 @@ <thumb>$INFO[Skin.String(Home_Custom_Back_TVShow_Folder)]</thumb> <visible>Skin.HasSetting(HomeMenuNoTVShowsButton) + Library.HasContent(TVShows)</visible> </item> - <item id="1"> - <label>0</label> - <onclick>ActivateWindow(Programs,Addons,return)</onclick> - <icon>special://skin/backgrounds/programs.jpg</icon> - <thumb>$INFO[Skin.String(Home_Custom_Back_Programs_Folder)]</thumb> - <visible>!Skin.HasSetting(HomeMenuNoProgramsButton)</visible> + <item id="3"> + <label>2</label> + <onclick>ActivateWindow(Music)</onclick> + <icon>special://skin/backgrounds/music.jpg</icon> + <thumb>$INFO[Skin.String(Home_Custom_Back_Music_Folder)]</thumb> + <visible>!Skin.HasSetting(HomeMenuNoMusicButton)</visible> </item> <item id="5"> <label>13000</label> diff --git a/addons/skin.confluence/720p/MyMusicNav.xml b/addons/skin.confluence/720p/MyMusicNav.xml index e91a5415bf..93aaf58364 100644 --- a/addons/skin.confluence/720p/MyMusicNav.xml +++ b/addons/skin.confluence/720p/MyMusicNav.xml @@ -4,29 +4,6 @@ <views>50,500,550,509,506,511,512,513</views> <controls> <include>CommonMusicBackground</include> - <control type="group"> - <include>Window_OpenClose_Animation</include> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>1280</width> - <height>720</height> - <texture background="true">$INFO[ListItem.Property(Fanart_Image)]</texture> - <include>backgroundfade</include> - <fadetime>FanartCrossfadeTime</fadetime> - <visible>!Skin.HasSetting(MusicLibraryFanart) + !IsEmpty(ListItem.Property(Fanart_Image))</visible> - </control> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>1280</width> - <height>720</height> - <texture background="true">$INFO[Fanart.Image]</texture> - <include>backgroundfade</include> - <fadetime>FanartCrossfadeTime</fadetime> - <visible>!Skin.HasSetting(MusicLibraryFanart) + !IsEmpty(Fanart.Image)</visible> - </control> - </control> <include>CommonMediaPlayingBackground</include> <control type="group"> <include>Window_OpenClose_Animation</include> @@ -188,14 +165,7 @@ <textcolor>dialogheader</textcolor> <align>center</align> <aligny>center</aligny> - </control> - <control type="radiobutton" id="201"> - <description>Toggle Fanart</description> - <textwidth>170</textwidth> - <include>ButtonMediaSubCommonValues</include> - <label>31307</label> - <onclick>Skin.ToggleSetting(MusicLibraryFanart)</onclick> - <selected>Skin.HasSetting(MusicLibraryFanart)</selected> + <visible>Control.IsVisible(512) + Container.Content(Artists)</visible> </control> <control type="radiobutton" id="202"> <description>Toggle Fanart</description> @@ -238,6 +208,7 @@ <description>View As button</description> <posx>0</posx> <posy>0</posy> + <textwidth>235</textwidth> <include>ButtonCommonValues</include> <label>-</label> <onleft>50</onleft> diff --git a/addons/skin.confluence/720p/MyMusicPlaylist.xml b/addons/skin.confluence/720p/MyMusicPlaylist.xml index 6ba3252b34..0997dbd45a 100644 --- a/addons/skin.confluence/720p/MyMusicPlaylist.xml +++ b/addons/skin.confluence/720p/MyMusicPlaylist.xml @@ -115,6 +115,7 @@ <description>View As button</description> <posx>0</posx> <posy>0</posy> + <textwidth>235</textwidth> <include>ButtonCommonValues</include> <label>-</label> <onleft>50</onleft> @@ -137,6 +138,7 @@ <description>Repeat button</description> <posx>0</posx> <posy>80</posy> + <textwidth>235</textwidth> <include>ButtonCommonValues</include> <label>-</label> <onleft>50</onleft> @@ -149,6 +151,7 @@ <posx>0</posx> <posy>120</posy> <label>190</label> + <textwidth>235</textwidth> <include>ButtonCommonValues</include> <onleft>50</onleft> <onright>50</onright> @@ -161,6 +164,7 @@ <posy>160</posy> <label>192</label> <onclick>ReplaceWindow(music)</onclick> + <textwidth>235</textwidth> <include>ButtonCommonValues</include> <onleft>50</onleft> <onright>50</onright> diff --git a/addons/skin.confluence/720p/MyMusicSongs.xml b/addons/skin.confluence/720p/MyMusicSongs.xml index db058ad4b1..f1da8de475 100644 --- a/addons/skin.confluence/720p/MyMusicSongs.xml +++ b/addons/skin.confluence/720p/MyMusicSongs.xml @@ -117,6 +117,7 @@ <description>View As button</description> <posx>0</posx> <posy>0</posy> + <textwidth>235</textwidth> <include>ButtonCommonValues</include> <label>-</label> <onleft>50</onleft> diff --git a/addons/skin.confluence/720p/MyPics.xml b/addons/skin.confluence/720p/MyPics.xml index 31b2e838d6..cff9d0eaad 100644 --- a/addons/skin.confluence/720p/MyPics.xml +++ b/addons/skin.confluence/720p/MyPics.xml @@ -138,6 +138,7 @@ <description>View As button</description> <posx>0</posx> <posy>0</posy> + <textwidth>235</textwidth> <include>ButtonCommonValues</include> <label>-</label> <onleft>50</onleft> @@ -170,6 +171,7 @@ <description>Slideshow</description> <posx>0</posx> <posy>80</posy> + <textwidth>235</textwidth> <include>ButtonCommonValues</include> <label>108</label> <onleft>50</onleft> @@ -181,6 +183,7 @@ <description>Recersive Slideshow</description> <posx>0</posx> <posy>120</posy> + <textwidth>235</textwidth> <include>ButtonCommonValues</include> <label>361</label> <onleft>50</onleft> diff --git a/addons/skin.confluence/720p/MyPrograms.xml b/addons/skin.confluence/720p/MyPrograms.xml index 32800a7659..b920b92d5b 100644 --- a/addons/skin.confluence/720p/MyPrograms.xml +++ b/addons/skin.confluence/720p/MyPrograms.xml @@ -116,6 +116,7 @@ <description>View As button</description> <posx>0</posx> <posy>0</posy> + <textwidth>235</textwidth> <include>ButtonCommonValues</include> <label>-</label> <onleft>50</onleft> diff --git a/addons/skin.confluence/720p/MyVideo.xml b/addons/skin.confluence/720p/MyVideo.xml index 6be283da29..378d4f6b0d 100644 --- a/addons/skin.confluence/720p/MyVideo.xml +++ b/addons/skin.confluence/720p/MyVideo.xml @@ -4,20 +4,9 @@ <views>50,51,550,560,500,501,508,505</views> <controls> <include>CommonVideoBackground</include> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>1280</width> - <height>720</height> - <texture background="true">$INFO[ListItem.Property(Fanart_Image)]</texture> - <include>backgroundfade</include> - <fadetime>FanartCrossfadeTime</fadetime> - <visible>!Skin.HasSetting(VideoFilesFanart) | Control.IsVisible(508)</visible> - <include>Window_OpenClose_Animation</include> - </control> <include>CommonMediaPlayingBackground</include> <control type="group"> - <include>Window_OpenClose_Animation</include> + <include>Window_OpenClose_Animation</include> <control type="image"> <posx>0</posx> <posy>0</posy> @@ -172,24 +161,6 @@ <include>ButtonMediaSubCommonValues</include> <label>346</label> </control> - <control type="label" id="200"> - <width>220</width> - <height>45</height> - <font>font12caps</font> - <label>14018</label> - <textcolor>dialogheader</textcolor> - <align>center</align> - <aligny>center</aligny> - </control> - <control type="radiobutton" id="201"> - <description>Toggle Fanart</description> - <textwidth>170</textwidth> - <include>ButtonMediaSubCommonValues</include> - <label>31307</label> - <onclick>Skin.ToggleSetting(VideoFilesFanart)</onclick> - <selected>Skin.HasSetting(VideoFilesFanart)</selected> - <visible>!Control.IsVisible(508)</visible> - </control> </control> </control> <control type="button" id="8999"> @@ -222,6 +193,7 @@ <description>View As button</description> <posx>0</posx> <posy>0</posy> + <textwidth>235</textwidth> <include>ButtonCommonValues</include> <label>-</label> <onleft>50</onleft> diff --git a/addons/skin.confluence/720p/MyVideoNav.xml b/addons/skin.confluence/720p/MyVideoNav.xml index 833bf20ee6..c0b9224d4a 100644 --- a/addons/skin.confluence/720p/MyVideoNav.xml +++ b/addons/skin.confluence/720p/MyVideoNav.xml @@ -4,57 +4,9 @@ <views>50,500,550,560,501,508,504,503,505,511</views> <controls> <include>CommonVideoBackground</include> - <control type="group"> - <include>Window_OpenClose_Animation</include> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>1280</width> - <height>720</height> - <texture background="true">$INFO[ListItem.Property(Fanart_Image)]</texture> - <include>backgroundfade</include> - <fadetime>FanartCrossfadeTime</fadetime> - <visible>!Skin.HasSetting(VideoLibraryMovieFanart) | Control.IsVisible(508)</visible> - <visible>Container.Content(Movies)</visible> - </control> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>1280</width> - <height>720</height> - <texture background="true">$INFO[ListItem.Property(Fanart_Image)]</texture> - <include>backgroundfade</include> - <fadetime>FanartCrossfadeTime</fadetime> - <visible>!Skin.HasSetting(VideoLibraryTVFanart)</visible> - <visible>Container.Content(TVShows) | [Container.Content(Episodes) + stringcompare(Container.FolderPath,videodb://5/)]</visible> - </control> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>1280</width> - <height>720</height> - <info>Fanart.Image</info> - <texture background="true">$INFO[Fanart.Image]</texture> - <include>backgroundfade</include> - <fadetime>FanartCrossfadeTime</fadetime> - <visible>!Skin.HasSetting(VideoLibraryTVFanart)</visible> - <visible>Container.Content(Seasons) | [Container.Content(Episodes) + !stringcompare(Container.FolderPath,videodb://5/)]</visible> - </control> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>1280</width> - <height>720</height> - <texture background="true">$INFO[ListItem.Property(Fanart_Image)]</texture> - <include>backgroundfade</include> - <fadetime>FanartCrossfadeTime</fadetime> - <visible>!Skin.HasSetting(VideoLibraryMusicVideoFanart)</visible> - <visible>Container.Content(MusicVideos) | Container.Content(Artists) | Container.Content(Albums)</visible> - </control> - </control> <include>CommonMediaPlayingBackground</include> <control type="group"> - <include>Window_OpenClose_Animation</include> + <include>Window_OpenClose_Animation</include> <control type="image"> <posx>0</posx> <posy>0</posy> @@ -254,34 +206,7 @@ <textcolor>dialogheader</textcolor> <align>center</align> <aligny>center</aligny> - <visible>Control.IsVisible(201) | Control.IsVisible(202) | Control.IsVisible(203) | Control.IsVisible(204) | Control.IsVisible(205)</visible> - </control> - <control type="radiobutton" id="201"> - <description>Toggle MoviesFanart</description> - <textwidth>170</textwidth> - <include>ButtonMediaSubCommonValues</include> - <label>31307</label> - <onclick>Skin.ToggleSetting(VideoLibraryMovieFanart)</onclick> - <selected>Skin.HasSetting(VideoLibraryMovieFanart)</selected> - <visible>Container.Content(Movies) + !Control.IsVisible(508)</visible> - </control> - <control type="radiobutton" id="202"> - <description>Toggle TVShow Fanart</description> - <textwidth>170</textwidth> - <include>ButtonMediaSubCommonValues</include> - <label>31307</label> - <onclick>Skin.ToggleSetting(VideoLibraryTVFanart)</onclick> - <selected>Skin.HasSetting(VideoLibraryTVFanart)</selected> - <visible>Container.Content(TVShows) | Container.Content(Seasons) | Container.Content(Episodes)</visible> - </control> - <control type="radiobutton" id="203"> - <description>Toggle MusicVideo Fanart</description> - <textwidth>170</textwidth> - <include>ButtonMediaSubCommonValues</include> - <label>31307</label> - <onclick>Skin.ToggleSetting(VideoLibraryMusicVideoFanart)</onclick> - <selected>Skin.HasSetting(VideoLibraryMusicVideoFanart)</selected> - <visible>Container.Content(MusicVideos) | Container.Content(Artists) | Container.Content(Albums)</visible> + <visible>Control.IsVisible(204) | Control.IsVisible(205)</visible> </control> <control type="radiobutton" id="204"> <description>Toggle Fanart</description> @@ -333,6 +258,7 @@ <description>View As button</description> <posx>0</posx> <posy>0</posy> + <textwidth>235</textwidth> <include>ButtonCommonValues</include> <label>-</label> <onleft>50</onleft> diff --git a/addons/skin.confluence/720p/MyVideoPlaylist.xml b/addons/skin.confluence/720p/MyVideoPlaylist.xml index 9e8692d028..d55f2fd60d 100644 --- a/addons/skin.confluence/720p/MyVideoPlaylist.xml +++ b/addons/skin.confluence/720p/MyVideoPlaylist.xml @@ -105,6 +105,7 @@ <description>View As button</description> <posx>0</posx> <posy>0</posy> + <textwidth>235</textwidth> <include>ButtonCommonValues</include> <label>-</label> <onleft>50</onleft> @@ -127,6 +128,7 @@ <description>Repeat button</description> <posx>0</posx> <posy>80</posy> + <textwidth>235</textwidth> <include>ButtonCommonValues</include> <label>-</label> <onleft>50</onleft> @@ -139,6 +141,7 @@ <posx>0</posx> <posy>120</posy> <label>190</label> + <textwidth>235</textwidth> <include>ButtonCommonValues</include> <onleft>50</onleft> <onright>50</onright> @@ -151,6 +154,7 @@ <posy>160</posy> <label>192</label> <onclick>ReplaceWindow(video)</onclick> + <textwidth>235</textwidth> <include>ButtonCommonValues</include> <onleft>50</onleft> <onright>50</onright> diff --git a/addons/skin.confluence/720p/MyWeather.xml b/addons/skin.confluence/720p/MyWeather.xml index 1e583353d0..027b879a48 100644 --- a/addons/skin.confluence/720p/MyWeather.xml +++ b/addons/skin.confluence/720p/MyWeather.xml @@ -812,6 +812,7 @@ <description>Refresh button</description> <posx>0</posx> <posy>40</posy> + <textwidth>235</textwidth> <include>ButtonCommonValues</include> <label>103</label> <onleft>50</onleft> @@ -827,6 +828,7 @@ <onclick>SetFocus(50)</onclick> <onclick>XBMC.RunScript($INFO[Skin.String(WeatherScript_Path)])</onclick> <onclick>SetFocus(50)</onclick> + <textwidth>235</textwidth> <include>ButtonCommonValues</include> <visible>Skin.HasSetting(WeatherScript_Enable) + !IsEmpty(Skin.String(WeatherScript_Label))</visible> <onleft>50</onleft> @@ -840,6 +842,7 @@ <posy>120</posy> <label>5</label> <onclick>ActivateWindow(MyWeatherSettings)</onclick> + <textwidth>235</textwidth> <include>ButtonCommonValues</include> <onleft>50</onleft> <onright>50</onright> diff --git a/addons/skin.confluence/720p/custom_SkinSetting_1111.xml b/addons/skin.confluence/720p/custom_SkinSetting_1111.xml index c637106cc9..c91607807d 100644 --- a/addons/skin.confluence/720p/custom_SkinSetting_1111.xml +++ b/addons/skin.confluence/720p/custom_SkinSetting_1111.xml @@ -255,6 +255,18 @@ <onclick>Skin.ToggleSetting(HideFilenameFlagging)</onclick> <selected>Skin.HasSetting(HideFilenameFlagging)</selected> </control> + <control type="radiobutton" id="114"> + <width>750</width> + <height>40</height> + <font>font13</font> + <label>31119</label> + <textcolor>grey2</textcolor> + <focusedcolor>white</focusedcolor> + <texturefocus>MenuItemFO.png</texturefocus> + <texturenofocus>MenuItemNF.png</texturenofocus> + <onclick>Skin.ToggleSetting(HideBackGroundFanart)</onclick> + <selected>Skin.HasSetting(HideBackGroundFanart)</selected> + </control> <control type="label" id="104"> <width>750</width> <height>45</height> diff --git a/addons/skin.confluence/720p/includes.xml b/addons/skin.confluence/720p/includes.xml index adef0d318c..703bbdb7aa 100644 --- a/addons/skin.confluence/720p/includes.xml +++ b/addons/skin.confluence/720p/includes.xml @@ -68,7 +68,18 @@ <timeperimage>10000</timeperimage> <randomize>true</randomize> <fadetime>1000</fadetime> - <visible>[Container.Content(TVShows) | Container.Content(Seasons) |Container.Content(Episodes)] + [!IsEmpty(Skin.String(Home_Custom_Back_TVShow_Folder) + Skin.HasSetting(HomeMenuNoTVShowsButton)])</visible> + <visible>[Container.Content(TVShows) | Container.Content(Seasons) | Container.Content(Episodes)] + [!IsEmpty(Skin.String(Home_Custom_Back_TVShow_Folder) + Skin.HasSetting(HomeMenuNoTVShowsButton)])</visible> + </control> + <control type="image"> + <posx>0</posx> + <posy>0</posy> + <width>1280</width> + <height>720</height> + <texture background="true">$INFO[ListItem.Property(Fanart_Image)]</texture> + <include>backgroundfade</include> + <fadetime>FanartCrossfadeTime</fadetime> + <visible>!Skin.HasSetting(HideBackGroundFanart) + !IsEmpty(ListItem.Property(Fanart_Image))</visible> + <include>Window_OpenClose_Animation</include> </control> </include> <include name="CommonTVBackground"> @@ -94,6 +105,17 @@ <randomize>true</randomize> <fadetime>1000</fadetime> </control> + <control type="image"> + <posx>0</posx> + <posy>0</posy> + <width>1280</width> + <height>720</height> + <texture background="true">$INFO[ListItem.Property(Fanart_Image)]</texture> + <include>backgroundfade</include> + <fadetime>FanartCrossfadeTime</fadetime> + <visible>!Skin.HasSetting(HideBackGroundFanart) + !IsEmpty(ListItem.Property(Fanart_Image))</visible> + <include>Window_OpenClose_Animation</include> + </control> </include> <include name="CommonPictureBackground"> <control type="multiimage"> @@ -106,6 +128,17 @@ <randomize>true</randomize> <fadetime>1000</fadetime> </control> + <control type="image"> + <posx>0</posx> + <posy>0</posy> + <width>1280</width> + <height>720</height> + <texture background="true">$INFO[ListItem.Property(Fanart_Image)]</texture> + <include>backgroundfade</include> + <fadetime>FanartCrossfadeTime</fadetime> + <visible>!Skin.HasSetting(HideBackGroundFanart) + !IsEmpty(ListItem.Property(Fanart_Image))</visible> + <include>Window_OpenClose_Animation</include> + </control> </include> <include name="CommonProgramsBackground"> <control type="multiimage"> @@ -118,17 +151,16 @@ <randomize>true</randomize> <fadetime>1000</fadetime> </control> - </include> - <include name="CommonScriptBackground"> - <control type="multiimage"> + <control type="image"> <posx>0</posx> <posy>0</posy> <width>1280</width> <height>720</height> - <imagepath fallback="special://skin/backgrounds/scripts.jpg" background="true">$INFO[Skin.String(Home_Custom_Back_Scripts_Folder)]</imagepath> - <timeperimage>10000</timeperimage> - <randomize>true</randomize> - <fadetime>1000</fadetime> + <texture background="true">$INFO[ListItem.Property(Fanart_Image)]</texture> + <include>backgroundfade</include> + <fadetime>FanartCrossfadeTime</fadetime> + <visible>!Skin.HasSetting(HideBackGroundFanart) + !IsEmpty(ListItem.Property(Fanart_Image))</visible> + <include>Window_OpenClose_Animation</include> </control> </include> <include name="CommonWeatherBackground"> @@ -167,6 +199,17 @@ <randomize>true</randomize> <fadetime>1000</fadetime> </control> + <control type="image"> + <posx>0</posx> + <posy>0</posy> + <width>1280</width> + <height>720</height> + <texture background="true">$INFO[ListItem.Property(Fanart_Image)]</texture> + <include>backgroundfade</include> + <fadetime>FanartCrossfadeTime</fadetime> + <visible>!Skin.HasSetting(HideBackGroundFanart) + !IsEmpty(ListItem.Property(Fanart_Image))</visible> + <include>Window_OpenClose_Animation</include> + </control> </include> <include name="BehindDialogFadeOut"> <control type="image"> @@ -220,7 +263,7 @@ <height>40</height> <width>250</width> <textoffsetx>10</textoffsetx> - <textwidth>235</textwidth> + <textwidth>200</textwidth> <aligny>center</aligny> <font>font13caps</font> <texturefocus border="5">button-focus.png</texturefocus> diff --git a/addons/skin.confluence/language/English/strings.xml b/addons/skin.confluence/language/English/strings.xml index d81e5ce232..bd762cd844 100644 --- a/addons/skin.confluence/language/English/strings.xml +++ b/addons/skin.confluence/language/English/strings.xml @@ -69,7 +69,7 @@ <string id="31116"></string> <string id="31117">Show Recently added Videos</string> <string id="31118">Home Page Programs Submenu</string> - <string id="31119"></string> <!-- blanked 2010-11-12 --> + <string id="31119">Hide Background Fanart</string> <string id="31120">BUTTON LABEL</string> <string id="31121"></string> <!-- blanked 2010-11-12 --> <string id="31122">Weather Page</string> |