replace ';' separator between members by ',' and set '.' as decimal mark in files

diff --git a/Styles/MessageBox.style b/Styles/MessageBox.style
index 1f562c11de0eb63e2a5be853221657d6e2e423f3..914fbb9751841aca35bd5621d34bc87941092aec 100644 (file)
--- a/Styles/MessageBox.style
+++ b/Styles/MessageBox.style
@@ -2,4 +2,4 @@
 Height=Fit;
 Title=MessageBox;
 Focusable=true;
-MinimumSize=150;80;
+MinimumSize=150,80;

diff --git a/Styles/Window.style b/Styles/Window.style
index 22ee20e298e6717da39a2ae65688a037c9f07307..264222336d895b2bd138de558d837899181fd52c 100644 (file)
--- a/Styles/Window.style
+++ b/Styles/Window.style
@@ -1,3 +1,3 @@
 Focusable=true;
-MinimumSize=50;50;
+MinimumSize=50,50;
 Fit=true;

diff --git a/Templates/ArrowButTemplate.crow b/Templates/ArrowButTemplate.crow
index 8614670d5590c575b2d4c7cf216fa0b4359423ae..fe0e122c7bb5d5dd3aad82f11533a2043b0d698c 100755 (executable)
--- a/Templates/ArrowButTemplate.crow
+++ b/Templates/ArrowButTemplate.crow
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <Border Name="Content"
-       Background="vgradient|0:White|0,1:LightGray|0,9:LightGray|1:Black" Foreground="DarkGray" 
+       Background="vgradient|0:White|0.1:LightGray|0.9:LightGray|1:Black" Foreground="DarkGray" 
        Height="{../HeightPolicy}" Width="{../WidthPolicy}"
        MouseEnter="{Foreground=White}"
        MouseLeave="{Foreground=DarkGray}"
-       MouseDown="{Background=vgradient|0:Black|0,1:LightGray|0,9:LightGray|1:White}"
-       MouseUp="{Background=vgradient|0:White|0,1:LightGray|0,9:LightGray|1:Black}"
+       MouseDown="{Background=vgradient|0:Black|0.1:LightGray|0.9:LightGray|1:White}"
+       MouseUp="{Background=vgradient|0:White|0.1:LightGray|0.9:LightGray|1:Black}"
        >
 </Border>
\ No newline at end of file

diff --git a/Templates/Button.crow b/Templates/Button.crow
index 7d128f7544b714151c2ba569ab6257d1b6530c9f..a9e45dc36cad773513eb4721ae006dd46fc1a1ad 100755 (executable)
--- a/Templates/Button.crow
+++ b/Templates/Button.crow
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <Border Background="{../Background}" MinimumSize="50;20" Height="{../HeightPolicy}" Width="{../WidthPolicy}"
                Foreground="Transparent" CornerRadius="{../CornerRadius}" BorderWidth="1" 
-       MouseEnter="{Foreground=vgradient|0:White|0,2:Gray|0,9:Gray|1:Black;caption.Foreground=White}"
+       MouseEnter="{Foreground=vgradient|0:White|0.2:Gray|0.9:Gray|1:Black;caption.Foreground=White}"
        MouseLeave="{Foreground=Transparent;caption.Foreground=LightGray}"
-       MouseDown="{Foreground=vgradient|0:Black|0,05:Gray|0,85:Gray|1:White}"
-       MouseUp="{Foreground=vgradient|0:White|0,2:Gray|0,9:Gray|1:Black}"                  
+       MouseDown="{Foreground=vgradient|0:Black|0.05:Gray|0.85:Gray|1:White}"
+       MouseUp="{Foreground=vgradient|0:White|0.2:Gray|0.9:Gray|1:Black}"                  
        >
 <!--   <Image Height="0" Width="0" Margin="0" Path="{../../Image}" SvgSub="{../../SvgSub}"/>-->
        <Label Font="{../../Font}" Name="caption" Margin="5" Foreground="LightGray" Text="{../../Caption}"/>

diff --git a/Templates/FileDialog.goml b/Templates/FileDialog.goml
index 3210edb8baa48f0606d0b0823d5dd39d415762f2..c8a10c8d7462ecbca6486e33abe0fc27991d90c8 100644 (file)
--- a/Templates/FileDialog.goml
+++ b/Templates/FileDialog.goml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <Window Caption="OpenFile" Height="300" Width="500">
        <VerticalStack Margin="5">
                <TextBox Margin="1" Width="0" Height="-1" Text="{CurrentPath}"/>
                <HorizontalStack >
                        <ListBox Data="{Directories}" Width="-1" Height="0"
-                               Background="0,5;0,5;0,5;0,5"
+                               Background="0.5,0.5,0.5,0.5"
                                SelectedItemChanged="OnSelectedItemChanged"
                                Template="#Crow.Templates.ScrollingListBox.goml" 
                                ItemTemplate="#Crow.Templates.tmpDirItem.goml" >
                        </ListBox>
                        <ListBox Data="{Files}" Width="0" Height="0"
-                               Background="0,5;0,5;0,5;0,5"
+                               Background="0.5,0.5,0.5,0.5"
                                SelectedItemChanged="onFileListItemChanged"
                                Template="#Crow.Templates.ScrollingListBox.goml" 
                                ItemTemplate="#Crow.Templates.imgItemTemplate.goml">

diff --git a/Templates/MessageBox.goml b/Templates/MessageBox.goml
index b8b547248b1f326b01170cc4ab207b75b7074d95..eef85052037bc5a0a6e5dd7643654e88c53b5fc7 100644 (file)
--- a/Templates/MessageBox.goml
+++ b/Templates/MessageBox.goml
@@ -1,8 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <Border Height="{../HeightPolicy}" Width="{../WidthPolicy}" BorderWidth="1" Foreground="White" CornerRadius="10" >
-       <VerticalStack Height="{../../HeightPolicy}" Width="{../../WidthPolicy}" Background="0,4;0,4;0,4;0,4">
+       <VerticalStack Height="{../../HeightPolicy}" Width="{../../WidthPolicy}" Background="0.4,0.4,0.4,0.4">
                <Border BorderWidth="1" Foreground="White" Width="{../../../WidthPolicy}" Height="-1" 
-                               Background="0,1;0,5;1,0;0,5">
+                               Background="0.1,0.5;1,0,0.5">
                        <HorizontalStack Name="hs" Margin="1" Spacing="1" Width="{../../../../WidthPolicy}" Height="-1" >
                                <GraphicObject Width="5" Height="5"/>
                                <Image Margin="1" Width="12" Height="12" Path="{../../../../../Icon}"/>

diff --git a/Templates/ScrollBar.goml b/Templates/ScrollBar.goml
index ffcc121e0db3f50fc4a46ef0a7b787fa609d19b4..1310443d4f6d50a4a1766b22b05a82b53edd70d8 100755 (executable)
--- a/Templates/ScrollBar.goml
+++ b/Templates/ScrollBar.goml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <Border BorderWidth="1" Foreground="LightGray" Width="{../WidthPolicy}" Height="{../HeightPolicy}">
        <GenericStack Orientation="{../../Orientation}" Spacing="0"
                Width="{../../WidthPolicy}" Height="{../../HeightPolicy}">
@@ -12,7 +12,7 @@
                        Maximum="{../../../Maximum}"
                        LargeIncrement="{../../../LargeIncrement}"
                        SmallIncrement="{../../../SmallIncrement}"
-                       Background="hgradient|0:DimGray|0,1:Gray|0,95:Gray|1:White"
+                       Background="hgradient|0:DimGray|0.1:Gray|0.95:Gray|1:White"
                        Width="{../../../WidthPolicy}" Height="{../../../HeightPolicy}"
                        ValueChanged="../../../onSliderValueChange"/>
                <Button MouseRepeat="true" Width="12" Height="12" MouseClick="../../../onScrollForth"

diff --git a/Templates/Window.goml b/Templates/Window.goml
index 5ce4347c1b977c9034a5d41593fede79f97c8868..01f88a22efae2d5eacc05fdf80c8188c13e8c52f 100755 (executable)
--- a/Templates/Window.goml
+++ b/Templates/Window.goml
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <Border BorderWidth="1" Foreground="White" CornerRadius="20" Height="{../HeightPolicy}" Width="{../WidthPolicy}"
                                MouseEnter="../onBorderMouseEnter"
                                MouseLeave="../onBorderMouseLeave">
        <VerticalStack Height="{../../HeightPolicy}" Width="{../../WidthPolicy}">
                <Border Name="TitleBar" BorderWidth="1" Foreground="White" Width="{../../../WidthPolicy}" Height="Fit"
-                               Background="vgradient|0:0,4;0,6;0,0;0,5|1:0,0;0,8;0,8;0,9">
+                               Background="vgradient|0:0.4,0.6,0.0,0.5|1:0.0,0.8,0.8,0.9">
                        <HorizontalStack Name="hs" Margin="1" Spacing="1" Width="{../../../../WidthPolicy}" Height="Fit" 
                                >
                                <GraphicObject Width="5"/>
@@ -18,6 +18,6 @@
                                <GraphicObject Width="5"/>
                        </HorizontalStack>
                </Border>
-               <Container Name="Content" MinimumSize="50;50" Height="{../../../HeightPolicy}" Width="{../../../WidthPolicy}" Background="0,5;0,5;0,5;0,5"/>
+               <Container Name="Content" MinimumSize="50;50" Height="{../../../HeightPolicy}" Width="{../../../WidthPolicy}" Background="0.5,0.5,0.5,0.5"/>
        </VerticalStack>
 </Border>
\ No newline at end of file

diff --git a/Templates/imgItemTemplate.goml b/Templates/imgItemTemplate.goml
index 393548912e61fb84f67b200fbf28bb3b33d4717f..792d27586421c514ad446128837b8933ce276ea5 100755 (executable)
--- a/Templates/imgItemTemplate.goml
+++ b/Templates/imgItemTemplate.goml
@@ -1,8 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
        <VerticalStack Width="0" Height="-1" Focusable="true"                   
                        MouseEnter="{Background=BlueCrayola}"
                        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"/>
+               <Label Text="{Name}" Width="-1" Height="-1" Margin="0" MaximumSize="100,0"/>
        </VerticalStack>
 

diff --git a/Tests/Interfaces/Divers/fps.crow b/Tests/Interfaces/Divers/fps.crow
index 18f96c022965bd4f0534adb60847807b06554f63..b696230263e65b5d87e84140066b1357d76dcb90 100755 (executable)
--- a/Tests/Interfaces/Divers/fps.crow
+++ b/Tests/Interfaces/Divers/fps.crow
@@ -1,6 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <Border Fit="true" CornerRadius="5" BorderWidth="1">
-       <Container Name="MainGrp" Background="0,5;0,5;0,5;0,4" Width="120" Fit="true"
+       <Container Name="MainGrp" Background="0.5,0.5,0.5,0.4" Width="120" Fit="true"
                Margin="10" Focusable="True" >
                        <VerticalStack Fit="true" Name="vsFps"  Spacing="10" >
                                <HorizontalStack Fit="true">

diff --git a/Tests/Interfaces/Divers/testBorder.crow b/Tests/Interfaces/Divers/testBorder.crow
index cae3c33d7a8906d11dc0e11d3ed111d35b1d3874..40ba7cf122869d92095bf17a9cf1947789b3aa82 100755 (executable)
--- a/Tests/Interfaces/Divers/testBorder.crow
+++ b/Tests/Interfaces/Divers/testBorder.crow
@@ -1,5 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <Border BorderWidth="2" Width="200" Height="200" CornerRadius="2" Margin="0" 
-               Background="vgradient|0,65:Mantis|1:Transparent">
+               Background="vgradient|0.65:Mantis|1:Transparent">
        <GraphicObject CornerRadius="20" Background="#Tests.image.crow0.svg" Margin="0" Height="100" Width="120" />
 </Border>

diff --git a/Tests/Interfaces/Divers/testGrid.crow b/Tests/Interfaces/Divers/testGrid.crow
index a336c1ed18acf41a70075100a149799c0f2b5e63..327d7716b857ce687c6708a2bb2053f6c1bb7641 100755 (executable)
--- a/Tests/Interfaces/Divers/testGrid.crow
+++ b/Tests/Interfaces/Divers/testGrid.crow
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <Grid RowCount="2" ColumnCount="2">
-       <GraphicObject Background="0,0;0,0;0,0;1,0"/>
-       <GraphicObject Background="0,0;0,0;0,5;1,0"/>
-       <GraphicObject Background="0,0;0,5;0,0;1,0"/>
-       <GraphicObject Background="0,5;0,0;0,0;1,0"/>
+       <GraphicObject Background="0.0,0.0,0.0;1,0"/>
+       <GraphicObject Background="0.0,0.0,0.5;1,0"/>
+       <GraphicObject Background="0.0,0.5,0.0;1,0"/>
+       <GraphicObject Background="0.5,0.0,0.0;1,0"/>
 </Grid>
\ No newline at end of file

diff --git a/Tests/Interfaces/Divers/testWindow.goml b/Tests/Interfaces/Divers/testWindow.goml
index fd24b50fce0592df82470e7a737aa10d70dda4f6..154577fbb4538199598f31a4ca8440c392d69439 100755 (executable)
--- a/Tests/Interfaces/Divers/testWindow.goml
+++ b/Tests/Interfaces/Divers/testWindow.goml
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <Window Left="10" Top="10" Title="Test window" 
                Width="250" Height="550" >
-       <VerticalStack Name="contentVSStack" Margin="10" Spacing="10" Background="0,4;0,4;0,4;0,4">
+       <VerticalStack Name="contentVSStack" Margin="10" Spacing="10" Background="0.4,0.4,0.4,0.4">
                <Slider Name="slider" Height="12" Width="Stretched" CornerRadius="3"/>
                <GroupBox Caption="test"  Height="Fit" Width="Stretched" Margin="5">
                        <VerticalStack  Height="Fit" Width="Stretched" >
@@ -17,13 +17,13 @@
                        <RadioButton Width="80" Height="Fit" Caption="Radio 3" />
                </HorizontalStack>
                <HorizontalStack Width="Stretched" Height="Stretched" MinimumSize="10;10" Margin="10" CornerRadius="5"
-                               Background="vgradient|0:White|0,1:SteelBlue|0,9:SteelBlue|1:Transparent">
+                               Background="vgradient|0:White|0.1:SteelBlue|0.9:SteelBlue|1:Transparent">
                        <CheckBox Height="Fit" Width="80"/>
                        <GraphicObject Width="Stretched"/>
                        <CheckBox Height="Fit" Width="80" IsChecked="true"/>
                </HorizontalStack>
                <Border Fit="true" CornerRadius="5" BorderWidth="1" >
-                       <Container Name="MainGrp" Background="0,5;0,5;0,5;0,4" Width="120" Fit="true"
+                       <Container Name="MainGrp" Background="0.5,0.5,0.5,0.4" Width="120" Fit="true"
                                Margin="10" Focusable="True" >
                                        <VerticalStack Fit="true" Name="vsFps"  Spacing="10" >
                                                <HorizontalStack Fit="true">

diff --git a/Tests/Interfaces/Divers/testWindow2.goml b/Tests/Interfaces/Divers/testWindow2.goml
index d7c441e69744930e30e74686431b5ae23b923251..e67061c608fe00760b712946ef925d0f19687fdf 100755 (executable)
--- a/Tests/Interfaces/Divers/testWindow2.goml
+++ b/Tests/Interfaces/Divers/testWindow2.goml
@@ -1,11 +1,11 @@
-<?xml version="1.0"?>
-<Window Name="window1" Left="10" Top="10" Title="Test window" Width="200" Height="200" Background="0,5;0,5;0,5;0,8" 
+<?xml version="1.0"?>
+<Window Name="window1" Left="10" Top="10" Title="Test window" Width="200" Height="200" Background="0.5,0.5,0.5,0.8" 
        Focusable="True"  CornerRadius="20" MinimumSize="100;100" MaximumSize="500;500">
        <Template>
                <Border BorderWidth="1" Foreground="White" CornerRadius="20" Height="{../HeightPolicy}" Width="{../WidthPolicy}">
                        <VerticalStack Height="{../../HeightPolicy}" Width="{../../WidthPolicy}">
                                <Border BorderWidth="1" Foreground="White" Width="{../../../WidthPolicy}" Height="Fit" 
-                                               Background="0,1;0,5;1,0;0,5">
+                                               Background="0.1,0.5;1,0,0.5">
                                        <HorizontalStack Name="hs" Margin="1" Spacing="1" Width="{../../../../WidthPolicy}" Height="Fit" >
                                                <GraphicObject Width="5"/>
                                                <Image Margin="1" Width="12" Height="12" Path="{../../../../../Icon}"/>
@@ -18,7 +18,7 @@
                                                <GraphicObject Width="5"/>
                                        </HorizontalStack>
                                </Border>
-                               <Container Name="Content" Height="{../../../../HeightPolicy}" Width="{../../../../WidthPolicy}" Background="0,5;0,5;0,5;0,5"/>
+                               <Container Name="Content" Height="{../../../../HeightPolicy}" Width="{../../../../WidthPolicy}" Background="0.5,0.5,0.5,0.5"/>
                        </VerticalStack>
                </Border>
        </Template>

diff --git a/Tests/Interfaces/Divers/testWindow3.goml b/Tests/Interfaces/Divers/testWindow3.goml
index c1784c5d3db697bcad495d6ca93a7d3262a0400e..54b573d87b62a4b64e0a53cfb3053dca633ad2f8 100755 (executable)
--- a/Tests/Interfaces/Divers/testWindow3.goml
+++ b/Tests/Interfaces/Divers/testWindow3.goml
@@ -1,8 +1,8 @@
-<?xml version="1.0"?>
-<Window Left="10" Top="10" Title="Test window" Width="200" Height="200" Background="0,5;0,5;0,5;0,8" 
+<?xml version="1.0"?>
+<Window Left="10" Top="10" Title="Test window" Width="200" Height="200" Background="0.5,0.5,0.5,0.8" 
        Focusable="True"  CornerRadius="20" MinimumSize="100;100" MaximumSize="500;500">
        <Template>
-               <Container Margin="20" Name="Content" Height="{../HeightPolicy}" Width="{../WidthPolicy}" Background="0,5;0,5;0,5;0,5"/>
+               <Container Margin="20" Name="Content" Height="{../HeightPolicy}" Width="{../WidthPolicy}" Background="0.5,0.5,0.5,0.5"/>
        </Template>
 <!--   <Group Background="Green">-->
                <GraphicObject Height="50" Width="50" Background="Red" Margin="5"/>

diff --git a/Tests/Interfaces/Divers/test_Listbox.crow b/Tests/Interfaces/Divers/test_Listbox.crow
index 0cbc4e2a889794f67c53a624f298d1b8ced983ff..61b673aa581cbd934f3f17706119eff39bd16d0d 100755 (executable)
--- a/Tests/Interfaces/Divers/test_Listbox.crow
+++ b/Tests/Interfaces/Divers/test_Listbox.crow
@@ -1,11 +1,11 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--<ListBox Data="{TestList}" Focusable="true"/>-->
 <Border Margin="50">
        <VerticalStack >
                <Label Text="{../ColorList.SelectedItem}" Background="DarkGreen"/>
                <Label Text="{Hover}" Background="DarkGreen"/>
                <Button Caption="Clear" Width="Stretched" MouseClick="OnClear"/>
-               <ListBox Name="ColorList" Data="{TestList}" Background="0,5;0,5;0,5;0,5"
+               <ListBox Name="ColorList" Data="{TestList}" Background="0.5,0.5,0.5,0.5"
                                         HorizontalAlignment="Center" Width="Fit" Height="200" Margin="0"
                                         ItemTemplate="#Tests.Interfaces.colorItem.crow"
                                         Template="#Crow.Templates.ScrollingListBox.goml">

diff --git a/Tests/Interfaces/Nouveau dossier/test4.1.crow b/Tests/Interfaces/Nouveau dossier/test4.1.crow
index 1cc40e3bf3bb8533f20cd608f6b61772e5b68e40..2ac55cd007fee025a27ce21308562c6e1e6fbf66 100755 (executable)
--- a/Tests/Interfaces/Nouveau dossier/test4.1.crow
+++ b/Tests/Interfaces/Nouveau dossier/test4.1.crow
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <Group Name="MainGrp"
        Width="800" Height="500"
-       Background="0,5;0,5;0,5;0,5" Foreground="White"
+       Background="0.5,0.5,0.5,0.5" Foreground="White"
        Margin="10" >
        <Border 
                BorderWidth="2" Foreground="Transparent"
@@ -12,7 +12,7 @@
                <HorizontalStack Name="hs0" Fit="true"
                        WidgetSpacing="10" 
                        VerticalAlignment="Center" 
-                       Background="0,5;0,5;0,5;0,5">
+                       Background="0.5,0.5,0.5,0.5">
                        <VerticalStack Name="vs1"
                                Margin="20" Width="400" Height="Fit">
                                <Label Name="labMouse" Text="MousePos"/>

diff --git a/Tests/Interfaces/Nouveau dossier/test4.crow b/Tests/Interfaces/Nouveau dossier/test4.crow
index eb200fcc8f723d31002efbe38b698ef6ac7a8cba..06476f31cb55c46b4dbbd76a8cc9adc54efa657d 100755 (executable)
--- a/Tests/Interfaces/Nouveau dossier/test4.crow
+++ b/Tests/Interfaces/Nouveau dossier/test4.crow
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <Group Name="MainGrp"
        Width="800" Height="500"
-       Background="0,5;0,5;0,5;0,5" Foreground="White"
+       Background="0.5,0.5,0.5,0.5" Foreground="White"
        Margin="10" >
        <Border Margin="10" CornerRadius="10"
                Name="mainBorder"

diff --git a/Tests/Interfaces/Nouveau dossier/test6.crow b/Tests/Interfaces/Nouveau dossier/test6.crow
index f75d46c7ec491f40c1d5b3e24130cb43e7555774..532450da538479a1f1e0fe2b8a734a36d7035d9a 100755 (executable)
--- a/Tests/Interfaces/Nouveau dossier/test6.crow
+++ b/Tests/Interfaces/Nouveau dossier/test6.crow
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <Border BorderWidth="1" Foreground="White" CornerRadius="10" Width="500" Height="300">
-       <VerticalStack Height="Stretched" Background="0,4;0,4;0,4;0,4">
-               <Border BorderWidth="1" Foreground="White"  Height="20" Background="0,1;0,5;1,0;0,5">
+       <VerticalStack Height="Stretched" Background="0.4,0.4,0.4,0.4">
+               <Border BorderWidth="1" Foreground="White"  Height="20" Background="0.1,0.5;1,0,0.5">
                        <HorizontalStack Name="hs" Margin="1" Spacing="1" Height="Fit" >
                                <GraphicObject Width="5"/>
                                <Image Name="Image" Margin="1" Width="12" Height="12" Path="#go.Images.Icons.tetra.png"/>

diff --git a/Tests/Interfaces/Nouveau dossier/testColorList.crow b/Tests/Interfaces/Nouveau dossier/testColorList.crow
index ccbbb094f2ae7188215b74203f7b40161230192e..8a5c592f2568f33e2de6a75471bf3aa49289625a 100755 (executable)
--- a/Tests/Interfaces/Nouveau dossier/testColorList.crow
+++ b/Tests/Interfaces/Nouveau dossier/testColorList.crow
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <Border BorderWidth="2" Fit="true">
        <VerticalStack Fit="true" Margin="5">
-               <ListBox Data="{TestList}" Background="0,5;0,5;0,5;0,7"
+               <ListBox Data="{TestList}" Background="0.5,0.5,0.5,0.7"
                                         HorizontalAlignment="Center" Width="200" Height="200" Margin="5"
                                         ItemTemplate="#Tests.Interfaces.colorItem.crow">
                        <Template>

diff --git a/Tests/Interfaces/Nouveau dossier/testDirViewer.crow b/Tests/Interfaces/Nouveau dossier/testDirViewer.crow
index ec32d76323a9773e4dcf9ce9e05f571be62c6f19..c63e548306a2849914323fdc52a448638442a3d8 100755 (executable)
--- a/Tests/Interfaces/Nouveau dossier/testDirViewer.crow
+++ b/Tests/Interfaces/Nouveau dossier/testDirViewer.crow
@@ -1,11 +1,11 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 
        <VerticalStack Height="Fit" Width="Fit" Name="hstack" Margin="0" Spacing="Stretched">
                <Border Height="Fit" Width="200" BorderWidth="2" CornerRadius="10">
                        <Label Name="labName" Text="{Name}" Width="Stretched" Height="Fit"/>
                </Border>
                <ListBox Data="{GetFileSystemInfos}" Width="Fit" Height="400"
-                       Background="0,5;0,5;0,5;0,5"
+                       Background="0.5,0.5,0.5,0.5"
                        SelectedItemChanged="OnSelectedItemChanged" 
                        ItemTemplate="Interfaces/tmpDirItem.goml" >
                        <Template>

diff --git a/Tests/OpenTKGameWindow.cs b/Tests/OpenTKGameWindow.cs
index 381f86c8d0eb06e8c12f316a8ffe9ff8295d320c..379f89f1b45e4e62bdcfb42e920f449ca34fb170 100644 (file)
--- a/Tests/OpenTKGameWindow.cs
+++ b/Tests/OpenTKGameWindow.cs
@@ -107,6 +107,8 @@ namespace Crow
 
                void interfaceThread()
                {
+                       Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.InvariantCulture;
+
                        CrowInterface.Quit += Quit;
                        CrowInterface.MouseCursorChanged += CrowInterface_MouseCursorChanged;
                        while (CrowInterface.ClientRectangle.Size.Width == 0)

diff --git a/Tests/ui/test.crow b/Tests/ui/test.crow
index d293a65e5a9d8e3457f4e3332a05b2acee5afc6d..da77637106e9bba675b97b268c41d2f207118b88 100755 (executable)
--- a/Tests/ui/test.crow
+++ b/Tests/ui/test.crow
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <Window Font="droid bold, 10" Title="Open GL" HorizontalAlignment="Left" Width="30%" Height="90%">
        <VerticalStack>
                <HorizontalStack Background="Jet" Height="Fit" Width="Stretched"  Margin="2">
@@ -18,8 +18,8 @@
                </HorizontalStack>
                <GroupBox Caption="Object Rotation" Margin="10" Width="70%" Height="Fit" >
                        <VerticalStack Spacing="10">
-                               <Spinner Width="50%" Maximum="1,0" SmallIncrement="0,01" Value="{²RotationSpeed}"/>
-                               <Slider Height="10" Width="50%" Maximum="1,0" SmallIncrement="0,01" Value="{²RotationSpeed}"/>
+                               <Spinner Width="50%" Maximum="1,0" SmallIncrement="0.01" Value="{²RotationSpeed}"/>
+                               <Slider Height="10" Width="50%" Maximum="1,0" SmallIncrement="0.01" Value="{²RotationSpeed}"/>
                                <CheckBox IsChecked="{²ClockWiseRotation}" Caption="Clockwise Rotation"/>
                                <GroupBox Caption="Rotation Axis" Height="Fit" >
                                        <VerticalStack>

diff --git a/Tests/ui/tmpWindow.crow b/Tests/ui/tmpWindow.crow
index 08a7d58afa930206fc8f1f3defd2964bb171cf1a..824ad7042abb844779194cf8bc10e6dcaf2c3d00 100755 (executable)
--- a/Tests/ui/tmpWindow.crow
+++ b/Tests/ui/tmpWindow.crow
@@ -1,9 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <Border BorderWidth="1" Foreground="White" CornerRadius="15"   
        Height="{../HeightPolicy}" Width="{../WidthPolicy}"
        MouseEnter="../onBorderMouseEnter"
        MouseLeave="../onBorderMouseLeave"
-       Background="vgradient|0:0,6;0,6;0,6;0,9|1:0,4;0,4;0,4;0,6">
+       Background="vgradient|0:0.6,0.6,0.6,0.9|1:0.4,0.4,0.4,0.6">
        <VerticalStack Height="{../../HeightPolicy}" Width="{../../WidthPolicy}">
                <HorizontalStack Height="Fit" Width="{../../../WidthPolicy}">
                        <Label Margin="2" Font="{../../../../Font}" Text="{../../../../Title}" Width="Stretched"/>

diff --git a/src/Colors.cs b/src/Colors.cs
index 269d7ae6a45026574e5eeb598aa0c51bcc53e504..751fb25201691b6c3136eaf19e15d2e6a6033cc3 100644 (file)
--- a/src/Colors.cs
+++ b/src/Colors.cs
@@ -1012,7 +1012,7 @@ namespace Crow
                #region IXmlSerializable
                public void ReadXml(System.Xml.XmlReader reader)
         {
-            string[] c = reader["Color"].Split(new char[] { ';' });            
+            string[] c = reader["Color"].Split(new char[] { ',' });            
             R = double.Parse(c[0]);
             G = double.Parse(c[1]);
             B = double.Parse(c[2]);
@@ -1061,7 +1061,7 @@ namespace Crow
                                }
                        }
 
-                       return string.Format("{0};{1};{2};{3}", R, G, B, A);
+                       return string.Format("{0},{1},{2},{3}", R, G, B, A);
                }
 
         public static object Parse(string s)

diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index 433599c1bfecb1e377294b6f5fe27482988a13f8..3eaa91f10965714e41aa6b60b2625400f340e7b5 100644 (file)
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -82,8 +82,8 @@ namespace Crow
                protected bool _isVisible = true;
                VerticalAlignment _verticalAlignment = VerticalAlignment.Center;
                HorizontalAlignment _horizontalAlignment = HorizontalAlignment.Center;
-               Size _maximumSize = "0;0";
-               Size _minimumSize = "0;0";
+               Size _maximumSize = "0,0";
+               Size _minimumSize = "0,0";
                bool cacheEnabled = false;
                object dataSource;
                string style;
@@ -419,7 +419,7 @@ namespace Crow
                                NotifyValueChanged ("Visible", _isVisible);
                        }
                }
-               [XmlAttributeAttribute()][DefaultValue("1;1")]
+               [XmlAttributeAttribute()][DefaultValue("1,1")]
                public virtual Size MinimumSize {
                        get { return _minimumSize; }
                        set {
@@ -432,7 +432,7 @@ namespace Crow
                                RegisterForLayouting (LayoutingType.Sizing);
                        }
                }
-               [XmlAttributeAttribute()][DefaultValue("0;0")]
+               [XmlAttributeAttribute()][DefaultValue("0,0")]
                public virtual Size MaximumSize {
                        get { return _maximumSize; }
                        set {
@@ -539,9 +539,15 @@ namespace Crow
                                        else
                                                name = xaa.AttributeName;
                                }
-                               if (styling.ContainsKey (name)) {
 
-                               } else {
+                               bool memberHasStyle = false;
+                               if (styling != null){
+                                       if (styling.ContainsKey (name))
+                                               memberHasStyle = true;
+                               } 
+                               if (memberHasStyle){
+                                       
+                               }else {
                                        if (name == "Style") {
                                                //retrieve default value from class attribute
                                                //DefaultStyle defStyle = thisType.GetCustomAttribute<DefaultStyle>();

diff --git a/src/Interface.cs b/src/Interface.cs
index d8f66443fa83262f250ecf65b9514612a3762773..2636b60abd76dafe4a288e3b2a1f98fc518efd04 100644 (file)
--- a/src/Interface.cs
+++ b/src/Interface.cs
@@ -204,6 +204,9 @@ namespace Crow
                }
                public static GraphicObject Load (string path, object hostClass = null)
                {
+                       System.Globalization.CultureInfo savedCulture = Thread.CurrentThread.CurrentCulture;
+                       Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.InvariantCulture;
+
                        Interface.XmlLoaderCount ++;
                        CurrentGOMLPath = path;
                        GraphicObject tmp = null;
@@ -211,6 +214,9 @@ namespace Crow
                                tmp = Load(stream, GetTopContainerOfGOMLStream(stream), hostClass);
                        }
                        Interface.XmlLoaderCount --;
+
+                       Thread.CurrentThread.CurrentCulture = savedCulture;
+
                        return tmp;
                }
                public static GraphicObject Load (Stream stream, Type type, object hostClass = null)
@@ -264,12 +270,17 @@ namespace Crow
                public Dictionary<string, Dictionary<string, string>> Styling;
 
                public void LoadStyling() {
+                       System.Globalization.CultureInfo savedCulture = Thread.CurrentThread.CurrentCulture;
+                       Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.InvariantCulture;
+
                        Styling = new Dictionary<string, Dictionary<string, string>> ();
 
                        //fetch styling info in this order, if member styling is alreadey referenced in previous
                        //assembly, it's ignored
                        loadStylingFromAssembly (Assembly.GetEntryAssembly ());
                        loadStylingFromAssembly (Assembly.GetExecutingAssembly ());
+
+                       Thread.CurrentThread.CurrentCulture = savedCulture;
                }
 
                void loadStylingFromAssembly (Assembly assembly) { 

diff --git a/src/Point.cs b/src/Point.cs
index 76beaa996fe9329eb730ba40649716a3f8dd1295..ba0103e3064c275de3097c8f23f525f0a3de9563 100644 (file)
--- a/src/Point.cs
+++ b/src/Point.cs
@@ -130,7 +130,7 @@ namespace Crow
 
         public override string ToString()
         {
-                       return string.Format("({0};{1})", X, Y);
+                       return string.Format("({0},{1})", X, Y);
         }
 
         public override bool Equals(object obj)
@@ -145,7 +145,7 @@ namespace Crow
                {
                        if (string.IsNullOrEmpty (s))
                                return default(Point);
-                       string[] d = s.Trim().Split(';');
+                       string[] d = s.Trim().Split(',');
                        if (d.Length == 2)
                                return new Point (int.Parse (d [0]), int.Parse (d [1]));
                        else if (d.Length == 1) {

diff --git a/src/Rectangle.cs b/src/Rectangle.cs
index e9445224be38d57f9f1cf6f2bfe94ad3230cbb7a..9a4ef396dfd64430585277b1f0913ed47a70bb75 100644 (file)
--- a/src/Rectangle.cs
+++ b/src/Rectangle.cs
@@ -236,11 +236,11 @@ namespace Crow
         }
         public override string ToString()
         {
-            return string.Format("{0};{1};{2};{3}", X, Y, Width, Height);
+            return string.Format("{0},{1},{2},{3}", X, Y, Width, Height);
         }
         public static Rectangle Parse(string s)
         {
-            string[] d = s.Split(new char[] { ';' });
+            string[] d = s.Split(new char[] { ',' });
             return new Rectangle(
                 int.Parse(d[0]),
                 int.Parse(d[1]),

diff --git a/src/Size.cs b/src/Size.cs
index 21ddb539ab4a894dead4f360782f0c70d833699f..5059d31acd567dfd7d810eaa6e0e519fb91a8ef9 100644 (file)
--- a/src/Size.cs
+++ b/src/Size.cs
@@ -153,7 +153,7 @@ namespace Crow
                }
                public static Size Parse(string s)
                {
-                       string[] d = s.Split(new char[] { ';' });
+                       string[] d = s.Split(new char[] { ',' });
                        return d.Length == 1 ? new Size(int.Parse(d[0])) : new Size(
                                int.Parse(d[0]),
                                int.Parse(d[1]));