diff options
| author | Jezz_X <jezzx2@gmail.com> | 2012-03-26 21:08:25 +1100 |
|---|---|---|
| committer | Jezz_X <jezzx2@gmail.com> | 2012-04-25 09:50:21 +1000 |
| commit | 786a5fb289fad2d9bfdda516d10395639b24f051 (patch) | |
| tree | 458ae7b26a6c98ab2ddf288ed438b4c548d7107f | |
| parent | f8b6d1d37dcc6e642bfc97b09fd203472b81798e (diff) | |
Changed: [Confluence] More design changes (mostly header bar)
24 files changed, 317 insertions, 654 deletions
diff --git a/addons/skin.confluence/720p/AddonBrowser.xml b/addons/skin.confluence/720p/AddonBrowser.xml index 40631c995e..e6481583c2 100644 --- a/addons/skin.confluence/720p/AddonBrowser.xml +++ b/addons/skin.confluence/720p/AddonBrowser.xml @@ -3,8 +3,7 @@ <allowoverlay>no</allowoverlay> <views>50,51,550,551</views> <controls> - <include>CommonSettingsBackground</include> - <include>CommonMediaPlayingBackground</include> + <include>CommonBackground</include> <include>ContentPanelBackgrounds</include> <control type="group"> <include>Window_OpenClose_Animation</include> @@ -17,6 +16,25 @@ <include>CommonNowPlaying</include> <include>BehindDialogFadeOut</include> <include>ScrollOffsetLabel</include> + <include>WindowTitleHomeButton</include> + <control type="grouplist"> + <posx>65</posx> + <posy>5</posy> + <width>1000</width> + <height>30</height> + <orientation>horizontal</orientation> + <align>left</align> + <itemgap>5</itemgap> + <control type="label"> + <include>WindowTitleCommons</include> + <label>$LOCALIZE[24001]</label> + </control> + <control type="label"> + <include>WindowTitleCommons</include> + <label>[COLOR=blue] - [/COLOR]$INFO[Container.FolderName]</label> + <visible>!IsEmpty(Container.FolderName)</visible> + </control> + </control> <control type="group"> <posx>-250</posx> <include>SideBladeLeft</include> @@ -86,71 +104,6 @@ <include>CommonNowPlaying_Controls</include> </control> </control> - <control type="group"> - <posx>520</posx> - <posy>0</posy> - <visible>!IsEmpty(Container.Property(AddonCategory))</visible> - <include>VisibleFadeEffect</include> - <animation effect="slide" end="-710,0" time="400" tween="quadratic" easing="out">WindowClose</animation> - <animation effect="slide" start="-710,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>300</width> - <height>35</height> - <texture border="0,0,32,0">header.png</texture> - </control> - <control type="fadelabel"> - <width>200</width> - <include>WindowTitleCommons</include> - <posx>70</posx> - <scrollout>false</scrollout> - <pauseatend>2000</pauseatend> - <label>$INFO[Container.Property(AddonCategory)]</label> - </control> - </control> - <control type="group"> - <posx>240</posx> - <posy>0</posy> - <visible>!IsEmpty(Container.Property(RepoName))</visible> - <include>VisibleFadeEffect</include> - <animation effect="slide" end="-600,0" time="400" tween="quadratic" easing="out">WindowClose</animation> - <animation effect="slide" start="-600,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>350</width> - <height>35</height> - <texture border="0,0,32,0">header.png</texture> - </control> - <control type="fadelabel"> - <width>250</width> - <include>WindowTitleCommons</include> - <posx>70</posx> - <scrollout>false</scrollout> - <pauseatend>2000</pauseatend> - <label>$INFO[Container.Property(RepoName)]</label> - </control> - </control> - <control type="group"> - <posx>60</posx> - <posy>0</posy> - <animation effect="slide" end="-310,0" time="400" tween="quadratic" easing="out">WindowClose</animation> - <animation effect="slide" start="-310,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>250</width> - <height>35</height> - <texture border="0,0,32,0">header.png</texture> - </control> - <control type="label"> - <include>WindowTitleCommons</include> - <posx>220</posx> - <label>$LOCALIZE[24001]</label> - </control> - </control> - <include>WindowTitleHomeButton</include> <include>Clock</include> </controls> </window> diff --git a/addons/skin.confluence/720p/FileManager.xml b/addons/skin.confluence/720p/FileManager.xml index 8fd426c703..de9c18f57b 100644 --- a/addons/skin.confluence/720p/FileManager.xml +++ b/addons/skin.confluence/720p/FileManager.xml @@ -2,8 +2,7 @@ <defaultcontrol>20</defaultcontrol> <allowoverlay>no</allowoverlay> <controls> - <include>CommonSettingsBackground</include> - <include>CommonMediaPlayingBackground</include> + <include>CommonBackground</include> <control type="image"> <posx>0</posx> <posy>100r</posy> @@ -13,6 +12,20 @@ <animation effect="slide" start="0,10" end="0,0" time="200" condition="Window.Previous(Home)">WindowOpen</animation> <animation effect="slide" start="0,0" end="0,10" time="200" condition="Window.Next(Home)">WindowClose</animation> </control> + <include>WindowTitleHomeButton</include> + <control type="grouplist"> + <posx>65</posx> + <posy>5</posy> + <width>1000</width> + <height>30</height> + <orientation>horizontal</orientation> + <align>left</align> + <itemgap>5</itemgap> + <control type="label"> + <include>WindowTitleCommons</include> + <label>$LOCALIZE[7]</label> + </control> + </control> <control type="group"> <posx>30</posx> <posy>40</posy> @@ -385,25 +398,6 @@ <shadowcolor>black</shadowcolor> <label>([COLOR=blue]$INFO[Container(21).NumItems][/COLOR]) $LOCALIZE[31025] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(21).CurrentPage]/$INFO[Container(21).NumPages][/COLOR])</label> </control> - <control type="group"> - <posx>60</posx> - <posy>0</posy> - <animation effect="slide" end="-310,0" time="400" tween="quadratic" easing="out">WindowClose</animation> - <animation effect="slide" start="-310,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>250</width> - <height>35</height> - <texture border="0,0,32,0">header.png</texture> - </control> - <control type="label"> - <include>WindowTitleCommons</include> - <posx>220</posx> - <label>$LOCALIZE[7]</label> - </control> - </control> - <include>WindowTitleHomeButton</include> <include>Clock</include> </controls> </window>
\ No newline at end of file diff --git a/addons/skin.confluence/720p/Font.xml b/addons/skin.confluence/720p/Font.xml index 7d93f589cb..561f32d9dc 100644 --- a/addons/skin.confluence/720p/Font.xml +++ b/addons/skin.confluence/720p/Font.xml @@ -17,6 +17,11 @@ <size>20</size> </font> <font> + <name>font14</name> + <filename>Roboto-Regular.ttf</filename> + <size>22</size> + </font> + <font> <name>font16</name> <filename>Roboto-Regular.ttf</filename> <size>25</size> diff --git a/addons/skin.confluence/720p/Home.xml b/addons/skin.confluence/720p/Home.xml index f94c38eaf5..5bb94754a5 100644 --- a/addons/skin.confluence/720p/Home.xml +++ b/addons/skin.confluence/720p/Home.xml @@ -5,16 +5,6 @@ <onunload condition="Control.HasFocus(9000) + Container(9000).Hasfocus(2)">ClearProperty(VideosDirectLink)</onunload> <controls> <include>CommonBackground</include> - <include>CommonMediaPlayingBackground</include> - <control type="image"> - <posx>0</posx> - <posy>-40</posy> - <width>1280</width> - <height>120</height> - <texture flipy="true">HomeNowPlayingBack.png</texture> - <visible>[Player.HasVideo + !Skin.HasSetting(ShowBackgroundVideo)] | [Player.HasAudio + !Skin.HasSetting(ShowBackgroundVis)]</visible> - <visible>!SubString(Window(videolibrary).Property(TvTunesIsAlive),True)</visible> - </control> <control type="image"> <posx>0</posx> <posy>90r</posy> diff --git a/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml b/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml index 484d32b961..b735f56d1e 100644 --- a/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml +++ b/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml @@ -1,48 +1,58 @@ <includes> <include name="CommonMediaPlayingBackground"> + </include> + <include name="CommonBackground"> <control type="image"> <posx>0</posx> <posy>0</posy> <width>1280</width> <height>720</height> - <texture>special://skin/backgrounds/media-overlay.png</texture> - <visible>Player.HasVideo + !Skin.HasSetting(ShowBackgroundVideo)</visible> + <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> + <visible>![Player.HasVideo + !Skin.HasSetting(ShowBackgroundVideo)] + ![Player.HasAudio + !Skin.HasSetting(ShowBackgroundVis)]</visible> </control> - <control type="visualisation"> + <control type="Image"> <posx>0</posx> <posy>0</posy> <width>1280</width> <height>720</height> - <visible>Player.HasAudio + !Skin.HasSetting(ShowBackgroundVis)</visible> - <visible>!SubString(Window(videolibrary).Property(TvTunesIsAlive),True)</visible> + <texture>special://skin/backgrounds/background.jpg</texture> + <animation effect="fade" start="100" end="60" time="200" condition="!Skin.HasSetting(HideBackGroundFanart) + !IsEmpty(ListItem.Property(Fanart_Image))">Conditional</animation> </control> - <control type="videowindow"> + <control type="image"> <posx>0</posx> <posy>0</posy> <width>1280</width> <height>720</height> + <texture>special://skin/backgrounds/media-overlay.png</texture> <visible>Player.HasVideo + !Skin.HasSetting(ShowBackgroundVideo)</visible> </control> - </include> - <include name="CommonBackground"> - <control type="image"> + <control type="visualisation"> <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> + <visible>Player.HasAudio + !Skin.HasSetting(ShowBackgroundVis)</visible> + <visible>!SubString(Window(videolibrary).Property(TvTunesIsAlive),True)</visible> </control> - <control type="Image"> + <control type="videowindow"> <posx>0</posx> <posy>0</posy> <width>1280</width> <height>720</height> - <texture>special://skin/backgrounds/background.jpg</texture> - <animation effect="fade" start="100" end="60" time="200" condition="!Skin.HasSetting(HideBackGroundFanart) + !IsEmpty(ListItem.Property(Fanart_Image))">Conditional</animation> + <visible>Player.HasVideo + !Skin.HasSetting(ShowBackgroundVideo)</visible> + </control> + <control type="image"> + <posx>0</posx> + <posy>-40</posy> + <width>1280</width> + <height>120</height> + <texture flipy="true">HomeNowPlayingBack.png</texture> + <visible>[Player.HasVideo + !Skin.HasSetting(ShowBackgroundVideo)] | [Player.HasAudio + !Skin.HasSetting(ShowBackgroundVis)]</visible> + <visible>!SubString(Window(videolibrary).Property(TvTunesIsAlive),True)</visible> </control> </include> <include name="ContentPanelBackgrounds"> diff --git a/addons/skin.confluence/720p/LoginScreen.xml b/addons/skin.confluence/720p/LoginScreen.xml index fd6a598608..c313da7251 100644 --- a/addons/skin.confluence/720p/LoginScreen.xml +++ b/addons/skin.confluence/720p/LoginScreen.xml @@ -7,17 +7,7 @@ <posy>0</posy> </coordinates> <controls> - <control type="multiimage"> - <posx>0</posx> - <posy>0</posy> - <width>1280</width> - <height>720</height> - <imagepath fallback="special://skin/backgrounds/videos.jpg" background="true">$INFO[Skin.String(Home_Custom_Back_Video_Folder)]</imagepath> - <timeperimage>10000</timeperimage> - <randomize>true</randomize> - <fadetime>1000</fadetime> - <animation effect="fade" time="400">WindowClose</animation> - </control> + <include>CommonBackground</include> <control type="group"> <include>Window_OpenClose_Animation</include> <control type="image"> @@ -224,49 +214,18 @@ </control> </control> </control> - <control type="group"> - <posx>400r</posx> - <posy>0</posy> - <animation effect="slide" start="0,0" end="400,0" delay="0" time="300">WindowClose</animation> - <animation effect="slide" start="400,0" end="0,0" delay="0" time="300">WindowOpen</animation> - <control type="image"> - <description>time background</description> - <posx>0</posx> - <posy>0</posy> - <width>440</width> - <height>35</height> - <texture flipx="true" border="32,0,0,0">header.png</texture> - </control> - <control type="label"> - <description>time label</description> - <posx>30</posx> - <posy>0</posy> - <width>400</width> - <height>28</height> - <align>left</align> - <aligny>center</aligny> - <font>font12</font> - <textcolor>white</textcolor> - <shadowcolor>black</shadowcolor> - <label>[COLOR=grey]$INFO[System.Date][/COLOR] | $INFO[System.Time]</label> - </control> - </control> - <control type="group"> - <posx>0</posx> - <posy>0</posy> - <animation effect="slide" end="-270,0" time="400" tween="quadratic" easing="out">WindowClose</animation> - <animation effect="slide" start="-270,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>250</width> - <height>35</height> - <texture border="0,0,32,0">header.png</texture> - </control> + <include>Clock</include> + <control type="grouplist"> + <posx>10</posx> + <posy>5</posy> + <width>1000</width> + <height>30</height> + <orientation>horizontal</orientation> + <align>left</align> + <itemgap>5</itemgap> <control type="label"> <include>WindowTitleCommons</include> - <posx>220</posx> - <label>$LOCALIZE[20096]</label> + <label>$LOCALIZE[2096]</label> </control> </control> </controls> diff --git a/addons/skin.confluence/720p/MyMusicNav.xml b/addons/skin.confluence/720p/MyMusicNav.xml index 2c0985ffce..af6b6fe72c 100644 --- a/addons/skin.confluence/720p/MyMusicNav.xml +++ b/addons/skin.confluence/720p/MyMusicNav.xml @@ -4,7 +4,6 @@ <views>50,51,500,550,551,509,506,511,512,513</views> <controls> <include>CommonBackground</include> - <include>CommonMediaPlayingBackground</include> <include>ContentPanelBackgrounds</include> <control type="group"> <include>Window_OpenClose_Animation</include> @@ -23,6 +22,25 @@ <include>CommonNowPlaying</include> <include>BehindDialogFadeOut</include> <include>ScrollOffsetLabel</include> + <include>WindowTitleHomeButton</include> + <control type="grouplist"> + <posx>65</posx> + <posy>5</posy> + <width>1000</width> + <height>30</height> + <orientation>horizontal</orientation> + <align>left</align> + <itemgap>5</itemgap> + <control type="label"> + <include>WindowTitleCommons</include> + <label>$LOCALIZE[10516]</label> + </control> + <control type="label"> + <include>WindowTitleCommons</include> + <label>[COLOR=blue] - [/COLOR]$INFO[Container.FolderName]</label> + <visible>!IsEmpty(Container.FolderName)</visible> + </control> + </control> <control type="group"> <posx>-250</posx> <include>SideBladeLeft</include> @@ -110,105 +128,6 @@ <include>CommonNowPlaying_Controls</include> </control> </control> - <control type="group"> - <posx>240</posx> - <posy>0</posy> - <visible>Container.Content(MusicVideos)</visible> - <include>VisibleFadeEffect</include> - <animation effect="slide" end="-510,0" time="400" tween="quadratic" easing="out">WindowClose</animation> - <animation effect="slide" start="-510,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>250</width> - <height>35</height> - <texture border="0,0,32,0">header.png</texture> - </control> - <control type="label"> - <include>WindowTitleCommons</include> - <posx>220</posx> - <label>$LOCALIZE[20389]</label> - </control> - </control> - <control type="group"> - <posx>240</posx> - <posy>0</posy> - <visible>Container.Content(Artists)</visible> - <include>VisibleFadeEffect</include> - <animation effect="slide" end="-510,0" time="400" tween="quadratic" easing="out">WindowClose</animation> - <animation effect="slide" start="-510,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>250</width> - <height>35</height> - <texture border="0,0,32,0">header.png</texture> - </control> - <control type="label"> - <include>WindowTitleCommons</include> - <posx>220</posx> - <label>$LOCALIZE[133]</label> - </control> - </control> - <control type="group"> - <posx>240</posx> - <posy>0</posy> - <visible>Container.Content(Songs)</visible> - <include>VisibleFadeEffect</include> - <animation effect="slide" end="-510,0" time="400" tween="quadratic" easing="out">WindowClose</animation> - <animation effect="slide" start="-510,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>250</width> - <height>35</height> - <texture border="0,0,32,0">header.png</texture> - </control> - <control type="label"> - <include>WindowTitleCommons</include> - <posx>220</posx> - <label>$LOCALIZE[134]</label> - </control> - </control> - <control type="group"> - <posx>240</posx> - <posy>0</posy> - <visible>Container.Content(Albums)</visible> - <include>VisibleFadeEffect</include> - <animation effect="slide" end="-510,0" time="400" tween="quadratic" easing="out">WindowClose</animation> - <animation effect="slide" start="-510,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>250</width> - <height>35</height> - <texture border="0,0,32,0">header.png</texture> - </control> - <control type="label"> - <include>WindowTitleCommons</include> - <posx>220</posx> - <label>$LOCALIZE[132]</label> - </control> - </control> - <control type="group"> - <posx>60</posx> - <posy>0</posy> - <animation effect="slide" end="-310,0" time="400" tween="quadratic" easing="out">WindowClose</animation> - <animation effect="slide" start="-310,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>250</width> - <height>35</height> - <texture border="0,0,32,0">header.png</texture> - </control> - <control type="label"> - <include>WindowTitleCommons</include> - <posx>220</posx> - <label>$LOCALIZE[10516]</label> - </control> - </control> - <include>WindowTitleHomeButton</include> <include>Clock</include> </controls> </window> diff --git a/addons/skin.confluence/720p/MyMusicPlaylist.xml b/addons/skin.confluence/720p/MyMusicPlaylist.xml index 2be0bbc896..2597accbb7 100644 --- a/addons/skin.confluence/720p/MyMusicPlaylist.xml +++ b/addons/skin.confluence/720p/MyMusicPlaylist.xml @@ -4,7 +4,6 @@ <views>50,51,506</views> <controls> <include>CommonBackground</include> - <include>CommonMediaPlayingBackground</include> <include>ContentPanelBackgrounds</include> <control type="group"> <include>Window_OpenClose_Animation</include> @@ -16,6 +15,25 @@ <include>CommonNowPlaying</include> <include>BehindDialogFadeOut</include> <include>ScrollOffsetLabel</include> + <include>WindowTitleHomeButton</include> + <control type="grouplist"> + <posx>65</posx> + <posy>5</posy> + <width>1000</width> + <height>30</height> + <orientation>horizontal</orientation> + <align>left</align> + <itemgap>5</itemgap> + <control type="label"> + <include>WindowTitleCommons</include> + <label>$LOCALIZE[10517]</label> + </control> + <control type="label"> + <include>WindowTitleCommons</include> + <label>[COLOR=blue] - [/COLOR]$INFO[Container.FolderName]</label> + <visible>!IsEmpty(Container.FolderName)</visible> + </control> + </control> <control type="group"> <posx>-250</posx> <include>SideBladeLeft</include> @@ -81,25 +99,6 @@ <include>CommonNowPlaying_Controls</include> </control> </control> - <control type="group"> - <posx>60</posx> - <posy>0</posy> - <animation effect="slide" end="-360,0" time="400" tween="quadratic" easing="out">WindowClose</animation> - <animation effect="slide" start="-360,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>300</width> - <height>35</height> - <texture border="0,0,32,0">header.png</texture> - </control> - <control type="label"> - <include>WindowTitleCommons</include> - <posx>270</posx> - <label>$LOCALIZE[10517]</label> - </control> - </control> - <include>WindowTitleHomeButton</include> <include>Clock</include> </controls> </window> diff --git a/addons/skin.confluence/720p/MyMusicPlaylistEditor.xml b/addons/skin.confluence/720p/MyMusicPlaylistEditor.xml index 2e496fff29..eb715d43f3 100644 --- a/addons/skin.confluence/720p/MyMusicPlaylistEditor.xml +++ b/addons/skin.confluence/720p/MyMusicPlaylistEditor.xml @@ -3,7 +3,6 @@ <allowoverlay>no</allowoverlay> <controls> <include>CommonBackground</include> - <include>CommonMediaPlayingBackground</include> <control type="group"> <posy>10</posy> <include>Window_OpenClose_Animation</include> @@ -396,25 +395,25 @@ </focusedlayout> </control> </control> - <control type="group"> - <posx>60</posx> - <posy>0</posy> - <animation effect="slide" end="-310,0" time="400" tween="quadratic" easing="out">WindowClose</animation> - <animation effect="slide" start="-310,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>250</width> - <height>35</height> - <texture border="0,0,32,0">header.png</texture> - </control> + <include>WindowTitleHomeButton</include> + <control type="grouplist"> + <posx>65</posx> + <posy>5</posy> + <width>1000</width> + <height>30</height> + <orientation>horizontal</orientation> + <align>left</align> + <itemgap>5</itemgap> <control type="label"> <include>WindowTitleCommons</include> - <posx>220</posx> <label>$LOCALIZE[10503]</label> </control> + <control type="label"> + <include>WindowTitleCommons</include> + <label>[COLOR=blue] - [/COLOR]$INFO[Container.FolderName]</label> + <visible>!IsEmpty(Container.FolderName)</visible> + </control> </control> - <include>WindowTitleHomeButton</include> <include>Clock</include> </controls> </window> diff --git a/addons/skin.confluence/720p/MyMusicSongs.xml b/addons/skin.confluence/720p/MyMusicSongs.xml index 96ab988dce..d14ffaa588 100644 --- a/addons/skin.confluence/720p/MyMusicSongs.xml +++ b/addons/skin.confluence/720p/MyMusicSongs.xml @@ -4,7 +4,6 @@ <views>50,51,550,551,500,506</views> <controls> <include>CommonBackground</include> - <include>CommonMediaPlayingBackground</include> <include>ContentPanelBackgrounds</include> <control type="group"> <include>Window_OpenClose_Animation</include> @@ -19,6 +18,25 @@ <include>CommonNowPlaying</include> <include>BehindDialogFadeOut</include> <include>ScrollOffsetLabel</include> + <include>WindowTitleHomeButton</include> + <control type="grouplist"> + <posx>65</posx> + <posy>5</posy> + <width>1000</width> + <height>30</height> + <orientation>horizontal</orientation> + <align>left</align> + <itemgap>5</itemgap> + <control type="label"> + <include>WindowTitleCommons</include> + <label>$LOCALIZE[31022]</label> + </control> + <control type="label"> + <include>WindowTitleCommons</include> + <label>[COLOR=blue] - [/COLOR]$INFO[Container.FolderName]</label> + <visible>!IsEmpty(Container.FolderName)</visible> + </control> + </control> <control type="group"> <posx>-250</posx> <include>SideBladeLeft</include> @@ -79,25 +97,6 @@ <include>CommonNowPlaying_Controls</include> </control> </control> - <control type="group"> - <posx>60</posx> - <posy>0</posy> - <animation effect="slide" end="-310,0" time="400" tween="quadratic" easing="out">WindowClose</animation> - <animation effect="slide" start="-310,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>250</width> - <height>35</height> - <texture border="0,0,32,0">header.png</texture> - </control> - <control type="label"> - <include>WindowTitleCommons</include> - <posx>220</posx> - <label>$LOCALIZE[31022]</label> - </control> - </control> - <include>WindowTitleHomeButton</include> <include>Clock</include> </controls> </window> diff --git a/addons/skin.confluence/720p/MyPics.xml b/addons/skin.confluence/720p/MyPics.xml index 75165a3df4..a770992364 100644 --- a/addons/skin.confluence/720p/MyPics.xml +++ b/addons/skin.confluence/720p/MyPics.xml @@ -4,7 +4,6 @@ <views>50,51,550,551,500,514,510</views> <controls> <include>CommonBackground</include> - <include>CommonMediaPlayingBackground</include> <control type="image"> <posx>0</posx> <posy>0</posy> @@ -32,6 +31,25 @@ <include>CommonNowPlaying</include> <include>BehindDialogFadeOut</include> <include>ScrollOffsetLabel</include> + <include>WindowTitleHomeButton</include> + <control type="grouplist"> + <posx>65</posx> + <posy>5</posy> + <width>1000</width> + <height>30</height> + <orientation>horizontal</orientation> + <align>left</align> + <itemgap>5</itemgap> + <control type="label"> + <include>WindowTitleCommons</include> + <label>$LOCALIZE[1]</label> + </control> + <control type="label"> + <include>WindowTitleCommons</include> + <label>[COLOR=blue] - [/COLOR]$INFO[Container.FolderName]</label> + <visible>!IsEmpty(Container.FolderName)</visible> + </control> + </control> <control type="group"> <posx>-250</posx> <include>SideBladeLeft</include> @@ -110,25 +128,6 @@ <include>CommonNowPlaying_Controls</include> </control> </control> - <control type="group"> - <posx>40</posx> - <posy>0</posy> - <animation effect="slide" end="-310,0" time="400" tween="quadratic" easing="out">WindowClose</animation> - <animation effect="slide" start="-310,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>250</width> - <height>35</height> - <texture border="0,0,32,0">header.png</texture> - </control> - <control type="label"> - <include>WindowTitleCommons</include> - <posx>220</posx> - <label>$LOCALIZE[1]</label> - </control> - </control> - <include>WindowTitleHomeButton</include> <include>Clock</include> </controls> </window> diff --git a/addons/skin.confluence/720p/MyPrograms.xml b/addons/skin.confluence/720p/MyPrograms.xml index c17a7142be..ad5dee1fdd 100644 --- a/addons/skin.confluence/720p/MyPrograms.xml +++ b/addons/skin.confluence/720p/MyPrograms.xml @@ -4,7 +4,6 @@ <views>50,51,500,550,551</views> <controls> <include>CommonBackground</include> - <include>CommonMediaPlayingBackground</include> <include>ContentPanelBackgrounds</include> <control type="group"> <include>Window_OpenClose_Animation</include> @@ -18,6 +17,25 @@ <include>CommonNowPlaying</include> <include>BehindDialogFadeOut</include> <include>ScrollOffsetLabel</include> + <include>WindowTitleHomeButton</include> + <control type="grouplist"> + <posx>65</posx> + <posy>5</posy> + <width>1000</width> + <height>30</height> + <orientation>horizontal</orientation> + <align>left</align> + <itemgap>5</itemgap> + <control type="label"> + <include>WindowTitleCommons</include> + <label>$LOCALIZE[0]</label> + </control> + <control type="label"> + <include>WindowTitleCommons</include> + <label>[COLOR=blue] - [/COLOR]$INFO[Container.FolderName]</label> + <visible>!IsEmpty(Container.FolderName)</visible> + </control> + </control> <control type="group"> <posx>-250</posx> <include>SideBladeLeft</include> @@ -70,25 +88,6 @@ <include>CommonNowPlaying_Controls</include> </control> </control> - <control type="group"> - <posx>60</posx> - <posy>0</posy> - <animation effect="slide" end="-370,0" time="400" tween="quadratic" easing="out">WindowClose</animation> - <animation effect="slide" start="-370,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>250</width> - <height>35</height> - <texture border="0,0,32,0">header.png</texture> - </control> - <control type="label"> - <include>WindowTitleCommons</include> - <posx>220</posx> - <label>$LOCALIZE[0]</label> - </control> - </control> - <include>WindowTitleHomeButton</include> <include>Clock</include> </controls> </window> diff --git a/addons/skin.confluence/720p/MyVideoNav.xml b/addons/skin.confluence/720p/MyVideoNav.xml index 10dbb45e3c..54e79e1db1 100644 --- a/addons/skin.confluence/720p/MyVideoNav.xml +++ b/addons/skin.confluence/720p/MyVideoNav.xml @@ -5,7 +5,6 @@ <onload condition="Skin.HasSetting(ActivateTvTunes) + System.HasAddon(script.tvtunes)">XBMC.RunScript(script.tvtunes,backend=True&loop=False)</onload> <controls> <include>CommonBackground</include> - <include>CommonMediaPlayingBackground</include> <include>ContentPanelBackgrounds</include> <control type="group"> <include>Window_OpenClose_Animation</include> @@ -26,6 +25,25 @@ <include>CommonNowPlaying</include> <include>BehindDialogFadeOut</include> <include>ScrollOffsetLabel</include> + <include>WindowTitleHomeButton</include> + <control type="grouplist"> + <posx>65</posx> + <posy>5</posy> + <width>1000</width> + <height>30</height> + <orientation>horizontal</orientation> + <align>left</align> + <itemgap>5</itemgap> + <control type="label"> + <include>WindowTitleCommons</include> + <label>$LOCALIZE[3]</label> + </control> + <control type="label"> + <include>WindowTitleCommons</include> + <label>[COLOR=blue] - [/COLOR]$INFO[Container.FolderName]</label> + <visible>!IsEmpty(Container.FolderName)</visible> + </control> + </control> <control type="group"> <posx>-250</posx> <include>SideBladeLeft</include> @@ -134,127 +152,6 @@ <include>CommonNowPlaying_Controls</include> </control> </control> - <control type="group"> - <posx>220</posx> - <posy>0</posy> - <visible>Container.Content(MusicVideos)</visible> - <include>VisibleFadeEffect</include> - <animation effect="slide" end="-510,0" time="400" tween="quadratic" easing="out">WindowClose</animation> - <animation effect="slide" start="-510,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>250</width> - <height>35</height> - <texture border="0,0,32,0">header.png</texture> - </control> - <control type="label"> - <include>WindowTitleCommons</include> - <posx>220</posx> - <label>$LOCALIZE[20389]</label> - </control> - </control> - <control type="group"> - <posx>210</posx> - <posy>0</posy> - <visible>Container.Content(TVShows)</visible> - <include>VisibleFadeEffect</include> - <animation effect="slide" end="-510,0" time="400" tween="quadratic" easing="out">WindowClose</animation> - <animation effect="slide" start="-510,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>250</width> - <height>35</height> - <texture border="0,0,32,0">header.png</texture> - </control> - <control type="label"> - <include>WindowTitleCommons</include> - <posx>220</posx> - <label>$LOCALIZE[20343]</label> - </control> - </control> - <control type="group"> - <posx>480</posx> - <posy>0</posy> - <visible>Container.Content(Episodes) + !IsEmpty(ListItem.Season)</visible> - <include>VisibleFadeEffect</include> - <animation effect="slide" end="-710,0" time="400" tween="quadratic" easing="out">WindowClose</animation> - <animation effect="slide" start="-710,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>250</width> - <height>35</height> - <texture border="0,0,32,0">header.png</texture> - </control> - <control type="label"> - <include>WindowTitleCommons</include> - <posx>220</posx> - <label>$INFO[ListItem.Season,$LOCALIZE[20373] ]</label> - </control> - </control> - <control type="group"> - <posx>210</posx> - <posy>0</posy> - <visible>Container.Content(Seasons) | Container.Content(Episodes)</visible> - <visible>!IsEmpty(ListItem.TVShowTitle)</visible> - <include>VisibleFadeEffect</include> - <animation effect="slide" end="-600,0" time="400" tween="quadratic" easing="out">WindowClose</animation> - <animation effect="slide" start="-600,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>350</width> - <height>35</height> - <texture border="0,0,32,0">header.png</texture> - </control> - <control type="label"> - <width>250</width> - <include>WindowTitleCommons</include> - <posx>320</posx> - <label>$INFO[ListItem.TVShowTitle]</label> - </control> - </control> - <control type="group"> - <posx>210</posx> - <posy>0</posy> - <visible>Container.Content(Movies)</visible> - <include>VisibleFadeEffect</include> - <animation effect="slide" end="-510,0" time="400" tween="quadratic" easing="out">WindowClose</animation> - <animation effect="slide" start="-510,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>300</width> - <height>35</height> - <texture border="0,0,32,0">header.png</texture> - </control> - <control type="label"> - <include>WindowTitleCommons</include> - <posx>270</posx> - <label>$INFO[Container.FolderName]</label> - </control> - </control> - <control type="group"> - <posx>50</posx> - <posy>0</posy> - <animation effect="slide" end="-310,0" time="400" tween="quadratic" easing="out">WindowClose</animation> - <animation effect="slide" start="-310,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>190</width> - <height>35</height> - <texture border="0,0,32,0">header.png</texture> - </control> - <control type="label"> - <include>WindowTitleCommons</include> - <posx>160</posx> - <label>$LOCALIZE[3]</label> - </control> - </control> - <include>WindowTitleHomeButton</include> <include>Clock</include> </controls> </window> diff --git a/addons/skin.confluence/720p/MyVideoPlaylist.xml b/addons/skin.confluence/720p/MyVideoPlaylist.xml index 44267e077a..e5d8c7cc36 100644 --- a/addons/skin.confluence/720p/MyVideoPlaylist.xml +++ b/addons/skin.confluence/720p/MyVideoPlaylist.xml @@ -4,7 +4,6 @@ <views>50,51</views> <controls> <include>CommonBackground</include> - <include>CommonMediaPlayingBackground</include> <include>ContentPanelBackgrounds</include> <control type="group"> <include>Window_OpenClose_Animation</include> @@ -15,6 +14,25 @@ <include>CommonNowPlaying</include> <include>BehindDialogFadeOut</include> <include>ScrollOffsetLabel</include> + <include>WindowTitleHomeButton</include> + <control type="grouplist"> + <posx>65</posx> + <posy>5</posy> + <width>1000</width> + <height>30</height> + <orientation>horizontal</orientation> + <align>left</align> + <itemgap>5</itemgap> + <control type="label"> + <include>WindowTitleCommons</include> + <label>$LOCALIZE[10522]</label> + </control> + <control type="label"> + <include>WindowTitleCommons</include> + <label>[COLOR=blue] - [/COLOR]$INFO[Container.FolderName]</label> + <visible>!IsEmpty(Container.FolderName)</visible> + </control> + </control> <control type="group"> <posx>-250</posx> <include>SideBladeLeft</include> @@ -80,25 +98,6 @@ <include>CommonNowPlaying_Controls</include> </control> </control> - <control type="group"> - <posx>60</posx> - <posy>0</posy> - <animation effect="slide" end="-370,0" time="400" tween="quadratic" easing="out">WindowClose</animation> - <animation effect="slide" start="-370,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>300</width> - <height>35</height> - <texture border="0,0,32,0">header.png</texture> - </control> - <control type="label"> - <include>WindowTitleCommons</include> - <posx>270</posx> - <label>$LOCALIZE[10522]</label> - </control> - </control> - <include>WindowTitleHomeButton</include> <include>Clock</include> </controls> </window> diff --git a/addons/skin.confluence/720p/MyWeather.xml b/addons/skin.confluence/720p/MyWeather.xml index 9049ef8409..5e38d2d9cd 100644 --- a/addons/skin.confluence/720p/MyWeather.xml +++ b/addons/skin.confluence/720p/MyWeather.xml @@ -4,6 +4,20 @@ <controls> <include>CommonBackground</include> <include>CommonMediaPlayingBackground</include> + <include>WindowTitleHomeButton</include> + <control type="grouplist"> + <posx>65</posx> + <posy>5</posy> + <width>1000</width> + <height>30</height> + <orientation>horizontal</orientation> + <align>left</align> + <itemgap>5</itemgap> + <control type="label"> + <include>WindowTitleCommons</include> + <label>$LOCALIZE[8]</label> + </control> + </control> <control type="image"> <posx>0</posx> <posy>100r</posy> @@ -929,25 +943,6 @@ <ondown>3</ondown> <visible allowhiddenfocus="true">false</visible> </control> - <control type="group"> - <posx>40</posx> - <posy>0</posy> - <animation effect="slide" end="-310,0" time="400" tween="quadratic" easing="out">WindowClose</animation> - <animation effect="slide" start="-310,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>250</width> - <height>35</height> - <texture border="0,0,32,0">header.png</texture> - </control> - <control type="label"> - <include>WindowTitleCommons</include> - <posx>220</posx> - <label>$LOCALIZE[8]</label> - </control> - </control> - <include>WindowTitleHomeButton</include> <include>Clock</include> </controls> </window> diff --git a/addons/skin.confluence/720p/Settings.xml b/addons/skin.confluence/720p/Settings.xml index 0913eb78f4..302276f9b9 100644 --- a/addons/skin.confluence/720p/Settings.xml +++ b/addons/skin.confluence/720p/Settings.xml @@ -3,7 +3,6 @@ <allowoverlay>no</allowoverlay> <controls> <include>CommonBackground</include> - <include>CommonMediaPlayingBackground</include> <control type="image"> <posx>0</posx> <posy>100r</posy> @@ -247,25 +246,20 @@ </control> <include>CommonNowPlaying</include> <include>BehindDialogFadeOut</include> - <control type="group"> - <posx>60</posx> - <posy>0</posy> - <animation effect="slide" end="-310,0" time="400" tween="quadratic" easing="out" condition="Window.Next(Home) | Window.Next(1111) | Window.Next(AddonBrowser)">WindowClose</animation> - <animation effect="slide" start="-310,0" time="400" tween="quadratic" easing="out" condition="Window.Previous(Home) | Window.Previous(1111) | Window.Previous(AddonBrowser)">WindowOpen</animation> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>250</width> - <height>35</height> - <texture border="0,0,32,0">header.png</texture> - </control> + <include>WindowTitleHomeButton</include> + <control type="grouplist"> + <posx>65</posx> + <posy>5</posy> + <width>1000</width> + <height>30</height> + <orientation>horizontal</orientation> + <align>left</align> + <itemgap>5</itemgap> <control type="label"> <include>WindowTitleCommons</include> - <posx>220</posx> <label>$LOCALIZE[5]</label> </control> </control> - <include>WindowTitleHomeButton</include> <include>Clock</include> </controls> </window> diff --git a/addons/skin.confluence/720p/SettingsCategory.xml b/addons/skin.confluence/720p/SettingsCategory.xml index 84f8c33ea0..7bd683e16e 100644 --- a/addons/skin.confluence/720p/SettingsCategory.xml +++ b/addons/skin.confluence/720p/SettingsCategory.xml @@ -3,7 +3,6 @@ <allowoverlay>no</allowoverlay> <controls> <include>CommonBackground</include> - <include>CommonMediaPlayingBackground</include> <control type="image"> <posx>0</posx> <posy>100r</posy> @@ -198,25 +197,24 @@ <visible>false</visible> </control> <include>CommonNowPlaying</include> - <control type="group"> - <posx>60</posx> - <posy>0</posy> - <animation effect="slide" end="-310,0" time="400" tween="quadratic" easing="out" condition="!Window.Next(Settings)">WindowClose</animation> - <animation effect="slide" start="-310,0" time="400" tween="quadratic" easing="out" condition="!Window.Previous(Settings)">WindowOpen</animation> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>250</width> - <height>35</height> - <texture border="0,0,32,0">header.png</texture> - </control> + <include>WindowTitleHomeButton</include> + <control type="grouplist"> + <posx>65</posx> + <posy>5</posy> + <width>1000</width> + <height>30</height> + <orientation>horizontal</orientation> + <align>left</align> + <itemgap>5</itemgap> <control type="label"> <include>WindowTitleCommons</include> - <posx>220</posx> <label>$LOCALIZE[5]</label> </control> + <control type="label"> + <include>WindowTitleCommons</include> + <label>[COLOR=blue] - [/COLOR]$INFO[Control.GetLabel(2)]</label> + </control> </control> - <include>WindowTitleHomeButton</include> <include>Clock</include> </controls> </window> diff --git a/addons/skin.confluence/720p/SettingsProfile.xml b/addons/skin.confluence/720p/SettingsProfile.xml index 673686ea68..184c98d7f6 100644 --- a/addons/skin.confluence/720p/SettingsProfile.xml +++ b/addons/skin.confluence/720p/SettingsProfile.xml @@ -3,7 +3,6 @@ <allowoverlay>no</allowoverlay> <controls> <include>CommonBackground</include> - <include>CommonMediaPlayingBackground</include> <control type="image"> <posx>0</posx> <posy>100r</posy> @@ -270,21 +269,17 @@ </control> <include>CommonNowPlaying</include> <include>BehindDialogFadeOut</include> - <control type="group"> - <posx>60</posx> - <posy>0</posy> - <animation effect="slide" end="-310,0" time="400" tween="quadratic" easing="out">WindowClose</animation> - <animation effect="slide" start="-310,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>250</width> - <height>35</height> - <texture border="0,0,32,0">header.png</texture> - </control> + <include>WindowTitleHomeButton</include> + <control type="grouplist"> + <posx>65</posx> + <posy>5</posy> + <width>1000</width> + <height>30</height> + <orientation>horizontal</orientation> + <align>left</align> + <itemgap>5</itemgap> <control type="label"> <include>WindowTitleCommons</include> - <posx>220</posx> <label>$LOCALIZE[13200]</label> </control> </control> diff --git a/addons/skin.confluence/720p/SettingsSystemInfo.xml b/addons/skin.confluence/720p/SettingsSystemInfo.xml index 45ee872c6a..c176f9670e 100644 --- a/addons/skin.confluence/720p/SettingsSystemInfo.xml +++ b/addons/skin.confluence/720p/SettingsSystemInfo.xml @@ -3,7 +3,6 @@ <allowoverlay>no</allowoverlay> <controls> <include>CommonBackground</include> - <include>CommonMediaPlayingBackground</include> <control type="image"> <posx>0</posx> <posy>100r</posy> @@ -163,23 +162,19 @@ <aspectratio>stretch</aspectratio> <texture>GlassTitleBar.png</texture> </control> - <control type="label"> + <control type="label" id="40"> <description>header label</description> <posx>300</posx> <posy>20</posy> <width>740</width> <height>30</height> - <font>font24_title</font> - <label>$LOCALIZE[130] - $INFO[Control.GetLabel(40)]</label> + <font>font16</font> + <label>-</label> <align>left</align> <aligny>center</aligny> <textcolor>white</textcolor> <shadowcolor>black</shadowcolor> </control> - <control type="label" id="40"> - <description>Hiddenlabel to pass to above</description> - <visible>false</visible> - </control> <control type="group"> <posx>290</posx> <posy>100</posy> @@ -319,43 +314,20 @@ </control> </control> <include>CommonNowPlaying</include> - <control type="group"> - <posx>60</posx> - <posy>0</posy> - <animation effect="slide" end="-310,0" time="400" tween="quadratic" easing="out">WindowClose</animation> - <animation effect="slide" start="-310,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>250</width> - <height>35</height> - <texture border="0,0,32,0">header.png</texture> - </control> - <control type="label"> - <include>WindowTitleCommons</include> - <posx>220</posx> - <label>$LOCALIZE[130]</label> - </control> - </control> - <control type="group"> - <posx>60</posx> - <posy>0</posy> - <animation effect="slide" end="-310,0" time="400" tween="quadratic" easing="out" condition="Window.Next(Home) | Window.Next(1111) | Window.Next(AddonBrowser)">WindowClose</animation> - <animation effect="slide" start="-310,0" time="400" tween="quadratic" easing="out" condition="Window.Previous(Home) | Window.Previous(1111) | Window.Previous(AddonBrowser)">WindowOpen</animation> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>250</width> - <height>35</height> - <texture border="0,0,32,0">header.png</texture> - </control> + <include>WindowTitleHomeButton</include> + <control type="grouplist"> + <posx>65</posx> + <posy>5</posy> + <width>1000</width> + <height>30</height> + <orientation>horizontal</orientation> + <align>left</align> + <itemgap>5</itemgap> <control type="label"> <include>WindowTitleCommons</include> - <posx>220</posx> <label>$LOCALIZE[130]</label> </control> </control> - <include>WindowTitleHomeButton</include> <include>Clock</include> </controls> </window> diff --git a/addons/skin.confluence/720p/custom_SkinSetting_1111.xml b/addons/skin.confluence/720p/custom_SkinSetting_1111.xml index ad70f31dc9..eab1dd2ee4 100644 --- a/addons/skin.confluence/720p/custom_SkinSetting_1111.xml +++ b/addons/skin.confluence/720p/custom_SkinSetting_1111.xml @@ -2,7 +2,6 @@ <defaultcontrol always="true">9000</defaultcontrol> <controls> <include>CommonBackground</include> - <include>CommonMediaPlayingBackground</include> <control type="image"> <posx>0</posx> <posy>100r</posy> @@ -11,6 +10,25 @@ <texture>floor.png</texture> <include>VisibleFadeEffect</include> </control> + <include>WindowTitleHomeButton</include> + <control type="grouplist"> + <posx>65</posx> + <posy>5</posy> + <width>1000</width> + <height>30</height> + <orientation>horizontal</orientation> + <align>left</align> + <itemgap>5</itemgap> + <control type="label"> + <include>WindowTitleCommons</include> + <label>$LOCALIZE[20077]</label> + </control> + <control type="label"> + <include>WindowTitleCommons</include> + <label>[COLOR=blue] - [/COLOR]$INFO[Container.FolderName]</label> + <visible>!IsEmpty(Container.FolderName)</visible> + </control> + </control> <control type="group"> <posx>90</posx> <posy>30</posy> @@ -957,25 +975,6 @@ </control> <include>CommonNowPlaying</include> <include>BehindDialogFadeOut</include> - <control type="group"> - <posx>60</posx> - <posy>0</posy> - <animation effect="slide" end="-310,0" time="400" tween="quadratic" easing="out">WindowClose</animation> - <animation effect="slide" start="-310,0" time="400" tween="quadratic" easing="out">WindowOpen</animation> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>250</width> - <height>35</height> - <texture border="0,0,32,0">header.png</texture> - </control> - <control type="label"> - <include>WindowTitleCommons</include> - <posx>220</posx> - <label>$LOCALIZE[20077]</label> - </control> - </control> - <include>WindowTitleHomeButton</include> <include>Clock</include> </controls> </window> diff --git a/addons/skin.confluence/720p/includes.xml b/addons/skin.confluence/720p/includes.xml index dcdaa8a16d..670859d049 100644 --- a/addons/skin.confluence/720p/includes.xml +++ b/addons/skin.confluence/720p/includes.xml @@ -32,39 +32,28 @@ </control> </include> <include name="WindowTitleCommons"> + <posx>0</posx> <posy>0</posy> - <width>1060</width> - <height>28</height> - <font>font12</font> + <width min="0" max="800">auto</width> + <height>30</height> + <font>font14</font> <textcolor>white</textcolor> + <shadowcolor>black</shadowcolor> <scroll>false</scroll> - <align>right</align> + <align>left</align> <aligny>center</aligny> </include> <include name="WindowTitleHomeButton"> - <control type="group"> - <posx>0</posx> - <posy>0</posy> - <animation effect="slide" end="-270,0" time="400" tween="quadratic" easing="out" condition="Window.Next(Home)">WindowClose</animation> - <animation effect="slide" start="-270,0" time="400" tween="quadratic" easing="out" condition="Window.Previous(Home)">WindowOpen</animation> - <control type="image"> - <posx>0</posx> - <posy>0</posy> - <width>80</width> - <height>35</height> - <texture border="0,0,32,0">header.png</texture> - </control> - <control type="button"> - <hitrect x="0" y="0" w="60" h="30" /> - <posx>20</posx> - <posy>5</posy> - <width>25</width> - <height>20</height> - <texturenofocus>HomeIcon.png</texturenofocus> - <texturefocus>HomeIcon-Focus.png</texturefocus> - <label>-</label> - <onclick>ActivateWindow(Home)</onclick> - </control> + <control type="button"> + <hitrect x="0" y="0" w="60" h="45" /> + <posx>20</posx> + <posy>3</posy> + <width>35</width> + <height>35</height> + <texturenofocus>icon_home.png</texturenofocus> + <texturefocus>icon_home_focus.png</texturefocus> + <label>-</label> + <onclick>ActivateWindow(Home)</onclick> </control> </include> <include name="ButtonCommonValues"> diff --git a/addons/skin.confluence/media/HomeIcon-Focus.png b/addons/skin.confluence/media/HomeIcon-Focus.png Binary files differdeleted file mode 100644 index 8b82faa1d7..0000000000 --- a/addons/skin.confluence/media/HomeIcon-Focus.png +++ /dev/null diff --git a/addons/skin.confluence/media/HomeIcon.png b/addons/skin.confluence/media/icon_home.png Binary files differindex 0f38e162fd..4c5e137e5f 100644 --- a/addons/skin.confluence/media/HomeIcon.png +++ b/addons/skin.confluence/media/icon_home.png diff --git a/addons/skin.confluence/media/icon_home_focus.png b/addons/skin.confluence/media/icon_home_focus.png Binary files differnew file mode 100644 index 0000000000..015e8f73f3 --- /dev/null +++ b/addons/skin.confluence/media/icon_home_focus.png |
