Changed: Lots of stuff for future building

4 files changed, 134 insertions, 281 deletions

diff --git a/addons/skin.confluence/720p/AddonBrowser.xml b/addons/skin.confluence/720p/AddonBrowser.xml
index b631461d52..3767088ed4 100644
--- a/addons/skin.confluence/720p/AddonBrowser.xml
+++ b/addons/skin.confluence/720p/AddonBrowser.xml
@@ -1,7 +1,7 @@
 <window id="40">
 	<defaultcontrol always="true">50</defaultcontrol>
 	<allowoverlay>no</allowoverlay>
-	<views>50,51,550</views>
+	<views>50,51,550,551</views>
 	<controls>
 		<include>CommonSettingsBackground</include>
 		<include>CommonMediaPlayingBackground</include>
@@ -78,80 +78,59 @@
 			<include>CommonRootView</include> <!-- view id = 50 -->
 			<include>FullWidthList</include> <!-- view id = 51 -->
 			<include>AddonInfoListView1</include> <!-- view id = 550 -->
+			<include>AddonInfoThumbView1</include> <!-- view id = 551 -->
 		</control>
 		<include>CommonPageCount</include>
 		<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>5</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>5</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">
-					<posx>0</posx>
-					<posy>90</posy>
+				<control type="label" id="201">
 					<width>250</width>
 					<height>45</height>
 					<font>font12caps</font>
-					<label>$LOCALIZE[24002]</label>
-					<textcolor>dialogheader</textcolor>
+					<label>31026</label>
+					<textcolor>blue</textcolor>
 					<align>center</align>
 					<aligny>center</aligny>
 				</control>
@@ -161,10 +140,6 @@
 					<posy>130</posy>
 					<include>ButtonCommonValues</include>
 					<label>24063</label>
-					<onleft>50</onleft>
-					<onright>50</onright>
-					<onup>3</onup>
-					<ondown>6</ondown>
 				</control>
 				<control type="radiobutton" id ="6">
 					<description>No notifications</description>
@@ -172,26 +147,14 @@
 					<posy>170</posy>
 					<include>ButtonCommonValues</include>
 					<label>25000</label>
-					<onleft>50</onleft>
-					<onright>50</onright>
-					<onup>5</onup>
-					<ondown>610</ondown>
 				</control>
 				<control type="button" id="610">
 					<description>Fake Button to fix Player Controls Navigation</description>
-					<onup>6</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/MyVideoNav.xml b/addons/skin.confluence/720p/MyVideoNav.xml
index b582c959d2..552ca1c567 100644
--- a/addons/skin.confluence/720p/MyVideoNav.xml
+++ b/addons/skin.confluence/720p/MyVideoNav.xml
@@ -195,46 +195,7 @@
 		<include>ScrollOffsetLabel</include>
 		<control type="group">
 			<posx>-250</posx>
-			<animation effect="slide" start="0,0" end="250,0" time="400" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | Control.HasFocus(9001) | Control.HasFocus(8999)">Conditional</animation>
-			<animation effect="slide" start="0,0" end="-300,0" time="400" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | Control.HasFocus(9001)">WindowClose</animation>
-			<animation effect="slide" start="-50,0" end="0,0" time="300" tween="quadratic" easing="out">WindowOpen</animation>
-			<control type="button" id="8999">
-				<description>Fake button for mouse control</description>
-				<posx>0</posx>
-				<posy>0</posy>
-				<width>250</width>
-				<height>720</height>
-				<label>-</label>
-				<font>-</font>
-				<texturenofocus>-</texturenofocus>
-				<texturefocus>-</texturefocus>
-				<visible>true</visible>
-			</control>
-			<control type="button" id="9001">
-				<posx>250</posx>
-				<posy>260</posy>
-				<width>42</width>
-				<height>128</height>
-				<font>-</font>
-				<texturefocus>HomeHasSub2.png</texturefocus>
-				<texturenofocus>HomeHasSub2.png</texturenofocus>
-			</control>
-			<control type="image">
-				<posx>0</posx>
-				<posy>0</posy>
-				<width>260</width>
-				<height>720</height>
-				<texture border="0,0,10,0">MediaBladeSub.png</texture>
-			</control>
-			<control type="image">
-				<description>LOGO</description>
-				<posx>15</posx>
-				<posy>50</posy>
-				<width>220</width>
-				<height>80</height>
-				<aspectratio>keep</aspectratio>
-				<texture>Confluence_Logo.png</texture>
-			</control>
+			<include>SideBladeLeft</include>
 			<control type="grouplist" id="9000">
 				<posx>0</posx>
 				<posy>110</posy>
diff --git a/addons/skin.confluence/720p/MyWeather.xml b/addons/skin.confluence/720p/MyWeather.xml
index 027b879a48..cc181f2d9d 100644
--- a/addons/skin.confluence/720p/MyWeather.xml
+++ b/addons/skin.confluence/720p/MyWeather.xml
@@ -4,6 +4,15 @@
 	<controls>
 		<include>CommonWeatherBackground</include>
 		<include>CommonMediaPlayingBackground</include>
+		<control type="image">
+			<posx>0</posx>
+			<posy>100r</posy>
+			<width>1280</width>
+			<height>100</height>
+			<texture>floor.png</texture>
+			<include>VisibleFadeEffect</include>
+		</control>
+		<include>CommonPageCount</include>
 		<control type="group">
 			<animation type="WindowOpen" reversible="false">
 				<effect type="zoom" start="80" end="100" center="640,360" easing="out" tween="back" time="300" />
@@ -13,11 +22,10 @@
 				<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>			
-			<visible>!Window.IsVisible(script-twc-main.xml)</visible>
 			<include>VisibleFadeEffect</include>
 			<control type="group">
 				<posx>100</posx>
-				<posy>50</posy>
+				<posy>40</posy>
 				<control type="image">
 					<posx>0</posx>
 					<posy>0</posy>
@@ -26,8 +34,15 @@
 					<texture border="20">ContentPanel.png</texture>
 				</control>
 				<control type="image">
+					<posx>0</posx>
+					<posy>612</posy>
+					<width>500</width>
+					<height>64</height>
+					<texture border="10">ContentPanelMirror.png</texture>
+				</control>
+				<control type="image">
 					<posx>20</posx>
-					<posy>10</posy>
+					<posy>5</posy>
 					<width>460</width>
 					<height>90</height>
 					<aspectratio>stretch</aspectratio>
@@ -36,7 +51,7 @@
 				<control type="label">
 					<description>header label</description>
 					<posx>20</posx>
-					<posy>18</posy>
+					<posy>13</posy>
 					<width>460</width>
 					<height>30</height>
 					<font>font13_title</font>
@@ -260,7 +275,7 @@
 			</control>
 			<control type="group">
 				<posx>680</posx>
-				<posy>50</posy>
+				<posy>40</posy>
 				<control type="image">
 					<posx>0</posx>
 					<posy>0</posy>
@@ -269,8 +284,15 @@
 					<texture border="20">ContentPanel.png</texture>
 				</control>
 				<control type="image">
+					<posx>0</posx>
+					<posy>612</posy>
+					<width>500</width>
+					<height>64</height>
+					<texture border="10">ContentPanelMirror.png</texture>
+				</control>
+				<control type="image">
 					<posx>20</posx>
-					<posy>10</posy>
+					<posy>5</posy>
 					<width>460</width>
 					<height>90</height>
 					<aspectratio>stretch</aspectratio>
@@ -279,7 +301,7 @@
 				<control type="label">
 					<description>header label</description>
 					<posx>20</posx>
-					<posy>18</posy>
+					<posy>13</posy>
 					<width>460</width>
 					<height>30</height>
 					<font>font13_title</font>
@@ -681,131 +703,44 @@
 			</control>
 		</control>
 		<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>200</posy>
-					<width>40</width>
-					<height>40</height>
-					<texture>MediaSubSet.png</texture>
-				</control>
-				<control type="grouplist" id="9010">
-					<posx>10</posx>
-					<posy>250</posy>
-					<width>240</width>
-					<height>550</height>
-					<onleft>9000</onleft>
-					<onright>50</onright>
-					<onup>9010</onup>
-					<ondown>9010</ondown>
-					<itemgap>0</itemgap>
-					<control type="radiobutton" id="200">
-						<description>Fanart Toggle</description>
-						<textwidth>170</textwidth>
-						<include>ButtonMediaSubCommonValues</include>
-						<label>31307</label>
-						<onclick>Skin.ToggleSetting(ShowWeatherFanart)</onclick>
-						<selected>!Skin.HasSetting(ShowWeatherFanart)</selected>
-					</control>
-					<control type="button" id="201">
-						<description>Search</description>
-						<textwidth>170</textwidth>
-						<include>ButtonMediaSubCommonValues</include>
-						<label>31317</label>
-						<onclick>Skin.SetPath(WeatherFanartDir)</onclick>
-						<enable>Skin.HasSetting(ShowWeatherFanart)</enable>
-					</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>31027</label>
+					<textcolor>blue</textcolor>
+					<align>center</align>
+					<aligny>center</aligny>
+				</control>
 				<control type="spincontrolex" id="3">
 					<description>change location button</description>
 					<posx>0</posx>
 					<posy>0</posy>
-					<font>-</font>
-					<textoffsetx>10</textoffsetx>
 					<include>ButtonCommonValues</include>
 					<onleft>50</onleft>
 					<onright>50</onright>
 					<onup>611</onup>
 					<ondown>2</ondown>
 				</control>
-				<control type="label">
-					<description>change location label</description>
-					<posx>10</posx>
-					<posy>0</posy>
-					<height>40</height>
-					<width>270</width>
-					<font>font13caps</font>
-					<label>31027</label>
-					<textcolor>white</textcolor>
-					<shadowcolor>black</shadowcolor>
-					<align>left</align>
+				<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="2">
@@ -815,10 +750,6 @@
 					<textwidth>235</textwidth>
 					<include>ButtonCommonValues</include>
 					<label>103</label>
-					<onleft>50</onleft>
-					<onright>50</onright>
-					<onup>3</onup>
-					<ondown>5</ondown>
 				</control>
 				<control type="button" id="5">
 					<description>Custom Weather Script Button</description>
@@ -831,10 +762,6 @@
 					<textwidth>235</textwidth>
 					<include>ButtonCommonValues</include>
 					<visible>Skin.HasSetting(WeatherScript_Enable) + !IsEmpty(Skin.String(WeatherScript_Label))</visible>
-					<onleft>50</onleft>
-					<onright>50</onright>
-					<onup>2</onup>
-					<ondown>4</ondown>
 				</control>
 				<control type="button" id="4">
 					<description>Settings button</description>
@@ -844,46 +771,28 @@
 					<onclick>ActivateWindow(MyWeatherSettings)</onclick>
 					<textwidth>235</textwidth>
 					<include>ButtonCommonValues</include>
-					<onleft>50</onleft>
-					<onright>50</onright>
-					<onup>5</onup>
-					<ondown>98</ondown>
-					<animation effect="slide" end="0,-40" time="0" condition="!Control.IsVisible(5)">Conditional</animation>
 				</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>
+				<control type="radiobutton" id="250">
+					<description>Fanart Toggle</description>
 					<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>4</onup>
-					<ondown>610</ondown>
-					<animation effect="slide" end="0,-40" time="0" condition="!Control.IsVisible(5)">Conditional</animation>
+					<label>31307</label>
+					<onclick>Skin.ToggleSetting(ShowWeatherFanart)</onclick>
+					<selected>!Skin.HasSetting(ShowWeatherFanart)</selected>
+				</control>
+				<control type="button" id="251">
+					<description>Search</description>
+					<include>ButtonCommonValues</include>
+					<label>31317</label>
+					<onclick>Skin.SetPath(WeatherFanartDir)</onclick>
+					<enable>Skin.HasSetting(ShowWeatherFanart)</enable>
 				</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>3</ondown>
 					<visible>false</visible>
 				</control>
 			</control>
@@ -897,7 +806,7 @@
 			<visible allowhiddenfocus="true">false</visible>
 		</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/includes.xml b/addons/skin.confluence/720p/includes.xml
index fb522759b8..ac3c5ad551 100644
--- a/addons/skin.confluence/720p/includes.xml
+++ b/addons/skin.confluence/720p/includes.xml
@@ -303,30 +303,50 @@
 		</control>
 	</include>
 	<include name="SideBladeLeft">
-		<control type="image">
-			<posx>-295</posx>
+		<animation effect="slide" start="0,0" end="250,0" time="400" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | Control.HasFocus(9001) | Control.HasFocus(8999)">Conditional</animation>
+		<animation effect="slide" start="0,0" end="-300,0" time="400" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | Control.HasFocus(9001)">WindowClose</animation>
+		<animation effect="slide" start="-50,0" end="0,0" time="300" tween="quadratic" easing="out">WindowOpen</animation>
+		<control type="button" id="8999">
+			<description>Fake button for mouse control</description>
+			<posx>0</posx>
 			<posy>0</posy>
-			<width>300</width>
+			<width>250</width>
 			<height>720</height>
-			<texture border="0,0,10,0">MediaBladeSub.png</texture>
-			<animation effect="slide" start="-26,0" end="0,0" time="300" tween="quadratic" easing="out">WindowOpen</animation>
-			<animation effect="slide" start="0,0" end="-26,0" time="200" delay="200" tween="quadratic" easing="out">WindowClose</animation>
+			<label>-</label>
+			<font>-</font>
+			<texturenofocus>-</texturenofocus>
+			<texturefocus>-</texturefocus>
+			<visible>true</visible>
 		</control>
-		<control type="button" id="9002">
-			<posx>5</posx>
+		<control type="button" id="9001">
+			<posx>250</posx>
 			<posy>260</posy>
 			<width>42</width>
 			<height>128</height>
 			<font>-</font>
 			<texturefocus>HomeHasSub2.png</texturefocus>
 			<texturenofocus>HomeHasSub2.png</texturenofocus>
-			<animation effect="slide" start="-26,0" end="0,0" time="300" tween="quadratic" easing="out">WindowOpen</animation>
-			<animation effect="slide" start="0,0" end="-26,0" time="200" delay="200" tween="quadratic" easing="out">WindowClose</animation>
+		</control>
+		<control type="image">
+			<posx>0</posx>
+			<posy>0</posy>
+			<width>260</width>
+			<height>720</height>
+			<texture border="0,0,10,0">MediaBladeSub.png</texture>
+		</control>
+		<control type="image">
+			<description>LOGO</description>
+			<posx>15</posx>
+			<posy>50</posy>
+			<width>220</width>
+			<height>80</height>
+			<aspectratio>keep</aspectratio>
+			<texture>Confluence_Logo.png</texture>
 		</control>
 	</include>
 	<include name="CommonPageCount">
 		<control type="image">
-			<description>gradient</description>
+			<description>Icon</description>
 			<posx>30</posx>
 			<posy>56r</posy>
 			<width>50</width>