Merge branch 'v2_develop' into v2_release

.github/workflows/build-release.yml

@@ -1,4 +1,4 @@
-name: Ensure that Release builds are not broken
+name: Ensure that Release Build of Solution Builds Correctly
 
 on:
   push:
@@ -15,7 +15,7 @@ jobs:
     # Ensure that RELEASE builds are not broken
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout code
+    - name: Checkout ${{ github.ref_name }}
       uses: actions/checkout@v4
 
     - name: Setup .NET Core
@@ -25,7 +25,7 @@ jobs:
         dotnet-quality: 'ga'
 
     - name: Build Release Terminal.Gui
-      run: dotnet build Terminal.Gui/Terminal.Gui.csproj --configuration Release
+      run: dotnet build Terminal.Gui/Terminal.Gui.csproj --no-incremental --nologo --force --configuration Release
 
     - name: Pack Release Terminal.Gui
       run: dotnet pack Terminal.Gui/Terminal.Gui.csproj --configuration Release --output ./local_packages

.github/workflows/publish.yml

@@ -1,4 +1,4 @@
-name: Publish Terminal.Gui
+name: Publish Terminal.Gui to Nuget
 
 on:
   push:
@@ -14,9 +14,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - name: Checkout ${{ github.ref_name }}
+      uses: actions/checkout@v4
       with:
-        fetch-depth: 0 # fetch-depth is needed for GitVersion
+        fetch-depth: 0 # fetch-depth is needed for GitVersion https://github.com/GitTools/actions/blob/main/docs/cloning.md
 
     - name: Install GitVersion
       uses: gittools/actions/gitversion/[email protected]
@@ -33,18 +34,13 @@ jobs:
     - name: Setup dotnet
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0
+        dotnet-version: 8.x
         dotnet-quality: 'ga'
-        
-    - name: Install dependencies
-      run: dotnet restore
 
-    - name: Build Release
-      run: |
-        dotnet build Terminal.Gui/Terminal.Gui.csproj --no-incremental --nologo --force --configuration Release
-        dotnet test Terminal.Gui/Terminal.Gui.csproj --configuration Release
+    - name: Build Release Terminal.Gui
+      run: dotnet build Terminal.Gui/Terminal.Gui.csproj --no-incremental --nologo --force --configuration Release
 
-    - name: Pack
+    - name: Pack Release Terminal.Gui ${{ steps.gitversion.outputs.SemVer }} for Nuget
       run: dotnet pack Terminal.Gui/Terminal.Gui.csproj -c Release --include-symbols -p:Version='${{ steps.gitversion.outputs.SemVer }}' 
 
     # - name: Test to generate Code Coverage Report
@@ -69,5 +65,5 @@ jobs:
     #     echo "Code coverage percentage: ${{steps.create_coverage_badge.outputs.percentage}}%"
     #     echo "Badge data: ${{steps.create_coverage_badge.outputs.badge}}"
         
-    - name: Publish to NuGet.org
+    - name: Publish Terminal.Gui.${{ steps.gitversion.outputs.SemVer }} to NuGet.org
       run: dotnet nuget push Terminal.Gui/bin/Release/Terminal.Gui.${{ steps.gitversion.outputs.SemVer }}.nupkg --api-key ${{ secrets.NUGET_API_KEY }} 

Examples/CommunityToolkitExample/LoginView.Designer.cs

@@ -1,4 +1,6 @@
-using Terminal.Gui;
+
+using Terminal.Gui.ViewBase;
+using Terminal.Gui.Views;
 
 namespace CommunityToolkitExample;
 

Examples/CommunityToolkitExample/LoginView.cs

@@ -1,5 +1,6 @@
 using CommunityToolkit.Mvvm.Messaging;
-using Terminal.Gui;
+using Terminal.Gui.App;
+using Terminal.Gui.ViewBase;
 
 namespace CommunityToolkitExample;
 

Examples/CommunityToolkitExample/LoginViewModel.cs

@@ -1,7 +1,8 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
-using Terminal.Gui;
+using Terminal.Gui.Configuration;
+using Terminal.Gui.Drawing;
 
 namespace CommunityToolkitExample;
 

Examples/CommunityToolkitExample/Program.cs

@@ -1,5 +1,8 @@
 using Microsoft.Extensions.DependencyInjection;
-using Terminal.Gui;
+using Terminal.Gui.Configuration;
+using Terminal.Gui.App;
+using Terminal.Gui.ViewBase;
+
 
 namespace CommunityToolkitExample;
 

Examples/Example/Example.cs

@@ -1,9 +1,14 @@
-// This is a simple example application.  For the full range of functionality
-// see the UICatalog project
+// A simple Terminal.Gui example in C# - using C# 9.0 Top-level statements
 
-// A simple Terminal.Gui example in C# - using C# 9.0 Top-level statements
+// This is a simple example application.  For the full range of functionality
+// see the UICatalog project
 
-using Terminal.Gui;
+using Terminal.Gui.Configuration;
+using Terminal.Gui.App;
+using Terminal.Gui.Drawing;
+using Terminal.Gui.ViewBase;
+using Terminal.Gui.Views;
+using Attribute = Terminal.Gui.Drawing.Attribute;
 
 // Override the default configuration for the application to use the Light theme
 ConfigurationManager.RuntimeConfig = """{ "Theme": "Light" }""";

Examples/NativeAot/Program.cs

@@ -3,7 +3,10 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
-using Terminal.Gui;
+using Terminal.Gui.Configuration;
+using Terminal.Gui.Views;
+using Terminal.Gui.App;
+using Terminal.Gui.ViewBase;
 
 namespace NativeAot;
 

Examples/ReactiveExample/LoginView.cs

@@ -2,7 +2,10 @@ using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using ReactiveMarbles.ObservableEvents;
 using ReactiveUI;
-using Terminal.Gui;
+using Terminal.Gui.Configuration;
+using Terminal.Gui.Views;
+using Terminal.Gui.App;
+using Terminal.Gui.ViewBase;
 
 namespace ReactiveExample;
 

Examples/ReactiveExample/LoginViewModel.cs

@@ -1,12 +1,9 @@
-using System;
-using System.ComponentModel;
 using System.Reactive;
 using System.Reactive.Linq;
 using System.Runtime.Serialization;
-using System.Threading.Tasks;
 using ReactiveUI;
 using ReactiveUI.SourceGenerators;
-using Terminal.Gui;
+using Terminal.Gui.Input;
 
 namespace ReactiveExample;
 

Examples/ReactiveExample/Program.cs

@@ -1,6 +1,9 @@
 using System.Reactive.Concurrency;
 using ReactiveUI;
-using Terminal.Gui;
+using ReactiveUI.SourceGenerators;
+using Terminal.Gui.Configuration;
+using Terminal.Gui.App;
+using Terminal.Gui.ViewBase;
 
 namespace ReactiveExample;
 

Examples/ReactiveExample/TerminalScheduler.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Reactive.Concurrency;
 using System.Reactive.Disposables;
-using Terminal.Gui;
+using Terminal.Gui.App;
 
 namespace ReactiveExample;
 

Examples/ReactiveExample/ViewExtensions.cs

@@ -1,5 +1,6 @@
 using System;
-using Terminal.Gui;
+using Terminal.Gui.ViewBase;
+using Terminal.Gui.Views;
 
 namespace ReactiveExample;
 public static class ViewExtensions

Examples/SelfContained/Program.cs

@@ -3,7 +3,10 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
-using Terminal.Gui;
+using Terminal.Gui.Configuration;
+using Terminal.Gui.App;
+using Terminal.Gui.ViewBase;
+using Terminal.Gui.Views;
 
 namespace SelfContained;
 

Examples/UICatalog/README.md

@@ -55,7 +55,6 @@ To add a new **Scenario** simply:
 The sample below is provided in the `.\UICatalog\Scenarios` directory as a generic sample that can be copied and re-named:
 
 ```csharp
-using Terminal.Gui;
 
 namespace UICatalog {
 	[ScenarioMetadata (Name: "Generic", Description: "Generic sample - A template for creating new Scenarios")]

Examples/UICatalog/Scenario.cs

@@ -4,7 +4,6 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Linq;
-using Terminal.Gui;
 
 namespace UICatalog;
 

Examples/UICatalog/Scenarios/Adornments.cs

@@ -1,5 +1,4 @@
 using System;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/AllViewsTester.cs

@@ -3,7 +3,6 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/AnimationScenario/AnimationScenario.cs

@@ -8,7 +8,6 @@ using System.Threading.Tasks;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/AnsiRequestsScenario.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/Arrangement.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using Terminal.Gui;
 using Timer = System.Timers.Timer;
 
 namespace UICatalog.Scenarios;
@@ -192,7 +191,7 @@ public class Arrangement : Scenario
         TransparentView transparentView = new ()
         {
             Title = "Transparent",
-            ViewportSettings = Terminal.Gui.ViewportSettings.Transparent,
+            ViewportSettings = Terminal.Gui.ViewBase.ViewportSettingsFlags.Transparent,
             X = 30,
             Y = 5,
             Width = 35,
@@ -209,7 +208,7 @@ public class Arrangement : Scenario
         testFrame.Add (new TransparentView ()
         {
             Title = "Transparent|TransparentMouse",
-            ViewportSettings = Terminal.Gui.ViewportSettings.TransparentMouse | Terminal.Gui.ViewportSettings.Transparent
+            ViewportSettings = Terminal.Gui.ViewBase.ViewportSettingsFlags.TransparentMouse | Terminal.Gui.ViewBase.ViewportSettingsFlags.Transparent
         });
 
         adornmentsEditor.AutoSelectSuperView = testFrame;
@@ -336,7 +335,7 @@ public class Arrangement : Scenario
             Width = 30;
             Height = 10;
             Arrangement = ViewArrangement.Overlapped | ViewArrangement.Resizable | ViewArrangement.Movable;
-            ViewportSettings |= Terminal.Gui.ViewportSettings.Transparent | Terminal.Gui.ViewportSettings.TransparentMouse;
+            ViewportSettings |= Terminal.Gui.ViewBase.ViewportSettingsFlags.Transparent | Terminal.Gui.ViewBase.ViewportSettingsFlags.TransparentMouse;
 
             Padding!.Thickness = new Thickness (1);
 

Examples/UICatalog/Scenarios/Bars.cs

@@ -4,7 +4,6 @@ using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Linq;
 using System.Text;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/Buttons.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Text;
 using JetBrains.Annotations;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/CharacterMap/CharacterMap.cs

@@ -5,7 +5,6 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Text;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/ChineseUI.cs

@@ -1,5 +1,4 @@
-using Terminal.Gui;
-
+
 namespace UICatalog.Scenarios;
 
 [ScenarioMetadata ("ChineseUI", "Chinese UI")]

Examples/UICatalog/Scenarios/ClassExplorer.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/Clipping.cs

@@ -1,5 +1,4 @@
-using Terminal.Gui;
-using Timer = System.Timers.Timer;
+using Timer = System.Timers.Timer;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/CollectionNavigatorTester.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/ColorPicker.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/CombiningMarks.cs

@@ -1,4 +1,3 @@
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/ComboBoxIteration.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/ComputedLayout.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/ConfigurationEditor.cs

@@ -1,13 +1,9 @@
 #nullable enable
-using System;
-using System.IO;
-using System.Linq;
 using System.Reflection;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 
-[ScenarioMetadata ("Configuration Editor", "Editor of Terminal.Gui Config Files")]
+[ScenarioMetadata ("Configuration Editor", "Edits of Terminal.Gui Config Files")]
 [ScenarioCategory ("TabView")]
 [ScenarioCategory ("Colors")]
 [ScenarioCategory ("Files and IO")]
@@ -15,56 +11,46 @@ namespace UICatalog.Scenarios;
 [ScenarioCategory ("Configuration")]
 public class ConfigurationEditor : Scenario
 {
-    //private static Scheme _editorScheme = SchemeManager.GetScheme (Schemes.Base);
-
-    //private static Action? _editorSchemeChanged;
     private TabView? _tabView;
     private Shortcut? _lenShortcut;
 
-    //[ConfigurationProperty (Scope = typeof (AppSettingsScope))]
-    //public static Scheme EditorScheme
-    //{
-    //    get => _editorScheme;
-    //    set
-    //    {
-    //        _editorScheme = value;
-    //        _editorSchemeChanged?.Invoke ();
-    //    }
-    //}
-
     public override void Main ()
     {
         Application.Init ();
 
         Window? win = new ();
 
-        _lenShortcut = new Shortcut ()
+        _lenShortcut = new ()
         {
             Title = "",
         };
 
-        var quitShortcut = new Shortcut ()
+        Shortcut quitShortcut = new ()
         {
             Key = Application.QuitKey,
             Title = $"Quit",
             Action = Quit
         };
 
-        var reloadShortcut = new Shortcut ()
+        Shortcut reloadShortcut = new  ()
         {
             Key = Key.F5.WithShift,
             Title = "Reload",
         };
-        reloadShortcut.Accepting += (s, e) => { Reload (); };
+        reloadShortcut.Accepting += (s, e) =>
+                                    {
+                                        Reload ();
+                                        e.Handled = true;
+                                    };
 
-        var saveShortcut = new Shortcut ()
+        Shortcut saveShortcut = new  ()
         {
             Key = Key.F4,
             Title = "Save",
             Action = Save
         };
 
-        var statusBar = new StatusBar ([quitShortcut, reloadShortcut, saveShortcut, _lenShortcut]);
+        StatusBar statusBar = new ([quitShortcut, reloadShortcut, saveShortcut, _lenShortcut]);
 
         _tabView = new ()
         {
@@ -77,43 +63,19 @@ public class ConfigurationEditor : Scenario
         win.Loaded += (s, a) =>
                       {
                           Open ();
-                          //_editorSchemeChanged?.Invoke ();
                       };
 
-
-
-        //_editorSchemeChanged += OnEditorSchemeChanged;
-
         ConfigurationManager.Applied += ConfigurationManagerOnApplied;
 
         Application.Run (win);
-        //_editorSchemeChanged -= OnEditorSchemeChanged;
         win.Dispose ();
-        win = null;
-
         Application.Shutdown ();
 
         return;
 
-        //void OnEditorSchemeChanged ()
-        //{
-        //    if (Application.Top is { })
-        //    {
-        //        return;
-        //    }
-
-        //    foreach (ConfigTextView t in _tabView.SubViews.OfType<ConfigTextView> ())
-        //    {
-        //        t.SetScheme (EditorScheme);
-        //    }
-        //}
-
         void ConfigurationManagerOnApplied (object? sender, ConfigurationManagerEventArgs e)
         {
-            if (win is { })
-            {
-                win.SetNeedsDraw ();
-            }
+            Application.Top?.SetNeedsDraw ();
         }
     }
     public void Save ()
@@ -126,7 +88,7 @@ public class ConfigurationEditor : Scenario
 
     private void Open ()
     {
-        foreach (var config in ConfigurationManager.SourcesManager!.Sources)
+        foreach (KeyValuePair<ConfigLocations, string> config in ConfigurationManager.SourcesManager!.Sources)
         {
             var homeDir = $"{Environment.GetFolderPath (Environment.SpecialFolder.UserProfile)}";
             var fileInfo = new FileInfo (config.Value.Replace ("~", homeDir));
@@ -145,7 +107,7 @@ public class ConfigurationEditor : Scenario
 
             }
 
-            Tab tab = new Tab ()
+            Tab tab = new ()
             {
                 View = editor,
                 DisplayText = config.Key.ToString ()
@@ -186,32 +148,37 @@ public class ConfigurationEditor : Scenario
                                                                     return null;
                                                                 }).Cast<ConfigTextView> ())
         {
-            if (editor.IsDirty)
+            if (!editor.IsDirty)
             {
-                int result = MessageBox.Query (
-                                               "Save Changes",
-                                               $"Save changes to {editor.FileInfo!.Name}",
-                                               "_Yes",
-                                               "_No",
-                                               "_Cancel"
-                                              );
-
-                if (result == -1 || result == 2)
-                {
-                    // user cancelled
-                }
+                continue;
+            }
 
-                if (result == 0)
-                {
+            int result = MessageBox.Query (
+                                           "Save Changes",
+                                           $"Save changes to {editor.FileInfo!.Name}",
+                                           "_Yes",
+                                           "_No",
+                                           "_Cancel"
+                                          );
+
+            switch (result)
+            {
+                case 0:
                     editor.Save ();
-                }
+
+                    break;
+
+                default:
+                case -1 or 2:
+                    // user cancelled
+                    return;
             }
         }
 
         Application.RequestStop ();
     }
 
-    private void Reload ()
+    private static void Reload ()
     {
         if (Application.Navigation?.GetFocused () is ConfigTextView editor)
         {
@@ -226,7 +193,7 @@ public class ConfigurationEditor : Scenario
             TabStop = TabBehavior.TabGroup;
         }
 
-        internal FileInfo? FileInfo { get; set; }
+        internal FileInfo? FileInfo { get; init; }
 
         internal void Read ()
         {
@@ -247,16 +214,18 @@ public class ConfigurationEditor : Scenario
                 string? name = assembly
                                .GetManifestResourceNames ()
                                .FirstOrDefault (x => x.EndsWith ("config.json"));
-                if (!string.IsNullOrEmpty (name))
-                {
 
-                    using Stream? stream = assembly.GetManifestResourceStream (name);
-                    using var reader = new StreamReader (stream!);
-                    Text = reader.ReadToEnd ();
-                    ReadOnly = true;
-                    Enabled = true;
+                if (string.IsNullOrEmpty (name))
+                {
+                    return;
                 }
 
+                using Stream? stream = assembly.GetManifestResourceStream (name);
+                using var reader = new StreamReader (stream!);
+                Text = reader.ReadToEnd ();
+                ReadOnly = true;
+                Enabled = true;
+
                 return;
             }
 

Examples/UICatalog/Scenarios/ContextMenus.cs

@@ -1,6 +1,5 @@
 using System.Globalization;
 using JetBrains.Annotations;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/CsvEditor.cs

@@ -5,7 +5,6 @@ using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
 using CsvHelper;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/DatePickers.cs

@@ -1,5 +1,4 @@
-using Terminal.Gui;
-
+
 namespace UICatalog.Scenarios;
 
 [ScenarioMetadata ("Date Picker", "Demonstrates how to use DatePicker class")]

Examples/UICatalog/Scenarios/Dialogs.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/DimAutoDemo.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/DynamicMenuBar.cs

@@ -3,7 +3,6 @@ using System.ComponentModel;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Text;
-using Terminal.Gui;
 
 #pragma warning disable CS0618 // Type or member is obsolete
 

Examples/UICatalog/Scenarios/DynamicStatusBar.cs

@@ -5,7 +5,6 @@ using System.Linq;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Text;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/Editor.cs

@@ -7,7 +7,6 @@ using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
-using Terminal.Gui;
 using static UICatalog.Scenarios.DynamicMenuBar;
 
 namespace UICatalog.Scenarios;

Examples/UICatalog/Scenarios/EditorsAndHelpers/AdornmentEditor.cs

@@ -1,6 +1,5 @@
 #nullable enable
 using System;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/EditorsAndHelpers/AdornmentsEditor.cs

@@ -1,6 +1,5 @@
 #nullable enable
 using System;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/EditorsAndHelpers/AllViewsView.cs

@@ -1,5 +1,4 @@
-using Terminal.Gui;
-
+
 namespace UICatalog.Scenarios;
 
 public class AllViewsView : View

Examples/UICatalog/Scenarios/EditorsAndHelpers/ArrangementEditor.cs

@@ -1,7 +1,6 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/EditorsAndHelpers/BorderEditor.cs

@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/EditorsAndHelpers/DimEditor.cs

@@ -3,7 +3,6 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/EditorsAndHelpers/EditorBase.cs

@@ -2,7 +2,6 @@
 using System;
 using System.Diagnostics;
 using System.Linq;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/EditorsAndHelpers/EventLog.cs

@@ -1,7 +1,6 @@
 #nullable enable
 using System;
 using System.Collections.ObjectModel;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/EditorsAndHelpers/ExpanderButton.cs

@@ -1,7 +1,6 @@
 #nullable enable
 using System;
 using System.Text;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 
@@ -14,9 +13,9 @@ namespace UICatalog.Scenarios;
 ///         (F4) or mouse.
 ///     </para>
 ///     <para>
-///         If <see cref="Orientation"/> is set to <see cref="Terminal.Gui.Orientation.Vertical"/>, the button will appear
+///         If <see cref="Orientation"/> is set to <see cref="Orientation.Vertical"/>, the button will appear
 ///         at the top/right.
-///         If <see cref="Orientation"/> is set to <see cref="Terminal.Gui.Orientation.Horizontal"/>, the button will
+///         If <see cref="Orientation"/> is set to <see cref="Orientation.Horizontal"/>, the button will
 ///         appear at the
 ///         bottom/left.
 ///     </para>

Examples/UICatalog/Scenarios/EditorsAndHelpers/LayoutEditor.cs

@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/EditorsAndHelpers/MarginEditor.cs

@@ -1,6 +1,5 @@
 #nullable enable
 using System;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 
@@ -57,8 +56,8 @@ public class MarginEditor : AdornmentEditor
 
         var flags = new Dictionary<uint, string> ()
         {
-            { (uint)Terminal.Gui.ViewportSettings.Transparent, "Transparent" },
-            { (uint)Terminal.Gui.ViewportSettings.TransparentMouse, "TransparentMouse" }
+            { (uint)Terminal.Gui.ViewBase.ViewportSettingsFlags.Transparent, "Transparent" },
+            { (uint)Terminal.Gui.ViewBase.ViewportSettingsFlags.TransparentMouse, "TransparentMouse" }
         };
 
         _flagSelectorTransparent = new FlagSelector ()
@@ -82,7 +81,7 @@ public class MarginEditor : AdornmentEditor
 
         _flagSelectorTransparent.ValueChanged += (_, args) =>
                                                  {
-                                                     ((Margin)AdornmentToEdit!).ViewportSettings = (Terminal.Gui.ViewportSettings)args.CurrentValue!;
+                                                     ((Margin)AdornmentToEdit!).ViewportSettings = (ViewportSettingsFlags)args.CurrentValue!;
                                                  };
 
 

Examples/UICatalog/Scenarios/EditorsAndHelpers/PosEditor.cs

@@ -3,7 +3,6 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/EditorsAndHelpers/SchemeViewer.cs

@@ -1,5 +1,4 @@
 #nullable enable
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/EditorsAndHelpers/ThemeViewer.cs

@@ -1,5 +1,4 @@
 #nullable enable
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/EditorsAndHelpers/ViewPropertiesEditor.cs

@@ -1,5 +1,4 @@
 #nullable enable
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/EditorsAndHelpers/ViewportSettingsEditor.cs

@@ -1,6 +1,5 @@
 #nullable enable
 using System;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 
@@ -32,35 +31,35 @@ public sealed class ViewportSettingsEditor : EditorBase
             _contentSizeWidth!.Value = ViewToEdit.GetContentSize ().Width;
             _contentSizeHeight!.Value = ViewToEdit.GetContentSize ().Height;
 
-            _cbAllowNegativeX!.CheckedState = ViewToEdit.ViewportSettings.HasFlag (Terminal.Gui.ViewportSettings.AllowNegativeX)
+            _cbAllowNegativeX!.CheckedState = ViewToEdit.ViewportSettings.HasFlag (ViewportSettingsFlags.AllowNegativeX)
                                                   ? CheckState.Checked
                                                   : CheckState.UnChecked;
 
-            _cbAllowNegativeY!.CheckedState = ViewToEdit.ViewportSettings.HasFlag (Terminal.Gui.ViewportSettings.AllowNegativeY)
+            _cbAllowNegativeY!.CheckedState = ViewToEdit.ViewportSettings.HasFlag (ViewportSettingsFlags.AllowNegativeY)
                                                   ? CheckState.Checked
                                                   : CheckState.UnChecked;
 
-            _cbAllowXGreaterThanContentWidth!.CheckedState = ViewToEdit.ViewportSettings.HasFlag (Terminal.Gui.ViewportSettings.AllowXGreaterThanContentWidth)
+            _cbAllowXGreaterThanContentWidth!.CheckedState = ViewToEdit.ViewportSettings.HasFlag (ViewportSettingsFlags.AllowXGreaterThanContentWidth)
                                                                  ? CheckState.Checked
                                                                  : CheckState.UnChecked;
 
-            _cbAllowYGreaterThanContentHeight!.CheckedState = ViewToEdit.ViewportSettings.HasFlag (Terminal.Gui.ViewportSettings.AllowYGreaterThanContentHeight)
+            _cbAllowYGreaterThanContentHeight!.CheckedState = ViewToEdit.ViewportSettings.HasFlag (ViewportSettingsFlags.AllowYGreaterThanContentHeight)
                                                                   ? CheckState.Checked
                                                                   : CheckState.UnChecked;
 
-            _cbClearContentOnly!.CheckedState = ViewToEdit.ViewportSettings.HasFlag (Terminal.Gui.ViewportSettings.ClearContentOnly)
+            _cbClearContentOnly!.CheckedState = ViewToEdit.ViewportSettings.HasFlag (ViewportSettingsFlags.ClearContentOnly)
                                                     ? CheckState.Checked
                                                     : CheckState.UnChecked;
 
-            _cbClipContentOnly!.CheckedState = ViewToEdit.ViewportSettings.HasFlag (Terminal.Gui.ViewportSettings.ClipContentOnly)
+            _cbClipContentOnly!.CheckedState = ViewToEdit.ViewportSettings.HasFlag (ViewportSettingsFlags.ClipContentOnly)
                                                    ? CheckState.Checked
                                                    : CheckState.UnChecked;
 
-            _cbTransparent!.CheckedState = ViewToEdit.ViewportSettings.HasFlag (Terminal.Gui.ViewportSettings.Transparent)
+            _cbTransparent!.CheckedState = ViewToEdit.ViewportSettings.HasFlag (ViewportSettingsFlags.Transparent)
                                                ? CheckState.Checked
                                                : CheckState.UnChecked;
 
-            _cbTransparentMouse!.CheckedState = ViewToEdit.ViewportSettings.HasFlag (Terminal.Gui.ViewportSettings.TransparentMouse)
+            _cbTransparentMouse!.CheckedState = ViewToEdit.ViewportSettings.HasFlag (ViewportSettingsFlags.TransparentMouse)
                                                ? CheckState.Checked
                                                : CheckState.UnChecked;
 
@@ -120,11 +119,11 @@ public sealed class ViewportSettingsEditor : EditorBase
         {
             if (e.NewValue == CheckState.Checked)
             {
-                ViewToEdit!.ViewportSettings |= Terminal.Gui.ViewportSettings.AllowNegativeX;
+                ViewToEdit!.ViewportSettings |= Terminal.Gui.ViewBase.ViewportSettingsFlags.AllowNegativeX;
             }
             else
             {
-                ViewToEdit!.ViewportSettings &= ~Terminal.Gui.ViewportSettings.AllowNegativeX;
+                ViewToEdit!.ViewportSettings &= ~Terminal.Gui.ViewBase.ViewportSettingsFlags.AllowNegativeX;
             }
         }
 
@@ -132,11 +131,11 @@ public sealed class ViewportSettingsEditor : EditorBase
         {
             if (e.NewValue == CheckState.Checked)
             {
-                ViewToEdit!.ViewportSettings |= Terminal.Gui.ViewportSettings.AllowXGreaterThanContentWidth;
+                ViewToEdit!.ViewportSettings |= Terminal.Gui.ViewBase.ViewportSettingsFlags.AllowXGreaterThanContentWidth;
             }
             else
             {
-                ViewToEdit!.ViewportSettings &= ~Terminal.Gui.ViewportSettings.AllowXGreaterThanContentWidth;
+                ViewToEdit!.ViewportSettings &= ~Terminal.Gui.ViewBase.ViewportSettingsFlags.AllowXGreaterThanContentWidth;
             }
         }
 
@@ -158,11 +157,11 @@ public sealed class ViewportSettingsEditor : EditorBase
         {
             if (e.NewValue == CheckState.Checked)
             {
-                ViewToEdit!.ViewportSettings |= Terminal.Gui.ViewportSettings.AllowNegativeY;
+                ViewToEdit!.ViewportSettings |= Terminal.Gui.ViewBase.ViewportSettingsFlags.AllowNegativeY;
             }
             else
             {
-                ViewToEdit!.ViewportSettings &= ~Terminal.Gui.ViewportSettings.AllowNegativeY;
+                ViewToEdit!.ViewportSettings &= ~Terminal.Gui.ViewBase.ViewportSettingsFlags.AllowNegativeY;
             }
         }
 
@@ -170,11 +169,11 @@ public sealed class ViewportSettingsEditor : EditorBase
         {
             if (e.NewValue == CheckState.Checked)
             {
-                ViewToEdit!.ViewportSettings |= Terminal.Gui.ViewportSettings.AllowYGreaterThanContentHeight;
+                ViewToEdit!.ViewportSettings |= Terminal.Gui.ViewBase.ViewportSettingsFlags.AllowYGreaterThanContentHeight;
             }
             else
             {
-                ViewToEdit!.ViewportSettings &= ~Terminal.Gui.ViewportSettings.AllowYGreaterThanContentHeight;
+                ViewToEdit!.ViewportSettings &= ~Terminal.Gui.ViewBase.ViewportSettingsFlags.AllowYGreaterThanContentHeight;
             }
         }
 
@@ -248,11 +247,11 @@ public sealed class ViewportSettingsEditor : EditorBase
         {
             if (e.NewValue == CheckState.Checked)
             {
-                ViewToEdit!.ViewportSettings |= Terminal.Gui.ViewportSettings.ClearContentOnly;
+                ViewToEdit!.ViewportSettings |= Terminal.Gui.ViewBase.ViewportSettingsFlags.ClearContentOnly;
             }
             else
             {
-                ViewToEdit!.ViewportSettings &= ~Terminal.Gui.ViewportSettings.ClearContentOnly;
+                ViewToEdit!.ViewportSettings &= ~Terminal.Gui.ViewBase.ViewportSettingsFlags.ClearContentOnly;
             }
         }
 
@@ -269,11 +268,11 @@ public sealed class ViewportSettingsEditor : EditorBase
         {
             if (e.NewValue == CheckState.Checked)
             {
-                ViewToEdit!.ViewportSettings |= Terminal.Gui.ViewportSettings.ClipContentOnly;
+                ViewToEdit!.ViewportSettings |= Terminal.Gui.ViewBase.ViewportSettingsFlags.ClipContentOnly;
             }
             else
             {
-                ViewToEdit!.ViewportSettings &= ~Terminal.Gui.ViewportSettings.ClipContentOnly;
+                ViewToEdit!.ViewportSettings &= ~Terminal.Gui.ViewBase.ViewportSettingsFlags.ClipContentOnly;
             }
         }
 
@@ -290,11 +289,11 @@ public sealed class ViewportSettingsEditor : EditorBase
         {
             if (e.NewValue == CheckState.Checked)
             {
-                ViewToEdit!.ViewportSettings |= Terminal.Gui.ViewportSettings.Transparent;
+                ViewToEdit!.ViewportSettings |= Terminal.Gui.ViewBase.ViewportSettingsFlags.Transparent;
             }
             else
             {
-                ViewToEdit!.ViewportSettings &= ~Terminal.Gui.ViewportSettings.Transparent;
+                ViewToEdit!.ViewportSettings &= ~Terminal.Gui.ViewBase.ViewportSettingsFlags.Transparent;
             }
         }
 
@@ -311,11 +310,11 @@ public sealed class ViewportSettingsEditor : EditorBase
         {
             if (e.NewValue == CheckState.Checked)
             {
-                ViewToEdit!.ViewportSettings |= Terminal.Gui.ViewportSettings.TransparentMouse;
+                ViewToEdit!.ViewportSettings |= Terminal.Gui.ViewBase.ViewportSettingsFlags.TransparentMouse;
             }
             else
             {
-                ViewToEdit!.ViewportSettings &= ~Terminal.Gui.ViewportSettings.TransparentMouse;
+                ViewToEdit!.ViewportSettings &= ~Terminal.Gui.ViewBase.ViewportSettingsFlags.TransparentMouse;
             }
         }
 

Examples/UICatalog/Scenarios/EditorsAndHelpers/VisualRoleViewer.cs

@@ -1,5 +1,4 @@
 #nullable enable
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/FileDialogExamples.cs

@@ -3,7 +3,6 @@ using System.IO;
 using System.IO.Abstractions;
 using System.Linq;
 using System.Text;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/Generic.cs

@@ -1,5 +1,4 @@
 #nullable enable
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/GraphViewExample.cs

@@ -3,8 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using System.Text;
-using Terminal.Gui;
-using Application = Terminal.Gui.Application;
+using Application = Terminal.Gui.App.Application;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/HexEditor.cs

@@ -1,7 +1,6 @@
 #nullable enable
 
 using System.Text;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/HotKeys.cs

@@ -1,4 +1,3 @@
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/Images.cs

@@ -1,15 +1,9 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
+using System.Collections.Concurrent;
 using System.Text;
 using ColorHelper;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using Terminal.Gui;
-using Color = Terminal.Gui.Color;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/InteractiveTree.cs

@@ -1,5 +1,4 @@
 using System.Linq;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/KeyBindings.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/Keys.cs

@@ -1,5 +1,4 @@
 using System.Collections.ObjectModel;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/LineCanvasExperiment.cs

@@ -1,5 +1,4 @@
-using Terminal.Gui;
-
+
 namespace UICatalog.Scenarios;
 
 [ScenarioMetadata ("LineCanvas Experiments", "Experiments with LineCanvas")]

Examples/UICatalog/Scenarios/LineDrawing.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/LineViewExample.cs

@@ -1,6 +1,5 @@
 using System.Globalization;
 using System.Text;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/ListColumns.cs

@@ -2,7 +2,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Data;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/ListViewWithSelection.cs

@@ -6,7 +6,6 @@ using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Text;
 using JetBrains.Annotations;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 
@@ -156,11 +155,11 @@ public class ListViewWithSelection : Scenario
     {
         if (stateEventArgs.NewValue == CheckState.Checked)
         {
-            _listView.ViewportSettings |= Terminal.Gui.ViewportSettings.AllowYGreaterThanContentHeight;
+            _listView.ViewportSettings |= Terminal.Gui.ViewBase.ViewportSettingsFlags.AllowYGreaterThanContentHeight;
         }
         else
         {
-            _listView.ViewportSettings &= ~Terminal.Gui.ViewportSettings.AllowYGreaterThanContentHeight;
+            _listView.ViewportSettings &= ~Terminal.Gui.ViewBase.ViewportSettingsFlags.AllowYGreaterThanContentHeight;
         }
         _appWindow.SetNeedsDraw ();
     }

Examples/UICatalog/Scenarios/ListsAndCombos.cs

@@ -2,7 +2,6 @@
 using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/Localization.cs

@@ -2,7 +2,6 @@
 using System.Globalization;
 using System.Linq;
 using System.Threading;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/Mazing.cs

@@ -1,6 +1,5 @@
 #nullable enable
 using System.Text;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/MenuBarScenario.cs

@@ -1,5 +1,4 @@
 using System;
-using Terminal.Gui;
 using static System.Runtime.InteropServices.JavaScript.JSType;
 
 namespace UICatalog.Scenarios;

Examples/UICatalog/Scenarios/Menus.cs

@@ -6,7 +6,6 @@ using Microsoft.Extensions.Logging;
 using Serilog;
 using Serilog.Core;
 using Serilog.Events;
-using Terminal.Gui;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace UICatalog.Scenarios;

Examples/UICatalog/Scenarios/MessageBoxes.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/Mouse.cs

@@ -2,7 +2,6 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Linq;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/MultiColouredTable.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Data;
 using System.Text;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/Navigation.cs

@@ -1,6 +1,5 @@
 using System.Text;
 using System.Timers;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/Notepad.cs

@@ -1,6 +1,5 @@
 using System.IO;
 using System.Linq;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/NumericUpDownDemo.cs

@@ -1,6 +1,5 @@
 #nullable enable 
 using System;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/PosAlignDemo.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/ProcessTable.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/Progress.cs

@@ -2,7 +2,6 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/ProgressBarStyles.cs

@@ -4,7 +4,6 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading;
-using Terminal.Gui;
 using static UICatalog.Scenarios.Adornments;
 
 namespace UICatalog.Scenarios;

Examples/UICatalog/Scenarios/RegionScenario.cs

@@ -3,7 +3,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Terminal.Gui;
 using UICatalog;
 using UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/RunTExample.cs

@@ -1,5 +1,4 @@
-using Terminal.Gui;
-
+
 namespace UICatalog.Scenarios;
 
 [ScenarioMetadata ("Run<T> Example", "Illustrates using Application.Run<T> to run a custom class")]

Examples/UICatalog/Scenarios/RuneWidthGreaterThanOne.cs

@@ -1,5 +1,4 @@
 using System;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/ScrollBarDemo.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.ObjectModel;
 using System.Linq;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/Scrolling.cs

@@ -1,6 +1,5 @@
 using System;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/SendKeys.cs

@@ -1,5 +1,4 @@
 using System;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/ShadowStyles.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics.Metrics;
 using System.Linq;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/Shortcuts.cs

@@ -1,7 +1,6 @@
 #nullable enable
 
 using System.Collections.ObjectModel;
-using Terminal.Gui;
 using Timer = System.Timers.Timer;
 
 namespace UICatalog.Scenarios;

Examples/UICatalog/Scenarios/SingleBackgroundWorker.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Threading;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/Sliders.cs

@@ -1,6 +1,5 @@
 using System.Collections.ObjectModel;
 using System.Text;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/Snake.cs

@@ -1,6 +1,5 @@
 using System.Diagnostics;
 using System.Text;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/SpinnerStyles.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/SyntaxHighlighting.cs

@@ -7,7 +7,6 @@ using System.Reflection;
 using System.Text;
 using System.Text.Json;
 using System.Text.RegularExpressions;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;