- use latest improvments in test4.xml

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