aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjezz_x <jezz_x@svn>2010-12-23 11:59:58 +0000
committerjezz_x <jezz_x@svn>2010-12-23 11:59:58 +0000
commitc224c7c0b7bab5c699de6c9264a344260b882666 (patch)
tree52dc126bdc07a135e77a69c363533cc099cba0d5
parent21467c5aed4bec4ae5ad30aa4e5f69226f671b47 (diff)
Changed: [Confluence] Reverted the option to have the Horizontal Home menu it just over complicated things and was more trouble than it was worth and reduced flexibility (custom menu items)
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@35672 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat
-rw-r--r--addons/skin.confluence/720p/Home.xml722
-rw-r--r--addons/skin.confluence/720p/IncludesHomeHorizontal.xml676
-rw-r--r--addons/skin.confluence/720p/IncludesHomeMenuItems.xml82
-rw-r--r--addons/skin.confluence/720p/IncludesHomeVertical.xml648
-rw-r--r--addons/skin.confluence/720p/custom_SkinSetting_1111.xml13
-rw-r--r--addons/skin.confluence/720p/includes.xml2
-rw-r--r--addons/skin.confluence/language/English/strings.xml2
-rw-r--r--addons/skin.confluence/media/HomeBackHorizontal_top.pngbin53361 -> 0 bytes
-rw-r--r--addons/skin.confluence/media/Makefile2
-rw-r--r--addons/skin.confluence/media/floor2.pngbin3276 -> 0 bytes
10 files changed, 721 insertions, 1426 deletions
diff --git a/addons/skin.confluence/720p/Home.xml b/addons/skin.confluence/720p/Home.xml
index 262bfe723c..44c394abf9 100644
--- a/addons/skin.confluence/720p/Home.xml
+++ b/addons/skin.confluence/720p/Home.xml
@@ -41,8 +41,726 @@
<texturefocus>-</texturefocus>
<visible>!Skin.HasSetting(homepageHideRecentlyAdded)</visible>
</control>
- <include condition="!Skin.HasSetting(UseHorizontalHome)">IncludeHomeVertical</include>
- <include condition="Skin.HasSetting(UseHorizontalHome)">IncludeHomeHorizontal</include>
+ <!-- Music Info -->
+ <control type="group">
+ <posx>0</posx>
+ <posy>400r</posy>
+ <visible>Player.HasAudio + !Skin.HasSetting(homepageMusicinfo)</visible>
+ <include>VisibleFadeEffect</include>
+ <include>Window_OpenClose_Animation</include>
+ <animation effect="slide" end="0,30" time="0" condition="!system.getbool(lookandfeel.enablerssfeeds)">conditional</animation>
+ <control type="image">
+ <posx>0</posx>
+ <posy>150</posy>
+ <width>1280</width>
+ <height>250</height>
+ <texture>HomeNowPlayingBack.png</texture>
+ </control>
+ <control type="image">
+ <description>Cover image</description>
+ <posx>200r</posx>
+ <posy>60</posy>
+ <width>180</width>
+ <height>280</height>
+ <aspectratio aligny="bottom">keep</aspectratio>
+ <texture>$INFO[MusicPlayer.Cover]</texture>
+ <bordertexture border="8">ThumbBorder.png</bordertexture>
+ <bordersize>5</bordersize>
+ </control>
+ <control type="label">
+ <description>NowPlaying label</description>
+ <posx>210r</posx>
+ <posy>210</posy>
+ <height>30</height>
+ <width>660</width>
+ <label>$LOCALIZE[31040]</label>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font12_title</font>
+ <textcolor>blue</textcolor>
+ <shadowcolor>black</shadowcolor>
+ </control>
+ <control type="label">
+ <description>Artist label</description>
+ <posx>210r</posx>
+ <posy>235</posy>
+ <height>30</height>
+ <width>660</width>
+ <label>$INFO[MusicPlayer.Artist]</label>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font12_title</font>
+ <textcolor>white</textcolor>
+ <shadowcolor>black</shadowcolor>
+ </control>
+ <control type="label">
+ <description>Album Label</description>
+ <posx>210r</posx>
+ <posy>260</posy>
+ <height>30</height>
+ <width>660</width>
+ <label>$INFO[MusicPlayer.Album]$INFO[musicplayer.discnumber, - $LOCALIZE[427]:]</label>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font12</font>
+ <textcolor>white</textcolor>
+ <shadowcolor>black</shadowcolor>
+ </control>
+ <control type="label">
+ <description>Title label</description>
+ <posx>210r</posx>
+ <posy>285</posy>
+ <height>30</height>
+ <width>660</width>
+ <label>$INFO[MusicPlayer.Title]</label>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font13_title</font>
+ <textcolor>white</textcolor>
+ <shadowcolor>black</shadowcolor>
+ </control>
+ <control type="label">
+ <description>Time Label</description>
+ <posx>210r</posx>
+ <posy>310</posy>
+ <height>30</height>
+ <width>325</width>
+ <label>$INFO[Player.Time]$INFO[Player.Duration, / ]</label>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font12</font>
+ <textcolor>white</textcolor>
+ <shadowcolor>black</shadowcolor>
+ </control>
+ </control>
+ <!-- Video Info -->
+ <control type="group">
+ <posx>0</posx>
+ <posy>400r</posy>
+ <visible>Player.HasVideo + !Skin.HasSetting(homepageVideoinfo)</visible>
+ <include>VisibleFadeEffect</include>
+ <include>Window_OpenClose_Animation</include>
+ <animation effect="slide" end="0,30" time="0" condition="!system.getbool(lookandfeel.enablerssfeeds)">conditional</animation>
+ <control type="image">
+ <posx>0</posx>
+ <posy>150</posy>
+ <width>1280</width>
+ <height>250</height>
+ <texture>HomeNowPlayingBack.png</texture>
+ </control>
+ <control type="group">
+ <visible>!VideoPlayer.Content(Movies) + !VideoPlayer.Content(Episodes)</visible>
+ <control type="image">
+ <description>Cover image</description>
+ <posx>200r</posx>
+ <posy>160</posy>
+ <width>180</width>
+ <height>180</height>
+ <aspectratio aligny="bottom">keep</aspectratio>
+ <texture>$INFO[VideoPlayer.Cover]</texture>
+ <bordertexture border="8">ThumbBorder.png</bordertexture>
+ <bordersize>5</bordersize>
+ </control>
+ <control type="label">
+ <description>NowPlaying label</description>
+ <posx>210r</posx>
+ <posy>260</posy>
+ <height>30</height>
+ <width>660</width>
+ <label>$LOCALIZE[31040]</label>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font12_title</font>
+ <textcolor>blue</textcolor>
+ <shadowcolor>black</shadowcolor>
+ </control>
+ <control type="label">
+ <description>Title label</description>
+ <posx>210r</posx>
+ <posy>285</posy>
+ <height>30</height>
+ <width>660</width>
+ <label>$INFO[VideoPlayer.Title]</label>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font13_title</font>
+ <textcolor>white</textcolor>
+ <shadowcolor>black</shadowcolor>
+ </control>
+ <control type="label">
+ <description>Time Label</description>
+ <posx>210r</posx>
+ <posy>310</posy>
+ <height>30</height>
+ <width>325</width>
+ <label>$INFO[Player.Time]$INFO[Player.Duration, / ]</label>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font12</font>
+ <textcolor>white</textcolor>
+ <shadowcolor>black</shadowcolor>
+ </control>
+ </control>
+ <control type="group">
+ <visible>VideoPlayer.Content(Movies)</visible>
+ <control type="image">
+ <description>Cover image</description>
+ <posx>200r</posx>
+ <posy>0</posy>
+ <width>180</width>
+ <height>340</height>
+ <aspectratio aligny="bottom">keep</aspectratio>
+ <texture>$INFO[VideoPlayer.Cover]</texture>
+ <bordertexture border="8">ThumbBorder.png</bordertexture>
+ <bordersize>5</bordersize>
+ </control>
+ <control type="label">
+ <description>NowPlaying label</description>
+ <posx>210r</posx>
+ <posy>210</posy>
+ <height>30</height>
+ <width>660</width>
+ <label>$LOCALIZE[31040]</label>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font12_title</font>
+ <textcolor>blue</textcolor>
+ <shadowcolor>black</shadowcolor>
+ </control>
+ <control type="label">
+ <description>Studio label</description>
+ <posx>210r</posx>
+ <posy>235</posy>
+ <height>30</height>
+ <width>660</width>
+ <label>$INFO[VideoPlayer.Studio]</label>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font12_title</font>
+ <textcolor>white</textcolor>
+ <shadowcolor>black</shadowcolor>
+ </control>
+ <control type="label">
+ <description>Genre Label</description>
+ <posx>210r</posx>
+ <posy>260</posy>
+ <height>30</height>
+ <width>660</width>
+ <label>$INFO[VideoPlayer.Genre]</label>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font12</font>
+ <textcolor>white</textcolor>
+ <shadowcolor>black</shadowcolor>
+ </control>
+ <control type="label">
+ <description>Title label</description>
+ <posx>210r</posx>
+ <posy>285</posy>
+ <height>30</height>
+ <width>660</width>
+ <label>$INFO[VideoPlayer.Title]$INFO[VideoPlayer.Year,[COLOR=grey] (,)[/COLOR]]</label>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font13_title</font>
+ <textcolor>white</textcolor>
+ <shadowcolor>black</shadowcolor>
+ </control>
+ <control type="label">
+ <description>Time Label</description>
+ <posx>210r</posx>
+ <posy>310</posy>
+ <height>30</height>
+ <width>325</width>
+ <label>$INFO[Player.Time]$INFO[Player.Duration, / ]</label>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font12</font>
+ <textcolor>white</textcolor>
+ <shadowcolor>black</shadowcolor>
+ </control>
+ </control>
+ <control type="group">
+ <visible>VideoPlayer.Content(Episodes)</visible>
+ <control type="image">
+ <description>Cover image</description>
+ <posx>250r</posx>
+ <posy>0</posy>
+ <width>230</width>
+ <height>340</height>
+ <aspectratio aligny="bottom">keep</aspectratio>
+ <texture>$INFO[VideoPlayer.Cover]</texture>
+ <bordertexture border="8">ThumbBorder.png</bordertexture>
+ <bordersize>5</bordersize>
+ </control>
+ <control type="label">
+ <description>NowPlaying label</description>
+ <posx>260r</posx>
+ <posy>210</posy>
+ <height>30</height>
+ <width>610</width>
+ <label>$LOCALIZE[31040]</label>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font12_title</font>
+ <textcolor>blue</textcolor>
+ <shadowcolor>black</shadowcolor>
+ </control>
+ <control type="label">
+ <description>TV Show label</description>
+ <posx>260r</posx>
+ <posy>235</posy>
+ <height>30</height>
+ <width>610</width>
+ <label>$INFO[VideoPlayer.TVShowTitle]</label>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font12_title</font>
+ <textcolor>white</textcolor>
+ <shadowcolor>black</shadowcolor>
+ </control>
+ <control type="label">
+ <description>Season Ep Label</description>
+ <posx>260r</posx>
+ <posy>260</posy>
+ <height>30</height>
+ <width>610</width>
+ <label>$LOCALIZE[20373] $INFO[VideoPlayer.Season] - $LOCALIZE[20359] $INFO[VideoPlayer.episode]</label>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font12</font>
+ <textcolor>white</textcolor>
+ <shadowcolor>black</shadowcolor>
+ </control>
+ <control type="label">
+ <description>Title label</description>
+ <posx>260r</posx>
+ <posy>285</posy>
+ <height>30</height>
+ <width>610</width>
+ <label>$INFO[VideoPlayer.Title]</label>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font13_title</font>
+ <textcolor>white</textcolor>
+ <shadowcolor>black</shadowcolor>
+ </control>
+ <control type="label">
+ <description>Time Label</description>
+ <posx>260r</posx>
+ <posy>310</posy>
+ <height>30</height>
+ <width>325</width>
+ <label>$INFO[Player.Time]$INFO[Player.Duration, / ]</label>
+ <align>right</align>
+ <aligny>center</aligny>
+ <font>font12</font>
+ <textcolor>white</textcolor>
+ <shadowcolor>black</shadowcolor>
+ </control>
+ </control>
+ </control>
+ <include condition="Skin.HasSetting(homepageHideRecentlyAdded)">HomeRecentlyAddedInfo</include>
+ <control type="group">
+ <animation effect="slide" end="-400,0" time="500" tween="quadratic" easing="out">WindowClose</animation>
+ <animation effect="slide" start="-400,0" time="500" tween="quadratic" easing="out">WindowOpen</animation>
+ <control type="group">
+ <animation effect="slide" end="-228,0" time="300" tween="quadratic" easing="out">WindowClose</animation>
+ <control type="image">
+ <posx>379</posx>
+ <posy>0</posy>
+ <width>1</width>
+ <height>720</height>
+ <texture>HomeBladeSub_Part1.png</texture>
+ <animation effect="zoom" start="379,0,1,720" end="379,0,229,720" time="300" tween="quadratic" easing="out" condition="ControlGroup(9001).HasFocus">Conditional</animation>
+ </control>
+ <control type="image">
+ <posx>380</posx>
+ <posy>0</posy>
+ <width>12</width>
+ <height>720</height>
+ <texture>HomeBladeSub_Part2.png</texture>
+ <animation effect="slide" end="228,0" time="300" tween="quadratic" easing="out" condition="ControlGroup(9001).HasFocus">Conditional</animation>
+ </control>
+ </control>
+ <control type="group" id="9001">
+ <posx>170</posx>
+ <posy>0</posy>
+ <animation effect="fade" start="100" end="0" time="0" condition="!ControlGroup(9001).HasFocus">conditional</animation>
+ <animation effect="fade" start="0" end="100" delay="300" time="200" condition="ControlGroup(9001).HasFocus">conditional</animation>
+ <animation effect="fade" start="100" end="0" time="0" condition="ControlGroup(9001).HasFocus">WindowClose</animation>
+ <animation effect="slide" end="210,0" time="300" tween="quadratic" easing="out" condition="ControlGroup(9001).HasFocus">conditional</animation>
+ <control type="grouplist" id="9010">
+ <posx>10</posx>
+ <posy>0</posy>
+ <width>240</width>
+ <height>720</height>
+ <align>center</align>
+ <onleft>9000</onleft>
+ <onright>Control.SetFocus(8000,0)</onright>
+ <onup>9010</onup>
+ <ondown>9010</ondown>
+ <itemgap>0</itemgap>
+ <visible>Container(9000).HasFocus(2)</visible>
+ <include>HomeSubMenuVideos</include> <!-- Buttons for the grouplist -->
+ </control>
+ <control type="grouplist" id="9011">
+ <posx>10</posx>
+ <posy>0</posy>
+ <width>240</width>
+ <height>720</height>
+ <align>center</align>
+ <onleft>9000</onleft>
+ <onright>9001</onright>
+ <onup>9011</onup>
+ <ondown>9011</ondown>
+ <itemgap>0</itemgap>
+ <visible>Container(9000).HasFocus(3)</visible>
+ <include>HomeSubMenuMusic</include> <!-- Buttons for the grouplist -->
+ </control>
+ <control type="grouplist" id="9013">
+ <posx>10</posx>
+ <posy>0</posy>
+ <width>240</width>
+ <height>720</height>
+ <align>center</align>
+ <onleft>9000</onleft>
+ <onright>9001</onright>
+ <onup>9015</onup>
+ <ondown>9015</ondown>
+ <itemgap>0</itemgap>
+ <visible>Container(9000).HasFocus(4) + [!IsEmpty(Skin.String(HomePictureButton1)) | !IsEmpty(Skin.String(HomePictureButton2)) | !IsEmpty(Skin.String(HomePictureButton3)) | !IsEmpty(Skin.String(HomePictureButton4)) | !IsEmpty(Skin.String(HomePictureButton5)) | !IsEmpty(Skin.String(HomePictureButton6))]</visible>
+ <include>HomeSubMenuPictures</include> <!-- Buttons for the grouplist -->
+ </control>
+ <control type="grouplist" id="9014">
+ <posx>10</posx>
+ <posy>0</posy>
+ <width>240</width>
+ <height>720</height>
+ <align>center</align>
+ <onleft>9000</onleft>
+ <onright>9001</onright>
+ <onup>9014</onup>
+ <ondown>9014</ondown>
+ <itemgap>0</itemgap>
+ <visible>Container(9000).HasFocus(5)</visible>
+ <include>HomeSubMenuSystem</include> <!-- Buttons for the grouplist -->
+ </control>
+ <control type="grouplist" id="9015">
+ <posx>10</posx>
+ <posy>0</posy>
+ <width>240</width>
+ <height>720</height>
+ <align>center</align>
+ <onleft>9000</onleft>
+ <onright>9001</onright>
+ <onup>9015</onup>
+ <ondown>9015</ondown>
+ <itemgap>0</itemgap>
+ <visible>Container(9000).HasFocus(1) + [!IsEmpty(Skin.String(HomeProgramButton1)) | !IsEmpty(Skin.String(HomeProgramButton2)) | !IsEmpty(Skin.String(HomeProgramButton3)) | !IsEmpty(Skin.String(HomeProgramButton4)) | !IsEmpty(Skin.String(HomeProgramButton5)) | !IsEmpty(Skin.String(HomeProgramButton6))]</visible>
+ <include>HomeSubMenuPrograms</include> <!-- Buttons for the grouplist -->
+ </control>
+ <control type="grouplist" id="9016">
+ <posx>10</posx>
+ <posy>0</posy>
+ <width>240</width>
+ <height>720</height>
+ <align>center</align>
+ <onleft>9000</onleft>
+ <onright>Control.SetFocus(8000,0)</onright>
+ <onup>9016</onup>
+ <ondown>9016</ondown>
+ <itemgap>0</itemgap>
+ <visible>Container(9000).HasFocus(10)</visible>
+ <include>HomeSubMenuMovies</include> <!-- Buttons for the grouplist -->
+ </control>
+ <control type="grouplist" id="9017">
+ <posx>10</posx>
+ <posy>0</posy>
+ <width>240</width>
+ <height>720</height>
+ <align>center</align>
+ <onleft>9000</onleft>
+ <onright>Control.SetFocus(8001,0)</onright>
+ <onup>9017</onup>
+ <ondown>9017</ondown>
+ <itemgap>0</itemgap>
+ <visible>Container(9000).HasFocus(11)</visible>
+ <include>HomeSubMenuTVShows</include> <!-- Buttons for the grouplist -->
+ </control>
+ </control>
+ <control type="image">
+ <posx>-450</posx>
+ <posy>0</posy>
+ <width>846</width>
+ <height>720</height>
+ <colordiffuse>DAFFFFFF</colordiffuse>
+ <texture>HomeBlade_bottom.png</texture>
+ </control>
+ <control type="fixedlist" id="9000">
+ <hitrect x="50" y="50" w="330" h="620" />
+ <posx>-20</posx>
+ <posy>0</posy>
+ <width>400</width>
+ <height>720</height>
+ <onleft>10</onleft>
+ <onright>9001</onright>
+ <onup>9000</onup>
+ <ondown>9000</ondown>
+ <pagecontrol>-</pagecontrol>
+ <scrolltime>300</scrolltime>
+ <focusposition>3</focusposition>
+ <movement>2</movement>
+ <animation effect="fade" start="0" end="100" time="200">Visible</animation>
+ <animation effect="fade" start="100" end="30" time="200" condition="Window.IsVisible(1113) | ControlGroup(9001).HasFocus | ControlGroup(10).HasFocus | Control.HasFocus(8000) | Control.HasFocus(8001)">conditional</animation>
+ <itemlayout height="102" width="380">
+ <control type="label">
+ <posx>380</posx>
+ <posy>21</posy>
+ <width>380</width>
+ <height>40</height>
+ <font>font50caps_title</font>
+ <textcolor>grey3</textcolor>
+ <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="fade" start="100" end="30" time="200" condition="Window.IsVisible(1113) | ControlGroup(9001).HasFocus | ControlGroup(10).HasFocus">conditional</animation>
+ </control>
+ </itemlayout>
+ <focusedlayout height="102" width="380">
+ <control type="label">
+ <posx>380</posx>
+ <posy>21</posy>
+ <width>380</width>
+ <height>40</height>
+ <font>font50caps_title</font>
+ <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>
+ <label>$INFO[ListItem.Label]</label>
+ </control>
+ <control type="image">
+ <posx>370</posx>
+ <posy>63</posy>
+ <width>18</width>
+ <height>18</height>
+ <texture>HomeHasSub.png</texture>
+ <visible>Container(9000).HasFocus(2) | Container(9000).HasFocus(3) | Container(9000).HasFocus(5) | Container(9000).HasFocus(7) | Container(9000).HasFocus(9) | [Container(9000).HasFocus(4) + [!IsEmpty(Skin.String(HomePictureButton1)) | !IsEmpty(Skin.String(HomePictureButton2)) | !IsEmpty(Skin.String(HomePictureButton3)) | !IsEmpty(Skin.String(HomePictureButton4)) | !IsEmpty(Skin.String(HomePictureButton5)) | !IsEmpty(Skin.String(HomePictureButton6))]] | [Container(9000).HasFocus(1) + [!IsEmpty(Skin.String(HomeProgramButton1)) | !IsEmpty(Skin.String(HomeProgramButton2)) | !IsEmpty(Skin.String(HomeProgramButton3)) | !IsEmpty(Skin.String(HomeProgramButton4)) | !IsEmpty(Skin.String(HomeProgramButton5)) | !IsEmpty(Skin.String(HomeProgramButton6))]] | Container(9000).HasFocus(10) | Container(9000).HasFocus(11)</visible>
+ <animation effect="fade" start="0" end="100" time="200">Focus</animation>
+ <animation effect="fade" start="100" end="0" time="200">UnFocus</animation>
+ </control>
+ </focusedlayout>
+ <content>
+ <item id="6">
+ <label>8</label>
+ <onclick>ActivateWindow(Weather)</onclick>
+ <icon>special://skin/backgrounds/weather.jpg</icon>
+ <thumb>$INFO[Skin.String(Home_Custom_Back_Weather_Folder)]</thumb>
+ <visible>!Skin.HasSetting(HomeMenuNoWeatherButton)</visible>
+ <visible>!Skin.HasSetting(ShowWeatherFanart) | IsEmpty(Skin.String(WeatherFanartDir))</visible>
+ </item>
+ <item id="6">
+ <label>8</label>
+ <onclick>ActivateWindow(Weather)</onclick>
+ <icon>special://skin/backgrounds/weather.jpg</icon>
+ <thumb>$INFO[Skin.String(WeatherFanartDir)]$INFO[Weather.FanartCode]</thumb>
+ <visible>!Skin.HasSetting(HomeMenuNoWeatherButton)</visible>
+ <visible>Skin.HasSetting(ShowWeatherFanart) + !IsEmpty(Skin.String(WeatherFanartDir))</visible>
+ </item>
+ <item id="4">
+ <label>1</label>
+ <onclick>ActivateWindow(Pictures)</onclick>
+ <icon>special://skin/backgrounds/pictures.jpg</icon>
+ <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>
+ <icon>special://skin/backgrounds/videos.jpg</icon>
+ <thumb>$INFO[Skin.String(Home_Custom_Back_Video_Folder)]</thumb>
+ <visible>!Skin.HasSetting(HomeMenuNoVideosButton) + ![Skin.HasSetting(HomeMenuNoMoviesButton) + Skin.HasSetting(HomeMenuNoTVShowsButton)]</visible>
+ </item>
+ <item id="2">
+ <label>3</label>
+ <onclick>ActivateWindow(VideoFiles)</onclick>
+ <icon>special://skin/backgrounds/videos.jpg</icon>
+ <thumb>$INFO[Skin.String(Home_Custom_Back_Video_Folder)]</thumb>
+ <visible>!Skin.HasSetting(HomeMenuNoVideosButton) + [Skin.HasSetting(HomeMenuNoMoviesButton) + Skin.HasSetting(HomeMenuNoTVShowsButton)]</visible>
+ </item>
+ <item id="10">
+ <label>20342</label>
+ <onclick>ActivateWindow(VideoLibrary,MovieTitles,return)</onclick>
+ <icon>special://skin/backgrounds/videos.jpg</icon>
+ <thumb>$INFO[Skin.String(Home_Custom_Back_Movies_Folder)]</thumb>
+ <visible>Skin.HasSetting(HomeMenuNoMoviesButton) + Library.HasContent(Movies)</visible>
+ </item>
+ <item id="11">
+ <label>20343</label>
+ <onclick>ActivateWindow(VideoLibrary,TVShowTitles,return)</onclick>
+ <icon>special://skin/backgrounds/videos.jpg</icon>
+ <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>
+ <item id="5">
+ <label>13000</label>
+ <onclick>ActivateWindow(Settings)</onclick>
+ <icon>special://skin/backgrounds/settings.jpg</icon>
+ <thumb>$INFO[Skin.String(Home_Custom_Back_Settings_Folder)]</thumb>
+ </item>
+ </content>
+ </control>
+ <control type="image">
+ <posx>0</posx>
+ <posy>-205</posy>
+ <width>385</width>
+ <height>1130</height>
+ <texture>HomeBlade_middle.png</texture>
+ <animation effect="slide" end="0,-204" time="300" condition="Container(9000).Row(1)">conditional</animation>
+ <animation effect="slide" end="0,-102" time="300" condition="Container(9000).Row(2)">conditional</animation>
+ <animation effect="slide" end="0,102" time="300" condition="Container(9000).Row(4)">conditional</animation>
+ <animation effect="slide" end="0,204" time="300" condition="Container(9000).Row(5)">conditional</animation>
+ </control>
+ <control type="image">
+ <posx>-450</posx>
+ <posy>0</posy>
+ <width>846</width>
+ <height>720</height>
+ <texture>HomeBlade_top.png</texture>
+ </control>
+ <control type="image">
+ <description>LOGO</description>
+ <posx>10</posx>
+ <posy>10</posy>
+ <width>140</width>
+ <height>40</height>
+ <texture>XBMC_Logo.png</texture>
+ </control>
+ <control type="image">
+ <description>LOGO Mirror</description>
+ <posx>10</posx>
+ <posy>42</posy>
+ <width>140</width>
+ <height>40</height>
+ <texture diffuse="diffuse_mirror.png" flipy="true">XBMC_Logo.png</texture>
+ </control>
+ <control type="image">
+ <posx>0</posx>
+ <posy>100r</posy>
+ <width>256</width>
+ <height>100</height>
+ <texture>HomeButtonsBack.png</texture>
+ </control>
+ <control type="group" id="10">
+ <posx>15</posx>
+ <posy>55r</posy>
+ <control type="button" id="20">
+ <description>Power push button</description>
+ <posx>90</posx>
+ <posy>0</posy>
+ <width>43</width>
+ <height>43</height>
+ <label>31003</label>
+ <font>-</font>
+ <aligny>-</aligny>
+ <onclick>ActivateWindow(ShutdownMenu)</onclick>
+ <texturefocus>home-power-FO.png</texturefocus>
+ <texturenofocus>home-power.png</texturenofocus>
+ <onleft>21</onleft>
+ <onright>9000</onright>
+ <onup>9000</onup>
+ <ondown>9000</ondown>
+ </control>
+ <control type="button" id="21">
+ <description>Favourites push button</description>
+ <posx>45</posx>
+ <posy>0</posy>
+ <width>43</width>
+ <height>43</height>
+ <label>1036</label>
+ <font>-</font>
+ <aligny>-</aligny>
+ <onclick>ActivateWindow(Favourites)</onclick>
+ <texturefocus>home-favourites-FO.png</texturefocus>
+ <texturenofocus>home-favourites.png</texturenofocus>
+ <onleft>22</onleft>
+ <onright>20</onright>
+ <onup>9000</onup>
+ <ondown>9000</ondown>
+ </control>
+ <control type="button" id="22">
+ <description>Play Disc Media push button</description>
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>43</width>
+ <height>43</height>
+ <label>16004</label>
+ <font>-</font>
+ <aligny>-</aligny>
+ <onclick>ActivateWindow(1113)</onclick>
+ <texturefocus>home-playmedia-FO.png</texturefocus>
+ <texturenofocus>home-playmedia.png</texturenofocus>
+ <onleft>9000</onleft>
+ <onright>21</onright>
+ <onup>9000</onup>
+ <ondown>9000</ondown>
+ </control>
+ </control>
+ </control>
+ <control type="group">
+ <posx>420</posx>
+ <posy>35r</posy>
+ <animation effect="slide" end="0,35" time="300" tween="quadratic" easing="out">WindowClose</animation>
+ <animation effect="slide" start="0,35" time="300" tween="quadratic" easing="out">WindowOpen</animation>
+ <control type="image">
+ <description>RSS background</description>
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>860</width>
+ <height>35</height>
+ <texture border="32,0,0,0">Rss_Back.png</texture>
+ <visible>system.getbool(lookandfeel.enablerssfeeds)</visible>
+ </control>
+ <control type="rss">
+ <description>RSS feed</description>
+ <posx>35</posx>
+ <posy>6</posy>
+ <height>35</height>
+ <width>825</width>
+ <font>font12</font>
+ <urlset>1</urlset>
+ <textcolor>blue</textcolor>
+ <titlecolor>blue</titlecolor>
+ <headlinecolor>white</headlinecolor>
+ <visible>system.getbool(lookandfeel.enablerssfeeds)</visible>
+ </control>
+ <control type="image">
+ <description>RSS background</description>
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>100</width>
+ <height>35</height>
+ <texture border="32,0,0,0">Rss_Back_Overlay.png</texture>
+ <visible>system.getbool(lookandfeel.enablerssfeeds)</visible>
+ </control>
+ </control>
<control type="group">
<posx>520r</posx>
<posy>0</posy>
diff --git a/addons/skin.confluence/720p/IncludesHomeHorizontal.xml b/addons/skin.confluence/720p/IncludesHomeHorizontal.xml
deleted file mode 100644
index 8d3f6bf9f9..0000000000
--- a/addons/skin.confluence/720p/IncludesHomeHorizontal.xml
+++ /dev/null
@@ -1,676 +0,0 @@
-<includes>
- <include name="IncludeHomeHorizontal">
- <!-- Music Info -->
- <control type="group">
- <posx>0</posx>
- <posy>0</posy>
- <visible>Player.HasAudio + !Skin.HasSetting(homepageMusicinfo)</visible>
- <include>VisibleFadeEffect</include>
- <include>Window_OpenClose_Animation</include>
- <control type="image">
- <posx>0</posx>
- <posy>0</posy>
- <width>1280</width>
- <height>260</height>
- <texture flipy="true">HomeNowPlayingBack.png</texture>
- </control>
- <control type="image">
- <description>Cover image</description>
- <posx>20</posx>
- <posy>20</posy>
- <width>180</width>
- <height>280</height>
- <aspectratio aligny="top">keep</aspectratio>
- <texture>$INFO[MusicPlayer.Cover]</texture>
- <bordertexture border="8">ThumbBorder.png</bordertexture>
- <bordersize>5</bordersize>
- </control>
- <control type="label">
- <description>NowPlaying label</description>
- <posx>210</posx>
- <posy>30</posy>
- <height>30</height>
- <width>660</width>
- <label>$LOCALIZE[31040]</label>
- <align>left</align>
- <aligny>center</aligny>
- <font>font12_title</font>
- <textcolor>blue</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- <control type="label">
- <description>Artist label</description>
- <posx>210</posx>
- <posy>60</posy>
- <height>30</height>
- <width>1000</width>
- <label>$INFO[MusicPlayer.Artist]</label>
- <align>left</align>
- <aligny>center</aligny>
- <font>font12_title</font>
- <textcolor>white</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- <control type="label">
- <description>Album Label</description>
- <posx>210</posx>
- <posy>85</posy>
- <height>30</height>
- <width>1000</width>
- <label>$INFO[MusicPlayer.Album]$INFO[musicplayer.discnumber, - $LOCALIZE[427]:]</label>
- <align>left</align>
- <aligny>center</aligny>
- <font>font12</font>
- <textcolor>white</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- <control type="label">
- <description>Title label</description>
- <posx>210</posx>
- <posy>110</posy>
- <height>30</height>
- <width>1000</width>
- <label>$INFO[MusicPlayer.Title]</label>
- <align>left</align>
- <aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>white</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- <control type="label">
- <description>Time Label</description>
- <posx>210</posx>
- <posy>140</posy>
- <height>30</height>
- <width>325</width>
- <label>$INFO[Player.Time]$INFO[Player.Duration, / ]</label>
- <align>left</align>
- <aligny>center</aligny>
- <font>font12</font>
- <textcolor>white</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- </control>
- <!-- Video Info -->
- <control type="group">
- <posx>0</posx>
- <posy>0</posy>
- <visible>Player.HasVideo + !Skin.HasSetting(homepageVideoinfo)</visible>
- <include>VisibleFadeEffect</include>
- <include>Window_OpenClose_Animation</include>
- <control type="image">
- <posx>0</posx>
- <posy>0</posy>
- <width>1280</width>
- <height>260</height>
- <texture flipy="true">HomeNowPlayingBack.png</texture>
- </control>
- <control type="group">
- <visible>!VideoPlayer.Content(Movies) + !VideoPlayer.Content(Episodes)</visible>
- <control type="image">
- <description>Cover image</description>
- <posx>20</posx>
- <posy>20</posy>
- <width>180</width>
- <height>280</height>
- <aspectratio aligny="top">keep</aspectratio>
- <texture>$INFO[VideoPlayer.Cover]</texture>
- <bordertexture border="8">ThumbBorder.png</bordertexture>
- <bordersize>5</bordersize>
- </control>
- <control type="label">
- <description>NowPlaying label</description>
- <posx>220</posx>
- <posy>30</posy>
- <height>30</height>
- <width>660</width>
- <label>$LOCALIZE[31040]</label>
- <align>left</align>
- <aligny>center</aligny>
- <font>font12_title</font>
- <textcolor>blue</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- <control type="label">
- <description>Title label</description>
- <posx>220</posx>
- <posy>60</posy>
- <height>30</height>
- <width>1000</width>
- <label>$INFO[VideoPlayer.Title]</label>
- <align>left</align>
- <aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>white</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- <control type="label">
- <description>Time Label</description>
- <posx>220</posx>
- <posy>90</posy>
- <height>30</height>
- <width>325</width>
- <label>$INFO[Player.Time]$INFO[Player.Duration, / ]</label>
- <align>left</align>
- <aligny>center</aligny>
- <font>font12</font>
- <textcolor>white</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- </control>
- <control type="group">
- <visible>VideoPlayer.Content(Movies)</visible>
- <control type="image">
- <description>Cover image</description>
- <posx>20</posx>
- <posy>20</posy>
- <width>180</width>
- <height>340</height>
- <aspectratio aligny="top">keep</aspectratio>
- <texture>$INFO[VideoPlayer.Cover]</texture>
- <bordertexture border="8">ThumbBorder.png</bordertexture>
- <bordersize>5</bordersize>
- </control>
- <control type="label">
- <description>NowPlaying label</description>
- <posx>220</posx>
- <posy>30</posy>
- <height>30</height>
- <width>660</width>
- <label>$LOCALIZE[31040]</label>
- <align>left</align>
- <aligny>center</aligny>
- <font>font12_title</font>
- <textcolor>blue</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- <control type="label">
- <description>Studio label</description>
- <posx>220</posx>
- <posy>60</posy>
- <height>30</height>
- <width>1000</width>
- <label>$INFO[VideoPlayer.Studio]</label>
- <align>left</align>
- <aligny>center</aligny>
- <font>font12_title</font>
- <textcolor>white</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- <control type="label">
- <description>Genre Label</description>
- <posx>220</posx>
- <posy>85</posy>
- <height>30</height>
- <width>1000</width>
- <label>$INFO[VideoPlayer.Genre]</label>
- <align>left</align>
- <aligny>center</aligny>
- <font>font12</font>
- <textcolor>white</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- <control type="label">
- <description>Title label</description>
- <posx>220</posx>
- <posy>110</posy>
- <height>30</height>
- <width>1000</width>
- <label>$INFO[VideoPlayer.Title]$INFO[VideoPlayer.Year,[COLOR=grey] (,)[/COLOR]]</label>
- <align>left</align>
- <aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>white</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- <control type="label">
- <description>Time Label</description>
- <posx>220</posx>
- <posy>140</posy>
- <height>30</height>
- <width>325</width>
- <label>$INFO[Player.Time]$INFO[Player.Duration, / ]</label>
- <align>left</align>
- <aligny>center</aligny>
- <font>font12</font>
- <textcolor>white</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- </control>
- <control type="group">
- <visible>VideoPlayer.Content(Episodes)</visible>
- <control type="image">
- <description>Cover image</description>
- <posx>20</posx>
- <posy>35</posy>
- <width>230</width>
- <height>340</height>
- <aspectratio aligny="top">keep</aspectratio>
- <texture>$INFO[VideoPlayer.Cover]</texture>
- <bordertexture border="8">ThumbBorder.png</bordertexture>
- <bordersize>5</bordersize>
- </control>
- <control type="label">
- <description>NowPlaying label</description>
- <posx>270</posx>
- <posy>30</posy>
- <height>30</height>
- <width>610</width>
- <label>$LOCALIZE[31040]</label>
- <align>left</align>
- <aligny>center</aligny>
- <font>font12_title</font>
- <textcolor>blue</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- <control type="label">
- <description>TV Show label</description>
- <posx>270</posx>
- <posy>60</posy>
- <height>30</height>
- <width>950</width>
- <label>$INFO[VideoPlayer.TVShowTitle]</label>
- <align>left</align>
- <aligny>center</aligny>
- <font>font12_title</font>
- <textcolor>white</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- <control type="label">
- <description>Season Ep Label</description>
- <posx>270</posx>
- <posy>85</posy>
- <height>30</height>
- <width>950</width>
- <label>$LOCALIZE[20373] $INFO[VideoPlayer.Season] - $LOCALIZE[20359] $INFO[VideoPlayer.episode]</label>
- <align>left</align>
- <aligny>center</aligny>
- <font>font12</font>
- <textcolor>white</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- <control type="label">
- <description>Title label</description>
- <posx>270</posx>
- <posy>110</posy>
- <height>30</height>
- <width>950</width>
- <label>$INFO[VideoPlayer.Title]</label>
- <align>left</align>
- <aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>white</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- <control type="label">
- <description>Time Label</description>
- <posx>270</posx>
- <posy>140</posy>
- <height>30</height>
- <width>325</width>
- <label>$INFO[Player.Time]$INFO[Player.Duration, / ]</label>
- <align>left</align>
- <aligny>center</aligny>
- <font>font12</font>
- <textcolor>white</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- </control>
- </control>
- <include condition="Skin.HasSetting(homepageHideRecentlyAdded)">HomeRecentlyAddedInfo</include>
- <control type="group" id="9001">
- <posx>510</posx>
- <posy>280</posy>
- <animation type="Conditional" condition="ControlGroup(9001).HasFocus" reversible="true">
- <effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300" />
- <effect type="fade" start="0" end="100" time="300" />
- </animation>
- <animation type="Conditional" condition="!ControlGroup(9001).HasFocus" reversible="true">
- <effect type="zoom" start="100" end="80" center="640,360" easing="in" tween="back" time="300" />
- <effect type="fade" start="100" end="0" time="300" />
- </animation>
- <animation effect="fade" start="100" end="0" time="0" condition="ControlGroup(9001).HasFocus">WindowClose</animation>
- <control type="image">
- <description>background image</description>
- <posx>0</posx>
- <posy>0</posy>
- <width>260</width>
- <height>300</height>
- <texture border="40">DialogBack.png</texture>
- </control>
- <control type="image">
- <posx>20</posx>
- <posy>10</posy>
- <width>220</width>
- <height>70</height>
- <aspectratio>stretch</aspectratio>
- <texture>GlassTitleBar.png</texture>
- </control>
- <control type="grouplist" id="9010">
- <posx>20</posx>
- <posy>30</posy>
- <width>220</width>
- <height>240</height>
- <align>top</align>
- <onleft>Control.Setfocus(9000)</onleft>
- <onleft>Control.Move(9000,-1)</onleft>
- <onright>Control.Setfocus(9000)</onright>
- <onright>Control.Move(9000,1)</onright>
- <onup>9000</onup>
- <ondown>9000</ondown>
- <itemgap>0</itemgap>
- <visible>Container(9000).HasFocus(2)</visible>
- <include>HomeSubMenuVideos</include> <!-- Buttons for the grouplist -->
- </control>
- <control type="grouplist" id="9011">
- <posx>20</posx>
- <posy>30</posy>
- <width>220</width>
- <height>240</height>
- <align>top</align>
- <onleft>Control.Setfocus(9000)</onleft>
- <onleft>Control.Move(9000,-1)</onleft>
- <onright>Control.Setfocus(9000)</onright>
- <onright>Control.Move(9000,1)</onright>
- <onup>9000</onup>
- <ondown>9000</ondown>
- <itemgap>0</itemgap>
- <visible>Container(9000).HasFocus(3)</visible>
- <include>HomeSubMenuMusic</include> <!-- Buttons for the grouplist -->
- </control>
- <control type="grouplist" id="9013">
- <posx>20</posx>
- <posy>30</posy>
- <width>220</width>
- <height>240</height>
- <align>top</align>
- <onleft>Control.Setfocus(9000)</onleft>
- <onleft>Control.Move(9000,-1)</onleft>
- <onright>Control.Setfocus(9000)</onright>
- <onright>Control.Move(9000,1)</onright>
- <onup>9000</onup>
- <ondown>9000</ondown>
- <itemgap>0</itemgap>
- <visible>Container(9000).HasFocus(4) + [!IsEmpty(Skin.String(HomePictureButton1)) | !IsEmpty(Skin.String(HomePictureButton2)) | !IsEmpty(Skin.String(HomePictureButton3)) | !IsEmpty(Skin.String(HomePictureButton4)) | !IsEmpty(Skin.String(HomePictureButton5)) | !IsEmpty(Skin.String(HomePictureButton6))]</visible>
- <include>HomeSubMenuPictures</include> <!-- Buttons for the grouplist -->
- </control>
- <control type="grouplist" id="9014">
- <posx>20</posx>
- <posy>30</posy>
- <width>220</width>
- <height>240</height>
- <align>top</align>
- <onleft>Control.Setfocus(9000)</onleft>
- <onleft>Control.Move(9000,-1)</onleft>
- <onright>Control.Setfocus(9000)</onright>
- <onright>Control.Move(9000,1)</onright>
- <onup>9000</onup>
- <ondown>9000</ondown>
- <itemgap>0</itemgap>
- <visible>Container(9000).HasFocus(5)</visible>
- <include>HomeSubMenuSystem</include> <!-- Buttons for the grouplist -->
- </control>
- <control type="grouplist" id="9015">
- <posx>20</posx>
- <posy>30</posy>
- <width>220</width>
- <height>240</height>
- <align>top</align>
- <onleft>Control.Setfocus(9000)</onleft>
- <onleft>Control.Move(9000,-1)</onleft>
- <onright>Control.Setfocus(9000)</onright>
- <onright>Control.Move(9000,1)</onright>
- <onup>9000</onup>
- <ondown>9000</ondown>
- <itemgap>0</itemgap>
- <visible>Container(9000).HasFocus(1) + [!IsEmpty(Skin.String(HomeProgramButton1)) | !IsEmpty(Skin.String(HomeProgramButton2)) | !IsEmpty(Skin.String(HomeProgramButton3)) | !IsEmpty(Skin.String(HomeProgramButton4)) | !IsEmpty(Skin.String(HomeProgramButton5)) | !IsEmpty(Skin.String(HomeProgramButton6))]</visible>
- <include>HomeSubMenuPrograms</include> <!-- Buttons for the grouplist -->
- </control>
- <control type="grouplist" id="9016">
- <posx>20</posx>
- <posy>30</posy>
- <width>220</width>
- <height>240</height>
- <align>top</align>
- <onleft>Control.Setfocus(9000)</onleft>
- <onleft>Control.Move(9000,-1)</onleft>
- <onright>Control.Setfocus(9000)</onright>
- <onright>Control.Move(9000,1)</onright>
- <onup>9000</onup>
- <ondown>9000</ondown>
- <itemgap>0</itemgap>
- <visible>Container(9000).HasFocus(10)</visible>
- <include>HomeSubMenuMovies</include> <!-- Buttons for the grouplist -->
- </control>
- <control type="grouplist" id="9017">
- <posx>20</posx>
- <posy>30</posy>
- <width>220</width>
- <height>240</height>
- <align>top</align>
- <onleft>Control.Setfocus(9000)</onleft>
- <onleft>Control.Move(9000,-1)</onleft>
- <onright>Control.Setfocus(9000)</onright>
- <onright>Control.Move(9000,1)</onright>
- <onup>9000</onup>
- <ondown>9000</ondown>
- <itemgap>0</itemgap>
- <visible>Container(9000).HasFocus(11)</visible>
- <include>HomeSubMenuTVShows</include> <!-- Buttons for the grouplist -->
- </control>
- </control>
- <control type="group">
- <include>Window_OpenClose_Animation</include>
- <control type="image">
- <posx>0</posx>
- <posy>170r</posy>
- <width>1280</width>
- <height>90</height>
- <texture>HomeNowPlayingBack.png</texture>
- <colordiffuse>CCFFFFFF</colordiffuse>
- </control>
- <control type="image">
- <posx>0</posx>
- <posy>80r</posy>
- <width>1280</width>
- <height>90</height>
- <texture>floor.png</texture>
- </control>
- <control type="wraplist" id="9000">
- <posx>-235</posx>
- <posy>580</posy>
- <width>1515</width>
- <height>100</height>
- <onleft>9000</onleft>
- <onright>9000</onright>
- <onup>9001</onup>
- <ondown>10</ondown>
- <pagecontrol>-</pagecontrol>
- <scrolltime>300</scrolltime>
- <focusposition>2</focusposition>
- <orientation>horizontal</orientation>
- <animation effect="fade" start="0" end="100" time="200">Visible</animation>
- <animation effect="fade" start="100" end="30" time="200" condition="Window.IsVisible(1113) | ControlGroup(9001).HasFocus | ControlGroup(10).HasFocus | Control.HasFocus(8000) | Control.HasFocus(8001)">conditional</animation>
- <itemlayout height="100" width="350">
- <control type="label">
- <posx>175</posx>
- <posy>21</posy>
- <width>350</width>
- <height>40</height>
- <font>font45caps_title</font>
- <textcolor>grey3</textcolor>
- <align>center</align>
- <aligny>center</aligny>
- <label>$INFO[ListItem.Label]</label>
- </control>
- <control type="label">
- <posx>175</posx>
- <posy>0</posy>
- <width>350</width>
- <height>40</height>
- <font>font45caps_title</font>
- <textcolor>grey3</textcolor>
- <align>center</align>
- <aligny>center</aligny>
- <label>$INFO[ListItem.Label]</label>
- <animation effect="fade" start="10" end="10" time="0" condition="true">Conditional</animation>
- <animation effect="rotatex" start="0" end="180" center="49,0" time="0" condition="true">Conditional</animation>
- </control>
- </itemlayout>
- <focusedlayout height="100" width="350">
- <control type="label">
- <posx>175</posx>
- <posy>21</posy>
- <width>350</width>
- <height>40</height>
- <font>font45caps_title</font>
- <textcolor>white</textcolor>
- <align>center</align>
- <aligny>center</aligny>
- <label>$INFO[ListItem.Label]</label>
- </control>
- <control type="label">
- <posx>175</posx>
- <posy>0</posy>
- <width>350</width>
- <height>40</height>
- <font>font45caps_title</font>
- <textcolor>grey3</textcolor>
- <align>center</align>
- <aligny>center</aligny>
- <label>$INFO[ListItem.Label]</label>
- <animation effect="fade" start="10" end="10" time="0" condition="true">Conditional</animation>
- <animation effect="rotatex" start="0" end="180" center="49,0" time="0" condition="true">Conditional</animation>
- </control>
- </focusedlayout>
- <content>
- <item id="6">
- <label>8</label>
- <onclick>ActivateWindow(Weather)</onclick>
- <icon>special://skin/backgrounds/weather.jpg</icon>
- <thumb>$INFO[Skin.String(Home_Custom_Back_Weather_Folder)]</thumb>
- <visible>!Skin.HasSetting(HomeMenuNoWeatherButton)</visible>
- <visible>!Skin.HasSetting(ShowWeatherFanart) | IsEmpty(Skin.String(WeatherFanartDir))</visible>
- </item>
- <item id="6">
- <label>8</label>
- <onclick>ActivateWindow(Weather)</onclick>
- <icon>special://skin/backgrounds/weather.jpg</icon>
- <thumb>$INFO[Skin.String(WeatherFanartDir)]$INFO[Weather.FanartCode]</thumb>
- <visible>!Skin.HasSetting(HomeMenuNoWeatherButton)</visible>
- <visible>Skin.HasSetting(ShowWeatherFanart) + !IsEmpty(Skin.String(WeatherFanartDir))</visible>
- </item>
- <item id="4">
- <label>1</label>
- <onclick>ActivateWindow(Pictures)</onclick>
- <icon>special://skin/backgrounds/pictures.jpg</icon>
- <thumb>$INFO[Skin.String(Home_Custom_Back_Pictures_Folder)]</thumb>
- <visible>!Skin.HasSetting(HomeMenuNoPicturesButton)</visible>
- </item>
- <item id="2">
- <label>3</label>
- <onclick>ActivateWindow(Videos)</onclick>
- <icon>special://skin/backgrounds/videos.jpg</icon>
- <thumb>$INFO[Skin.String(Home_Custom_Back_Video_Folder)]</thumb>
- <visible>!Skin.HasSetting(HomeMenuNoVideosButton) + ![Skin.HasSetting(HomeMenuNoMoviesButton) + Skin.HasSetting(HomeMenuNoTVShowsButton)]</visible>
- </item>
- <item id="2">
- <label>3</label>
- <onclick>ActivateWindow(VideoFiles)</onclick>
- <icon>special://skin/backgrounds/videos.jpg</icon>
- <thumb>$INFO[Skin.String(Home_Custom_Back_Video_Folder)]</thumb>
- <visible>!Skin.HasSetting(HomeMenuNoVideosButton) + [Skin.HasSetting(HomeMenuNoMoviesButton) + Skin.HasSetting(HomeMenuNoTVShowsButton)]</visible>
- </item>
- <item id="10">
- <label>20342</label>
- <onclick>ActivateWindow(VideoLibrary,MovieTitles,return)</onclick>
- <icon>special://skin/backgrounds/videos.jpg</icon>
- <thumb>$INFO[Skin.String(Home_Custom_Back_Movies_Folder)]</thumb>
- <visible>Skin.HasSetting(HomeMenuNoMoviesButton) + Library.HasContent(Movies)</visible>
- </item>
- <item id="11">
- <label>20343</label>
- <onclick>ActivateWindow(VideoLibrary,TVShowTitles,return)</onclick>
- <icon>special://skin/backgrounds/videos.jpg</icon>
- <thumb>$INFO[Skin.String(Home_Custom_Back_TVShow_Folder)]</thumb>
- <visible>Skin.HasSetting(HomeMenuNoTVShowsButton) + Library.HasContent(TVShows)</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="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="5">
- <label>13000</label>
- <onclick>ActivateWindow(Settings)</onclick>
- <icon>special://skin/backgrounds/settings.jpg</icon>
- <thumb>$INFO[Skin.String(Home_Custom_Back_Settings_Folder)]</thumb>
- </item>
- </content>
- </control>
- <control type="image">
- <posx>0</posx>
- <posy>150r</posy>
- <width>1280</width>
- <height>70</height>
- <texture>HomeBackHorizontal_top.png</texture>
- </control>
- <control type="image">
- <posx>0</posx>
- <posy>80r</posy>
- <width>1280</width>
- <height>90</height>
- <texture>floor2.png</texture>
- </control>
- <control type="image">
- <posx>631</posx>
- <posy>580</posy>
- <width>18</width>
- <height>18</height>
- <texture>HomeHasSub.png</texture>
- <visible>Container(9000).HasFocus(2) | Container(9000).HasFocus(3) | Container(9000).HasFocus(5) | Container(9000).HasFocus(7) | Container(9000).HasFocus(9) | [Container(9000).HasFocus(4) + [!IsEmpty(Skin.String(HomePictureButton1)) | !IsEmpty(Skin.String(HomePictureButton2)) | !IsEmpty(Skin.String(HomePictureButton3)) | !IsEmpty(Skin.String(HomePictureButton4)) | !IsEmpty(Skin.String(HomePictureButton5)) | !IsEmpty(Skin.String(HomePictureButton6))]] | [Container(9000).HasFocus(1) + [!IsEmpty(Skin.String(HomeProgramButton1)) | !IsEmpty(Skin.String(HomeProgramButton2)) | !IsEmpty(Skin.String(HomeProgramButton3)) | !IsEmpty(Skin.String(HomeProgramButton4)) | !IsEmpty(Skin.String(HomeProgramButton5)) | !IsEmpty(Skin.String(HomeProgramButton6))]] | Container(9000).HasFocus(10) | Container(9000).HasFocus(11)</visible>
- <animation effect="rotate" start="90" end="90" center="auto" time="0" condition="true">Conditional</animation>
- <animation effect="fade" start="0" end="100" time="200">Visible</animation>
- <animation effect="fade" start="100" end="0" time="200">Hidden</animation>
- </control>
- <control type="group">
- <visible>![Player.HasAudio + !Skin.HasSetting(homepageMusicinfo)] + ![Player.HasVideo + !Skin.HasSetting(homepageVideoinfo)]</visible>
- <include>VisibleFadeEffect</include>
- <include>Window_OpenClose_Animation</include>
- <include>HomeXBMCLogo</include>
- </control>
- <control type="rss">
- <description>RSS feed</description>
- <posx>0</posx>
- <posy>40r</posy>
- <height>35</height>
- <width>1280</width>
- <font>font12</font>
- <urlset>1</urlset>
- <textcolor>blue</textcolor>
- <titlecolor>blue</titlecolor>
- <headlinecolor>white</headlinecolor>
- <visible>system.getbool(lookandfeel.enablerssfeeds)</visible>
- <animation effect="slide" end="0,35" time="300" tween="quadratic" easing="out">WindowClose</animation>
- <animation effect="slide" start="0,35" time="300" tween="quadratic" easing="out">WindowOpen</animation>
- </control>
- <control type="image">
- <posx>0</posx>
- <posy>100r</posy>
- <width>256</width>
- <height>100</height>
- <texture>HomeButtonsBack.png</texture>
- </control>
- <include>HomePowerButtons</include>
- </control>
- </include>
-</includes>
diff --git a/addons/skin.confluence/720p/IncludesHomeMenuItems.xml b/addons/skin.confluence/720p/IncludesHomeMenuItems.xml
index 9620ba6693..3342ef2653 100644
--- a/addons/skin.confluence/720p/IncludesHomeMenuItems.xml
+++ b/addons/skin.confluence/720p/IncludesHomeMenuItems.xml
@@ -1,86 +1,4 @@
<includes>
- <include name="HomeXBMCLogo">
- <control type="image">
- <description>LOGO</description>
- <posx>10</posx>
- <posy>10</posy>
- <width>140</width>
- <height>40</height>
- <texture>XBMC_Logo.png</texture>
- </control>
- <control type="image">
- <description>LOGO Mirror</description>
- <posx>10</posx>
- <posy>42</posy>
- <width>140</width>
- <height>40</height>
- <texture diffuse="diffuse_mirror.png" flipy="true">XBMC_Logo.png</texture>
- </control>
- </include>
- <include name="HomePowerButtons">
- <control type="image">
- <posx>0</posx>
- <posy>100r</posy>
- <width>256</width>
- <height>100</height>
- <texture>HomeButtonsBack.png</texture>
- </control>
- <control type="group" id="10">
- <posx>15</posx>
- <posy>55r</posy>
- <control type="button" id="20">
- <description>Power push button</description>
- <posx>90</posx>
- <posy>0</posy>
- <width>43</width>
- <height>43</height>
- <label>31003</label>
- <font>-</font>
- <aligny>-</aligny>
- <onclick>ActivateWindow(ShutdownMenu)</onclick>
- <texturefocus>home-power-FO.png</texturefocus>
- <texturenofocus>home-power.png</texturenofocus>
- <onleft>21</onleft>
- <onright>9000</onright>
- <onup>9000</onup>
- <ondown>9000</ondown>
- </control>
- <control type="button" id="21">
- <description>Favourites push button</description>
- <posx>45</posx>
- <posy>0</posy>
- <width>43</width>
- <height>43</height>
- <label>1036</label>
- <font>-</font>
- <aligny>-</aligny>
- <onclick>ActivateWindow(Favourites)</onclick>
- <texturefocus>home-favourites-FO.png</texturefocus>
- <texturenofocus>home-favourites.png</texturenofocus>
- <onleft>22</onleft>
- <onright>20</onright>
- <onup>9000</onup>
- <ondown>9000</ondown>
- </control>
- <control type="button" id="22">
- <description>Play Disc Media push button</description>
- <posx>0</posx>
- <posy>0</posy>
- <width>43</width>
- <height>43</height>
- <label>16004</label>
- <font>-</font>
- <aligny>-</aligny>
- <onclick>ActivateWindow(1113)</onclick>
- <texturefocus>home-playmedia-FO.png</texturefocus>
- <texturenofocus>home-playmedia.png</texturenofocus>
- <onleft>9000</onleft>
- <onright>21</onright>
- <onup>9000</onup>
- <ondown>9000</ondown>
- </control>
- </control>
- </include>
<include name="HomeSubMenuVideos">
<control type="button" id="90101">
<include>ButtonHomeSubCommonValues</include>
diff --git a/addons/skin.confluence/720p/IncludesHomeVertical.xml b/addons/skin.confluence/720p/IncludesHomeVertical.xml
deleted file mode 100644
index c9e953add3..0000000000
--- a/addons/skin.confluence/720p/IncludesHomeVertical.xml
+++ /dev/null
@@ -1,648 +0,0 @@
-<includes>
- <include name="IncludeHomeVertical">
- <!-- Music Info -->
- <control type="group">
- <posx>0</posx>
- <posy>400r</posy>
- <visible>Player.HasAudio + !Skin.HasSetting(homepageMusicinfo)</visible>
- <include>VisibleFadeEffect</include>
- <include>Window_OpenClose_Animation</include>
- <animation effect="slide" end="0,30" time="0" condition="!system.getbool(lookandfeel.enablerssfeeds)">conditional</animation>
- <control type="image">
- <posx>0</posx>
- <posy>150</posy>
- <width>1280</width>
- <height>250</height>
- <texture>HomeNowPlayingBack.png</texture>
- </control>
- <control type="image">
- <description>Cover image</description>
- <posx>200r</posx>
- <posy>60</posy>
- <width>180</width>
- <height>280</height>
- <aspectratio aligny="bottom">keep</aspectratio>
- <texture>$INFO[MusicPlayer.Cover]</texture>
- <bordertexture border="8">ThumbBorder.png</bordertexture>
- <bordersize>5</bordersize>
- </control>
- <control type="label">
- <description>NowPlaying label</description>
- <posx>210r</posx>
- <posy>210</posy>
- <height>30</height>
- <width>660</width>
- <label>$LOCALIZE[31040]</label>
- <align>right</align>
- <aligny>center</aligny>
- <font>font12_title</font>
- <textcolor>blue</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- <control type="label">
- <description>Artist label</description>
- <posx>210r</posx>
- <posy>235</posy>
- <height>30</height>
- <width>660</width>
- <label>$INFO[MusicPlayer.Artist]</label>
- <align>right</align>
- <aligny>center</aligny>
- <font>font12_title</font>
- <textcolor>white</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- <control type="label">
- <description>Album Label</description>
- <posx>210r</posx>
- <posy>260</posy>
- <height>30</height>
- <width>660</width>
- <label>$INFO[MusicPlayer.Album]$INFO[musicplayer.discnumber, - $LOCALIZE[427]:]</label>
- <align>right</align>
- <aligny>center</aligny>
- <font>font12</font>
- <textcolor>white</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- <control type="label">
- <description>Title label</description>
- <posx>210r</posx>
- <posy>285</posy>
- <height>30</height>
- <width>660</width>
- <label>$INFO[MusicPlayer.Title]</label>
- <align>right</align>
- <aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>white</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- <control type="label">
- <description>Time Label</description>
- <posx>210r</posx>
- <posy>310</posy>
- <height>30</height>
- <width>325</width>
- <label>$INFO[Player.Time]$INFO[Player.Duration, / ]</label>
- <align>right</align>
- <aligny>center</aligny>
- <font>font12</font>
- <textcolor>white</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- </control>
- <!-- Video Info -->
- <control type="group">
- <posx>0</posx>
- <posy>400r</posy>
- <visible>Player.HasVideo + !Skin.HasSetting(homepageVideoinfo)</visible>
- <include>VisibleFadeEffect</include>
- <include>Window_OpenClose_Animation</include>
- <animation effect="slide" end="0,30" time="0" condition="!system.getbool(lookandfeel.enablerssfeeds)">conditional</animation>
- <control type="image">
- <posx>0</posx>
- <posy>150</posy>
- <width>1280</width>
- <height>250</height>
- <texture>HomeNowPlayingBack.png</texture>
- </control>
- <control type="group">
- <visible>!VideoPlayer.Content(Movies) + !VideoPlayer.Content(Episodes)</visible>
- <control type="image">
- <description>Cover image</description>
- <posx>200r</posx>
- <posy>160</posy>
- <width>180</width>
- <height>180</height>
- <aspectratio aligny="bottom">keep</aspectratio>
- <texture>$INFO[VideoPlayer.Cover]</texture>
- <bordertexture border="8">ThumbBorder.png</bordertexture>
- <bordersize>5</bordersize>
- </control>
- <control type="label">
- <description>NowPlaying label</description>
- <posx>210r</posx>
- <posy>260</posy>
- <height>30</height>
- <width>660</width>
- <label>$LOCALIZE[31040]</label>
- <align>right</align>
- <aligny>center</aligny>
- <font>font12_title</font>
- <textcolor>blue</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- <control type="label">
- <description>Title label</description>
- <posx>210r</posx>
- <posy>285</posy>
- <height>30</height>
- <width>660</width>
- <label>$INFO[VideoPlayer.Title]</label>
- <align>right</align>
- <aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>white</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- <control type="label">
- <description>Time Label</description>
- <posx>210r</posx>
- <posy>310</posy>
- <height>30</height>
- <width>325</width>
- <label>$INFO[Player.Time]$INFO[Player.Duration, / ]</label>
- <align>right</align>
- <aligny>center</aligny>
- <font>font12</font>
- <textcolor>white</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- </control>
- <control type="group">
- <visible>VideoPlayer.Content(Movies)</visible>
- <control type="image">
- <description>Cover image</description>
- <posx>200r</posx>
- <posy>0</posy>
- <width>180</width>
- <height>340</height>
- <aspectratio aligny="bottom">keep</aspectratio>
- <texture>$INFO[VideoPlayer.Cover]</texture>
- <bordertexture border="8">ThumbBorder.png</bordertexture>
- <bordersize>5</bordersize>
- </control>
- <control type="label">
- <description>NowPlaying label</description>
- <posx>210r</posx>
- <posy>210</posy>
- <height>30</height>
- <width>660</width>
- <label>$LOCALIZE[31040]</label>
- <align>right</align>
- <aligny>center</aligny>
- <font>font12_title</font>
- <textcolor>blue</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- <control type="label">
- <description>Studio label</description>
- <posx>210r</posx>
- <posy>235</posy>
- <height>30</height>
- <width>660</width>
- <label>$INFO[VideoPlayer.Studio]</label>
- <align>right</align>
- <aligny>center</aligny>
- <font>font12_title</font>
- <textcolor>white</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- <control type="label">
- <description>Genre Label</description>
- <posx>210r</posx>
- <posy>260</posy>
- <height>30</height>
- <width>660</width>
- <label>$INFO[VideoPlayer.Genre]</label>
- <align>right</align>
- <aligny>center</aligny>
- <font>font12</font>
- <textcolor>white</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- <control type="label">
- <description>Title label</description>
- <posx>210r</posx>
- <posy>285</posy>
- <height>30</height>
- <width>660</width>
- <label>$INFO[VideoPlayer.Title]$INFO[VideoPlayer.Year,[COLOR=grey] (,)[/COLOR]]</label>
- <align>right</align>
- <aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>white</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- <control type="label">
- <description>Time Label</description>
- <posx>210r</posx>
- <posy>310</posy>
- <height>30</height>
- <width>325</width>
- <label>$INFO[Player.Time]$INFO[Player.Duration, / ]</label>
- <align>right</align>
- <aligny>center</aligny>
- <font>font12</font>
- <textcolor>white</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- </control>
- <control type="group">
- <visible>VideoPlayer.Content(Episodes)</visible>
- <control type="image">
- <description>Cover image</description>
- <posx>250r</posx>
- <posy>0</posy>
- <width>230</width>
- <height>340</height>
- <aspectratio aligny="bottom">keep</aspectratio>
- <texture>$INFO[VideoPlayer.Cover]</texture>
- <bordertexture border="8">ThumbBorder.png</bordertexture>
- <bordersize>5</bordersize>
- </control>
- <control type="label">
- <description>NowPlaying label</description>
- <posx>260r</posx>
- <posy>210</posy>
- <height>30</height>
- <width>610</width>
- <label>$LOCALIZE[31040]</label>
- <align>right</align>
- <aligny>center</aligny>
- <font>font12_title</font>
- <textcolor>blue</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- <control type="label">
- <description>TV Show label</description>
- <posx>260r</posx>
- <posy>235</posy>
- <height>30</height>
- <width>610</width>
- <label>$INFO[VideoPlayer.TVShowTitle]</label>
- <align>right</align>
- <aligny>center</aligny>
- <font>font12_title</font>
- <textcolor>white</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- <control type="label">
- <description>Season Ep Label</description>
- <posx>260r</posx>
- <posy>260</posy>
- <height>30</height>
- <width>610</width>
- <label>$LOCALIZE[20373] $INFO[VideoPlayer.Season] - $LOCALIZE[20359] $INFO[VideoPlayer.episode]</label>
- <align>right</align>
- <aligny>center</aligny>
- <font>font12</font>
- <textcolor>white</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- <control type="label">
- <description>Title label</description>
- <posx>260r</posx>
- <posy>285</posy>
- <height>30</height>
- <width>610</width>
- <label>$INFO[VideoPlayer.Title]</label>
- <align>right</align>
- <aligny>center</aligny>
- <font>font13_title</font>
- <textcolor>white</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- <control type="label">
- <description>Time Label</description>
- <posx>260r</posx>
- <posy>310</posy>
- <height>30</height>
- <width>325</width>
- <label>$INFO[Player.Time]$INFO[Player.Duration, / ]</label>
- <align>right</align>
- <aligny>center</aligny>
- <font>font12</font>
- <textcolor>white</textcolor>
- <shadowcolor>black</shadowcolor>
- </control>
- </control>
- </control>
- <include condition="Skin.HasSetting(homepageHideRecentlyAdded)">HomeRecentlyAddedInfo</include>
- <control type="group">
- <animation effect="slide" end="-400,0" time="500" tween="quadratic" easing="out">WindowClose</animation>
- <animation effect="slide" start="-400,0" time="500" tween="quadratic" easing="out">WindowOpen</animation>
- <control type="group">
- <animation effect="slide" end="-228,0" time="300" tween="quadratic" easing="out">WindowClose</animation>
- <control type="image">
- <posx>379</posx>
- <posy>0</posy>
- <width>1</width>
- <height>720</height>
- <texture>HomeBladeSub_Part1.png</texture>
- <animation effect="zoom" start="379,0,1,720" end="379,0,229,720" time="300" tween="quadratic" easing="out" condition="ControlGroup(9001).HasFocus">Conditional</animation>
- </control>
- <control type="image">
- <posx>380</posx>
- <posy>0</posy>
- <width>12</width>
- <height>720</height>
- <texture>HomeBladeSub_Part2.png</texture>
- <animation effect="slide" end="228,0" time="300" tween="quadratic" easing="out" condition="ControlGroup(9001).HasFocus">Conditional</animation>
- </control>
- </control>
- <control type="group" id="9001">
- <posx>170</posx>
- <posy>0</posy>
- <animation effect="fade" start="100" end="0" time="0" condition="!ControlGroup(9001).HasFocus">conditional</animation>
- <animation effect="fade" start="0" end="100" delay="300" time="200" condition="ControlGroup(9001).HasFocus">conditional</animation>
- <animation effect="fade" start="100" end="0" time="0" condition="ControlGroup(9001).HasFocus">WindowClose</animation>
- <animation effect="slide" end="210,0" time="300" tween="quadratic" easing="out" condition="ControlGroup(9001).HasFocus">conditional</animation>
- <control type="grouplist" id="9010">
- <posx>10</posx>
- <posy>0</posy>
- <width>240</width>
- <height>720</height>
- <align>center</align>
- <onleft>9000</onleft>
- <onright>Control.SetFocus(8000,0)</onright>
- <onup>9010</onup>
- <ondown>9010</ondown>
- <itemgap>0</itemgap>
- <visible>Container(9000).HasFocus(2)</visible>
- <include>HomeSubMenuVideos</include> <!-- Buttons for the grouplist -->
- </control>
- <control type="grouplist" id="9011">
- <posx>10</posx>
- <posy>0</posy>
- <width>240</width>
- <height>720</height>
- <align>center</align>
- <onleft>9000</onleft>
- <onright>9001</onright>
- <onup>9011</onup>
- <ondown>9011</ondown>
- <itemgap>0</itemgap>
- <visible>Container(9000).HasFocus(3)</visible>
- <include>HomeSubMenuMusic</include> <!-- Buttons for the grouplist -->
- </control>
- <control type="grouplist" id="9013">
- <posx>10</posx>
- <posy>0</posy>
- <width>240</width>
- <height>720</height>
- <align>center</align>
- <onleft>9000</onleft>
- <onright>9001</onright>
- <onup>9015</onup>
- <ondown>9015</ondown>
- <itemgap>0</itemgap>
- <visible>Container(9000).HasFocus(4) + [!IsEmpty(Skin.String(HomePictureButton1)) | !IsEmpty(Skin.String(HomePictureButton2)) | !IsEmpty(Skin.String(HomePictureButton3)) | !IsEmpty(Skin.String(HomePictureButton4)) | !IsEmpty(Skin.String(HomePictureButton5)) | !IsEmpty(Skin.String(HomePictureButton6))]</visible>
- <include>HomeSubMenuPictures</include> <!-- Buttons for the grouplist -->
- </control>
- <control type="grouplist" id="9014">
- <posx>10</posx>
- <posy>0</posy>
- <width>240</width>
- <height>720</height>
- <align>center</align>
- <onleft>9000</onleft>
- <onright>9001</onright>
- <onup>9014</onup>
- <ondown>9014</ondown>
- <itemgap>0</itemgap>
- <visible>Container(9000).HasFocus(5)</visible>
- <include>HomeSubMenuSystem</include> <!-- Buttons for the grouplist -->
- </control>
- <control type="grouplist" id="9015">
- <posx>10</posx>
- <posy>0</posy>
- <width>240</width>
- <height>720</height>
- <align>center</align>
- <onleft>9000</onleft>
- <onright>9001</onright>
- <onup>9015</onup>
- <ondown>9015</ondown>
- <itemgap>0</itemgap>
- <visible>Container(9000).HasFocus(1) + [!IsEmpty(Skin.String(HomeProgramButton1)) | !IsEmpty(Skin.String(HomeProgramButton2)) | !IsEmpty(Skin.String(HomeProgramButton3)) | !IsEmpty(Skin.String(HomeProgramButton4)) | !IsEmpty(Skin.String(HomeProgramButton5)) | !IsEmpty(Skin.String(HomeProgramButton6))]</visible>
- <include>HomeSubMenuPrograms</include> <!-- Buttons for the grouplist -->
- </control>
- <control type="grouplist" id="9016">
- <posx>10</posx>
- <posy>0</posy>
- <width>240</width>
- <height>720</height>
- <align>center</align>
- <onleft>9000</onleft>
- <onright>Control.SetFocus(8000,0)</onright>
- <onup>9016</onup>
- <ondown>9016</ondown>
- <itemgap>0</itemgap>
- <visible>Container(9000).HasFocus(10)</visible>
- <include>HomeSubMenuMovies</include> <!-- Buttons for the grouplist -->
- </control>
- <control type="grouplist" id="9017">
- <posx>10</posx>
- <posy>0</posy>
- <width>240</width>
- <height>720</height>
- <align>center</align>
- <onleft>9000</onleft>
- <onright>Control.SetFocus(8001,0)</onright>
- <onup>9017</onup>
- <ondown>9017</ondown>
- <itemgap>0</itemgap>
- <visible>Container(9000).HasFocus(11)</visible>
- <include>HomeSubMenuTVShows</include> <!-- Buttons for the grouplist -->
- </control>
- </control>
- <control type="image">
- <posx>-450</posx>
- <posy>0</posy>
- <width>846</width>
- <height>720</height>
- <colordiffuse>DAFFFFFF</colordiffuse>
- <texture>HomeBlade_bottom.png</texture>
- </control>
- <control type="fixedlist" id="9000">
- <hitrect x="50" y="50" w="330" h="620" />
- <posx>-20</posx>
- <posy>0</posy>
- <width>400</width>
- <height>720</height>
- <onleft>10</onleft>
- <onright>9001</onright>
- <onup>9000</onup>
- <ondown>9000</ondown>
- <pagecontrol>-</pagecontrol>
- <scrolltime>300</scrolltime>
- <focusposition>3</focusposition>
- <movement>2</movement>
- <animation effect="fade" start="0" end="100" time="200">Visible</animation>
- <animation effect="fade" start="100" end="30" time="200" condition="Window.IsVisible(1113) | ControlGroup(9001).HasFocus | ControlGroup(10).HasFocus | Control.HasFocus(8000) | Control.HasFocus(8001)">conditional</animation>
- <itemlayout height="102" width="380">
- <control type="label">
- <posx>380</posx>
- <posy>21</posy>
- <width>380</width>
- <height>40</height>
- <font>font50caps_title</font>
- <textcolor>grey3</textcolor>
- <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="fade" start="100" end="30" time="200" condition="Window.IsVisible(1113) | ControlGroup(9001).HasFocus | ControlGroup(10).HasFocus">conditional</animation>
- </control>
- </itemlayout>
- <focusedlayout height="102" width="380">
- <control type="label">
- <posx>380</posx>
- <posy>21</posy>
- <width>380</width>
- <height>40</height>
- <font>font50caps_title</font>
- <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>
- <label>$INFO[ListItem.Label]</label>
- </control>
- <control type="image">
- <posx>370</posx>
- <posy>63</posy>
- <width>18</width>
- <height>18</height>
- <texture>HomeHasSub.png</texture>
- <visible>Container(9000).HasFocus(2) | Container(9000).HasFocus(3) | Container(9000).HasFocus(5) | Container(9000).HasFocus(7) | Container(9000).HasFocus(9) | [Container(9000).HasFocus(4) + [!IsEmpty(Skin.String(HomePictureButton1)) | !IsEmpty(Skin.String(HomePictureButton2)) | !IsEmpty(Skin.String(HomePictureButton3)) | !IsEmpty(Skin.String(HomePictureButton4)) | !IsEmpty(Skin.String(HomePictureButton5)) | !IsEmpty(Skin.String(HomePictureButton6))]] | [Container(9000).HasFocus(1) + [!IsEmpty(Skin.String(HomeProgramButton1)) | !IsEmpty(Skin.String(HomeProgramButton2)) | !IsEmpty(Skin.String(HomeProgramButton3)) | !IsEmpty(Skin.String(HomeProgramButton4)) | !IsEmpty(Skin.String(HomeProgramButton5)) | !IsEmpty(Skin.String(HomeProgramButton6))]] | Container(9000).HasFocus(10) | Container(9000).HasFocus(11)</visible>
- <animation effect="fade" start="0" end="100" time="200">Focus</animation>
- <animation effect="fade" start="100" end="0" time="200">UnFocus</animation>
- </control>
- </focusedlayout>
- <content>
- <item id="6">
- <label>8</label>
- <onclick>ActivateWindow(Weather)</onclick>
- <icon>special://skin/backgrounds/weather.jpg</icon>
- <thumb>$INFO[Skin.String(Home_Custom_Back_Weather_Folder)]</thumb>
- <visible>!Skin.HasSetting(HomeMenuNoWeatherButton)</visible>
- <visible>!Skin.HasSetting(ShowWeatherFanart) | IsEmpty(Skin.String(WeatherFanartDir))</visible>
- </item>
- <item id="6">
- <label>8</label>
- <onclick>ActivateWindow(Weather)</onclick>
- <icon>special://skin/backgrounds/weather.jpg</icon>
- <thumb>$INFO[Skin.String(WeatherFanartDir)]$INFO[Weather.FanartCode]</thumb>
- <visible>!Skin.HasSetting(HomeMenuNoWeatherButton)</visible>
- <visible>Skin.HasSetting(ShowWeatherFanart) + !IsEmpty(Skin.String(WeatherFanartDir))</visible>
- </item>
- <item id="4">
- <label>1</label>
- <onclick>ActivateWindow(Pictures)</onclick>
- <icon>special://skin/backgrounds/pictures.jpg</icon>
- <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>
- <icon>special://skin/backgrounds/videos.jpg</icon>
- <thumb>$INFO[Skin.String(Home_Custom_Back_Video_Folder)]</thumb>
- <visible>!Skin.HasSetting(HomeMenuNoVideosButton) + ![Skin.HasSetting(HomeMenuNoMoviesButton) + Skin.HasSetting(HomeMenuNoTVShowsButton)]</visible>
- </item>
- <item id="2">
- <label>3</label>
- <onclick>ActivateWindow(VideoFiles)</onclick>
- <icon>special://skin/backgrounds/videos.jpg</icon>
- <thumb>$INFO[Skin.String(Home_Custom_Back_Video_Folder)]</thumb>
- <visible>!Skin.HasSetting(HomeMenuNoVideosButton) + [Skin.HasSetting(HomeMenuNoMoviesButton) + Skin.HasSetting(HomeMenuNoTVShowsButton)]</visible>
- </item>
- <item id="10">
- <label>20342</label>
- <onclick>ActivateWindow(VideoLibrary,MovieTitles,return)</onclick>
- <icon>special://skin/backgrounds/videos.jpg</icon>
- <thumb>$INFO[Skin.String(Home_Custom_Back_Movies_Folder)]</thumb>
- <visible>Skin.HasSetting(HomeMenuNoMoviesButton) + Library.HasContent(Movies)</visible>
- </item>
- <item id="11">
- <label>20343</label>
- <onclick>ActivateWindow(VideoLibrary,TVShowTitles,return)</onclick>
- <icon>special://skin/backgrounds/videos.jpg</icon>
- <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>
- <item id="5">
- <label>13000</label>
- <onclick>ActivateWindow(Settings)</onclick>
- <icon>special://skin/backgrounds/settings.jpg</icon>
- <thumb>$INFO[Skin.String(Home_Custom_Back_Settings_Folder)]</thumb>
- </item>
- </content>
- </control>
- <control type="image">
- <posx>0</posx>
- <posy>-205</posy>
- <width>385</width>
- <height>1130</height>
- <texture>HomeBlade_middle.png</texture>
- <animation effect="slide" end="0,-204" time="300" condition="Container(9000).Row(1)">conditional</animation>
- <animation effect="slide" end="0,-102" time="300" condition="Container(9000).Row(2)">conditional</animation>
- <animation effect="slide" end="0,102" time="300" condition="Container(9000).Row(4)">conditional</animation>
- <animation effect="slide" end="0,204" time="300" condition="Container(9000).Row(5)">conditional</animation>
- </control>
- <control type="image">
- <posx>-450</posx>
- <posy>0</posy>
- <width>846</width>
- <height>720</height>
- <texture>HomeBlade_top.png</texture>
- </control>
- <include>HomeXBMCLogo</include>
- <include>HomePowerButtons</include>
- </control>
- <control type="group">
- <posx>420</posx>
- <posy>35r</posy>
- <animation effect="slide" end="0,35" time="300" tween="quadratic" easing="out">WindowClose</animation>
- <animation effect="slide" start="0,35" time="300" tween="quadratic" easing="out">WindowOpen</animation>
- <control type="image">
- <description>RSS background</description>
- <posx>0</posx>
- <posy>0</posy>
- <width>860</width>
- <height>35</height>
- <texture border="32,0,0,0">Rss_Back.png</texture>
- <visible>system.getbool(lookandfeel.enablerssfeeds)</visible>
- </control>
- <control type="rss">
- <description>RSS feed</description>
- <posx>35</posx>
- <posy>6</posy>
- <height>35</height>
- <width>825</width>
- <font>font12</font>
- <urlset>1</urlset>
- <textcolor>blue</textcolor>
- <titlecolor>blue</titlecolor>
- <headlinecolor>white</headlinecolor>
- <visible>system.getbool(lookandfeel.enablerssfeeds)</visible>
- </control>
- <control type="image">
- <description>RSS background</description>
- <posx>0</posx>
- <posy>0</posy>
- <width>100</width>
- <height>35</height>
- <texture border="32,0,0,0">Rss_Back_Overlay.png</texture>
- <visible>system.getbool(lookandfeel.enablerssfeeds)</visible>
- </control>
- </control>
- </include>
-</includes>
diff --git a/addons/skin.confluence/720p/custom_SkinSetting_1111.xml b/addons/skin.confluence/720p/custom_SkinSetting_1111.xml
index 52fcbf3faa..8db4c17056 100644
--- a/addons/skin.confluence/720p/custom_SkinSetting_1111.xml
+++ b/addons/skin.confluence/720p/custom_SkinSetting_1111.xml
@@ -386,19 +386,6 @@
<align>left</align>
<aligny>center</aligny>
</control>
- <control type="radiobutton" id="220">
- <description>use Horizontal Home Button</description>
- <width>750</width>
- <height>40</height>
- <font>font13</font>
- <textcolor>grey2</textcolor>
- <focusedcolor>white</focusedcolor>
- <label>$LOCALIZE[31131]</label>
- <onclick>Skin.ToggleSetting(UseHorizontalHome)</onclick>
- <selected>Skin.HasSetting(UseHorizontalHome)</selected>
- <texturefocus>MenuItemFO.png</texturefocus>
- <texturenofocus>MenuItemNF.png</texturenofocus>
- </control>
<control type="radiobutton" id="202">
<description>enable video info</description>
<width>750</width>
diff --git a/addons/skin.confluence/720p/includes.xml b/addons/skin.confluence/720p/includes.xml
index e0e9e2a10c..c6510be6f2 100644
--- a/addons/skin.confluence/720p/includes.xml
+++ b/addons/skin.confluence/720p/includes.xml
@@ -8,8 +8,6 @@
<include file="ViewsLiveTV.xml" />
<include file="IncludesCodecFlagging.xml" />
<include file="IncludesHomeRecentlyAdded.xml" />
- <include file="IncludesHomeVertical.xml" />
- <include file="IncludesHomeHorizontal.xml" />
<include file="IncludesHomeMenuItems.xml" />
<constant name="FanartCrossfadeTime">500</constant>
diff --git a/addons/skin.confluence/language/English/strings.xml b/addons/skin.confluence/language/English/strings.xml
index 0c48f3b6c5..e1b1146581 100644
--- a/addons/skin.confluence/language/English/strings.xml
+++ b/addons/skin.confluence/language/English/strings.xml
@@ -83,7 +83,7 @@
<string id="31129"></string> <!-- blanked 2010-11-12 -->
<string id="31130"></string> <!-- blanked 2010-11-12 -->
- <string id="31131">Use Horizontal Home Menu</string>
+ <string id="31131"></string> <!-- blanked 2010-12-23 -->
<string id="31132">Lyrics Add-on</string>
<string id="31133">Subtitle Add-on</string>
<string id="31134">Home Page Videos Submenu</string>
diff --git a/addons/skin.confluence/media/HomeBackHorizontal_top.png b/addons/skin.confluence/media/HomeBackHorizontal_top.png
deleted file mode 100644
index 67f65dc914..0000000000
--- a/addons/skin.confluence/media/HomeBackHorizontal_top.png
+++ /dev/null
Binary files differ
diff --git a/addons/skin.confluence/media/Makefile b/addons/skin.confluence/media/Makefile
index e968fcb7df..2a5e4b284c 100644
--- a/addons/skin.confluence/media/Makefile
+++ b/addons/skin.confluence/media/Makefile
@@ -147,7 +147,6 @@ IMAGES= \
flagging/video/xvid.png \
flagging/video/vhs.png \
floor.png \
- floor2.png \
folder-focus.png \
GlassOverlay.png \
GlassTitleBar.png \
@@ -158,7 +157,6 @@ IMAGES= \
home-playmedia.png \
home-power-FO.png \
home-power.png \
- HomeBackHorizontal_top.png \
HomeBlade.png \
HomeBlade_bottom.png \
HomeBlade_middle.png \
diff --git a/addons/skin.confluence/media/floor2.png b/addons/skin.confluence/media/floor2.png
deleted file mode 100644
index 952adf8e57..0000000000
--- a/addons/skin.confluence/media/floor2.png
+++ /dev/null
Binary files differ
generated by cgit v1.2.3 (git 2.26.2) at 2025-02-06 16:51:32 +0000