Remove more color scheme code

Author: tznind

src/DefaultColorSchemes.cs

@@ -514,8 +514,7 @@ public string GetUniqueFieldName(string? candidate)
 
         // what field names are already taken by other objects?
         var usedFieldNames = allDesigns.Select(d => d.FieldName).ToList();
-        usedFieldNames.AddRange(SchemeManager.Instance.Schemes.Select(k => k.Name));
-
+        
         return candidate.MakeUnique(usedFieldNames);
     }
 
@@ -613,9 +612,6 @@ private IEnumerable<Property> LoadDesignableProperties()
         yield return this.CreateSuppressedProperty(nameof(this.View.Visible), true);
 
         yield return this.CreateSuppressedProperty(nameof(this.View.Arrangement), ViewArrangement.Fixed);
-        
-
-        yield return new SchemeProperty(this);
 
         yield return this.CreateSuppressedProperty(nameof(View.CanFocus), true);
         yield return this.CreateProperty(nameof(this.View.ShadowStyle));

src/Design.cs

@@ -70,7 +70,7 @@ private void DrawBorderlessViewFrame(Rectangle r)
 
         var color = isSelected ?
             SelectionManager.Instance.SelectedScheme.Normal :
-            this.Design.View.Scheme.Normal;
+            this.Design.View.GetScheme().Normal;
 
         Application.Driver.SetAttribute(color);
 

src/DesignState.cs

@@ -158,9 +158,7 @@ public void GenerateDesignerCs(Design rootDesign, Type viewType)
         initMethod.Name = SourceCodeFile.InitializeComponentMethodName;
 
         var args = new CodeDomArgs(class1, initMethod);
-
-        this.AddSchemesToClass(args);
-
+        
         // Add designable root properties to the InitializeComponent method
         foreach (var prop in rootDesign.GetDesignableProperties())
         {
@@ -328,13 +326,4 @@ private void AddCustomHeaderForDesignerCsFile(CodeNamespace nSpace)
             "-----------------------------------" +
             "------------------------------------------"));
     }
-
-    private void AddSchemesToClass(CodeDomArgs args)
-    {
-        foreach (var scheme in SchemeManager.Instance.Schemes)
-        {
-            var toCode = new SchemeToCode(scheme);
-            toCode.ToCode(args);
-        }
-    }
 }

src/ToCode/ViewToCode.cs

@@ -288,8 +288,6 @@ protected override void OnDrawComplete(DrawContext? context)
 
         if (this.enableShowFocused)
         {
-            Application.Driver.SetAttribute(this.viewBeingEdited.View.Scheme.Normal);
-
             string? toDisplay = this.GetLowerRightTextIfAny();
 
             // and have a designable view focused
@@ -558,12 +556,6 @@ public bool HandleKey(Key key)
                 return true;
             }
 
-            if (keyString == this.keyMap.ShowSchemes)
-            {
-                this.ShowSchemes();
-                return true;
-            }
-
             if (keyString == this.keyMap.Copy)
             {
                 this.Copy();
@@ -825,15 +817,16 @@ private void BuildRootMenu()
             Y = Pos.Percent(75),
             Width = maxWidth,
             Height = 4,
-            Scheme = new Scheme
-            (
-                new Attribute(new Color(Color.White),new Color(Color.Black)),
-                new Attribute(new Color(Color.Black),new Color(Color.White)),
-            new Attribute(new Color(Color.White), new Color(Color.Black)),
-            new Attribute(new Color(Color.White), new Color(Color.Black)),
-            new Attribute(new Color(Color.Black), new Color(Color.White))
-                ),
         };
+        rootCommandsListView.SetScheme(new Scheme
+            {
+            Normal = new Attribute(new Color(Color.White), new Color(Color.Black)),
+            Focus = new Attribute(new Color(Color.Black), new Color(Color.White)),
+            HotNormal = new Attribute(new Color(Color.White), new Color(Color.Black)),
+            HotFocus = new Attribute(new Color(Color.White), new Color(Color.Black)),
+            Disabled = new Attribute(new Color(Color.Black), new Color(Color.White))
+        });
+
         this.rootCommandsListView.SetSource(rootCommands);
         this.rootCommandsListView.SelectedItem = 0;
 
@@ -1196,7 +1189,6 @@ private void Open()
             Title = "Open",
             AllowedTypes = new List<IAllowedType>(new[] { new AllowedType("View", SourceCodeFile.ExpectedExtension) })
         };
-        ofd.SetupNiceSchemes();
         ofd.Layout();
 
         Application.Run(ofd, this.ErrorHandler);
@@ -1279,7 +1271,6 @@ private void New()
             Path = "MyView.cs",
         };
         ofd.Layout();
-        ofd.SetupNiceSchemes();
 
         Application.Run(ofd);
 
@@ -1421,9 +1412,6 @@ private void ReplaceViewBeingEdited(Design design)
             // Load new instance
             this.viewBeingEdited = design;
 
-            // TODO: Find a better place for this
-            SchemeManager.Instance.FindDeclaredSchemes(this.viewBeingEdited);
-
             // And add it to the editing window
             this.Add(this.viewBeingEdited.View);
         });
@@ -1476,15 +1464,4 @@ private void ShowEditProperties(Design d)
         var edit = new EditDialog(d);
         Application.Run(edit, this.ErrorHandler);
     }
-
-    private void ShowSchemes()
-    {
-        if (this.viewBeingEdited == null)
-        {
-            return;
-        }
-
-        var schemes = new SchemesUI(this.viewBeingEdited);
-        Application.Run(schemes);
-    }
 }

src/UI/Editor.cs

@@ -164,12 +164,6 @@ public KeyMap( )
     /// <summary>Gets the string to assign a new shortcut to a <see cref="MenuItem" />.</summary>
     public string SetShortcut { get; init; } = SetShortcut;
 
-    /// <summary>
-    ///   Gets the string to open the <see cref="SchemesUI" /> window for creating/deleting <see cref="Scheme" /> that can be
-    ///   used in the <see cref="Editor" />.
-    /// </summary>
-    public string ShowSchemes { get; init; } = ShowSchemes;
-
     /// <summary>Gets the string to pop up the right click context menu.</summary>
     public string ShowContextMenu { get; init; } = ShowContextMenu;
 

src/UI/KeyMap.cs

@@ -7,7 +7,6 @@
 using Terminal.Gui.Views;
 using TerminalGuiDesigner.ToCode;
 using TerminalGuiDesigner.UI.Windows;
-using ColorPicker = TerminalGuiDesigner.UI.Windows.ColorPicker;
 using Attribute = Terminal.Gui.Drawing.Attribute;
 
 namespace TerminalGuiDesigner.UI
@@ -56,10 +55,6 @@ internal static bool GetNewValue(string propertyName, Design design, Type type,
             {
                 return RunEditor(new SliderOptionEditor(type.GetGenericArguments()[0], oldValue), out newValue);
             }
-            if (type == typeof(Attribute) || type == typeof(Attribute?))
-            {
-                return RunEditor(new ColorPicker((Attribute?)oldValue), out newValue);
-            }
             if (type == typeof(Pos))
             {
                 return RunEditor(new PosEditor(design, (Pos)oldValue ?? throw new Exception("Pos property was unexpectedly null")), out newValue);
@@ -190,7 +185,6 @@ internal static bool GetNewValue(string propertyName, Design design, Type type,
             if (type == typeof(FileSystemInfo))
             {
                 var fd = new FileDialog();
-                fd.SetupNiceSchemes();
                 fd.AllowsMultipleSelection = false;
                 fd.Layout();