remove old colors name, debug Scrollers

diff --git a/Crow.Test/Interfaces/5.crow b/Crow.Test/Interfaces/5.crow
index b9b8ee29381127f7da8e9ec14dfe5f936dd5a989..7238ae45daccf74a6beea749410674377b06970f 100755 (executable)
--- a/Crow.Test/Interfaces/5.crow
+++ b/Crow.Test/Interfaces/5.crow
@@ -57,7 +57,7 @@
                <Spinner Value="100"  Width="0"/>
        </VerticalStack>
 </HorizontalStack>
-<!--<HorizontalStack Fit="true" Background="BlueCrayola" Margin="5">
+<!--<HorizontalStack Fit="true" Background="RoyalBlue" Margin="5">
        <GraphicObject Background="Red" Width="30" Height="20"/>
        <Spinner Maximum="10000000000" SmallIncrement="10" Value="0"/>
        <GraphicObject Background="Green" Width="30" Height="20"/>

diff --git a/Images/screenshot.png b/Images/screenshot.png
index e2f802f2f7177c4fc6b361d80196cb89e6a84cde..3540d6b1a6bcf75712f0d9a514fc18e0841a9d13 100644 (file)
Binary files a/Images/screenshot.png and b/Images/screenshot.png differ

diff --git a/Templates/FileItems.template b/Templates/FileItems.template
index 99d7b6a9582aced73bb37bac3b4ab1234f7e71a7..452a402adf52ffcdddb98e61b171e95470c39977 100644 (file)
--- a/Templates/FileItems.template
+++ b/Templates/FileItems.template
@@ -6,14 +6,14 @@
                <Image Margin="2" Width="16" Height="16"
                        Path="#Crow.Icons.file.svg"/>
                        <Label Text="{Name}" Width="Stretched"
-                               MouseEnter="{Background=BlueCrayola}"
+                               MouseEnter="{Background=RoyalBlue}"
                                MouseLeave="{Background=Transparent}"/>
        </HorizontalStack>
 </ItemTemplate>
 <ItemTemplate DataType="System.IO.DirectoryInfo">
        <Border Foreground="Transparent" Focusable="true" Height="Fit">
                <HorizontalStack
-                               MouseEnter="{Background=BlueCrayola}"
+                               MouseEnter="{Background=RoyalBlue}"
                                MouseLeave="{Background=Transparent}">
                        <Image Margin="2" Width="16" Height="16"
                                Path="#Crow.Icons.folder.svg"/>

diff --git a/Templates/ScrollingListBox.template b/Templates/ScrollingListBox.template
index 3b098df28c63a30bf653a7cf22113a9647610c65..1e7304f04f87689c0cf64e16dbe188c1764faa93 100644 (file)
--- a/Templates/ScrollingListBox.template
+++ b/Templates/ScrollingListBox.template
@@ -2,13 +2,13 @@
 <Border BorderWidth="1" Background="{./Background}">
        <HorizontalStack Margin="1">
                <Scroller Name="scroller1" 
-                               Margin="2" ScrollY="{../scrollbar1.Value}">
+                               Margin="2">
                        <VerticalStack Height="Fit" MinimumSize="10,10"
                                Name="ItemsContainer" Margin="0" VerticalAlignment="Top"/>
                </Scroller>
                <ScrollBar Name="scrollbar1" Value="{²../scroller1.ScrollY}"
                        LargeIncrement="{../scroller1.PageHeight}" SmallIncrement="30" CursorSize="{../scroller1.ChildHeightRatio}"
-                       Maximum="{../scroller1.MaximumScroll}" Orientation="Vertical" 
+                       Maximum="{../scroller1.MaxScrollY}" Orientation="Vertical" 
                        Width="14" />
        </HorizontalStack>
 </Border>

diff --git a/Templates/imgItem.template b/Templates/imgItem.template
index c08f390e30cf37fbe34e0150c7d653c16e59dbab..9dbf23d5f7eea4a531da361b23f7ea0ae471d22d 100755 (executable)
--- a/Templates/imgItem.template
+++ b/Templates/imgItem.template
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
        <VerticalStack Width="0" Height="-1" Focusable="true"                   
-                       MouseEnter="{Background=BlueCrayola}"
+                       MouseEnter="{Background=RoyalBlue}"
                        MouseLeave="{Background=Transparent}">
                <Image Width="-1" Height="-1" Path="{FullName}" MaximumSize="80,80"/>
                <Label Text="{Name}" Width="-1" Height="-1" Margin="0" MaximumSize="100,0"/>

diff --git a/Tests/Interfaces/Divers/0.crow b/Tests/Interfaces/Divers/0.crow
index afb7db06f65f147108c2f7f1d3dbe6b14f9cac83..d98668c01680db4e1af8dd352b0df17fcb72558b 100755 (executable)
--- a/Tests/Interfaces/Divers/0.crow
+++ b/Tests/Interfaces/Divers/0.crow
@@ -52,7 +52,7 @@
                        </HorizontalStack>
                        <HorizontalStack Height="Fit" Margin="5">
                                <Label Text="MouseEvents" Width="50%" Margin="3"
-                                       Background="DimGray"
+                                       Background="Jet"
                                        Foreground="DimGray"
                                        TextAlignment="Center"
                                        MouseEnter="{Foreground=White}"
@@ -60,9 +60,9 @@
                                        MouseDown="{Background=DarkRed}"
                                        MouseClick="{Foreground=Green}"
                                        MouseDoubleClick="{Foreground=Yellow}"
-                                       MouseUp="{Background=DimGray}"/>
+                                       MouseUp="{Background=Jet}"/>
                                <Label Text="MouseEvents" Width="50%" Margin="3"
-                                       Background="DimGray"
+                                       Background="Jet"
                                        Foreground="DimGray"
                                        TextAlignment="Center"
                                        MouseClick="{Foreground=Green}"

diff --git a/Tests/Interfaces/Divers/3.crow b/Tests/Interfaces/Divers/3.crow
index 84d8a783c4c6871068cca1b9b2a66e860c7cc222..5ec5c69620b9ae23e0dcaa8776a38c4b230b64cd 100755 (executable)
--- a/Tests/Interfaces/Divers/3.crow
+++ b/Tests/Interfaces/Divers/3.crow
@@ -5,373 +5,373 @@
                <HorizontalStack Fit="true">
                        <Label Text="Memory:" Width="50" TextAlignment="Right"/>
                        <Label Text="{memory}" Font="droid,12" TextAlignment="Center"
-                               Background="vgradient|0:BlueCrayola|1:Black"/>
+                               Background="vgradient|0:RoyalBlue|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Update:" Width="50" TextAlignment="Right"/>
                        <Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Layouting:" Width="50" TextAlignment="Right"/>
                        <Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Drawing:" Width="50" TextAlignment="Right"/>
                        <Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
                        <Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Min:" Width="50" TextAlignment="Right"/>
                        <Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Max:" Width="50" TextAlignment="Right"/>
                        <Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Update:" Width="50" TextAlignment="Right"/>
                        <Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Layouting:" Width="50" TextAlignment="Right"/>
                        <Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Drawing:" Width="50" TextAlignment="Right"/>
                        <Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
                        <Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Min:" Width="50" TextAlignment="Right"/>
                        <Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Max:" Width="50" TextAlignment="Right"/>
                        <Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Update:" Width="50" TextAlignment="Right"/>
                        <Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Layouting:" Width="50" TextAlignment="Right"/>
                        <Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Drawing:" Width="50" TextAlignment="Right"/>
                        <Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
                        <Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Min:" Width="50" TextAlignment="Right"/>
                        <Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Max:" Width="50" TextAlignment="Right"/>
                        <Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
        </VerticalStack>
        <VerticalStack Fit="true" Name="vsFps"  Spacing="10" >
                <HorizontalStack Fit="true">
                        <Label Text="Update:" Width="50" TextAlignment="Right"/>
                        <Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Layouting:" Width="50" TextAlignment="Right"/>
                        <Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Drawing:" Width="50" TextAlignment="Right"/>
                        <Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
                        <Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Min:" Width="50" TextAlignment="Right"/>
                        <Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Max:" Width="50" TextAlignment="Right"/>
                        <Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Update:" Width="50" TextAlignment="Right"/>
                        <Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Layouting:" Width="50" TextAlignment="Right"/>
                        <Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Drawing:" Width="50" TextAlignment="Right"/>
                        <Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
                        <Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Min:" Width="50" TextAlignment="Right"/>
                        <Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Max:" Width="50" TextAlignment="Right"/>
                        <Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Update:" Width="50" TextAlignment="Right"/>
                        <Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Layouting:" Width="50" TextAlignment="Right"/>
                        <Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Drawing:" Width="50" TextAlignment="Right"/>
                        <Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
                        <Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Min:" Width="50" TextAlignment="Right"/>
                        <Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Max:" Width="50" TextAlignment="Right"/>
                        <Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
        </VerticalStack>
        <VerticalStack Fit="true" Name="vsFps"  Spacing="10" >
                <HorizontalStack Fit="true">
                        <Label Text="Update:" Width="50" TextAlignment="Right"/>
                        <Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Layouting:" Width="50" TextAlignment="Right"/>
                        <Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Drawing:" Width="50" TextAlignment="Right"/>
                        <Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
                        <Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Min:" Width="50" TextAlignment="Right"/>
                        <Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Max:" Width="50" TextAlignment="Right"/>
                        <Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Update:" Width="50" TextAlignment="Right"/>
                        <Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Layouting:" Width="50" TextAlignment="Right"/>
                        <Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Drawing:" Width="50" TextAlignment="Right"/>
                        <Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
                        <Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Min:" Width="50" TextAlignment="Right"/>
                        <Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Max:" Width="50" TextAlignment="Right"/>
                        <Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Update:" Width="50" TextAlignment="Right"/>
                        <Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Layouting:" Width="50" TextAlignment="Right"/>
                        <Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Drawing:" Width="50" TextAlignment="Right"/>
                        <Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
                        <Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Min:" Width="50" TextAlignment="Right"/>
                        <Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Max:" Width="50" TextAlignment="Right"/>
                        <Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
        </VerticalStack>
        <VerticalStack Fit="true" Name="vsFps"  Spacing="10" >
                <HorizontalStack Fit="true">
                        <Label Text="Update:" Width="50" TextAlignment="Right"/>
                        <Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Layouting:" Width="50" TextAlignment="Right"/>
                        <Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Drawing:" Width="50" TextAlignment="Right"/>
                        <Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
                        <Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Min:" Width="50" TextAlignment="Right"/>
                        <Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Max:" Width="50" TextAlignment="Right"/>
                        <Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Update:" Width="50" TextAlignment="Right"/>
                        <Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Layouting:" Width="50" TextAlignment="Right"/>
                        <Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Drawing:" Width="50" TextAlignment="Right"/>
                        <Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
                        <Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Min:" Width="50" TextAlignment="Right"/>
                        <Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Max:" Width="50" TextAlignment="Right"/>
                        <Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Update:" Width="50" TextAlignment="Right"/>
                        <Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Layouting:" Width="50" TextAlignment="Right"/>
                        <Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Drawing:" Width="50" TextAlignment="Right"/>
                        <Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
                        <Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Min:" Width="50" TextAlignment="Right"/>
                        <Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
                <HorizontalStack Fit="true">
                        <Label Text="Max:" Width="50" TextAlignment="Right"/>
                        <Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-                               Background="vgradient|0:AoEnglish|1:Black"/>
+                               Background="vgradient|0:SeaGreen|1:Black"/>
                </HorizontalStack>
        </VerticalStack>
 </HorizontalStack>
\ No newline at end of file

diff --git a/Tests/Interfaces/Divers/5.crow b/Tests/Interfaces/Divers/5.crow
index 34ee42c39602a671edd83229a2a8420787998a65..53040f93a4564d4bcf37fece990720aba375c8ae 100755 (executable)
--- a/Tests/Interfaces/Divers/5.crow
+++ b/Tests/Interfaces/Divers/5.crow
@@ -57,7 +57,7 @@
                <Spinner Value="100"  Width="Stretched"/>
        </VerticalStack>-->
 </HorizontalStack>
-<!--<HorizontalStack Fit="true" Background="BlueCrayola" Margin="5">
+<!--<HorizontalStack Fit="true" Background="RoyalBlue" Margin="5">
        <GraphicObject Background="Red" Width="30" Height="20"/>
        <Spinner Maximum="10000000000" SmallIncrement="10" Value="0"/>
        <GraphicObject Background="Green" Width="30" Height="20"/>

diff --git a/Tests/Interfaces/Divers/clip0.crow b/Tests/Interfaces/Divers/clip0.crow
index 2ebea9ff56447288b0b67f4e9eb1b93c0613f382..8cdf459bdceee3502c0c65ae38605195dcf380e9 100755 (executable)
--- a/Tests/Interfaces/Divers/clip0.crow
+++ b/Tests/Interfaces/Divers/clip0.crow
@@ -5,6 +5,6 @@
                MouseLeave="{Background=LimeGreen}">
        <Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="false"
                MouseEnter="{Background=DimGray}" Width="100"
-               MouseLeave="{Background=BlueCrayola}"
-               Margin="10" Text="{drawing}" Background="BlueCrayola"/>
+               MouseLeave="{Background=RoyalBlue}"
+               Margin="10" Text="{drawing}" Background="RoyalBlue"/>
  </Container>
\ No newline at end of file

diff --git a/Tests/Interfaces/Divers/clip1.crow b/Tests/Interfaces/Divers/clip1.crow
index 4aeb7fdeb833a0999763e6bacba655348e83fdfe..1e202d90a1d515967d38e63c7eeeb04eeb62f185 100755 (executable)
--- a/Tests/Interfaces/Divers/clip1.crow
+++ b/Tests/Interfaces/Divers/clip1.crow
@@ -17,8 +17,8 @@
                                                MouseLeave="{Background=LimeGreen}">
                                        <Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true"
                                                MouseEnter="{Background=DimGray}"
-                                               MouseLeave="{Background=BlueCrayola}" 
-                                               Margin="1" Text="{drawing}" Background="BlueCrayola"/>
+                                               MouseLeave="{Background=RoyalBlue}" 
+                                               Margin="1" Text="{drawing}" Background="RoyalBlue"/>
                                </Container>
                        </Container>
                </Container>

diff --git a/Tests/Interfaces/Divers/clip2.crow b/Tests/Interfaces/Divers/clip2.crow
index 4f95bf90459654456501217b3f5d0917ed24b993..198d9113e661e8c0b204ef7ee07c50f4c8e8dfee 100755 (executable)
--- a/Tests/Interfaces/Divers/clip2.crow
+++ b/Tests/Interfaces/Divers/clip2.crow
@@ -9,7 +9,7 @@
                MouseLeave="{Background=LimeGreen}">
        <Label Left="10" HorizontalAlignment="Right" VerticalAlignment="Center" CacheEnabled="true"
                MouseEnter="{Background=DimGray}" Width="100"
-               MouseLeave="{Background=BlueCrayola}"
-               Margin="10" Text="{drawing}" Background="BlueCrayola"/>
+               MouseLeave="{Background=RoyalBlue}"
+               Margin="10" Text="{drawing}" Background="RoyalBlue"/>
  </Group>
  </Group>
\ No newline at end of file

diff --git a/Tests/Interfaces/Divers/clip3.crow b/Tests/Interfaces/Divers/clip3.crow
index b08216c0a48a4100eabf0a03b313e1cfd5714889..2bb7c357d0a3f741cdde223f42ddf05244801c8b 100755 (executable)
--- a/Tests/Interfaces/Divers/clip3.crow
+++ b/Tests/Interfaces/Divers/clip3.crow
@@ -10,12 +10,12 @@
                                MouseLeave="{Background=LimeGreen}">
                        <Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true"
                                MouseEnter="{Background=DimGray}" Width="100"
-                               MouseLeave="{Background=BlueCrayola}"
-                               Margin="10" Text="{fps}" Background="BlueCrayola"/>
+                               MouseLeave="{Background=RoyalBlue}"
+                               Margin="10" Text="{fps}" Background="RoyalBlue"/>
                        <Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true"
                                MouseEnter="{Background=DimGray}" Width="100"
-                               MouseLeave="{Background=BlueCrayola}"
-                               Margin="10" Text="{drawing}" Background="BlueCrayola"/>
+                               MouseLeave="{Background=RoyalBlue}"
+                               Margin="10" Text="{drawing}" Background="RoyalBlue"/>
                 </VerticalStack>
                <VerticalStack Fit="true" Margin="50" Background="LimeGreen" CacheEnabled="false"
                                HorizontalAlignment="Right" VerticalAlignment="Bottom"
@@ -23,12 +23,12 @@
                                MouseLeave="{Background=LimeGreen}">
                        <Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true"
                                MouseEnter="{Background=DimGray}" Width="100"
-                               MouseLeave="{Background=BlueCrayola}"
-                               Margin="10" Text="{fpsMax}" Background="BlueCrayola"/>
+                               MouseLeave="{Background=RoyalBlue}"
+                               Margin="10" Text="{fpsMax}" Background="RoyalBlue"/>
                        <Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true"
                                MouseEnter="{Background=DimGray}" Width="100"
-                               MouseLeave="{Background=BlueCrayola}"
-                               Margin="10" Text="{fpsMin}" Background="BlueCrayola"/>
+                               MouseLeave="{Background=RoyalBlue}"
+                               Margin="10" Text="{fpsMin}" Background="RoyalBlue"/>
                 </VerticalStack>
        </HorizontalStack>
  </Group>
\ No newline at end of file

diff --git a/Tests/Interfaces/Divers/clip4.crow b/Tests/Interfaces/Divers/clip4.crow
index 852a4e879391efa431d14f0db0cf4be1c85aa878..71a887ab9cfefca0683261c8916842d78cc30465 100755 (executable)
--- a/Tests/Interfaces/Divers/clip4.crow
+++ b/Tests/Interfaces/Divers/clip4.crow
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <Border Fit="true" BorderWidth="2"  >
 <Scroller CornerRadius="2" Height="200" Width="300" Background="DimGray" Margin="2">
-       <VerticalStack Margin="10" VerticalAlignment="Top" Fit="true" Background="vgradient|0:BlueCrayola|1:Black" >
+       <VerticalStack Margin="10" VerticalAlignment="Top" Fit="true" Background="vgradient|0:RoyalBlue|1:Black" >
                 <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 1"/>
                 <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 2"/>
                 <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 3"/>
@@ -35,7 +35,7 @@
                MouseEnter="{Background=Gray}"
                MouseLeave="{Background=LimeGreen}">
 
-               <CheckBox Margin="20" Background="BlueCrayola"/>
+               <CheckBox Margin="20" Background="RoyalBlue"/>
                <CheckBox/>
                <CheckBox/>
                <CheckBox/>
@@ -49,10 +49,10 @@
 
        <Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true"
                MouseEnter="{Background=DimGray}" Width="100"
-               MouseLeave="{Background=BlueCrayola}"
-               Margin="10" Text="{fps}" Background="BlueCrayola"/>
+               MouseLeave="{Background=RoyalBlue}"
+               Margin="10" Text="{fps}" Background="RoyalBlue"/>
        <Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true"
                MouseEnter="{Background=DimGray}" Width="100"
-               MouseLeave="{Background=BlueCrayola}"
-               Margin="10" Text="{drawing}" Background="BlueCrayola"/>
+               MouseLeave="{Background=RoyalBlue}"
+               Margin="10" Text="{drawing}" Background="RoyalBlue"/>
  </VerticalStack>-->
\ No newline at end of file

diff --git a/Tests/Interfaces/Divers/fps.crow b/Tests/Interfaces/Divers/fps.crow
index 6747bbd2c5a393d9fdf36781794c703b4c2a0b9d..1d515a15e2d94ca3fd1801958c579f90c87fcf3b 100755 (executable)
--- a/Tests/Interfaces/Divers/fps.crow
+++ b/Tests/Interfaces/Divers/fps.crow
@@ -5,19 +5,19 @@
                        <VerticalStack Fit="true" Name="vsFps"  Spacing="10" >
                                <HorizontalStack Fit="true">
                                        <Label Text="Update:" Width="50" TextAlignment="Right"/>
-                                       <Label Margin="5" Name="labUpdate" Text="{update}" Font="droid,12" Background="AoEnglish" Width="50" TextAlignment="Center"/>
+                                       <Label Margin="5" Name="labUpdate" Text="{update}" Font="droid,12" Background="SeaGreen" Width="50" TextAlignment="Center"/>
                                </HorizontalStack>
                                <HorizontalStack Fit="true">
                                        <Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
-                                       <Label Margin="5" Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" Background="AoEnglish"/>
+                                       <Label Margin="5" Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" Background="SeaGreen"/>
                                </HorizontalStack>
                                <HorizontalStack Fit="true">
                                        <Label Text="Min:" Width="50" TextAlignment="Right"/>
-                                       <Label Margin="5" Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center" Background="AoEnglish"/>
+                                       <Label Margin="5" Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center" Background="SeaGreen"/>
                                </HorizontalStack>
                                <HorizontalStack Fit="true">
                                        <Label Text="Max:" Width="50" TextAlignment="Right"/>
-                                       <Label Margin="5" Text="{fpsMax}" Font="droid , 12" Background="AoEnglish" Width="50" TextAlignment="Center"/>
+                                       <Label Margin="5" Text="{fpsMax}" Font="droid , 12" Background="SeaGreen" Width="50" TextAlignment="Center"/>
                                </HorizontalStack>
                        </VerticalStack>
        </Container>

diff --git a/Tests/Interfaces/Divers/testDisable.crow b/Tests/Interfaces/Divers/testDisable.crow
index 2300a0136936cc59cd87360fb446e4ccdc5798e9..85a3d3b9c4f1e55b27aaba7f719bef6c63ee48e4 100644 (file)
--- a/Tests/Interfaces/Divers/testDisable.crow
+++ b/Tests/Interfaces/Divers/testDisable.crow
@@ -4,8 +4,8 @@
        <Label Font="20" Text="Enable / Disable test"/>
        <Label Text="{fps}" IsEnabled="false" Font="30"/>
        <Label Text="{fps}" IsEnabled="true" Font="30"/>
-               <Label Text="{fps}" IsEnabled="false" Font="30" Background="SeaBlue"/>
-       <Label Text="{fps}" IsEnabled="true" Font="30" Background="SeaBlue"/>
+               <Label Text="{fps}" IsEnabled="false" Font="30" Background="SeaGreen"/>
+       <Label Text="{fps}" IsEnabled="true" Font="30" Background="SeaGreen"/>
        <Button Caption="Button" IsEnabled="true" Background="Gray"/>
        <Button Caption="Button" IsEnabled="false" Background="Gray"/>
        <Button Caption="Button" IsEnabled="true" />

diff --git a/Tests/Interfaces/Divers/testOutOfClipUpdate.crow b/Tests/Interfaces/Divers/testOutOfClipUpdate.crow
index 5e4e4177ce16047e34647ffc78b9c836b464d5a6..738f2b119a612998f43f3e2a31ba888c8f78136c 100755 (executable)
--- a/Tests/Interfaces/Divers/testOutOfClipUpdate.crow
+++ b/Tests/Interfaces/Divers/testOutOfClipUpdate.crow
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <Container Width="200" Height="100" Background="DimGray" Margin="5">
        <Container Width="Stretched" Height="800" Background="DarkBlue">
-               <Label Text="{fps}" Background="BlueCrayola" VerticalAlignment="Center"/>
+               <Label Text="{fps}" Background="RoyalBlue" VerticalAlignment="Center"/>
        </Container>
 </Container>

diff --git a/Tests/Interfaces/Divers/testShape.crow b/Tests/Interfaces/Divers/testShape.crow
index c75af67d7562ccb3e833d6a9ce5d59494bcceb3c..4adada3912c833b8af6d86e714abf85807af8959 100644 (file)
--- a/Tests/Interfaces/Divers/testShape.crow
+++ b/Tests/Interfaces/Divers/testShape.crow
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <Container Fit="true" Background="Red" Tooltip="test tooltip" >
        <Shape Foreground="Transparent" Background="DimGray" Path="M 5.5,0.5 L 10.5,10.5 L 0.5,10.5 Z"
-               MouseEnter="{Background=hgradient|0:DimGray|0.5:BlueCrayola|1:Black}"
+               MouseEnter="{Background=hgradient|0:DimGray|0.5:RoyalBlue|1:Black}"
                MouseLeave="{Background=DimGray}"/>
 </Container>
\ No newline at end of file

diff --git a/Tests/Interfaces/TemplatedContainer/0.crow b/Tests/Interfaces/TemplatedContainer/0.crow
index 195b981b1679d1cd91f867e3eaf67072c880cdb5..e600d37cc1cedafdc611f5849c98e48d6487efeb 100755 (executable)
--- a/Tests/Interfaces/TemplatedContainer/0.crow
+++ b/Tests/Interfaces/TemplatedContainer/0.crow
@@ -7,7 +7,7 @@
                        <CheckBox Name="chk4" />
                        <HorizontalStack Fit="true" Margin="2" Background="SeaGreen">
                                <Label Name="captionFps" Text="Fps:" Width="30" TextAlignment="Right"/>
-                               <Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="Fit" TextAlignment="Center" Background="AoEnglish"/>
+                               <Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="Fit" TextAlignment="Center" Background="SeaGreen"/>
                        </HorizontalStack>
                </VerticalStack>
 </Expandable>

diff --git a/Tests/Interfaces/TemplatedContainer/6.crow b/Tests/Interfaces/TemplatedContainer/6.crow
index 041bdf52b106e0a3b70241b15946ed47499f7107..c1362017d4f88419993a8563d0adf35de7d83937 100755 (executable)
--- a/Tests/Interfaces/TemplatedContainer/6.crow
+++ b/Tests/Interfaces/TemplatedContainer/6.crow
@@ -4,9 +4,9 @@
                                <Expandable Width="Stretched" Background="LimeGreen">
                                        <Expandable Width="Stretched" Background="DimGray">
                                                <Expandable Width="Stretched" Background="Yellow">
-                                                       <Expandable Width="Stretched" Background="NavyBlue">
+                                                       <Expandable Width="Stretched" Background="SeaGreen">
                                                                <Expandable Width="Stretched" Background="Blue">
-                                                                       <Expandable Width="Stretched" Background="BlueCrayola">
+                                                                       <Expandable Width="Stretched" Background="RoyalBlue">
                                                                                <Expandable Width="Stretched" Background="Green">
                                                                                        <Label Background="Red" Text="{fps}"/>
                                                                                </Expandable>

diff --git a/Tests/Interfaces/TemplatedContainer/7.crow b/Tests/Interfaces/TemplatedContainer/7.crow
index 0c94b6c4507372f281a1141da6f1e1b38234b6ab..648b7a82846f2ad401c2b04701b665a0be4725c9 100755 (executable)
--- a/Tests/Interfaces/TemplatedContainer/7.crow
+++ b/Tests/Interfaces/TemplatedContainer/7.crow
@@ -7,9 +7,9 @@
                                <Expandable Background="LimeGreen">
                                        <Expandable Background="DimGray">
                                                <Expandable Width="Stretched" Background="Yellow">
-                                                       <Expandable Background="NavyBlue">
+                                                       <Expandable Background="SeaGreen">
                                                                <Expandable Width="Stretched" Background="Blue">
-                                                                       <Expandable Width="Stretched" Background="BlueCrayola">
+                                                                       <Expandable Width="Stretched" Background="RoyalBlue">
                                                                                <Expandable Width="Stretched" Background="Green">
                                                                                        <Label Background="Red" Text="{fps}"/>
                                                                                </Expandable>

diff --git a/Tests/Interfaces/TemplatedContainer/testPopper.crow b/Tests/Interfaces/TemplatedContainer/testPopper.crow
index 0c579d95d28042e0b6bcd815b7cdc8b56a689866..07e56b8029ef450865a59532bc245eff2e971ef1 100755 (executable)
--- a/Tests/Interfaces/TemplatedContainer/testPopper.crow
+++ b/Tests/Interfaces/TemplatedContainer/testPopper.crow
@@ -10,7 +10,7 @@
        </Border>
        <GraphicObject Height="200"/>
        <Popper Caption="TestPopper" Width="100" Background="DimGray" PopDirection="{alignment}">
-               <Border Fit="True" Background="ArmyGreen">
+               <Border Fit="True" Background="SteelBlue">
                        <Image Fit="true" Path="#go.Images.Icons.tetra.png" Margin="10"/>
                        <VerticalStack Fit="true" Margin="10" Background="CornflowerBlue">
                                <CheckBox Name="chk1" Background="Red"/>
@@ -19,7 +19,7 @@
                                <CheckBox Name="chk4"/>
                                <HorizontalStack Fit="true" Margin="20">
                                        <Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
-                                       <Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" Background="AoEnglish"/>
+                                       <Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" Background="SeaGreen"/>
                                </HorizontalStack>
                        </VerticalStack>
                </Border>

diff --git a/Tests/Interfaces/TemplatedContainer/testWindow.goml b/Tests/Interfaces/TemplatedContainer/testWindow.goml
index d27d02b82af9cfe758c72fa9aa5fa20369f431d2..3142012f447b005ac771e7d687dd470cd4bf4a88 100755 (executable)
--- a/Tests/Interfaces/TemplatedContainer/testWindow.goml
+++ b/Tests/Interfaces/TemplatedContainer/testWindow.goml
@@ -29,37 +29,37 @@
                                                <HorizontalStack Fit="true">
                                                        <Label Text="Layouting:" Width="50" TextAlignment="Right"/>
                                                        <Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-                                                               Background="vgradient|0:AoEnglish|1:Black"/>
+                                                               Background="vgradient|0:SeaGreen|1:Black"/>
                                                </HorizontalStack>
                                                <HorizontalStack Fit="true">
                                                        <Label Text="Clipping:" Width="50" TextAlignment="Right"/>
                                                        <Label Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-                                                               Background="vgradient|0:AoEnglish|1:Black"/>
+                                                               Background="vgradient|0:SeaGreen|1:Black"/>
                                                </HorizontalStack>
                                                <HorizontalStack Fit="true">
                                                        <Label Text="Drawing:" Width="50" TextAlignment="Right"/>
                                                        <Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-                                                               Background="vgradient|0:AoEnglish|1:Black"/>
+                                                               Background="vgradient|0:SeaGreen|1:Black"/>
                                                </HorizontalStack>
                                                <HorizontalStack Fit="true">
                                                        <Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
                                                        <Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center"
-                                                               Background="vgradient|0:AoEnglish|1:Black"/>
+                                                               Background="vgradient|0:SeaGreen|1:Black"/>
                                                </HorizontalStack>
                                                <HorizontalStack Fit="true">
                                                        <Label Text="Min:" Width="50" TextAlignment="Right"/>
                                                        <Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-                                                               Background="vgradient|0:AoEnglish|1:Black"/>
+                                                               Background="vgradient|0:SeaGreen|1:Black"/>
                                                </HorizontalStack>
                                                <HorizontalStack Fit="true">
                                                        <Label Text="Max:" Width="50" TextAlignment="Right"/>
                                                        <Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-                                                               Background="vgradient|0:AoEnglish|1:Black"/>
+                                                               Background="vgradient|0:SeaGreen|1:Black"/>
                                                </HorizontalStack>
                                        </VerticalStack>
                        </Container>
                </Border>
-               <HorizontalStack Fit="true" Background="BlueCrayola" Margin="3">
+               <HorizontalStack Fit="true" Background="RoyalBlue" Margin="3">
                        <GraphicObject Margin="10" Background="LimeGreen" Width="5" Height="5"/>
                        <TextBox Font="droid, 16" Multiline="true" Text="this is a test\nmultiline" Margin="2"/>
                        <GraphicObject Margin="10" Background="LimeGreen" Width="5" Height="5"/>

diff --git a/Tests/Interfaces/TemplatedControl/testItemTemplateTag.crow b/Tests/Interfaces/TemplatedControl/testItemTemplateTag.crow
index 90c475a5b518e7ff4cfa41c2e8b15895e5054cb9..1dcef800eebd2432d5adf188462931c7d9523cd2 100755 (executable)
--- a/Tests/Interfaces/TemplatedControl/testItemTemplateTag.crow
+++ b/Tests/Interfaces/TemplatedControl/testItemTemplateTag.crow
@@ -6,14 +6,13 @@
                        <Template>
                                <Border BorderWidth="1">
                                        <HorizontalStack Margin="1">
-                                               <Scroller Name="scroller1" 
-                                                               Margin="2" ScrollY="{../scrollbar1.Value}">
+                                               <Scroller Name="scroller1" Margin="2">
                                                        <VerticalStack Height="Fit" MinimumSize="10,10"
                                                                Name="ItemsContainer" Margin="0" VerticalAlignment="Top"/>
                                                </Scroller>
                                                <ScrollBar Name="scrollbar1" Value="{²../scroller1.ScrollY}"
                                                        LargeIncrement="{../scroller1.PageHeight}" SmallIncrement="30" CursorSize="{../scroller1.ChildHeightRatio}"
-                                                       Maximum="{../scroller1.MaximumScroll}" Orientation="Vertical" 
+                                                       Maximum="{../scroller1.MaxScrollY}" Orientation="Vertical" 
                                                        Width="14" />
                                        </HorizontalStack>
                                </Border>

diff --git a/Tests/Interfaces/Wrapper/2.2.crow b/Tests/Interfaces/Wrapper/2.2.crow
index 246a937dd73d3d55f3fffb3dccf30f694bfc2c68..c6dfbf8df9edb64103bdbff415e4c0269d98404a 100755 (executable)
--- a/Tests/Interfaces/Wrapper/2.2.crow
+++ b/Tests/Interfaces/Wrapper/2.2.crow
@@ -1,39 +1,32 @@
 <?xml version="1.0"?>
 <Window Caption="Horizontal Wrapper" Width="50%" Height="50%">
-       <VerticalStack Margin="1">
-               <Scroller Name="scroller1" ScrollX="{../scrollbar1.Value}" Margin="1" Background="BlueCrayola">
-                       <Wrapper HorizontalAlignment="Left" Orientation="Horizontal" Height="100%" Width="Fit" Margin="0" Background="MediumSeaGreen" Spacing="1" >
-                               <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
-                               <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
-                               <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
-                               <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
-                               <GraphicObject Width="50%" Height="50" Background="SeaGreen"/>
-                               <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
-                               <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
-                               <GraphicObject Width="50" Height="50%" Background="SeaGreen"/>
-                               <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
-                               <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
-                               <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
-                               <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
-                               <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
-                               <GraphicObject Width="50%" Height="50" Background="SeaGreen"/>
-                               <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
-                               <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
-                               <GraphicObject Width="50" Height="50%" Background="SeaGreen"/>
-                               <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
-                               <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
-                               <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
-                               <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
-                               <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
-                               <GraphicObject Width="50%" Height="50" Background="SeaGreen"/>
-                               <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
-                               <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
-                               <GraphicObject Width="50" Height="50%" Background="SeaGreen"/>
-                               <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
-                       </Wrapper>
-               </Scroller>
-               <ScrollBar Name="scrollbar1" Value="{../scroller1.ScrollX}" 
-                       Maximum="{../scroller1.MaximumScroll}" Orientation="Horizontal" 
-                       Height="14" />
-       </VerticalStack>
+               <Wrapper HorizontalAlignment="Left" Orientation="Horizontal" Height="100%" Width="Fit" Margin="0" Background="MediumSeaGreen" Spacing="1" >
+                       <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
+                       <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
+                       <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
+                       <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
+                       <GraphicObject Width="50%" Height="50" Background="SeaGreen"/>
+                       <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
+                       <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
+                       <GraphicObject Width="50" Height="50%" Background="SeaGreen"/>
+                       <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
+                       <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
+                       <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
+                       <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
+                       <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
+                       <GraphicObject Width="50%" Height="50" Background="SeaGreen"/>
+                       <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
+                       <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
+                       <GraphicObject Width="50" Height="50%" Background="SeaGreen"/>
+                       <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
+                       <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
+                       <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
+                       <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
+                       <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
+                       <GraphicObject Width="50%" Height="50" Background="SeaGreen"/>
+                       <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
+                       <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
+                       <GraphicObject Width="50" Height="50%" Background="SeaGreen"/>
+                       <GraphicObject Width="50" Height="50" Background="SeaGreen"/>
+               </Wrapper>      
 </Window>
\ No newline at end of file

diff --git a/Tests/Interfaces/tmpDirItem.goml b/Tests/Interfaces/tmpDirItem.goml
index 4d401faf779a3becb933337a73589b23cf9d1a3e..41665d139b48a3fed2ea0a338fb53c3d88827d13 100755 (executable)
--- a/Tests/Interfaces/tmpDirItem.goml
+++ b/Tests/Interfaces/tmpDirItem.goml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
        <HorizontalStack Width="Fit" Height="Fit" Focusable="true"
                        HorizontalAlignment="Left"
-                       MouseEnter="{Background=BlueCrayola}"
+                       MouseEnter="{Background=RoyalBlue}"
                        MouseLeave="{Background=Transparent}">
                <Image Width="16" Height="16" Path="#Tests.image.folder1.svg" SvgSub="{Attributes}"/>
                <Label Text="{Name}" Width="Fit" Height="Fit" Margin="0"/>

diff --git a/Tests/test.style b/Tests/test.style
index bbe53513333f02ef393ad0dea5eed4928e1523d5..5539b3d02d47d2e111a67dca2db651f449543d0a 100644 (file)
--- a/Tests/test.style
+++ b/Tests/test.style
@@ -14,15 +14,15 @@ FpsDisp {
 }
 CheckBox2 {
        Template= "#Tests.Interfaces.CheckBox2.imlt";
-       Background = "DimGray";
-       Checked="{Background=MediumSeaGreen;Font=droid bold, 10}";
-       Unchecked = "{Background=DarkGray;Font=droid,10}";
+       Background = "Jet";
+       Checked="{Background=MediumSeaGreen}";
+       Unchecked = "{Background=Jet}";
 }
 RadioButton2 {
        Template="#Tests.Interfaces.CheckBox2.imlt";
-       Background = "DimGray";
-       Checked = "{Background=MediumSeaGreen;Font=droid bold, 10}";
-       Unchecked = "{Background=DimGray;Font=droid,10}";
+       Background = "Jet";
+       Checked = "{Background=MediumSeaGreen}";
+       Unchecked = "{Background=Jet}";
 }
 labPerf {
        Font = "droid, 8";

diff --git a/Tests/ui/showcase.crow b/Tests/ui/showcase.crow
index 61df4443bd8aeb0d9c521a317be9c8737107a268..956e236d9722d76c3b4e345c5b41f9701bfb7608 100755 (executable)
--- a/Tests/ui/showcase.crow
+++ b/Tests/ui/showcase.crow
@@ -16,7 +16,7 @@
                        <ScrollBar Name="scrollbar1" Value="{../scroller1.ScrollY}"
                                LargeIncrement="{../scroller1.PageHeight}" SmallIncrement="30"
                                CursorSize="{../scroller1.ChildHeightRatio}"
-                               Maximum="{../scroller1.MaximumScroll}" Orientation="Vertical"
+                               Maximum="{../scroller1.MaxScrollY}" Orientation="Vertical"
                                Width="14" />
                </HorizontalStack>
                <Label Visible="{ShowError}" Text="{ErrorMessage}" Background="Red" Foreground="White" Width="Stretched" Margin="2"