Resolving merge conflicts.

This commit is contained in:
BDisp
2023-03-17 11:24:53 +00:00
51 changed files with 301 additions and 157 deletions

View File

@@ -41,7 +41,7 @@ namespace UICatalog.Scenarios {
var menu = new MenuBar (new MenuBarItem [] {
new MenuBarItem ("_File", new MenuItem [] {
new MenuItem ("_Quit", "CTRL-Q", () => Quit()),
new MenuItem ("_Quit", $"{Application.QuitKey}", () => Quit()),
}),
new MenuBarItem ("_View", new MenuItem [] {
miFullPaths = new MenuItem ("_Full Paths", "", () => SetFullName()){Checked = false, CheckType = MenuItemCheckStyle.Checked},