From 688cd87004569c122bf19c127699c5b034492528 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jean-Philippe=20Bruy=C3=A8re?= Date: Tue, 13 Feb 2018 06:53:18 +0100 Subject: [PATCH] CrowIDE, ObservableList, include Crow.Coding --- Crow.csproj | 8 +- Crow.sln | 35 ++++++--- Default.style | 2 +- Templates/ColorPicker.template | 2 +- Templates/Spinner.template | 16 ++-- Tests/BasicTests.cs | 6 +- Tests/CrowWindow.cs | 9 ++- Tests/Interfaces/TabItem.template | 22 ++++++ .../TemplatedContainer/testTabView.crow | 8 +- .../TemplatedControl/testSpinner.crow | 1 + Tests/Tests.csproj | 17 +++- src/GraphicObjects/GraphicObject.cs | 7 +- src/GraphicObjects/Group.cs | 14 +++- src/GraphicObjects/IMLContainer.cs | 50 ++++++++++++ src/GraphicObjects/MDIContainer.cs | 40 ++++++++++ src/GraphicObjects/MessageBox.cs | 4 +- src/GraphicObjects/PrivateContainer.cs | 3 +- src/GraphicObjects/TabItem.cs | 54 ++++++++----- src/GraphicObjects/TabView.cs | 77 +++++++++++-------- src/GraphicObjects/TemplatedGroup.cs | 37 ++++++++- src/IListChanged.cs | 43 +++++++++++ src/Instantiator.cs | 24 ++++-- src/Interface.cs | 14 ++-- src/ObservableList.cs | 46 +++++++++++ 24 files changed, 437 insertions(+), 102 deletions(-) create mode 100644 Tests/Interfaces/TabItem.template create mode 100644 src/GraphicObjects/IMLContainer.cs create mode 100644 src/GraphicObjects/MDIContainer.cs create mode 100644 src/IListChanged.cs create mode 100644 src/ObservableList.cs diff --git a/Crow.csproj b/Crow.csproj index a8b47dc8..4de640dd 100644 --- a/Crow.csproj +++ b/Crow.csproj @@ -30,12 +30,14 @@ true full true - DEBUG_UPDATE0;DEBUG_FOCUS0;DEBUG_LAYOUTING0;TRACE0;DEBUG;MEASURE_TIME;DEBUG_LOAD0;DEBUG_BINDING0;DEBUG_CLIP_RECTANGLE0 + DEBUG_UPDATE0;DEBUG_FOCUS0;DEBUG_LAYOUTING0;TRACE0;DEBUG;MEASURE_TIME;DEBUG_LOAD0;DEBUG_BINDING;DEBUG_CLIP_RECTANGLE0 false + $(SolutionDir)build\Debug true __linux__ + $(SolutionDir)build\Release @@ -213,6 +215,10 @@ + + + + diff --git a/Crow.sln b/Crow.sln index 5fc9079f..61aaa3af 100644 --- a/Crow.sln +++ b/Crow.sln @@ -9,6 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Crow.Test", "Crow.Test\Crow EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CrowIDE", "CrowIDE\CrowIDE.csproj", "{B6D911CD-1D09-42FC-B300-9187190F2AE1}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Crow.Coding", "..\gts\CrowEdit\Crow.Coding\Crow.Coding.csproj", "{78842EE4-8A2F-4C75-AEC6-C95F15AD3994}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -22,32 +24,46 @@ Global {74289092-9F70-4941-AFCB-DFD7BE2140B6}.Release|Any CPU.ActiveCfg = Release|Any CPU {74289092-9F70-4941-AFCB-DFD7BE2140B6}.Release|Any CPU.Build.0 = Release|Any CPU {B6D911CD-1D09-42FC-B300-9187190F2AE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B6D911CD-1D09-42FC-B300-9187190F2AE1}.Debug|Any CPU.Build.0 = Debug|Any CPU {B6D911CD-1D09-42FC-B300-9187190F2AE1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B6D911CD-1D09-42FC-B300-9187190F2AE1}.Release|Any CPU.Build.0 = Release|Any CPU {C2980F9B-4798-4C05-99E2-E174810F7C7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C2980F9B-4798-4C05-99E2-E174810F7C7B}.Debug|Any CPU.Build.0 = Debug|Any CPU {C2980F9B-4798-4C05-99E2-E174810F7C7B}.Release|Any CPU.ActiveCfg = Release|Any CPU {C2980F9B-4798-4C05-99E2-E174810F7C7B}.Release|Any CPU.Build.0 = Release|Any CPU + {78842EE4-8A2F-4C75-AEC6-C95F15AD3994}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {78842EE4-8A2F-4C75-AEC6-C95F15AD3994}.Debug|Any CPU.Build.0 = Debug|Any CPU + {78842EE4-8A2F-4C75-AEC6-C95F15AD3994}.Release|Any CPU.ActiveCfg = Release|Any CPU + {78842EE4-8A2F-4C75-AEC6-C95F15AD3994}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution Policies = $0 $0.StandardHeader = $1 $1.Text = @\n${FileName}\n \nAuthor:\n ${AuthorName} <${AuthorEmail}>\n\nCopyright (c) 2013-2017 Jean-Philippe Bruyère\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the "Software"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE. - $1.IncludeInNewFiles = True $0.DotNetNamingPolicy = $2 - $2.DirectoryNamespaceAssociation = None - $2.ResourceNamePolicy = FileFormatDefault $0.TextStylePolicy = $3 - $3.FileWidth = 120 - $3.TabsToSpaces = False $3.EolMarker = Unix - $3.inheritsSet = VisualStudio - $3.inheritsScope = text/plain $3.scope = text/x-csharp $0.CSharpFormattingPolicy = $4 $4.AfterDelegateDeclarationParameterComma = True - $4.inheritsSet = Mono - $4.inheritsScope = text/x-csharp $4.scope = text/x-csharp + $4.IndentSwitchSection = False + $4.NewLinesForBracesInProperties = False + $4.NewLinesForBracesInAccessors = False + $4.NewLinesForBracesInAnonymousMethods = False + $4.NewLinesForBracesInControlBlocks = False + $4.NewLinesForBracesInAnonymousTypes = False + $4.NewLinesForBracesInObjectCollectionArrayInitializers = False + $4.NewLinesForBracesInLambdaExpressionBody = False + $4.NewLineForElse = False + $4.NewLineForCatch = False + $4.NewLineForFinally = False + $4.NewLineForMembersInObjectInit = False + $4.NewLineForMembersInAnonymousTypes = False + $4.NewLineForClausesInQuery = False + $4.SpacingAfterMethodDeclarationName = True + $4.SpaceAfterMethodCallName = True + $4.SpaceBeforeOpenSquareBracket = True $0.VersionControlPolicy = $5 $5.CommitMessageStyle = $6 $6.Indent = @\t @@ -55,7 +71,6 @@ Global $6.LastFilePostfix = "@:\n " $6.LineAlign = 0 $6.Wrap = False - $5.inheritsSet = Mono description = @C.R.O.W. c# Rapid Open Widgets\n\nCrow is a pure c# widget toolkit with XML definition of interface, bindings, styling...\n version = 0.5 EndGlobalSection diff --git a/Default.style b/Default.style index c5c04ea7..9a0f3f54 100644 --- a/Default.style +++ b/Default.style @@ -157,7 +157,7 @@ ArrowBut { Focusable=true; Foreground=Jet; Background=hgradient|0:Gray|1:Jet; - MouseDown={Background=hgradient|0:White|0.2:BlueCrayola|1:Jet}; + MouseDown={Background=hgradient|0:White|0.4:BlueCrayola|1:Jet}; MouseUp={Background=hgradient|0:Gray|1:Jet}; MouseEnter={Foreground=Black}; MouseLeave={Foreground=Jet}; diff --git a/Templates/ColorPicker.template b/Templates/ColorPicker.template index d6bda346..f626bfea 100755 --- a/Templates/ColorPicker.template +++ b/Templates/ColorPicker.template @@ -8,7 +8,7 @@ Width="128" Height="128"/> - +