WIP more compilation error fixes

tznind · tznind · commit a73bdaaa2e34 · 2025-06-23T00:30:17.000+01:00
diff --git a/src/ColorSchemeManager.cs b/src/ColorSchemeManager.cs
@@ -1,6 +1,7 @@
 ﻿using System.Collections.ObjectModel;
 using System.Reflection;
 using Terminal.Gui;
+using Terminal.Gui.Drawing;
 using TerminalGuiDesigner;
 using TerminalGuiDesigner.Operations;
 
diff --git a/src/DefaultColorSchemes.cs b/src/DefaultColorSchemes.cs
@@ -1,4 +1,5 @@
 ﻿using Terminal.Gui;
+using Terminal.Gui.Drawing;
 
 namespace TerminalGuiDesigner;
 
diff --git a/src/Design.cs b/src/Design.cs
@@ -5,6 +5,7 @@
 using System.Xml.Linq;
 using NLog;
 using Terminal.Gui;
+using Terminal.Gui.Drawing;
 using Terminal.Gui.Input;
 using Terminal.Gui.ViewBase;
 using Terminal.Gui.Views;
@@ -93,7 +94,7 @@ public Design(SourceCodeFile sourceCode, string fieldName, View view)
 
     /// <summary>
     /// Gets the record of user configured values of otherwise volatile <see cref="View"/> settings.
-    /// <para>For example while <see cref="View.Scheme"/> can change based on selection
+    /// <para>For example while <see cref="Scheme"/> can change based on selection
     /// (see <see cref="SelectionManager.SelectedScheme"/> the <see cref="DesignState.OriginalScheme"/>
     /// will not change.
     /// </para>
diff --git a/src/DesignState.cs b/src/DesignState.cs
@@ -1,5 +1,6 @@
 ﻿using System.Text;
 using Terminal.Gui;
+using Terminal.Gui.Drawing;
 using Terminal.Gui.ViewBase;
 using TerminalGuiDesigner.UI;
 
diff --git a/src/NamedColorScheme.cs b/src/NamedColorScheme.cs
@@ -1,4 +1,5 @@
 ﻿using Terminal.Gui;
+using Terminal.Gui.Drawing;
 using Terminal.Gui.ViewBase;
 using TerminalGuiDesigner.ToCode;
 
diff --git a/src/Operations/DeleteColorSchemeOperation.cs b/src/Operations/DeleteColorSchemeOperation.cs
@@ -1,4 +1,5 @@
 using Terminal.Gui;
+using Terminal.Gui.Drawing;
 using Terminal.Gui.Views;
 
 namespace TerminalGuiDesigner.Operations;
diff --git a/src/Operations/StatusBarOperations/SetShortcutOperation.cs b/src/Operations/StatusBarOperations/SetShortcutOperation.cs
@@ -1,4 +1,5 @@
 using Terminal.Gui;
+using Terminal.Gui.Input;
 using Terminal.Gui.Views;
 using TerminalGuiDesigner.Operations.Generics;
 using TerminalGuiDesigner.UI.Windows;
diff --git a/src/ToCode/ColorPickerToCode.cs b/src/ToCode/ColorPickerToCode.cs
@@ -1,5 +1,6 @@
 ﻿using System.CodeDom;
 using Terminal.Gui;
+using Terminal.Gui.Views;
 
 namespace TerminalGuiDesigner.ToCode
 {
diff --git a/src/ToCode/ColorSchemeProperty.cs b/src/ToCode/ColorSchemeProperty.cs
@@ -1,14 +1,15 @@
 using System.CodeDom;
 using Terminal.Gui;
+using Terminal.Gui.Drawing;
 using Terminal.Gui.ViewBase;
 
 namespace TerminalGuiDesigner.ToCode;
 
 /// <summary>
-/// <para><see cref="Property"/> wrapper for <see cref="View.Scheme"/>.
+/// <para><see cref="Property"/> wrapper for <see cref="Scheme"/>.
 /// </para>
 /// <para>
-/// In Terminal.Gui the <see cref="View.Scheme"/> has inbuilt inheritance
+/// In Terminal.Gui the <see cref="Scheme"/> has inbuilt inheritance
 /// to parental containers.  This class handles detecting if the current value comes
 /// from a parent or is explicitly declared.  Also interacts with <see cref="SchemeManager"/>
 /// which tracks what <see cref="Scheme"/> user has declared and/or is using in
@@ -21,9 +22,9 @@ public class SchemeProperty : Property
     /// Initializes a new instance of the <see cref="SchemeProperty"/> class.
     /// </summary>
     /// <param name="design">Wrapper for a <see cref="View"/> upon which the
-    /// <see cref="View.Scheme"/> is to be managed.</param>
+    /// <see cref="Scheme"/> is to be managed.</param>
     /// <exception cref="Exception">Thrown if Terminal.Gui public API is
-    /// changed and <see cref="View.Scheme"/> can no longer be found
+    /// changed and <see cref="Scheme"/> can no longer be found
     /// with reflection.</exception>
     public SchemeProperty(Design design)
         : base(
diff --git a/src/ToCode/ColorSchemeToCode.cs b/src/ToCode/ColorSchemeToCode.cs
@@ -1,5 +1,6 @@
 using System.CodeDom;
 using Terminal.Gui;
+using Terminal.Gui.Drawing;
 using Attribute = Terminal.Gui.Drawing.Attribute;
 
 namespace TerminalGuiDesigner.ToCode;
diff --git a/src/ToCode/Property.cs b/src/ToCode/Property.cs
@@ -91,7 +91,7 @@ public Property(Design design, PropertyInfo property, string subProperty, object
     }
 
     /// <summary>
-    /// Sets a new value for the <see cref="PropertyInfo"/>.  For complex properties like <see cref="View.Scheme"/>
+    /// Sets a new value for the <see cref="PropertyInfo"/>.  For complex properties like <see cref="Scheme"/>
     /// this may involve other steps (e.g. interacting with <see cref="SchemeManager"/>).
     /// </summary>
     /// <param name="value">New value to set.</param>
diff --git a/src/UI/ColorSchemeBlueprint.cs b/src/UI/ColorSchemeBlueprint.cs
@@ -1,5 +1,6 @@
 ﻿using System.Text.Json.Serialization;
 using Terminal.Gui;
+using Terminal.Gui.Drawing;
 using YamlDotNet.Core;
 using YamlDotNet.Serialization;
 using Attribute = Terminal.Gui.Drawing.Attribute;
@@ -13,7 +14,7 @@ namespace TerminalGuiDesigner.UI;
 public record SchemeBlueprint( Color NormalForeground, Color NormalBackground, Color HotNormalForeground, Color HotNormalBackground, Color FocusForeground, Color FocusBackground, Color HotFocusForeground, Color HotFocusBackground, Color DisabledForeground, Color DisabledBackground )
 {
     /// <summary>
-    /// Gets the <see cref="Color"/> to use for <see cref="Scheme.Normal"/> <see cref="Attribute.Foreground"/>.
+    /// Gets the <see cref="Color"/> to use for <see cref="Terminal.Gui.Drawing.Scheme.Normal"/> <see cref="Attribute.Foreground"/>.
     /// </summary>
     public Color NormalForeground { get; init; } = NormalForeground;
 
diff --git a/src/UI/KeyMap.cs b/src/UI/KeyMap.cs
@@ -2,6 +2,7 @@
 using System.Text.Json.Serialization;
 using Microsoft.Extensions.Configuration;
 using Terminal.Gui;
+using Terminal.Gui.Drawing;
 using Terminal.Gui.Input;
 using Terminal.Gui.ViewBase;
 using Terminal.Gui.Views;
diff --git a/src/UI/KeyboardManager.cs b/src/UI/KeyboardManager.cs
@@ -1,6 +1,7 @@
 using Terminal.Gui;
 using Terminal.Gui.App;
 using Terminal.Gui.Drivers;
+using Terminal.Gui.Input;
 using Terminal.Gui.ViewBase;
 using Terminal.Gui.Views;
 using TerminalGuiDesigner.Operations;
diff --git a/src/UI/ValueFactory.cs b/src/UI/ValueFactory.cs
@@ -2,6 +2,7 @@
 using System.Text;
 using Terminal.Gui;
 using Terminal.Gui.App;
+using Terminal.Gui.Drawing;
 using Terminal.Gui.ViewBase;
 using Terminal.Gui.Views;
 using TerminalGuiDesigner.ToCode;
diff --git a/src/UI/Windows/BigListBox.cs b/src/UI/Windows/BigListBox.cs
@@ -1,6 +1,7 @@
 using System.Collections.Concurrent;
 using System.Collections.ObjectModel;
 using Terminal.Gui;
+using Terminal.Gui.Drawing;
 using Terminal.Gui.Input;
 using Terminal.Gui.ViewBase;
 using Terminal.Gui.Views;
diff --git a/src/UI/Windows/ChoicesDialog.Designer.cs b/src/UI/Windows/ChoicesDialog.Designer.cs
diff --git a/src/UI/Windows/ColorPicker.Designer.cs b/src/UI/Windows/ColorPicker.Designer.cs
diff --git a/src/UI/Windows/ColorSchemeEditor.cs b/src/UI/Windows/ColorSchemeEditor.cs
@@ -8,6 +8,7 @@
 //  </auto-generated>
 // -----------------------------------------------------------------------------
 
+using Terminal.Gui.Drawing;
 using Terminal.Gui.ViewBase;
 
 namespace TerminalGuiDesigner.UI.Windows; 
diff --git a/src/UI/Windows/ColorSchemesUI.cs b/src/UI/Windows/ColorSchemesUI.cs
@@ -8,6 +8,7 @@
 //  </auto-generated>
 // -----------------------------------------------------------------------------
 
+using Terminal.Gui.Drawing;
 using Terminal.Gui.Views;
 
 namespace TerminalGuiDesigner.UI.Windows; 
diff --git a/src/UI/Windows/DimEditor.cs b/src/UI/Windows/DimEditor.cs
@@ -8,6 +8,11 @@
 //------------------------------------------------------------------------------
 
 using JetBrains.Annotations;
+using Terminal.Gui.App;
+using Terminal.Gui.Drawing;
+using Terminal.Gui.Input;
+using Terminal.Gui.ViewBase;
+using Terminal.Gui.Views;
 
 namespace TerminalGuiDesigner.UI.Windows;
 
@@ -145,14 +150,14 @@ private void SetupForCurrentDimType()
 
     private void BtnCancel_Clicked(object sender, CommandEventArgs e)
     {
-        e.Cancel = true;
+        e.Handled = true;
         Cancelled = true;
         Application.RequestStop();
     }
 
     private void BtnOk_Clicked(object sender, CommandEventArgs e)
     {
-        e.Cancel = true;
+        e.Handled = true;
         Cancelled = false;
         Result = BuildResult();
         Application.RequestStop();
diff --git a/src/UI/Windows/EditDialog.cs b/src/UI/Windows/EditDialog.cs
@@ -2,7 +2,8 @@
 using System.ComponentModel.Design;
 using System.Text;
 using Terminal.Gui;
-using Terminal.Gui.TextValidateProviders;
+using Terminal.Gui.App;
+using Terminal.Gui.Input;
 using Terminal.Gui.ViewBase;
 using Terminal.Gui.Views;
 using TerminalGuiDesigner.Operations;
@@ -60,7 +61,7 @@ public EditDialog(Design design)
 
         btnSet.Accepting += (s, e) =>
         {
-            e.Cancel = true;
+            e.Handled = true;
             this.SetProperty(false);
         };
 
@@ -72,7 +73,7 @@ public EditDialog(Design design)
         };
         btnClose.Accepting += (s, e) =>
         {
-            e.Cancel = true;
+            e.Handled = true;
             Application.RequestStop();
         };
 
diff --git a/src/UI/Windows/GetTextDialog.cs b/src/UI/Windows/GetTextDialog.cs
@@ -1,4 +1,6 @@
 using Terminal.Gui;
+using Terminal.Gui.App;
+using Terminal.Gui.Input;
 using Terminal.Gui.ViewBase;
 using Terminal.Gui.Views;
 
@@ -85,7 +87,7 @@ public GetTextDialog(DialogArgs args, string? initialValue)
         };
         btnOk.Accepting += (s, e) =>
         {
-            e.Cancel = true;
+            e.Handled = true;
             this.Accept();
         };
 
@@ -98,7 +100,7 @@ public GetTextDialog(DialogArgs args, string? initialValue)
         };
         btnCancel.Accepting += (s, e) =>
         {
-            e.Cancel = true;
+            e.Handled = true;
             this.okClicked = false;
             Application.RequestStop();
         };
@@ -111,7 +113,7 @@ public GetTextDialog(DialogArgs args, string? initialValue)
         };
         btnClear.Accepting += (s, e) =>
         {
-            e.Cancel = true;
+            e.Handled = true;
             this.textView.Text = string.Empty;
         };
 
@@ -145,7 +147,7 @@ private void SetupMultiLineOptional()
         };
         cbMultiLine.CheckedStateChanging += (s, e) =>
         {
-            SetEnableNewlines(e.NewValue);
+            SetEnableNewlines(e.Result);
         };
         win.Add(cbMultiLine);
     }
diff --git a/src/UI/Windows/KeyBindingsUI.cs b/src/UI/Windows/KeyBindingsUI.cs
@@ -10,7 +10,9 @@
 
 using System.Reflection;
 using System.Text.Json;
+using Terminal.Gui.Drawing;
 using Terminal.Gui.Views;
+using Attribute = System.Attribute;
 
 namespace TerminalGuiDesigner.UI.Windows {
     using Terminal.Gui;
diff --git a/src/UI/Windows/Modals.cs b/src/UI/Windows/Modals.cs
@@ -2,8 +2,9 @@
 using System.Text;
 using Terminal.Gui;
 using Terminal.Gui.Drivers;
+using Terminal.Gui.Input;
 using YamlDotNet.Core.Tokens;
-using Key = Terminal.Gui.Key;
+using Key = Terminal.Gui.Input.Key;
 
 namespace TerminalGuiDesigner.UI.Windows;
 
@@ -177,7 +178,7 @@ internal static bool GetChar(string windowTitle, string entryLabel, char? oldVal
         return false;
     }
 
-    internal static Terminal.Gui.Key GetShortcut()
+    internal static Key GetShortcut()
     {
         Key key = KeyCode.Null;
         var dlg = new LoadingDialog("Press Shortcut or Del");
diff --git a/src/UI/Windows/MutableColorScheme.cs b/src/UI/Windows/MutableColorScheme.cs
@@ -1,5 +1,6 @@
 #nullable disable
 using Terminal.Gui;
+using Terminal.Gui.Drawing;
 using Attribute = Terminal.Gui.Drawing.Attribute;
 
 namespace TerminalGuiDesigner.UI.Windows;
diff --git a/src/UI/Windows/PointEditor.cs b/src/UI/Windows/PointEditor.cs
@@ -8,6 +8,9 @@
 //------------------------------------------------------------------------------
 
 using JetBrains.Annotations;
+using Terminal.Gui.App;
+using Terminal.Gui.Input;
+using Terminal.Gui.Views;
 using TerminalGuiDesigner.UI.Windows;
 
 namespace TerminalGuiDesigner; 
@@ -54,14 +57,14 @@ public PointEditor(float x, float y) {
 
     private void Cancel(object sender, CommandEventArgs e)
     {
-        e.Cancel = true;
+        e.Handled = true;
         Cancelled = true;
         Application.RequestStop();
     }
 
     private void Ok(object sender, CommandEventArgs e)
     {
-        e.Cancel = true;
+        e.Handled = true;
         if(int.TryParse(tbX.Text.ToString(), out var x))
         {
             if(int.TryParse(tbY.Text.ToString(), out var y))
diff --git a/src/UI/Windows/PosEditor.cs b/src/UI/Windows/PosEditor.cs
diff --git a/src/ViewExtensions.cs b/src/ViewExtensions.cs
diff --git a/src/ViewFactory.cs b/src/ViewFactory.cs
diff --git a/tests/ColorSchemeTests.cs b/tests/ColorSchemeTests.cs
diff --git a/tests/CopyPasteTests.cs b/tests/CopyPasteTests.cs
diff --git a/tests/KeyboardManagerTests.cs b/tests/KeyboardManagerTests.cs
diff --git a/tests/MenuBarTests.cs b/tests/MenuBarTests.cs
diff --git a/tests/Operations/DeleteColorSchemeOperationTests.cs b/tests/Operations/DeleteColorSchemeOperationTests.cs
diff --git a/tests/Operations/MoveMenuItemRightOperationTests.cs b/tests/Operations/MoveMenuItemRightOperationTests.cs
diff --git a/tests/StatusBarTests.cs b/tests/StatusBarTests.cs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using Terminal.Gui;`
	`2`	`+using Terminal.Gui.Drawing;`
`2`	`3`
`3`	`4`	`namespace TerminalGuiDesigner;`
`4`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using Terminal.Gui;`
	`2`	`+using Terminal.Gui.Input;`
`2`	`3`	`using Terminal.Gui.Views;`
`3`	`4`	`using TerminalGuiDesigner.Operations.Generics;`
`4`	`5`	`using TerminalGuiDesigner.UI.Windows;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System.CodeDom;`
`2`	`2`	`using Terminal.Gui;`
	`3`	`+using Terminal.Gui.Views;`
`3`	`4`
`4`	`5`	`namespace TerminalGuiDesigner.ToCode`
`5`	`6`	`{`