V2

.editorconfig

@@ -0,0 +1,3 @@
+root = true
+
+

.github/workflows/build.yml

@@ -4,19 +4,22 @@ on: push
 
 jobs:
   package:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+
       - name: Build
         run: cd src && dotnet build
+
       - name: Test
         run: |
           cd tests && dotnet test --configuration Debug --verbosity normal --collect:'XPlat Code Coverage' --settings coverlet.runsettings
+
       - name: Move test results to accessible directory
         run: |
-          mkdir TestResults
-          mv -v tests/TestResults/*/*.* TestResults/
-      # Note: this step is currently not writing to the gist for some reason
+          mkdir -p TestResults
+          find tests/TestResults -type f -name "*.xml" -exec mv -v --backup=numbered {} TestResults/ \;
+
       - name: Create Test Coverage Badge
         uses: simon-k/dotnet-code-coverage-badge@v1.0.0
         id: create_coverage_badge
@@ -33,8 +36,10 @@ jobs:
         run: |
           echo "Code coverage percentage: ${{steps.create_coverage_badge.outputs.percentage}}%"
           echo "Badge data: ${{steps.create_coverage_badge.outputs.badge}}"
+
       - name: Pack
-        run: cd src && dotnet pack
-      - name: Publish to Nuget
+        run: cd src && dotnet pack --configuration Debug --output ./nupkg
+
+      - name: Publish to NuGet
         if: contains(github.ref, 'refs/tags/v')
-        run: dotnet nuget push ./src/nupkg/TerminalGuiDesigner.$(fgrep \<Version\> ./src/TerminalGuiDesigner.csproj | grep -oEi '[0-9.]+').nupkg --api-key ${{ secrets.NUGET_KEY }} --source https://api.nuget.org/v3/index.json
+        run: dotnet nuget push ./src/nupkg/*.nupkg --api-key ${{ secrets.NUGET_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate

.github/workflows/codeql.yml

@@ -0,0 +1,67 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "convert-tests-to-constraint-model","v2","v2_latest_changes_pre_220" ]
+
+
+jobs:
+  analyze:
+    name: Analyze
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners
+    # Consider using larger runners for possible analysis time improvements.
+    runs-on: ${{ 'ubuntu-latest' }}
+    timeout-minutes: ${{ 360 }}
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'csharp' ]
+
+    steps:
+    - name: Set up .net 8 SDK
+      uses: actions/setup-dotnet@v3.2.0
+      with:
+        dotnet-version: 8.0
+
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+
+    # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #     echo "Run, Build Application using script"
+    #     ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"

README.md

@@ -7,6 +7,9 @@ Cross platform designer for [Terminal.Gui](https://github.com/migueldeicaza/gui.
 
 Built with CodeDom and Roslyn, TerminalGuiDesigner lets you create complicated Views with drag and drop just like the WinForms designer you know and love (or hate).
 
+
+## V1
+
 Install the tool from NuGet or follow the [Hello World Tutorial](./README.md#usage):
 ```
 dotnet tool install --global TerminalGuiDesigner
@@ -16,10 +19,19 @@ Update to the latest version using
 ```
 dotnet tool update --global TerminalGuiDesigner
 ```
-
 This project is in alpha.  See the [feature list](./README.md#features) for progress.
 
-![newdemo](https://user-images.githubusercontent.com/31306100/175789072-27fcacf0-e9f0-4543-818d-50058bb46a2f.gif)
+## V2 
+
+If you are targetting Terminal.Gui version 2 (currently pre-alpha) then you will want to install version 2 of the designer
+```
+dotnet tool install --global TerminalGuiDesigner --prerelease
+```
+Ensure that you match the Terminal.Gui library version you reference to the designer version.
+
+## Demo
+
+![long-demo](https://github.com/gui-cs/TerminalGuiDesigner/assets/31306100/5df9f545-8c61-4655-bc0c-1e75d1c149d9)
 
 ### Building
 ----------------
@@ -62,7 +74,7 @@ You can add new code to `MyDialog.cs` but avoid making any changes to `MyDialog.
 For example in `MyDialog.cs` after `InitializeComponent()` add the following:
 
 ```csharp
-button1.Clicked += ()=>MessageBox.Query("Hello","Hello World","Ok");
+button1.Accept += ()=>MessageBox.Query("Hello","Hello World","Ok");
 ```
 Now when run clicking the button will trigger a message box.
 
@@ -207,6 +219,7 @@ italics are experimental and require passing the `-e` flag when starting applica
   - [x] TimeField
   - [x] TreeView
   - [x] View
+  - [x] Slider
 
 ### Class Diagram
 -------------------------------

src/.gitattributes

@@ -0,0 +1 @@
+Keys.yaml eol=lf

src/ArrayExtensions.cs

@@ -1,3 +1,7 @@
+using System.Collections;
+using System.Collections.ObjectModel;
+using Terminal.Gui;
+
 namespace TerminalGuiDesigner;
 
 /// <summary>
@@ -26,4 +30,23 @@
 
         return toReturn;
     }
+
+    public static IListDataSource ToListDataSource(this IEnumerable enumerable)
+    {
+        // Get the type of the elements
+        var elementType = enumerable.GetType().GetElementType() ?? enumerable.GetType().GetGenericArguments().FirstOrDefault();
+        if (elementType == null)
+        {
+            throw new Exception("Unable to get element type for collection");
+        }
+
+        // Convert the enumerable to an ObservableCollection<T>
+        var observableCollectionType = typeof(ObservableCollection<>).MakeGenericType(elementType);
+        var list = Activator.CreateInstance(observableCollectionType, enumerable);
+
+        // Create an instance of ListWrapper<T>
+        var listWrapperType = typeof(ListWrapper<>).MakeGenericType(elementType);
+        return (IListDataSource)Activator.CreateInstance(listWrapperType, list);
+    }
+
 }

src/AttributeExtensions.cs

@@ -12,6 +12,6 @@ public static class AttributeExtensions
     /// <returns>Code construct <paramref name="a"/>.</returns>
     public static string ToCode(this Terminal.Gui.Attribute a)
     {
-        return $"Terminal.Gui.Attribute.Make(Color.{a.Foreground},Color.{a.Background})";
+        return $"new Terminal.Gui.Attribute(Terminal.Gui.Color.{a.Foreground},Terminal.Gui.Color.{a.Background})";
     }
 }

src/ColorSchemeManager.cs

@@ -61,7 +61,7 @@ public void Remove(NamedColorScheme toDelete)
     /// schemes.
     /// </summary>
     /// <param name="viewBeingEdited">View to find color schemes in, must be the root design (i.e. <see cref="Design.IsRoot"/>).</param>
-    /// <exception cref="ArgumentException">Thrown if passed a non root <see cref="Design"/>.</exception>
+    /// <exception cref="ArgumentException">Thrown if passed a non-root <see cref="Design"/>.</exception>
     public void FindDeclaredColorSchemes(Design viewBeingEdited)
     {
         if (!viewBeingEdited.IsRoot)
@@ -94,7 +94,7 @@ public void FindDeclaredColorSchemes(Design viewBeingEdited)
     /// <returns>The name of the scheme or null if it is not known.</returns>
     public string? GetNameForColorScheme(ColorScheme s)
     {
-        var match = this.colorSchemes.Where(kvp => s.AreEqual(kvp.Scheme)).ToArray();
+        var match = this.colorSchemes.Where(kvp => s.Equals(kvp.Scheme)).ToArray();
 
         if (match.Length > 0)
         {
@@ -114,16 +114,16 @@ public void FindDeclaredColorSchemes(Design viewBeingEdited)
     /// Will become <see cref="NamedColorScheme.Name"/>.</param>
     /// <param name="scheme">The new <see cref="ColorScheme"/> color values to use.</param>
     /// <param name="rootDesign">The topmost <see cref="Design"/> the user is editing (see <see cref="Design.GetRootDesign"/>).</param>
-    public void AddOrUpdateScheme(string name, ColorScheme scheme, Design rootDesign)
+    /// <returns>A reference to the <see cref="ColorScheme"/> that was added or updated.</returns>
+    public ColorScheme AddOrUpdateScheme(string name, ColorScheme scheme, Design rootDesign)
     {
-        var oldScheme = this.colorSchemes.FirstOrDefault(c => c.Name.Equals(name));
-
         // if we don't currently know about this scheme
-        if (oldScheme == null)
+        if (this.colorSchemes.FirstOrDefault(c => c.Name.Equals(name)) is not { } oldScheme)
         {
             // simply record that we now know about it and exit
-            this.colorSchemes.Add(new NamedColorScheme(name, scheme));
-            return;
+            NamedColorScheme newColorScheme = new (name, scheme);
+            this.colorSchemes.Add(newColorScheme);
+            return newColorScheme.Scheme;
         }
 
         // we know about this color already and people may be using it!
@@ -138,6 +138,7 @@ public void AddOrUpdateScheme(string name, ColorScheme scheme, Design rootDesign
         }
 
         oldScheme.Scheme = scheme;
+        return scheme;
     }
 
     /// <summary>

src/DefaultColorSchemes.cs

@@ -16,43 +16,49 @@ public class DefaultColorSchemes
     /// </summary>
     public DefaultColorSchemes()
     {
-        this.RedOnBlack = new NamedColorScheme("redOnBlack");
-        this.RedOnBlack.Scheme.Normal = new Terminal.Gui.Attribute(Terminal.Gui.Color.Red, Terminal.Gui.Color.Black);
-        this.RedOnBlack.Scheme.HotNormal = new Terminal.Gui.Attribute(Terminal.Gui.Color.BrightRed, Terminal.Gui.Color.Black);
-        this.RedOnBlack.Scheme.Focus = new Terminal.Gui.Attribute(Terminal.Gui.Color.Red, Terminal.Gui.Color.Brown);
-        this.RedOnBlack.Scheme.HotFocus = new Terminal.Gui.Attribute(Terminal.Gui.Color.BrightRed, Terminal.Gui.Color.Brown);
-        this.RedOnBlack.Scheme.Disabled = new Terminal.Gui.Attribute(Terminal.Gui.Color.Gray, Terminal.Gui.Color.Black);
+        this.RedOnBlack = new NamedColorScheme("redOnBlack",
+            new ColorScheme(
+        normal: new Terminal.Gui.Attribute(Terminal.Gui.Color.Red, Terminal.Gui.Color.Black),
+        hotNormal: new Terminal.Gui.Attribute(Terminal.Gui.Color.BrightRed, Terminal.Gui.Color.Black),
+        focus: new Terminal.Gui.Attribute(Terminal.Gui.Color.Red, Terminal.Gui.Color.Yellow),
+        hotFocus: new Terminal.Gui.Attribute(Terminal.Gui.Color.BrightRed, Terminal.Gui.Color.Yellow),
+        disabled: new Terminal.Gui.Attribute(Terminal.Gui.Color.Gray, Terminal.Gui.Color.Black)
+            ));
 
-        this.GreenOnBlack = new NamedColorScheme("greenOnBlack");
-        this.GreenOnBlack.Scheme.Normal = new Terminal.Gui.Attribute(Terminal.Gui.Color.Green, Terminal.Gui.Color.Black);
-        this.GreenOnBlack.Scheme.HotNormal = new Terminal.Gui.Attribute(Terminal.Gui.Color.BrightGreen, Terminal.Gui.Color.Black);
-        this.GreenOnBlack.Scheme.Focus = new Terminal.Gui.Attribute(Terminal.Gui.Color.Green, Terminal.Gui.Color.Magenta);
-        this.GreenOnBlack.Scheme.HotFocus = new Terminal.Gui.Attribute(Terminal.Gui.Color.BrightGreen, Terminal.Gui.Color.Magenta);
-        this.GreenOnBlack.Scheme.Disabled = new Terminal.Gui.Attribute(Terminal.Gui.Color.Gray, Terminal.Gui.Color.Black);
+        this.GreenOnBlack = new NamedColorScheme("greenOnBlack",
+            new ColorScheme(
+        normal : new Terminal.Gui.Attribute(Terminal.Gui.Color.Green, Terminal.Gui.Color.Black),
+        hotNormal: new Terminal.Gui.Attribute(Terminal.Gui.Color.BrightGreen, Terminal.Gui.Color.Black),
+        focus: new Terminal.Gui.Attribute(Terminal.Gui.Color.Green, Terminal.Gui.Color.Magenta),
+        hotFocus: new Terminal.Gui.Attribute(Terminal.Gui.Color.BrightGreen, Terminal.Gui.Color.Magenta),
+        disabled : new Terminal.Gui.Attribute(Terminal.Gui.Color.Gray, Terminal.Gui.Color.Black)));
 
-        this.BlueOnBlack = new NamedColorScheme("blueOnBlack");
-        this.BlueOnBlack.Scheme.Normal = new Terminal.Gui.Attribute(Terminal.Gui.Color.BrightBlue, Terminal.Gui.Color.Black);
-        this.BlueOnBlack.Scheme.HotNormal = new Terminal.Gui.Attribute(Terminal.Gui.Color.Cyan, Terminal.Gui.Color.Black);
-        this.BlueOnBlack.Scheme.Focus = new Terminal.Gui.Attribute(Terminal.Gui.Color.BrightBlue, Terminal.Gui.Color.BrightYellow);
-        this.BlueOnBlack.Scheme.HotFocus = new Terminal.Gui.Attribute(Terminal.Gui.Color.Cyan, Terminal.Gui.Color.BrightYellow);
-        this.BlueOnBlack.Scheme.Disabled = new Terminal.Gui.Attribute(Terminal.Gui.Color.Gray, Terminal.Gui.Color.Black);
+        this.BlueOnBlack = new NamedColorScheme("blueOnBlack",
+            new ColorScheme(
+        normal : new Terminal.Gui.Attribute(Terminal.Gui.Color.BrightBlue, Terminal.Gui.Color.Black),
+        hotNormal: new Terminal.Gui.Attribute(Terminal.Gui.Color.Cyan, Terminal.Gui.Color.Black),
+        focus: new Terminal.Gui.Attribute(Terminal.Gui.Color.BrightBlue, Terminal.Gui.Color.BrightYellow),
+        hotFocus: new Terminal.Gui.Attribute(Terminal.Gui.Color.Cyan, Terminal.Gui.Color.BrightYellow),
+        disabled: new Terminal.Gui.Attribute(Terminal.Gui.Color.Gray, Terminal.Gui.Color.Black)));
 
-        this.GrayOnBlack = new NamedColorScheme("greyOnBlack");
-        this.GrayOnBlack.Scheme.Normal = new Terminal.Gui.Attribute(Terminal.Gui.Color.DarkGray, Terminal.Gui.Color.Black);
-        this.GrayOnBlack.Scheme.HotNormal = new Terminal.Gui.Attribute(Terminal.Gui.Color.DarkGray, Terminal.Gui.Color.Black);
-        this.GrayOnBlack.Scheme.Focus = new Terminal.Gui.Attribute(Terminal.Gui.Color.Black, Terminal.Gui.Color.DarkGray);
-        this.GrayOnBlack.Scheme.HotFocus = new Terminal.Gui.Attribute(Terminal.Gui.Color.Black, Terminal.Gui.Color.DarkGray);
-        this.GrayOnBlack.Scheme.Disabled = new Terminal.Gui.Attribute(Terminal.Gui.Color.DarkGray, Terminal.Gui.Color.Black);
+        this.GrayOnBlack = new NamedColorScheme("greyOnBlack",
+            new ColorScheme(
+        normal : new Terminal.Gui.Attribute(Terminal.Gui.Color.DarkGray, Terminal.Gui.Color.Black),
+        hotNormal: new Terminal.Gui.Attribute(Terminal.Gui.Color.DarkGray, Terminal.Gui.Color.Black),
+        focus: new Terminal.Gui.Attribute(Terminal.Gui.Color.Black, Terminal.Gui.Color.DarkGray),
+        hotFocus: new Terminal.Gui.Attribute(Terminal.Gui.Color.Black, Terminal.Gui.Color.DarkGray),
+        disabled: new Terminal.Gui.Attribute(Terminal.Gui.Color.DarkGray, Terminal.Gui.Color.Black)));
 
-        this.TerminalGuiDefault = new NamedColorScheme("tgDefault");
-        this.TerminalGuiDefault.Scheme.Normal = new Terminal.Gui.Attribute(Color.White, Color.Blue);
-        this.TerminalGuiDefault.Scheme.HotNormal = new Terminal.Gui.Attribute(Color.BrightCyan, Color.Blue);
-        this.TerminalGuiDefault.Scheme.Focus = new Terminal.Gui.Attribute(Color.Black, Color.Gray);
-        this.TerminalGuiDefault.Scheme.HotFocus = new Terminal.Gui.Attribute(Color.BrightBlue, Color.Gray);
+        this.TerminalGuiDefault = new NamedColorScheme("tgDefault",
+            new ColorScheme(
+        normal : new Terminal.Gui.Attribute(Color.White, Color.Blue),
+        hotNormal : new Terminal.Gui.Attribute(Color.BrightCyan, Color.Blue),
+        focus : new Terminal.Gui.Attribute(Color.Black, Color.Gray),
+        hotFocus : new Terminal.Gui.Attribute(Color.BrightBlue, Color.Gray),
 
         // HACK : Keeping this foreground as Brown because otherwise designer will think this is legit
         // the real default and assume user has not chosen it.  See: https://github.com/gui-cs/TerminalGuiDesigner/issues/133
-        this.TerminalGuiDefault.Scheme.Disabled = new Terminal.Gui.Attribute(Color.Brown, Color.Blue);
+        disabled: new Terminal.Gui.Attribute(Color.Yellow, Color.Blue)));
     }
 
     /// <summary>