From 6554ed885c43de414c01474e6b29a1af254c6632 Mon Sep 17 00:00:00 2001
From: jpbruyere <jp.bruyere@hotmail.com>
Date: Mon, 22 Dec 2014 08:24:43 +0100
Subject: [PATCH] - use latest improvments in test4.xml

---
 Tests/Interfaces/test4.xml | 163 +++++++++++++++++++++----------------
 1 file changed, 93 insertions(+), 70 deletions(-)

diff --git a/Tests/Interfaces/test4.xml b/Tests/Interfaces/test4.xml
index b015b4b1..fdcd988d 100755
--- a/Tests/Interfaces/test4.xml
+++ b/Tests/Interfaces/test4.xml
@@ -1,75 +1,98 @@
 <?xml version="1.0"?>
-<Group Name="MainGrp" Background="0,5;0,5;0,5;0,5" Foreground="White"
-	 Margin="10" Focusable="True" Width="800" Height="500">
-	<Slider Height="10" Width="300" BorderWidth="1" Background="Transparent"
-		VerticalAlignment="Bottom" />
-	<HorizontalStack WidgetSpacing="10" Name="hs0" VerticalAlignment="Top" Background="0,5;0,5;0,5;0,5">
-		<VerticalStack Name="vs1" BorderWidth="1" Margin="20">
-			<Label Name="labMouse" Text="MousePos"/>
-			<HorizontalStack Name="hsPbar">
-				<ProgressBar Name="pbBar" Width="100" Height="20" Value="50"
-							BorderWidth="2" BorderColor="White" Foreground="BlueCrayola" Background="DarkGray"/>
-				<Label Name="labPb" Width="20" TextAlignment="RightCenter"/>
-				<ProgressBar Name="pbBar" Width="100" Height="10" Value="30"/>
-			</HorizontalStack>
-			<HorizontalStack  Name="hsFocus">
-				<Label Text="Focused:"/>
-				<Label Name="labFocus" Width="200"/>
-			</HorizontalStack>
-			<HorizontalStack>
-				<Label Text="Active:"  Name="hsActive"/>
-				<Label Name="labActive" Width="200"/>
-			</HorizontalStack>
-			<HorizontalStack>
-				<Label Text="Hover:"  Name="hsHover"/>
-				<Label Name="labHover" Width="200"/>
-			</HorizontalStack>
-			<Button Margin="5" BorderWidth="0" Background="Gray" Width="-1" Height="-1">
-				<Label FontSize="10" Text="This is a test" Margin="5" FontColor="White" Foreground="White" />
-			</Button>
-			<TextBoxWidget 	TextAlignment="LeftCenter" Font="droid,14"						
-							Width="300" Height="-1" Margin="2"
-							BorderColor="White" BorderWidth="1"
-							Text="editable text"/>
-			<GroupBox Title="Group Box" Width="300" Height="100" 
-				BorderColor="White" BorderWidth="2" Margin="3">
-				<Label Name="labValue" FontSize="14" Text="000"	TextAlignment="Center"/>
-			</GroupBox>
-			<Slider Height="10" Width="300" BorderWidth="1" Background="Transparent" />
-			<GraduatedSlider Name="slider" Height="30" Width="300" Foreground="BlueBell"/>
-		</VerticalStack>
-		<VerticalStack Width="-1" Height="-1" BorderWidth="1" Focusable="False" Margin="5" WidgetSpacing="4">
-			<Button Width="-1" Height="-1" Margin="5" BorderWidth="1" Background="Gray">
-				<Image Path="/mnt/data/Images/130px-Blason_ville_fr_Aubure_(Haut-Rhin).svg.png"/>
-			</Button>
-			<HorizontalStack>
-				<Label Text="Update" FontColor="White" VerticalAlignment="Center" />
-				<Label Name="labUpdate" Text="xxxx" FontSize="16" Width="60" TextAlignment="Center" Background="DarkGreen"/>
-			</HorizontalStack>
-			<HorizontalStack>
-				<Label Text="Fps:" Width = "30" VerticalAlignment="Center"  TextAlignment="LeftCenter"/>
-				<Label Name="labFps" Text="xxxx" Font="droid bold, 14"
-					TextAlignment="Center" Background="AoEnglish"/>
-			</HorizontalStack>
-			<HorizontalStack>
-				<Label Text="Min:" Width = "30" />
-				<Label Name="labFpsMin" Text="xxxx" Font="droid bold, 14"
-					TextAlignment="Center" Background="AoEnglish"/>
-			</HorizontalStack>
-			<HorizontalStack>
-				<Label Text="Max:" Width = "30"/>
-				<Label Name="labFpsMax" Text="xxxx" Font="droid bold, 14"
-					TextAlignment="Center" Background="AoEnglish"/>
-			</HorizontalStack>
-		</VerticalStack>
+<Group Name="MainGrp"
+	Width="800" Height="500"
+	Background="0,5;0,5;0,5;0,5" Foreground="White"
+	Margin="10" >
+	<Border 
+		BorderWidth="2" BorderColor="Transparent"
+		Focusable="True"
+		MouseEnter="{BorderColor = White}"
+		MouseLeave="{BorderColor = Transparent}">
 
-		<Scroller Background="DimGray" Height="350" Width="300"  
-			 Margin="5" VerticalScrolling="true">
-			<VerticalStack Name="colors" VerticalAlignment="Top" Margin="5">
-				<ProgressBar Name="pbBar2" Width="100" Height="20" Value="50"
-							BorderWidth="2" BorderColor="White" Foreground="BlueCrayola" Background="DarkGray"/>
+		<HorizontalStack Name="hs0"
+			WidgetSpacing="10" 
+			VerticalAlignment="Top" 
+			Background="0,5;0,5;0,5;0,5">
+			<VerticalStack Name="vs1"
+				Margin="20">
+				<Label Name="labMouse" Text="MousePos"/>
+				<HorizontalStack Name="hsPbar">
+					<ProgressBar Name="pbBar" 
+						Width="100" Height="20"
+						Value="50"
+						Foreground="BlueCrayola" Background="DarkGray"
+						BorderWidth="2" BorderColor="White"/>
+					<Label Name="labPb"
+						Width="20"
+						TextAlignment="RightCenter"/>
+					<ProgressBar Name="pbBar"
+						Width="100" Height="10"
+						Value="30"/>
+				</HorizontalStack>
+				<HorizontalStack  Name="hsFocus">
+					<Label Text="Focused:"/>
+					<Label Name="labFocus" Width="200"/>
+				</HorizontalStack>
+				<HorizontalStack>
+					<Label Text="Active:"  Name="hsActive"/>
+					<Label Name="labActive" Width="200"/>
+				</HorizontalStack>
+				<HorizontalStack>
+					<Label Text="Hover:"  Name="hsHover"/>
+					<Label Name="labHover" Width="200"/>
+				</HorizontalStack>
+				<Button Margin="5" BorderWidth="0" Background="Gray" Width="-1" Height="-1">
+					<Label FontSize="10" Text="This is a test" Margin="5" FontColor="White" Foreground="White" />
+				</Button>
+				<TextBoxWidget 	TextAlignment="LeftCenter" Font="droid,14"						
+								Width="300" Height="-1" Margin="2"
+								BorderColor="White" BorderWidth="1"
+								Text="editable text"/>
+				<GroupBox Title="Group Box" Width="300" Height="100" 
+					BorderColor="White" BorderWidth="2" Margin="3">
+					<Label Name="labValue" FontSize="14" Text="000"	TextAlignment="Center"/>
+				</GroupBox>
+				<Slider Height="10" Width="300" BorderWidth="1" Background="Transparent" />
+				<GraduatedSlider Name="slider" Height="30" Width="300" Foreground="BlueBell"/>
 			</VerticalStack>
-		</Scroller>
+			<VerticalStack Width="-1" Height="-1" BorderWidth="1" Margin="5" WidgetSpacing="4">
+				<Button Width="-1" Height="-1" Margin="5">
+					<Image Path="/mnt/data/Images/130px-Blason_ville_fr_Aubure_(Haut-Rhin).svg.png"/>
+				</Button>
+				<HorizontalStack>
+					<Label Text="Update" FontColor="White" VerticalAlignment="Center" />
+					<Label Name="labUpdate" Text="xxxx" FontSize="16" Width="60" TextAlignment="Center" Background="DarkGreen"/>
+				</HorizontalStack>
+				<HorizontalStack>
+					<Label Text="Fps:" Width = "30" VerticalAlignment="Center"  TextAlignment="LeftCenter"/>
+					<Label Name="labFps" Text="xxxx" Font="droid bold, 14"
+						TextAlignment="Center" Background="AoEnglish"/>
+				</HorizontalStack>
+				<HorizontalStack>
+					<Label Text="Min:" Width = "30" />
+					<Label Name="labFpsMin" Text="xxxx" Font="droid bold, 14"
+						TextAlignment="Center" Background="AoEnglish"/>
+				</HorizontalStack>
+				<HorizontalStack>
+					<Label Text="Max:" Width = "30"/>
+					<Label Name="labFpsMax" Text="xxxx" Font="droid bold, 14"
+						TextAlignment="Center" Background="AoEnglish"/>
+				</HorizontalStack>
+			</VerticalStack>
+
+			<Scroller Background="DimGray" Height="350" Width="300"  
+				 Margin="5" VerticalScrolling="true">
+				<VerticalStack Name="colors" VerticalAlignment="Top" Margin="5">
+					<ProgressBar Name="pbBar2" Width="100" Height="20" Value="50"
+								BorderWidth="2" BorderColor="White" Foreground="BlueCrayola" Background="DarkGray"/>
+				</VerticalStack>
+			</Scroller>
+
+		</HorizontalStack>
 
-	</HorizontalStack>
+		<Slider 
+			Height="20" Width="300" 
+			Background="Transparent"
+			VerticalAlignment="Bottom" />
+		</Border>
 </Group>
\ No newline at end of file
-- 
2.47.3