Fixes #4107 - Revamps Terminal.Gui's namespace

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,12 @@
-// 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.ViewBase;
+using Terminal.Gui.Views;
 
 // 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.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.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.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 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 override void Main ()
         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 override void Main ()
         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 TransparentView ()
             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.ComponentModel;
 using System.Linq;
 using System.Text;
-using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
 

Examples/UICatalog/Scenarios/Buttons.cs

@@ -3,7 +3,6 @@
 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.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.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

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

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.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.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.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.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;