aboutsummaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
Diffstat (limited to 'addons')
-rw-r--r--addons/skin.confluence/720p/MyMusicNav.xml220
-rw-r--r--addons/skin.confluence/720p/MyMusicPlaylist.xml96
-rw-r--r--addons/skin.confluence/720p/MyMusicSongs.xml103
-rw-r--r--addons/skin.confluence/720p/MyPics.xml117
-rw-r--r--addons/skin.confluence/720p/MyPrograms.xml97
-rw-r--r--addons/skin.confluence/720p/MyVideoPlaylist.xml98
6 files changed, 235 insertions, 496 deletions
diff --git a/addons/skin.confluence/720p/MyMusicNav.xml b/addons/skin.confluence/720p/MyMusicNav.xml
index 93aaf58364..14cc55e5ee 100644
--- a/addons/skin.confluence/720p/MyMusicNav.xml
+++ b/addons/skin.confluence/720p/MyMusicNav.xml
@@ -88,212 +88,86 @@
<include>BehindDialogFadeOut</include>
<include>ScrollOffsetLabel</include>
<control type="group">
- <animation effect="slide" start="0,0" end="250,0" time="400" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | ControlGroup(9001).HasFocus | Control.HasFocus(8999)">Conditional</animation>
- <animation effect="slide" start="0,0" end="-250,0" time="400" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | ControlGroup(9001).HasFocus">WindowClose</animation>
- <control type="group">
- <animation effect="slide" end="-240,0" time="300" tween="quadratic" easing="out">WindowClose</animation>
- <animation effect="slide" start="-15,0" end="0,0" time="300" tween="quadratic" easing="out">WindowOpen</animation>
- <control type="image">
- <posx>0</posx>
- <posy>0</posy>
- <width>1</width>
- <height>720</height>
- <texture>MediaBladeSub_Part1.png</texture>
- <animation effect="zoom" start="0,0,1,720" end="0,0,229,720" time="300" tween="quadratic" easing="out" condition="Control.HasFocus(98) | ControlGroup(9001).HasFocus">Conditional</animation>
- </control>
- <control type="image">
- <posx>1</posx>
- <posy>0</posy>
- <width>12</width>
- <height>720</height>
- <texture>MediaBladeSub_Part2.png</texture>
- <animation effect="slide" end="228,0" time="300" tween="quadratic" easing="out" condition="Control.HasFocus(98) | ControlGroup(9001).HasFocus">Conditional</animation>
- </control>
- </control>
- <control type="group" id="9001">
- <posx>-220</posx>
- <posy>0</posy>
- <animation effect="fade" start="100" end="0" time="0" condition="!ControlGroup(9001).HasFocus + !Control.HasFocus(98)">conditional</animation>
- <animation effect="fade" start="0" end="100" delay="300" time="200" condition="Control.HasFocus(98) | ControlGroup(9001).HasFocus">conditional</animation>
- <animation effect="fade" start="100" end="0" time="0" condition="Control.HasFocus(98) | ControlGroup(9001).HasFocus">WindowClose</animation>
- <animation effect="slide" end="220,0" time="300" tween="quadratic" easing="out" condition="Control.HasFocus(98) | ControlGroup(9001).HasFocus">conditional</animation>
- <control type="button">
- <description>Fake button for mouse control</description>
- <posx>-15</posx>
- <posy>0</posy>
- <width>245</width>
- <height>720</height>
- <label>-</label>
- <font>-</font>
- <texturenofocus>-</texturenofocus>
- <texturefocus>-</texturefocus>
- <visible>true</visible>
- </control>
- <control type="image">
- <posx>185</posx>
- <posy>240</posy>
- <width>40</width>
- <height>40</height>
- <texture>MediaSubSet.png</texture>
- </control>
- <control type="grouplist" id="9010">
- <posx>10</posx>
- <posy>290</posy>
- <width>240</width>
- <height>550</height>
- <onleft>9000</onleft>
- <onright>50</onright>
- <onup>9010</onup>
- <ondown>9010</ondown>
- <itemgap>0</itemgap>
- <control type="button" id="8">
- <description>Search</description>
- <include>ButtonMediaSubCommonValues</include>
- <label>137</label>
- </control>
- <control type="radiobutton" id="19">
- <description>Filter</description>
- <textwidth>170</textwidth>
- <include>ButtonMediaSubCommonValues</include>
- <label>587</label>
- </control>
- <control type="label" id="200">
- <width>220</width>
- <height>45</height>
- <font>font12caps</font>
- <label>14018</label>
- <textcolor>dialogheader</textcolor>
- <align>center</align>
- <aligny>center</aligny>
- <visible>Control.IsVisible(512) + Container.Content(Artists)</visible>
- </control>
- <control type="radiobutton" id="202">
- <description>Toggle Fanart</description>
- <textwidth>170</textwidth>
- <include>ButtonMediaSubCommonValues</include>
- <label>31318</label>
- <onclick>Skin.ToggleSetting(MusicLibraryFanartView512)</onclick>
- <selected>!Skin.HasSetting(MusicLibraryFanartView512)</selected>
- <visible>Control.IsVisible(512) + Container.Content(Artists)</visible>
- </control>
- </control>
- </control>
- <control type="button" id="8999">
- <description>Fake button for mouse control</description>
- <posx>-250</posx>
- <posy>0</posy>
- <width>265</width>
- <height>720</height>
- <label>-</label>
- <font>-</font>
- <texturenofocus>-</texturenofocus>
- <texturefocus>-</texturefocus>
- <visible>true</visible>
- </control>
+ <posx>-250</posx>
<include>SideBladeLeft</include>
- <control type="image">
- <description>LOGO</description>
- <posx>-230</posx>
- <posy>50</posy>
- <width>220</width>
- <height>80</height>
- <aspectratio>keep</aspectratio>
- <texture>Confluence_Logo.png</texture>
- </control>
- <control type="group" id="9000">
- <posx>-250</posx>
- <posy>130</posy>
- <include>CommonNowPlaying</include>
+ <control type="grouplist" id="9000">
+ <posx>0</posx>
+ <posy>110</posy>
+ <width>250</width>
+ <height>550</height>
+ <onleft>9000</onleft>
+ <onright>50</onright>
+ <onup>9000</onup>
+ <ondown>9000</ondown>
+ <itemgap>0</itemgap>
+ <control type="label" id="200">
+ <width>250</width>
+ <height>45</height>
+ <font>font12caps</font>
+ <label>View Options</label>
+ <textcolor>blue</textcolor>
+ <align>center</align>
+ <aligny>center</aligny>
+ </control>
<control type="button" id="2">
<description>View As button</description>
- <posx>0</posx>
- <posy>0</posy>
<textwidth>235</textwidth>
<include>ButtonCommonValues</include>
<label>-</label>
- <onleft>50</onleft>
- <onright>50</onright>
- <onup>611</onup>
- <ondown>3</ondown>
</control>
<control type="button" id="3">
<description>Sort by button</description>
- <posx>0</posx>
- <posy>40</posy>
<include>ButtonCommonValues</include>
<label>103</label>
- <onleft>50</onleft>
- <onright>4</onright>
- <onup>2</onup>
- <ondown>99</ondown>
</control>
<control type="togglebutton" id="4">
<description>Sort asc</description>
- <posx>220</posx>
- <posy>53</posy>
- <label>-</label>
- <onleft>3</onleft>
- <onright>50</onright>
- <onup>2</onup>
- <ondown>99</ondown>
+ <include>ButtonCommonValues</include>
+ <alttexturefocus border="5">button-focus.png</alttexturefocus>
+ <alttexturenofocus>-</alttexturenofocus>
+ <label>31051</label>
+ <altlabel>31050</altlabel>
+ <usealtlabel>Container.SortDirection(Ascending)</usealtlabel>
</control>
<control type="radiobutton" id="99">
<description>Library button</description>
- <posx>0</posx>
- <posy>80</posy>
<label>$LOCALIZE[29800]</label>
<onclick>ReplaceWindow(MusicFiles)</onclick>
<selected>Window.IsVisible(MusicLibrary)</selected>
<include>ButtonCommonValues</include>
- <onleft>50</onleft>
- <onright>50</onright>
- <onup>3</onup>
- <ondown>16</ondown>
+ </control>
+ <control type="label" id="201">
+ <width>250</width>
+ <height>45</height>
+ <font>font12caps</font>
+ <label>31026</label>
+ <textcolor>blue</textcolor>
+ <align>center</align>
+ <aligny>center</aligny>
+ </control>
+ <control type="button" id="8">
+ <description>Search</description>
+ <include>ButtonCommonValues</include>
+ <label>137</label>
+ </control>
+ <control type="radiobutton" id="19">
+ <description>Filter</description>
+ <textwidth>170</textwidth>
+ <include>ButtonCommonValues</include>
+ <label>587</label>
</control>
<control type="radiobutton" id="16">
<description>PartyMode</description>
- <posx>0</posx>
- <posy>120</posy>
<label>589</label>
<include>ButtonCommonValues</include>
- <onleft>50</onleft>
- <onright>50</onright>
- <onup>99</onup>
- <ondown>98</ondown>
- </control>
- <control type="radiobutton" id="98">
- <description>Extra Options</description>
- <hitrect x="0" y="160" w="265" h="40" />
- <posx>0</posx>
- <posy>160</posy>
- <include>ButtonCommonValues</include>
- <radiowidth>18</radiowidth>
- <radioheight>18</radioheight>
- <radioposx>222</radioposx>
- <radioposy>12</radioposy>
- <textureradiofocus>HomeHasSub.png</textureradiofocus>
- <textureradionofocus>HomeHasSub.png</textureradionofocus>
- <label>31026</label>
- <onleft>50</onleft>
- <onright>9010</onright>
- <onup>16</onup>
- <ondown>610</ondown>
</control>
<control type="button" id="610">
<description>Fake Button to fix Player Controls Navigation</description>
- <onup>98</onup>
- <ondown>603</ondown>
<visible>false</visible>
</control>
- <control type="group">
- <posx>0</posx>
- <posy>260</posy>
- <include>CommonNowPlaying_Controls</include>
- </control>
+ <include>CommonNowPlaying_Controls</include>
<control type="button" id="611">
<description>Fake Button to fix Player Controls Navigation</description>
- <onup>608</onup>
- <ondown>2</ondown>
<visible>false</visible>
</control>
</control>
diff --git a/addons/skin.confluence/720p/MyMusicPlaylist.xml b/addons/skin.confluence/720p/MyMusicPlaylist.xml
index 0997dbd45a..33c6a3abd0 100644
--- a/addons/skin.confluence/720p/MyMusicPlaylist.xml
+++ b/addons/skin.confluence/720p/MyMusicPlaylist.xml
@@ -83,109 +83,73 @@
<include>BehindDialogFadeOut</include>
<include>ScrollOffsetLabel</include>
<control type="group">
- <animation effect="slide" start="0,0" end="250,0" time="400" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | Control.HasFocus(8999)">Conditional</animation>
- <animation effect="slide" start="0,0" end="-250,0" time="400" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | Control.HasFocus(8999)">WindowClose</animation>
- <control type="button" id="8999">
- <description>Fake button for mouse control</description>
- <posx>-250</posx>
- <posy>0</posy>
- <width>265</width>
- <height>720</height>
- <label>-</label>
- <font>-</font>
- <texturenofocus>-</texturenofocus>
- <texturefocus>-</texturefocus>
- <visible>true</visible>
- </control>
+ <posx>-250</posx>
<include>SideBladeLeft</include>
- <control type="image">
- <description>LOGO</description>
- <posx>-230</posx>
- <posy>50</posy>
- <width>220</width>
- <height>80</height>
- <aspectratio>keep</aspectratio>
- <texture>Confluence_Logo.png</texture>
- </control>
- <control type="group" id="9000">
- <posx>-250</posx>
- <posy>130</posy>
- <include>CommonNowPlaying</include>
+ <control type="grouplist" id="9000">
+ <posx>0</posx>
+ <posy>110</posy>
+ <width>250</width>
+ <height>550</height>
+ <onleft>9000</onleft>
+ <onright>50</onright>
+ <onup>9000</onup>
+ <ondown>9000</ondown>
+ <itemgap>0</itemgap>
+ <control type="label" id="200">
+ <width>250</width>
+ <height>45</height>
+ <font>font12caps</font>
+ <label>View Options</label>
+ <textcolor>blue</textcolor>
+ <align>center</align>
+ <aligny>center</aligny>
+ </control>
<control type="button" id="2">
<description>View As button</description>
- <posx>0</posx>
- <posy>0</posy>
<textwidth>235</textwidth>
<include>ButtonCommonValues</include>
<label>-</label>
- <onleft>50</onleft>
- <onright>50</onright>
- <onup>611</onup>
- <ondown>20</ondown>
+ </control>
+ <control type="label" id="201">
+ <width>250</width>
+ <height>45</height>
+ <font>font12caps</font>
+ <label>31026</label>
+ <textcolor>blue</textcolor>
+ <align>center</align>
+ <aligny>center</aligny>
</control>
<control type="radiobutton" id="20">
<description>Shuffle button</description>
- <posx>0</posx>
- <posy>40</posy>
<include>ButtonCommonValues</include>
<label>191</label>
- <onleft>50</onleft>
- <onright>50</onright>
- <onup>2</onup>
- <ondown>26</ondown>
</control>
<control type="button" id="26">
<description>Repeat button</description>
- <posx>0</posx>
- <posy>80</posy>
<textwidth>235</textwidth>
<include>ButtonCommonValues</include>
<label>-</label>
- <onleft>50</onleft>
- <onright>50</onright>
- <onup>20</onup>
- <ondown>21</ondown>
</control>
<control type="button" id="21">
<description>Save button</description>
- <posx>0</posx>
- <posy>120</posy>
<label>190</label>
<textwidth>235</textwidth>
<include>ButtonCommonValues</include>
- <onleft>50</onleft>
- <onright>50</onright>
- <onup>26</onup>
- <ondown>22</ondown>
</control>
<control type="button" id="22">
<description>Clear button</description>
- <posx>0</posx>
- <posy>160</posy>
<label>192</label>
<onclick>ReplaceWindow(music)</onclick>
<textwidth>235</textwidth>
<include>ButtonCommonValues</include>
- <onleft>50</onleft>
- <onright>50</onright>
- <onup>21</onup>
- <ondown>610</ondown>
</control>
<control type="button" id="610">
<description>Fake Button to fix Player Controls Navigation</description>
- <onup>22</onup>
- <ondown>603</ondown>
<visible>false</visible>
</control>
- <control type="group">
- <posx>0</posx>
- <posy>260</posy>
- <include>CommonNowPlaying_Controls</include>
- </control>
+ <include>CommonNowPlaying_Controls</include>
<control type="button" id="611">
<description>Fake Button to fix Player Controls Navigation</description>
- <onup>608</onup>
- <ondown>2</ondown>
<visible>false</visible>
</control>
</control>
diff --git a/addons/skin.confluence/720p/MyMusicSongs.xml b/addons/skin.confluence/720p/MyMusicSongs.xml
index f1da8de475..2faa804cab 100644
--- a/addons/skin.confluence/720p/MyMusicSongs.xml
+++ b/addons/skin.confluence/720p/MyMusicSongs.xml
@@ -85,96 +85,77 @@
<include>BehindDialogFadeOut</include>
<include>ScrollOffsetLabel</include>
<control type="group">
- <animation effect="slide" start="0,0" end="250,0" time="400" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | Control.HasFocus(8999)">Conditional</animation>
- <animation effect="slide" start="0,0" end="-250,0" time="400" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | Control.HasFocus(8999)">WindowClose</animation>
- <control type="button" id="8999">
- <description>Fake button for mouse control</description>
- <posx>-250</posx>
- <posy>0</posy>
- <width>265</width>
- <height>720</height>
- <label>-</label>
- <font>-</font>
- <texturenofocus>-</texturenofocus>
- <texturefocus>-</texturefocus>
- <visible>true</visible>
- </control>
+ <posx>-250</posx>
<include>SideBladeLeft</include>
- <control type="image">
- <description>LOGO</description>
- <posx>-230</posx>
- <posy>50</posy>
- <width>220</width>
- <height>80</height>
- <aspectratio>keep</aspectratio>
- <texture>Confluence_Logo.png</texture>
- </control>
- <control type="group" id="9000">
- <posx>-250</posx>
- <posy>130</posy>
- <include>CommonNowPlaying</include>
+ <control type="grouplist" id="9000">
+ <posx>0</posx>
+ <posy>110</posy>
+ <width>250</width>
+ <height>550</height>
+ <onleft>9000</onleft>
+ <onright>50</onright>
+ <onup>9000</onup>
+ <ondown>9000</ondown>
+ <itemgap>0</itemgap>
+ <control type="label" id="200">
+ <width>250</width>
+ <height>45</height>
+ <font>font12caps</font>
+ <label>View Options</label>
+ <textcolor>blue</textcolor>
+ <align>center</align>
+ <aligny>center</aligny>
+ </control>
<control type="button" id="2">
<description>View As button</description>
- <posx>0</posx>
- <posy>0</posy>
<textwidth>235</textwidth>
<include>ButtonCommonValues</include>
<label>-</label>
- <onleft>50</onleft>
- <onright>50</onright>
- <onup>611</onup>
- <ondown>3</ondown>
</control>
<control type="button" id="3">
<description>Sort by button</description>
- <posx>0</posx>
- <posy>40</posy>
<include>ButtonCommonValues</include>
<label>103</label>
- <onleft>50</onleft>
- <onright>4</onright>
- <onup>2</onup>
- <ondown>99</ondown>
</control>
<control type="togglebutton" id="4">
<description>Sort asc</description>
- <posx>220</posx>
- <posy>53</posy>
- <label>-</label>
- <onleft>3</onleft>
- <onright>50</onright>
- <onup>2</onup>
- <ondown>99</ondown>
+ <include>ButtonCommonValues</include>
+ <alttexturefocus border="5">button-focus.png</alttexturefocus>
+ <alttexturenofocus>-</alttexturenofocus>
+ <label>31051</label>
+ <altlabel>31050</altlabel>
+ <usealtlabel>Container.SortDirection(Ascending)</usealtlabel>
</control>
<control type="radiobutton" id="99">
<description>Library button</description>
- <posx>0</posx>
- <posy>80</posy>
<label>$LOCALIZE[29800]</label>
<onclick>ReplaceWindow(MusicLibrary)</onclick>
<selected>Window.IsVisible(MusicLibrary)</selected>
<include>ButtonCommonValues</include>
- <onleft>50</onleft>
- <onright>50</onright>
- <onup>3</onup>
- <ondown>610</ondown>
<enable>Library.HasContent(Music)</enable>
</control>
+ <control type="label" id="201">
+ <width>250</width>
+ <height>45</height>
+ <font>font12caps</font>
+ <label>31026</label>
+ <textcolor>blue</textcolor>
+ <align>center</align>
+ <aligny>center</aligny>
+ </control>
+ <control type="radiobutton" id="19">
+ <description>Filter</description>
+ <textwidth>170</textwidth>
+ <include>ButtonCommonValues</include>
+ <label>587</label>
+ </control>
<control type="button" id="610">
<description>Fake Button to fix Player Controls Navigation</description>
- <onup>99</onup>
- <ondown>603</ondown>
<visible>false</visible>
</control>
- <control type="group">
- <posx>0</posx>
- <posy>260</posy>
- <include>CommonNowPlaying_Controls</include>
- </control>
+ <include>CommonNowPlaying_Controls</include>
<control type="button" id="611">
<description>Fake Button to fix Player Controls Navigation</description>
- <onup>608</onup>
- <ondown>2</ondown>
<visible>false</visible>
</control>
</control>
diff --git a/addons/skin.confluence/720p/MyPics.xml b/addons/skin.confluence/720p/MyPics.xml
index cff9d0eaad..c8499ef597 100644
--- a/addons/skin.confluence/720p/MyPics.xml
+++ b/addons/skin.confluence/720p/MyPics.xml
@@ -106,123 +106,92 @@
<include>BehindDialogFadeOut</include>
<include>ScrollOffsetLabel</include>
<control type="group">
- <animation effect="slide" start="0,0" end="250,0" time="400" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | Control.HasFocus(8999)">Conditional</animation>
- <animation effect="slide" start="0,0" end="-250,0" time="400" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | Control.HasFocus(8999)">WindowClose</animation>
- <control type="button" id="8999">
- <description>Fake button for mouse control</description>
- <posx>-250</posx>
- <posy>0</posy>
- <width>265</width>
- <height>720</height>
- <label>-</label>
- <font>-</font>
- <texturenofocus>-</texturenofocus>
- <texturefocus>-</texturefocus>
- <visible>true</visible>
- </control>
+ <posx>-250</posx>
<include>SideBladeLeft</include>
- <control type="image">
- <description>LOGO</description>
- <posx>-230</posx>
- <posy>50</posy>
- <width>220</width>
- <height>80</height>
- <aspectratio>keep</aspectratio>
- <texture>Confluence_Logo.png</texture>
- </control>
- <control type="group" id="9000">
- <posx>-250</posx>
- <posy>130</posy>
- <include>CommonNowPlaying</include>
+ <control type="grouplist" id="9000">
+ <posx>0</posx>
+ <posy>110</posy>
+ <width>250</width>
+ <height>550</height>
+ <onleft>9000</onleft>
+ <onright>50</onright>
+ <onup>9000</onup>
+ <ondown>9000</ondown>
+ <itemgap>0</itemgap>
+ <control type="label" id="200">
+ <width>250</width>
+ <height>45</height>
+ <font>font12caps</font>
+ <label>View Options</label>
+ <textcolor>blue</textcolor>
+ <align>center</align>
+ <aligny>center</aligny>
+ </control>
<control type="button" id="2">
<description>View As button</description>
- <posx>0</posx>
- <posy>0</posy>
<textwidth>235</textwidth>
<include>ButtonCommonValues</include>
<label>-</label>
- <onleft>50</onleft>
- <onright>50</onright>
- <onup>611</onup>
- <ondown>3</ondown>
</control>
<control type="button" id="3">
<description>Sort by button</description>
- <posx>0</posx>
- <posy>40</posy>
<include>ButtonCommonValues</include>
<label>103</label>
- <onleft>50</onleft>
- <onright>4</onright>
- <onup>2</onup>
- <ondown>6</ondown>
</control>
<control type="togglebutton" id="4">
<description>Sort asc</description>
- <posx>220</posx>
- <posy>53</posy>
- <label>-</label>
- <onleft>3</onleft>
- <onright>50</onright>
- <onup>2</onup>
- <ondown>6</ondown>
+ <include>ButtonCommonValues</include>
+ <alttexturefocus border="5">button-focus.png</alttexturefocus>
+ <alttexturenofocus>-</alttexturenofocus>
+ <label>31051</label>
+ <altlabel>31050</altlabel>
+ <usealtlabel>Container.SortDirection(Ascending)</usealtlabel>
+ </control>
+ <control type="label" id="201">
+ <width>250</width>
+ <height>45</height>
+ <font>font12caps</font>
+ <label>31026</label>
+ <textcolor>blue</textcolor>
+ <align>center</align>
+ <aligny>center</aligny>
</control>
<control type="button" id="6">
<description>Slideshow</description>
- <posx>0</posx>
- <posy>80</posy>
<textwidth>235</textwidth>
<include>ButtonCommonValues</include>
<label>108</label>
- <onleft>50</onleft>
- <onright>50</onright>
- <onup>3</onup>
- <ondown>7</ondown>
</control>
<control type="button" id="7">
<description>Recersive Slideshow</description>
- <posx>0</posx>
- <posy>120</posy>
<textwidth>235</textwidth>
<include>ButtonCommonValues</include>
<label>361</label>
- <onleft>50</onleft>
- <onright>50</onright>
- <onup>6</onup>
- <ondown>9</ondown>
</control>
<control type="radiobutton" id="9">
<description>Randomize Toggle</description>
- <posx>0</posx>
- <posy>160</posy>
<include>ButtonCommonValues</include>
<label>13319</label>
- <onleft>50</onleft>
- <onright>50</onright>
- <onup>7</onup>
- <ondown>610</ondown>
+ </control>
+ <control type="radiobutton" id="19">
+ <description>Filter</description>
+ <textwidth>170</textwidth>
+ <include>ButtonCommonValues</include>
+ <label>587</label>
</control>
<control type="button" id="610">
<description>Fake Button to fix Player Controls Navigation</description>
- <onup>9</onup>
- <ondown>603</ondown>
<visible>false</visible>
</control>
- <control type="group">
- <posx>0</posx>
- <posy>260</posy>
- <include>CommonNowPlaying_Controls</include>
- </control>
+ <include>CommonNowPlaying_Controls</include>
<control type="button" id="611">
<description>Fake Button to fix Player Controls Navigation</description>
- <onup>608</onup>
- <ondown>2</ondown>
<visible>false</visible>
</control>
</control>
</control>
<control type="group">
- <posx>60</posx>
+ <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>
diff --git a/addons/skin.confluence/720p/MyPrograms.xml b/addons/skin.confluence/720p/MyPrograms.xml
index b920b92d5b..7fc5b50c35 100644
--- a/addons/skin.confluence/720p/MyPrograms.xml
+++ b/addons/skin.confluence/720p/MyPrograms.xml
@@ -84,82 +84,69 @@
<include>BehindDialogFadeOut</include>
<include>ScrollOffsetLabel</include>
<control type="group">
- <animation effect="slide" start="0,0" end="250,0" time="400" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | Control.HasFocus(8999)">Conditional</animation>
- <animation effect="slide" start="0,0" end="-250,0" time="400" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | Control.HasFocus(8999)">WindowClose</animation>
- <control type="button" id="8999">
- <description>Fake button for mouse control</description>
- <posx>-250</posx>
- <posy>0</posy>
- <width>265</width>
- <height>720</height>
- <label>-</label>
- <font>-</font>
- <texturenofocus>-</texturenofocus>
- <texturefocus>-</texturefocus>
- <visible>true</visible>
- </control>
+ <posx>-250</posx>
<include>SideBladeLeft</include>
- <control type="image">
- <description>LOGO</description>
- <posx>-230</posx>
- <posy>50</posy>
- <width>220</width>
- <height>80</height>
- <aspectratio>keep</aspectratio>
- <texture>Confluence_Logo.png</texture>
- </control>
- <control type="group" id="9000">
- <posx>-250</posx>
- <posy>130</posy>
- <include>CommonNowPlaying</include>
+ <control type="grouplist" id="9000">
+ <posx>0</posx>
+ <posy>110</posy>
+ <width>250</width>
+ <height>550</height>
+ <onleft>9000</onleft>
+ <onright>50</onright>
+ <onup>9000</onup>
+ <ondown>9000</ondown>
+ <itemgap>0</itemgap>
+ <control type="label" id="200">
+ <width>250</width>
+ <height>45</height>
+ <font>font12caps</font>
+ <label>View Options</label>
+ <textcolor>blue</textcolor>
+ <align>center</align>
+ <aligny>center</aligny>
+ </control>
<control type="button" id="2">
<description>View As button</description>
- <posx>0</posx>
- <posy>0</posy>
<textwidth>235</textwidth>
<include>ButtonCommonValues</include>
<label>-</label>
- <onleft>50</onleft>
- <onright>50</onright>
- <onup>611</onup>
- <ondown>3</ondown>
</control>
<control type="button" id="3">
<description>Sort by button</description>
- <posx>0</posx>
- <posy>40</posy>
<include>ButtonCommonValues</include>
<label>103</label>
- <onleft>50</onleft>
- <onright>4</onright>
- <onup>2</onup>
- <ondown>610</ondown>
</control>
<control type="togglebutton" id="4">
<description>Sort asc</description>
- <posx>220</posx>
- <posy>53</posy>
- <label>-</label>
- <onleft>3</onleft>
- <onright>50</onright>
- <onup>2</onup>
- <ondown>610</ondown>
+ <include>ButtonCommonValues</include>
+ <alttexturefocus border="5">button-focus.png</alttexturefocus>
+ <alttexturenofocus>-</alttexturenofocus>
+ <label>31051</label>
+ <altlabel>31050</altlabel>
+ <usealtlabel>Container.SortDirection(Ascending)</usealtlabel>
+ </control>
+ <control type="label" id="201">
+ <width>250</width>
+ <height>45</height>
+ <font>font12caps</font>
+ <label>31026</label>
+ <textcolor>blue</textcolor>
+ <align>center</align>
+ <aligny>center</aligny>
+ </control>
+ <control type="radiobutton" id="19">
+ <description>Filter</description>
+ <textwidth>170</textwidth>
+ <include>ButtonCommonValues</include>
+ <label>587</label>
</control>
<control type="button" id="610">
<description>Fake Button to fix Player Controls Navigation</description>
- <onup>3</onup>
- <ondown>603</ondown>
<visible>false</visible>
</control>
- <control type="group">
- <posx>0</posx>
- <posy>260</posy>
- <include>CommonNowPlaying_Controls</include>
- </control>
+ <include>CommonNowPlaying_Controls</include>
<control type="button" id="611">
<description>Fake Button to fix Player Controls Navigation</description>
- <onup>608</onup>
- <ondown>2</ondown>
<visible>false</visible>
</control>
</control>
diff --git a/addons/skin.confluence/720p/MyVideoPlaylist.xml b/addons/skin.confluence/720p/MyVideoPlaylist.xml
index d55f2fd60d..a186c524b9 100644
--- a/addons/skin.confluence/720p/MyVideoPlaylist.xml
+++ b/addons/skin.confluence/720p/MyVideoPlaylist.xml
@@ -73,109 +73,73 @@
<include>BehindDialogFadeOut</include>
<include>ScrollOffsetLabel</include>
<control type="group">
- <animation effect="slide" start="0,0" end="250,0" time="400" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | Control.HasFocus(8999)">Conditional</animation>
- <animation effect="slide" start="0,0" end="-250,0" time="400" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | Control.HasFocus(8999)">WindowClose</animation>
- <control type="button" id="8999">
- <description>Fake button for mouse control</description>
- <posx>-250</posx>
- <posy>0</posy>
- <width>265</width>
- <height>720</height>
- <label>-</label>
- <font>-</font>
- <texturenofocus>-</texturenofocus>
- <texturefocus>-</texturefocus>
- <visible>true</visible>
- </control>
+ <posx>-250</posx>
<include>SideBladeLeft</include>
- <control type="image">
- <description>LOGO</description>
- <posx>-230</posx>
- <posy>50</posy>
- <width>220</width>
- <height>80</height>
- <aspectratio>keep</aspectratio>
- <texture>Confluence_Logo.png</texture>
- </control>
- <control type="group" id="9000">
- <posx>-250</posx>
- <posy>130</posy>
- <include>CommonNowPlaying</include>
+ <control type="grouplist" id="9000">
+ <posx>0</posx>
+ <posy>110</posy>
+ <width>250</width>
+ <height>550</height>
+ <onleft>9000</onleft>
+ <onright>50</onright>
+ <onup>9000</onup>
+ <ondown>9000</ondown>
+ <itemgap>0</itemgap>
+ <control type="label" id="200">
+ <width>250</width>
+ <height>45</height>
+ <font>font12caps</font>
+ <label>View Options</label>
+ <textcolor>blue</textcolor>
+ <align>center</align>
+ <aligny>center</aligny>
+ </control>
<control type="button" id="2">
<description>View As button</description>
- <posx>0</posx>
- <posy>0</posy>
<textwidth>235</textwidth>
<include>ButtonCommonValues</include>
<label>-</label>
- <onleft>50</onleft>
- <onright>50</onright>
- <onup>611</onup>
- <ondown>20</ondown>
+ </control>
+ <control type="label" id="201">
+ <width>250</width>
+ <height>45</height>
+ <font>font12caps</font>
+ <label>31026</label>
+ <textcolor>blue</textcolor>
+ <align>center</align>
+ <aligny>center</aligny>
</control>
<control type="radiobutton" id="20">
<description>Shuffle button</description>
- <posx>0</posx>
- <posy>40</posy>
<include>ButtonCommonValues</include>
<label>191</label>
- <onleft>50</onleft>
- <onright>50</onright>
- <onup>2</onup>
- <ondown>26</ondown>
</control>
<control type="button" id="26">
<description>Repeat button</description>
- <posx>0</posx>
- <posy>80</posy>
<textwidth>235</textwidth>
<include>ButtonCommonValues</include>
<label>-</label>
- <onleft>50</onleft>
- <onright>50</onright>
- <onup>20</onup>
- <ondown>21</ondown>
</control>
<control type="button" id="21">
<description>Save button</description>
- <posx>0</posx>
- <posy>120</posy>
<label>190</label>
<textwidth>235</textwidth>
<include>ButtonCommonValues</include>
- <onleft>50</onleft>
- <onright>50</onright>
- <onup>26</onup>
- <ondown>22</ondown>
</control>
<control type="button" id="22">
<description>Clear button</description>
- <posx>0</posx>
- <posy>160</posy>
<label>192</label>
- <onclick>ReplaceWindow(video)</onclick>
+ <onclick>ReplaceWindow(music)</onclick>
<textwidth>235</textwidth>
<include>ButtonCommonValues</include>
- <onleft>50</onleft>
- <onright>50</onright>
- <onup>21</onup>
- <ondown>610</ondown>
</control>
<control type="button" id="610">
<description>Fake Button to fix Player Controls Navigation</description>
- <onup>22</onup>
- <ondown>603</ondown>
<visible>false</visible>
</control>
- <control type="group">
- <posx>0</posx>
- <posy>260</posy>
- <include>CommonNowPlaying_Controls</include>
- </control>
+ <include>CommonNowPlaying_Controls</include>
<control type="button" id="611">
<description>Fake Button to fix Player Controls Navigation</description>
- <onup>608</onup>
- <ondown>2</ondown>
<visible>false</visible>
</control>
</control>