From d49701b5c38bca5447063e659ffc085194c50789 Mon Sep 17 00:00:00 2001 From: Tig Date: Sun, 16 Jun 2024 22:39:44 -0700 Subject: [PATCH] Updated TreeuseCases --- UICatalog/Scenarios/TreeUseCases.cs | 58 ++++++++++++++--------------- UICatalog/Scenarios/Unicode.cs | 25 ++++++------- 2 files changed, 41 insertions(+), 42 deletions(-) diff --git a/UICatalog/Scenarios/TreeUseCases.cs b/UICatalog/Scenarios/TreeUseCases.cs index 274e2d4be..57cee729a 100644 --- a/UICatalog/Scenarios/TreeUseCases.cs +++ b/UICatalog/Scenarios/TreeUseCases.cs @@ -11,11 +11,13 @@ public class TreeUseCases : Scenario { private View _currentTree; - public override void Setup () + public override void Main () { - Win.Title = GetName (); - Win.Y = 1; // menu - Win.Height = Dim.Fill (1); // status bar + // Init + Application.Init (); + + // Setup - Create a top-level application window and configure it. + Toplevel appWindow = new (); var menu = new MenuBar { @@ -47,25 +49,23 @@ public class TreeUseCases : Scenario ] }; - Top.Add (menu); + appWindow.Add (menu); - var statusBar = new StatusBar ( -#if V2_STATUSBAR - new StatusItem [] - { - new ( - Application.QuitKey, - $"{Application.QuitKey} to Quit", - () => Quit () - ) - } -#endif - ); + var statusBar = new StatusBar ([new (Application.QuitKey, "Quit", Quit)]); - Top.Add (statusBar); + appWindow.Add (statusBar); + + appWindow.Ready += (sender, args) => + // Start with the most basic use case + LoadSimpleNodes (); + + // Run - Start the application. + Application.Run (appWindow); + appWindow.Dispose (); + + // Shutdown - Calling Application.Shutdown is required. + Application.Shutdown (); - // Start with the most basic use case - LoadSimpleNodes (); } private void LoadArmies (bool useDelegate) @@ -78,11 +78,11 @@ public class TreeUseCases : Scenario if (_currentTree != null) { - Win.Remove (_currentTree); + Application.Top.Remove (_currentTree); _currentTree.Dispose (); } - TreeView tree = new () { X = 0, Y = 0, Width = 40, Height = 20 }; + TreeView tree = new () { X = 0, Y = 1, Width = Dim.Fill (), Height = Dim.Fill (1) }; if (useDelegate) { @@ -98,7 +98,7 @@ public class TreeUseCases : Scenario tree.TreeBuilder = new GameObjectTreeBuilder (); } - Win.Add (tree); + Application.Top.Add (tree); tree.AddObject (army1); @@ -118,13 +118,13 @@ public class TreeUseCases : Scenario if (_currentTree != null) { - Win.Remove (_currentTree); + Application.Top.Remove (_currentTree); _currentTree.Dispose (); } - var tree = new TreeView { X = 0, Y = 0, Width = 40, Height = 20 }; + var tree = new TreeView { X = 0, Y = 1, Width = Dim.Fill(), Height = Dim.Fill (1) }; - Win.Add (tree); + Application.Top.Add (tree); tree.AddObject (myHouse); @@ -135,13 +135,13 @@ public class TreeUseCases : Scenario { if (_currentTree != null) { - Win.Remove (_currentTree); + Application.Top.Remove (_currentTree); _currentTree.Dispose (); } - var tree = new TreeView { X = 0, Y = 0, Width = 40, Height = 20 }; + var tree = new TreeView { X = 0, Y = 1, Width = Dim.Fill (), Height = Dim.Fill (1) }; - Win.Add (tree); + Application.Top.Add (tree); var root1 = new TreeNode ("Root1"); root1.Children.Add (new TreeNode ("Child1.1")); diff --git a/UICatalog/Scenarios/Unicode.cs b/UICatalog/Scenarios/Unicode.cs index d6c866b0d..384369e12 100644 --- a/UICatalog/Scenarios/Unicode.cs +++ b/UICatalog/Scenarios/Unicode.cs @@ -34,7 +34,7 @@ public class UnicodeInMenu : Scenario // Setup - Create a top-level application window and configure it. Window appWindow = new () { - Title = $"{Application.QuitKey} to Quit - Scenario: {GetName ()}", + Title = $"{Application.QuitKey} to Quit - Scenario: {GetName ()}" }; var menu = new MenuBar @@ -76,7 +76,7 @@ public class UnicodeInMenu : Scenario { new ( Application.QuitKey, - $"Выход", + "Выход", () => Application.RequestStop () ), new (Key.F2, "Создать", null), @@ -98,14 +98,14 @@ public class UnicodeInMenu : Scenario }; appWindow.Add (testlabel); - label = new() { X = Pos.X (label), Y = Pos.Bottom (label) + 1, Text = "Label (CanFocus):" }; + label = new () { X = Pos.X (label), Y = Pos.Bottom (label) + 1, Text = "Label (CanFocus):" }; appWindow.Add (label); var sb = new StringBuilder (); sb.Append ('e'); sb.Append ('\u0301'); sb.Append ('\u0301'); - testlabel = new() + testlabel = new () { X = 20, Y = Pos.Y (label), @@ -116,12 +116,12 @@ public class UnicodeInMenu : Scenario Text = $"Should be [e with two accents, but isn't due to #2616]: [{sb}]" }; appWindow.Add (testlabel); - label = new() { X = Pos.X (label), Y = Pos.Bottom (label) + 1, Text = "Button:" }; + label = new () { X = Pos.X (label), Y = Pos.Bottom (label) + 1, Text = "Button:" }; appWindow.Add (label); var button = new Button { X = 20, Y = Pos.Y (label), Text = "A123456789♥♦♣♠JQK" }; appWindow.Add (button); - label = new() { X = Pos.X (label), Y = Pos.Bottom (label) + 1, Text = "CheckBox:" }; + label = new () { X = Pos.X (label), Y = Pos.Bottom (label) + 1, Text = "CheckBox:" }; appWindow.Add (label); var checkBox = new CheckBox @@ -146,7 +146,7 @@ public class UnicodeInMenu : Scenario }; appWindow.Add (checkBox, checkBoxRight); - label = new() { X = Pos.X (label), Y = Pos.Bottom (checkBoxRight) + 1, Text = "ComboBox:" }; + label = new () { X = Pos.X (label), Y = Pos.Bottom (checkBoxRight) + 1, Text = "ComboBox:" }; appWindow.Add (label); var comboBox = new ComboBox { X = 20, Y = Pos.Y (label), Width = Dim.Percent (50) }; comboBox.SetSource (new ObservableCollection { gitString, "Со_хранить" }); @@ -154,7 +154,7 @@ public class UnicodeInMenu : Scenario appWindow.Add (comboBox); comboBox.Text = gitString; - label = new() { X = Pos.X (label), Y = Pos.Bottom (label) + 2, Text = "HexView:" }; + label = new () { X = Pos.X (label), Y = Pos.Bottom (label) + 2, Text = "HexView:" }; appWindow.Add (label); var hexView = new HexView (new MemoryStream (Encoding.ASCII.GetBytes (gitString + " Со_хранить"))) @@ -163,7 +163,7 @@ public class UnicodeInMenu : Scenario }; appWindow.Add (hexView); - label = new() { X = Pos.X (label), Y = Pos.Bottom (hexView) + 1, Text = "ListView:" }; + label = new () { X = Pos.X (label), Y = Pos.Bottom (hexView) + 1, Text = "ListView:" }; appWindow.Add (label); var listView = new ListView @@ -178,7 +178,7 @@ public class UnicodeInMenu : Scenario }; appWindow.Add (listView); - label = new() { X = Pos.X (label), Y = Pos.Bottom (listView) + 1, Text = "RadioGroup:" }; + label = new () { X = Pos.X (label), Y = Pos.Bottom (listView) + 1, Text = "RadioGroup:" }; appWindow.Add (label); var radioGroup = new RadioGroup @@ -190,7 +190,7 @@ public class UnicodeInMenu : Scenario }; appWindow.Add (radioGroup); - label = new() { X = Pos.X (label), Y = Pos.Bottom (radioGroup) + 1, Text = "TextField:" }; + label = new () { X = Pos.X (label), Y = Pos.Bottom (radioGroup) + 1, Text = "TextField:" }; appWindow.Add (label); var textField = new TextField @@ -199,7 +199,7 @@ public class UnicodeInMenu : Scenario }; appWindow.Add (textField); - label = new() { X = Pos.X (label), Y = Pos.Bottom (textField) + 1, Text = "TextView:" }; + label = new () { X = Pos.X (label), Y = Pos.Bottom (textField) + 1, Text = "TextView:" }; appWindow.Add (label); var textView = new TextView @@ -212,7 +212,6 @@ public class UnicodeInMenu : Scenario }; appWindow.Add (textView); - // Run - Start the application. Application.Run (appWindow);