[Estuary] rework LoginScreen

2 files changed, 96 insertions, 101 deletions

diff --git a/addons/skin.estuary/media/icons/profiles/profile-diffuse.png b/addons/skin.estuary/media/icons/profiles/profile-diffuse.png
new file mode 100644
index 0000000000..44ffe35693
--- /dev/null
+++ b/addons/skin.estuary/media/icons/profiles/profile-diffuse.png
diff --git a/addons/skin.estuary/xml/LoginScreen.xml b/addons/skin.estuary/xml/LoginScreen.xml
index f92e539c73..14288de727 100644
--- a/addons/skin.estuary/xml/LoginScreen.xml
+++ b/addons/skin.estuary/xml/LoginScreen.xml
@@ -4,137 +4,132 @@
 	<controls>
 		<include>DefaultBackground</include>
 		<control type="group">
-			<include>OpenClose_Right</include>
-			<control type="image">
-				<description>LOGO</description>
-				<left>1240</left>
-				<top>280</top>
-				<width>112</width>
+			<include>Animation_TopSlide</include>
+			<control type="group">
+				<centerleft>50%</centerleft>
+				<top>160</top>
+				<width>250</width>
 				<height>112</height>
-				<aspectratio aligny="top" align="center">keep</aspectratio>
-				<texture colordiffuse="button_focus">icons/logo.png</texture>
-			</control>
-			<control type="image">
-				<left>1400</left>
-				<top>316</top>
-				<width>112</width>
-				<height>36</height>
-				<texture>icons/logo-text.png</texture>
+				<control type="image">
+					<width>112</width>
+					<height>112</height>
+					<aspectratio aligny="top" align="center">keep</aspectratio>
+					<texture colordiffuse="button_focus">icons/logo.png</texture>
+				</control>
+				<control type="image">
+					<left>138</left>
+					<top>0</top>
+					<width>112</width>
+					<height>112</height>
+					<aspectratio aligny="center" align="center">keep</aspectratio>
+					<texture>icons/logo-text.png</texture>
+				</control>
 			</control>
 			<control type="textbox">
-				<left>1015</left>
-				<top>390</top>
+				<centerleft>50%</centerleft>
+				<top>220</top>
 				<width>750</width>
 				<height>300</height>
 				<align>center</align>
 				<aligny>center</aligny>
+				<textcolor>99FFFFFF</textcolor>
 				<font>font14</font>
 				<label>$LOCALIZE[31098]</label>
 			</control>
-			<control type="button" id="20">
-				<description>Power push button</description>
-				<left>1150</left>
-				<top>690</top>
-				<width>500</width>
-				<height>130</height>
-				<label>$LOCALIZE[31072]</label>
-				<font>font12</font>
-				<align>center</align>
-				<onclick>ActivateWindow(ShutdownMenu)</onclick>
-				<onleft>52</onleft>
-				<onright>52</onright>
-				<onup>52</onup>
-				<ondown>52</ondown>
-				<colordiffuse>CCFFFFFF</colordiffuse>
-			</control>
 		</control>
 		<control type="group">
-			<include>OpenClose_Left</include>
-			<include content="ContentPanel">
-				<param name="width" value="820" />
-				<param name="left" value="-24" />
-			</include>
+			<include>Animation_BottomSlide</include>
 			<control type="fixedlist" id="52">
 				<left>0</left>
-				<top>list_y_offset</top>
-				<width>775</width>
-				<bottom>list_y_offset</bottom>
-				<onleft>20</onleft>
-				<onright>20</onright>
-				<focusposition>1</focusposition>
-				<movement>0</movement>
-				<onup>52</onup>
-				<ondown>52</ondown>
-				<pagecontrol>60</pagecontrol>
+				<right>0</right>
+				<top>500</top>
+				<height>300</height>
+				<onleft>52</onleft>
+				<onright>52</onright>
+				<onup>20</onup>
+				<ondown>20</ondown>
+				<focusposition>2</focusposition>
+				<orientation>horizontal</orientation>
 				<scrolltime tween="cubic" easing="out">500</scrolltime>
-				<itemlayout height="130" width="775">
+				<itemlayout width="384" height="300">
 					<control type="image">
-						<left>10</left>
-						<top>10</top>
-						<width>110</width>
-						<height>110</height>
-						<texture fallback="DefaultUser.png">$INFO[ListItem.Icon]</texture>
-						<aspectratio>keep</aspectratio>
-					</control>
-					<control type="label">
-						<left>130</left>
-						<top>14</top>
-						<right>20</right>
-						<height>60</height>
-						<font>font37</font>
-						<aligny>center</aligny>
-						<label>$INFO[ListItem.Label]</label>
+						<centerleft>50%</centerleft>
+						<top>20</top>
+						<height>200</height>
+						<width>200</width>
+						<texture diffuse="icons/profiles/profile-diffuse.png">$INFO[ListItem.Icon]</texture>
+						<aspectratio scalediffuse="false">scale</aspectratio>
 					</control>
-					<control type="label">
-						<left>130</left>
-						<top>58</top>
-						<right>20</right>
-						<height>50</height>
-						<font>font12</font>
-						<textcolor>grey</textcolor>
+					<control type="textbox">
+						<left>60</left>
+						<right>60</right>
+						<top>220</top>
+						<height>80</height>
+						<label>$INFO[ListItem.label]</label>
+						<font>font27</font>
+						<align>center</align>
 						<aligny>center</aligny>
-						<label>$INFO[ListItem.Label2]</label>
+						<textcolor>99FFFFFF</textcolor>
 					</control>
 				</itemlayout>
-				<focusedlayout height="130" width="775">
+				<focusedlayout width="384" height="300">
 					<control type="image">
-						<left>0</left>
-						<top>0</top>
-						<right>0</right>
-						<bottom>0</bottom>
-						<texture colordiffuse="button_focus">lists/focus.png</texture>
+						<left>30</left>
+						<top>-20</top>
+						<right>30</right>
+						<bottom>-20</bottom>
+						<texture border="30" colordiffuse="button_focus">buttons/dialogbutton-fo.png</texture>
 						<visible>Control.HasFocus(52)</visible>
+						<animation reversible="false" effect="fade" start="20" end="75" time="200">Focus</animation>
 					</control>
 					<control type="image">
-						<left>10</left>
-						<top>10</top>
-						<width>110</width>
-						<height>110</height>
-						<texture fallback="DefaultUser.png">$INFO[ListItem.Icon]</texture>
-						<aspectratio>keep</aspectratio>
-					</control>
-					<control type="label">
-						<left>130</left>
-						<top>14</top>
-						<right>20</right>
-						<height>60</height>
-						<font>font37</font>
-						<aligny>center</aligny>
-						<label>$INFO[ListItem.Label]</label>
+						<centerleft>50%</centerleft>
+						<top>20</top>
+						<height>200</height>
+						<width>200</width>
+						<texture diffuse="icons/profiles/profile-diffuse.png">$INFO[ListItem.Icon]</texture>
+						<aspectratio scalediffuse="false">scale</aspectratio>
 					</control>
-					<control type="label">
-						<left>130</left>
-						<top>58</top>
-						<right>20</right>
-						<height>50</height>
-						<font>font12</font>
+					<control type="textbox">
+						<left>60</left>
+						<right>60</right>
+						<top>220</top>
+						<height>80</height>
+						<label>[B]$INFO[ListItem.label][/B]</label>
+						<font>font27</font>
+						<align>center</align>
 						<aligny>center</aligny>
-						<label>$INFO[ListItem.Label2]</label>
 					</control>
 				</focusedlayout>
 			</control>
+			<control type="label">
+				<left>0</left>
+				<right>0</right>
+				<top>860</top>
+				<height>45</height>
+				<font>font25_narrow</font>
+				<textcolor>80FFFFFF</textcolor>
+				<align>center</align>
+				<aligny>center</aligny>
+				<label>$INFO[ListItem.label2]</label>
+			</control>
+			<control type="button" id="20">
+				<centerleft>50%</centerleft>
+				<bottom>20</bottom>
+				<width>500</width>
+				<height>130</height>
+				<label>$LOCALIZE[31072]</label>
+				<font>font12</font>
+				<align>center</align>
+				<onclick>ActivateWindow(ShutdownMenu)</onclick>
+				<onleft>52</onleft>
+				<onright>52</onright>
+				<onup>52</onup>
+				<ondown>52</ondown>
+				<texturefocus border="40" colordiffuse="button_focus">buttons/dialogbutton-fo.png</texturefocus>
+				<texturenofocus border="40">buttons/dialogbutton-nofo.png</texturenofocus>
+			</control>
 		</control>
 		<include>TopBar</include>
-		<include>BottomBar</include>
 	</controls>
 </window>