From a64b4bc405f4e2935d0f29c66cc1d306df881bb5 Mon Sep 17 00:00:00 2001 From: Tig Date: Fri, 21 Mar 2025 09:17:49 +0100 Subject: [PATCH 001/137] touching publish.yml --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 545f596053..507e68e8e9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -2,7 +2,7 @@ name: Publish Terminal.Gui on: push: - branches: [ v1_release, v1_develop, v2_release, v2_develop ] + branches: [ v2_release, v2_develop ] tags: - v* paths-ignore: From 76a0d088ba1b14fd06a483a5950ac121c4b093a9 Mon Sep 17 00:00:00 2001 From: Tig Date: Mon, 28 Apr 2025 13:18:57 -0600 Subject: [PATCH 002/137] ColorScheme->Scheme --- Examples/CommunityToolkitExample/LoginView.cs | 4 +- .../CommunityToolkitExample/LoginViewModel.cs | 6 +- Examples/CommunityToolkitExample/README.md | 4 +- Examples/ReactiveExample/LoginView.cs | 4 +- Examples/UICatalog/Resources/config.json | 6 +- Examples/UICatalog/Scenarios/Adornments.cs | 8 +- .../UICatalog/Scenarios/AllViewsTester.cs | 8 +- .../Scenarios/AnsiRequestsScenario.cs | 4 +- Examples/UICatalog/Scenarios/Arrangement.cs | 14 +-- Examples/UICatalog/Scenarios/Bars.cs | 2 +- Examples/UICatalog/Scenarios/Buttons.cs | 22 ++--- .../Scenarios/CharacterMap/CharacterMap.cs | 2 +- Examples/UICatalog/Scenarios/Clipping.cs | 2 +- .../Scenarios/CollectionNavigatorTester.cs | 2 +- Examples/UICatalog/Scenarios/ColorPicker.cs | 6 +- .../UICatalog/Scenarios/ComboBoxIteration.cs | 2 +- .../UICatalog/Scenarios/ComputedLayout.cs | 34 +++---- .../Scenarios/ConfigurationEditor.cs | 22 ++--- Examples/UICatalog/Scenarios/ContextMenus.cs | 2 +- Examples/UICatalog/Scenarios/Dialogs.cs | 2 +- Examples/UICatalog/Scenarios/DimAutoDemo.cs | 10 +-- .../UICatalog/Scenarios/DynamicMenuBar.cs | 4 +- .../UICatalog/Scenarios/DynamicStatusBar.cs | 2 +- .../Scenarios/Editors/AdornmentEditor.cs | 4 +- .../Scenarios/Editors/ArrangementEditor.cs | 4 +- Examples/UICatalog/Scenarios/Generic.cs | 4 +- .../UICatalog/Scenarios/GraphViewExample.cs | 6 +- Examples/UICatalog/Scenarios/HexEditor.cs | 2 +- Examples/UICatalog/Scenarios/InvertColors.cs | 10 +-- Examples/UICatalog/Scenarios/Keys.cs | 8 +- .../Scenarios/LineCanvasExperiment.cs | 12 +-- Examples/UICatalog/Scenarios/LineDrawing.cs | 2 +- Examples/UICatalog/Scenarios/ListColumns.cs | 12 +-- .../Scenarios/ListViewWithSelection.cs | 2 +- .../UICatalog/Scenarios/ListsAndCombos.cs | 4 +- Examples/UICatalog/Scenarios/Menus.cs | 2 +- Examples/UICatalog/Scenarios/MessageBoxes.cs | 2 +- Examples/UICatalog/Scenarios/Mouse.cs | 10 +-- .../UICatalog/Scenarios/MultiColouredTable.cs | 8 +- Examples/UICatalog/Scenarios/Navigation.cs | 8 +- .../UICatalog/Scenarios/NumericUpDownDemo.cs | 18 ++-- Examples/UICatalog/Scenarios/PosAlignDemo.cs | 20 ++--- Examples/UICatalog/Scenarios/Progress.cs | 6 +- .../UICatalog/Scenarios/ProgressBarStyles.cs | 16 ++-- .../UICatalog/Scenarios/RegionScenario.cs | 2 +- .../Scenarios/RuneWidthGreaterThanOne.cs | 2 +- Examples/UICatalog/Scenarios/ScrollBarDemo.cs | 4 +- Examples/UICatalog/Scenarios/Scrolling.cs | 10 +-- Examples/UICatalog/Scenarios/Shortcuts.cs | 12 +-- .../Scenarios/SingleBackgroundWorker.cs | 2 +- Examples/UICatalog/Scenarios/Sliders.cs | 26 +++--- Examples/UICatalog/Scenarios/Snake.cs | 2 +- .../UICatalog/Scenarios/SyntaxHighlighting.cs | 6 +- Examples/UICatalog/Scenarios/TableEditor.cs | 38 ++++---- .../Scenarios/TextAlignmentAndDirection.cs | 56 ++++++------ .../Scenarios/TextEffectsScenario.cs | 2 +- .../UICatalog/Scenarios/TextFormatterDemo.cs | 6 +- Examples/UICatalog/Scenarios/Threading.cs | 4 +- Examples/UICatalog/Scenarios/Transparent.cs | 10 +-- .../UICatalog/Scenarios/TreeViewFileSystem.cs | 8 +- Examples/UICatalog/Scenarios/TrueColors.cs | 4 +- .../UICatalog/Scenarios/ViewportSettings.cs | 8 +- .../Scenarios/VkeyPacketSimulator.cs | 8 +- .../Scenarios/WindowsAndFrameViews.cs | 28 +++--- Examples/UICatalog/Scenarios/Wizards.cs | 6 +- Examples/UICatalog/UICatalogTop.cs | 18 ++-- ...sonConverter.cs => SchemeJsonConverter.cs} | 22 ++--- .../Configuration/SourceGenerationContext.cs | 2 +- Terminal.Gui/Configuration/ThemeManager.cs | 2 +- Terminal.Gui/Configuration/ThemeScope.cs | 2 +- Terminal.Gui/Drawing/Attribute.cs | 2 +- Terminal.Gui/Drawing/Cell.cs | 2 +- ...ColorScheme.Colors.cs => Scheme.Colors.cs} | 90 +++++++++---------- .../Color/{ColorScheme.cs => Scheme.cs} | 27 +++--- Terminal.Gui/Drawing/VisualRole.cs | 51 +++++++++++ Terminal.Gui/Resources/config.json | 10 +-- .../Text/Autocomplete/AppendAutocomplete.cs | 10 +-- .../Text/Autocomplete/AutocompleteBase.cs | 2 +- .../Text/Autocomplete/IAutocomplete.cs | 2 +- .../Text/Autocomplete/PopupAutocomplete.cs | 16 ++-- Terminal.Gui/View/Adornment/Adornment.cs | 2 +- Terminal.Gui/View/Adornment/Border.cs | 22 ++--- Terminal.Gui/View/Adornment/Margin.cs | 18 ++-- Terminal.Gui/View/Adornment/Padding.cs | 6 +- Terminal.Gui/View/View.Adornments.cs | 2 +- Terminal.Gui/View/View.ColorScheme.cs | 60 ++++++------- Terminal.Gui/View/View.Drawing.Primitives.cs | 6 +- Terminal.Gui/View/View.Mouse.cs | 46 +++++----- Terminal.Gui/Views/Bar.cs | 4 +- Terminal.Gui/Views/CharMap/CharMap.cs | 2 +- Terminal.Gui/Views/ComboBox.cs | 22 ++--- Terminal.Gui/Views/Dialog.cs | 10 +-- Terminal.Gui/Views/FileDialog.cs | 10 +-- Terminal.Gui/Views/FlagSelector.cs | 6 +- Terminal.Gui/Views/GraphView/Annotations.cs | 4 +- Terminal.Gui/Views/GraphView/GraphView.cs | 2 +- Terminal.Gui/Views/ListView.cs | 6 +- Terminal.Gui/Views/Menu/MenuBarv2.cs | 4 +- Terminal.Gui/Views/Menu/Menuv2.cs | 2 +- Terminal.Gui/Views/Menuv1/Menu.cs | 16 ++-- Terminal.Gui/Views/Menuv1/MenuBar.cs | 4 +- Terminal.Gui/Views/MessageBox.cs | 2 +- Terminal.Gui/Views/OptionSelector.cs | 12 +-- Terminal.Gui/Views/ProgressBar.cs | 6 +- Terminal.Gui/Views/StatusBar.cs | 2 +- .../Views/TableView/CellColorGetterArgs.cs | 6 +- .../Views/TableView/RowColorGetterArgs.cs | 2 +- Terminal.Gui/Views/TableView/TableStyle.cs | 2 +- Terminal.Gui/Views/TableView/TableView.cs | 16 ++-- Terminal.Gui/Views/TextField.cs | 6 +- Terminal.Gui/Views/TextValidateField.cs | 4 +- Terminal.Gui/Views/TextView.cs | 36 ++++---- Terminal.Gui/Views/TileView.cs | 8 +- Terminal.Gui/Views/Toplevel.cs | 2 +- Terminal.Gui/Views/TreeView/Branch.cs | 2 +- .../TreeView/DrawTreeViewLineEventArgs.cs | 2 +- Terminal.Gui/Views/TreeView/TreeView.cs | 4 +- Terminal.Gui/Views/Window.cs | 6 +- Terminal.Gui/Views/Wizard/Wizard.cs | 6 +- .../UICatalog/ScenarioTests.cs | 10 +-- .../ColorSchemeJsonConverterTests.cs | 18 ++-- .../Configuration/ConfigurationMangerTests.cs | 88 +++++++++--------- Tests/UnitTests/Configuration/ThemeTests.cs | 90 +++++++++---------- Tests/UnitTests/Text/AutocompleteTests.cs | 16 ++-- Tests/UnitTests/View/Adornment/BorderTests.cs | 18 ++-- Tests/UnitTests/View/Adornment/MarginTests.cs | 2 +- .../UnitTests/View/Adornment/PaddingTests.cs | 4 +- .../View/Adornment/ShadowStyleTests.cs | 4 +- .../UnitTests/View/Draw/ClearViewportTests.cs | 8 +- Tests/UnitTests/View/Draw/DrawTests.cs | 6 +- Tests/UnitTests/View/Draw/NeedsDrawTests.cs | 2 +- Tests/UnitTests/View/Mouse/MouseTests.cs | 10 +-- Tests/UnitTests/View/ViewTests.cs | 10 +-- Tests/UnitTests/Views/ComboBoxTests.cs | 4 +- Tests/UnitTests/Views/GraphViewTests.cs | 20 ++--- Tests/UnitTests/Views/LabelTests.cs | 12 +-- .../UnitTests/Views/Menuv1/MenuBarv1Tests.cs | 18 ++-- Tests/UnitTests/Views/ShortcutTests.cs | 8 +- Tests/UnitTests/Views/StatusBarTests.cs | 2 +- Tests/UnitTests/Views/TabViewTests.cs | 2 +- Tests/UnitTests/Views/TableViewTests.cs | 80 ++++++++--------- Tests/UnitTests/Views/TextFieldTests.cs | 10 +-- Tests/UnitTests/Views/TextViewTests.cs | 22 ++--- Tests/UnitTests/Views/TileViewTests.cs | 24 ++--- Tests/UnitTests/Views/ToplevelTests.cs | 2 +- Tests/UnitTests/Views/TreeTableSourceTests.cs | 4 +- Tests/UnitTests/Views/TreeViewTests.cs | 24 ++--- Tests/UnitTests/Views/WindowTests.cs | 6 +- .../Drawing/ColorSchemeTests.cs | 22 ++--- .../View/ColorSchemeTests.cs | 18 ++-- .../Views/ShortcutTests.cs | 8 +- 151 files changed, 916 insertions(+), 868 deletions(-) rename Terminal.Gui/Configuration/{ColorSchemeJsonConverter.cs => SchemeJsonConverter.cs} (78%) rename Terminal.Gui/Drawing/Color/{ColorScheme.Colors.cs => Scheme.Colors.cs} (66%) rename Terminal.Gui/Drawing/Color/{ColorScheme.cs => Scheme.cs} (79%) create mode 100644 Terminal.Gui/Drawing/VisualRole.cs diff --git a/Examples/CommunityToolkitExample/LoginView.cs b/Examples/CommunityToolkitExample/LoginView.cs index 2e72b45cf4..2da956f92a 100644 --- a/Examples/CommunityToolkitExample/LoginView.cs +++ b/Examples/CommunityToolkitExample/LoginView.cs @@ -47,7 +47,7 @@ public void Receive (Message message) { loginProgressLabel.Text = ViewModel.LoginProgressMessage; validationLabel.Text = ViewModel.ValidationMessage; - validationLabel.ColorScheme = ViewModel.ValidationColorScheme; + validationLabel.Scheme = ViewModel.ValidationScheme; break; } case LoginActions.LoginProgress: @@ -58,7 +58,7 @@ public void Receive (Message message) case LoginActions.Validation: { validationLabel.Text = ViewModel.ValidationMessage; - validationLabel.ColorScheme = ViewModel.ValidationColorScheme; + validationLabel.Scheme = ViewModel.ValidationScheme; break; } } diff --git a/Examples/CommunityToolkitExample/LoginViewModel.cs b/Examples/CommunityToolkitExample/LoginViewModel.cs index 8d48546bbc..3b492da523 100644 --- a/Examples/CommunityToolkitExample/LoginViewModel.cs +++ b/Examples/CommunityToolkitExample/LoginViewModel.cs @@ -29,7 +29,7 @@ internal partial class LoginViewModel : ObservableObject private string _usernameLengthMessage; [ObservableProperty] - private ColorScheme? _validationColorScheme; + private Scheme? _validationScheme; [ObservableProperty] private string _validationMessage; @@ -107,14 +107,14 @@ private void SendMessage (LoginActions loginAction, string message = "") case LoginActions.Clear: LoginProgressMessage = message; ValidationMessage = INVALID_LOGIN_MESSAGE; - ValidationColorScheme = Colors.ColorSchemes ["Error"]; + ValidationScheme = Colors.Schemes ["Error"]; break; case LoginActions.LoginProgress: LoginProgressMessage = message; break; case LoginActions.Validation: ValidationMessage = CanLogin ? VALID_LOGIN_MESSAGE : INVALID_LOGIN_MESSAGE; - ValidationColorScheme = CanLogin ? Colors.ColorSchemes ["Base"] : Colors.ColorSchemes ["Error"]; + ValidationScheme = CanLogin ? Colors.Schemes ["Base"] : Colors.Schemes ["Error"]; break; } WeakReferenceMessenger.Default.Send (new Message { Value = loginAction }); diff --git a/Examples/CommunityToolkitExample/README.md b/Examples/CommunityToolkitExample/README.md index c3a7128685..908ae592b8 100644 --- a/Examples/CommunityToolkitExample/README.md +++ b/Examples/CommunityToolkitExample/README.md @@ -115,7 +115,7 @@ private void SendMessage (LoginAction loginAction, string message = "") break; case LoginAction.Validation: ValidationMessage = CanLogin ? VALID_LOGIN_MESSAGE : INVALID_LOGIN_MESSAGE; - ValidationColorScheme = CanLogin ? Colors.ColorSchemes ["Base"] : Colors.ColorSchemes ["Error"]; + ValidationScheme = CanLogin ? Colors.Schemes ["Base"] : Colors.Schemes ["Error"]; break; } WeakReferenceMessenger.Default.Send (new Message { Value = loginAction }); @@ -144,7 +144,7 @@ public void Receive (Message message) case LoginAction.Validation: { validationLabel.Text = ViewModel.ValidationMessage; - validationLabel.ColorScheme = ViewModel.ValidationColorScheme; + validationLabel.Scheme = ViewModel.ValidationScheme; break; } } diff --git a/Examples/ReactiveExample/LoginView.cs b/Examples/ReactiveExample/LoginView.cs index 130aebb43b..03955989b8 100644 --- a/Examples/ReactiveExample/LoginView.cs +++ b/Examples/ReactiveExample/LoginView.cs @@ -96,8 +96,8 @@ public LoginView (LoginViewModel viewModel) ViewModel .WhenAnyValue (x => x.IsValid) - .Select (valid => valid ? Colors.ColorSchemes ["Base"] : Colors.ColorSchemes ["Error"]) - .BindTo (validation, x => x.ColorScheme) + .Select (valid => valid ? Colors.Schemes ["Base"] : Colors.Schemes ["Error"]) + .BindTo (validation, x => x.Scheme) .DisposeWith (_disposable); }) .AddControlAfter