From fda39ed7506551ab48dce271cb2d5e9c63f2b00c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jean-Philippe=20Bruy=C3=A8re?= Date: Tue, 13 Mar 2018 17:16:24 +0100 Subject: [PATCH] limit to html safe color plus several ones, crowIDE wip --- Crow.csproj | 2 +- Default.style | 26 +- Templates/ColorPicker.template | 2 +- Templates/ContextMenu.template | 4 +- Templates/FileDialog.template | 2 +- Templates/HScrollBar.template | 6 +- Templates/MenuItem.template | 2 +- Templates/ScrollBar.template | 6 +- Templates/TabItem.template | 2 +- Templates/Tooltip.template | 4 +- Tests/BasicTests.cs | 16 +- Tests/Interfaces/Container/0.crow | 4 +- Tests/Interfaces/Container/2.crow | 4 +- Tests/Interfaces/Container/3.crow | 4 +- Tests/Interfaces/Divers/0.crow | 20 +- Tests/Interfaces/Divers/colorPicker.crow | 4 +- Tests/Interfaces/Divers/testPropLess.crow | 2 +- Tests/Interfaces/Divers/testShape.crow | 6 +- Tests/Interfaces/Divers/welcome.crow | 6 +- Tests/Interfaces/DragAndDrop/0.crow | 12 +- Tests/Interfaces/Experimental/testDock.crow | 6 +- Tests/Interfaces/Experimental/testDock2.crow | 2 +- Tests/Interfaces/Experimental/testStack.crow | 4 +- Tests/Interfaces/GraphicObject/0.crow | 2 +- Tests/Interfaces/GraphicObject/1.crow | 2 +- Tests/Interfaces/Group/0.crow | 8 +- Tests/Interfaces/Group/1.crow | 20 +- Tests/Interfaces/Group/2.crow | 20 +- Tests/Interfaces/Group/3.crow | 20 +- Tests/Interfaces/Group/4.crow | 4 +- Tests/Interfaces/Splitter/1.crow | 2 +- Tests/Interfaces/Stack/0.crow | 8 +- Tests/Interfaces/Stack/0h.crow | 8 +- Tests/Interfaces/Stack/1.crow | 8 +- Tests/Interfaces/Stack/1h.crow | 8 +- Tests/Interfaces/Stack/2.crow | 8 +- Tests/Interfaces/Stack/2h.crow | 8 +- Tests/Interfaces/Stack/3.crow | 44 +- Tests/Interfaces/Stack/3h.crow | 44 +- Tests/Interfaces/Stack/4.crow | 44 +- Tests/Interfaces/TabItem.template | 2 +- Tests/Interfaces/TemplatedContainer/0.crow | 2 +- .../TemplatedContainer/testTabView.crow | 10 +- .../TemplatedContainer/testTabView2.crow | 16 +- .../TemplatedControl/testCombobox.crow | 2 +- Tests/Interfaces/Wrapper/1.1.crow | 20 +- Tests/Interfaces/Wrapper/1.crow | 20 +- Tests/Interfaces/Wrapper/2.1.crow | 20 +- Tests/Interfaces/Wrapper/2.2.crow | 56 +- Tests/Interfaces/Wrapper/2.crow | 20 +- Tests/Tests.csproj | 4 +- Tests/Tutorials/T4_Gauge.cs | 2 +- Tests/test.style | 16 +- Tests/ui/showcase.crow | 4 +- Tests/ui/test.crow | 4 +- src/Colors.cs | 1105 ++++------------- src/GraphicObjects/Border.cs | 2 +- src/GraphicObjects/ColorPicker.cs | 11 +- src/GraphicObjects/Expandable.cs | 2 +- src/GraphicObjects/GraphicObject.cs | 2 +- src/GraphicObjects/Label.cs | 2 +- src/GraphicObjects/SaturationValueSelector.cs | 2 +- src/GraphicObjects/Window.cs | 4 +- src/Instantiator.cs | 10 +- src/Interface.cs | 4 +- src/ObservableList.cs | 1 + src/Size.cs | 8 + src/StyleReader.cs | 26 +- 68 files changed, 554 insertions(+), 1227 deletions(-) diff --git a/Crow.csproj b/Crow.csproj index f14b185a..db3da7bb 100644 --- a/Crow.csproj +++ b/Crow.csproj @@ -36,7 +36,7 @@ true - __linux__ + DESIGN_MODE $(SolutionDir)build\Release diff --git a/Default.style b/Default.style index 54d2b974..f1445fe5 100644 --- a/Default.style +++ b/Default.style @@ -14,7 +14,7 @@ GroupBox { Caption = "Group Box"; } ControlBorder { BorderWidth = "1"; - Foreground = "Jet"; + Foreground = "DimGray"; Background = "Transparent"; } ControlCaption { @@ -42,7 +42,7 @@ Label { } Menu { Margin = "1"; - Background = "vgradient|0:DimGray|1:Onyx"; + Background = "vgradient|0:DimGray|1:Black"; Height = "Fit"; Width = "Stretched"; VerticalAlignment = "Top"; @@ -54,7 +54,7 @@ MenuItem { Height = "Fit"; Background = "Transparent"; Foreground = "LightGray"; - MouseEnter = "{Background = vgradient|0:UnitedNationsBlue|1:Onyx;Foreground=White;}"; + MouseEnter = "{Background = vgradient|0:SteelBlue|1:Jet;Foreground=White;}"; MouseLeave = "{Foreground=LightGray;Background=Transparent;}"; SelectionBackground = "Transparent"; } @@ -144,7 +144,7 @@ FileDialog { Height = "300"; } ProgressBar { - Foreground = "vgradient|0:BlueCrayola|0.5:SkyBlue|1:BlueCrayola"; + Foreground = "vgradient|0:DarkBlue|0.5:SkyBlue|1:DarkBlue"; } ScrollBar { Maximum = "0"; @@ -185,7 +185,7 @@ TxtInFileDialog { CheckBoxAlt { Template= "#Crow.Templates.CheckBox2.template"; Background = "Transparent"; - Checked="{Background=DarkSlateGray;Foreground=LightGray;}"; + Checked="{Background=Gray;Foreground=LightGray;}"; Unchecked = "{Background=Transparent;Foreground=DimGray;}"; } @@ -194,12 +194,12 @@ ArrowBut { Height="Fit"; Width="Fit"; Focusable="true"; - Foreground="Jet"; + Foreground="Onyx"; Background="hgradient|0:Gray|1:Jet"; - MouseDown="{Background=hgradient|0:White|0.4:BlueCrayola|1:Jet}"; - MouseUp="{Background=hgradient|0:Gray|1:Jet}"; + MouseDown="{Background=hgradient|0:White|0.4:CornflowerBlue|1:Jet}"; + MouseUp="{Background=hgradient|0:Gray|1:DimGray}"; MouseEnter="{Foreground=Black}"; - MouseLeave="{Foreground=Jet}"; + MouseLeave="{Foreground=Onyx}"; } HArrowBut { MouseRepeat="true"; @@ -207,9 +207,9 @@ HArrowBut { Width="Fit"; Focusable="true"; Foreground="Jet"; - Background="vgradient|0:Gray|1:Jet"; - MouseDown="{Background=vgradient|0:White|0.4:BlueCrayola|1:Jet}"; - MouseUp="{Background=vgradient|0:Gray|1:Jet}"; + Background="vgradient|0:Gray|1:DimGray"; + MouseDown="{Background=vgradient|0:White|0.4:DarkBlue|1:Jet}"; + MouseUp="{Background=vgradient|0:Gray|1:DimGray}"; MouseEnter="{Foreground=Black}"; - MouseLeave="{Foreground=Jet}"; + MouseLeave="{Foreground=DimGray}"; } \ No newline at end of file diff --git a/Templates/ColorPicker.template b/Templates/ColorPicker.template index f626bfea..71965850 100755 --- a/Templates/ColorPicker.template +++ b/Templates/ColorPicker.template @@ -10,7 +10,7 @@ -