Move Dev Tools MenuItem from Help to Tools
MODIFY
WalletWasabi.Gui/Shell/Commands/HelpCommands.cs
WalletWasabi.Gui/Shell/Commands/HelpCommands.cs
@@ -101,29 +101,6 @@ namespace WalletWasabi.Gui.Shell.Commands
{
IoC.Get<IShell>().AddOrSelectDocument(() => new LegalIssuesViewModel(Global));
}));
-
-#if DEBUG
- DevToolsCommand = new CommandDefinition(
- "Dev Tools",
- commandIconService.GetCompletionKindImage("DevTools"),
- ReactiveCommand.Create(() =>
- {
- var devTools = new DevTools(Application.Current.Windows.FirstOrDefault());
-
- var devToolsWindow = new Window
- {
- Width = 1024,
- Height = 512,
- Content = devTools,
- DataTemplates =
- {
- new ViewLocator<Avalonia.Diagnostics.ViewModels.ViewModelBase>()
- }
- };
-
- devToolsWindow.Show();
- }));
-#endif
}
[ExportCommandDefinition("Help.About")]
@@ -146,12 +123,5 @@ namespace WalletWasabi.Gui.Shell.Commands
[ExportCommandDefinition("Help.LegalIssues")]
public CommandDefinition LegalIssuesCommand { get; }
-
-#if DEBUG
-
- [ExportCommandDefinition("Help.DevTools")]
- public CommandDefinition DevToolsCommand { get; }
-
-#endif
}
}

MODIFY
WalletWasabi.Gui/Shell/Commands/ToolCommands.cs
WalletWasabi.Gui/Shell/Commands/ToolCommands.cs
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Diagnostics;
using AvalonStudio.Commands;
using AvalonStudio.Extensibility;
using AvalonStudio.Shell;
@@ -42,6 +45,29 @@ namespace WalletWasabi.Gui.Shell.Commands
"Settings",
commandIconService.GetCompletionKindImage("Settings"),
settingsCommand);
+
+#if DEBUG
+ DevToolsCommand = new CommandDefinition(
+ "Dev Tools",
+ commandIconService.GetCompletionKindImage("DevTools"),
+ ReactiveCommand.Create(() =>
+ {
+ var devTools = new DevTools(Application.Current.Windows.FirstOrDefault());
+
+ var devToolsWindow = new Window
+ {
+ Width = 1024,
+ Height = 512,
+ Content = devTools,
+ DataTemplates =
+ {
+ new ViewLocator<Avalonia.Diagnostics.ViewModels.ViewModelBase>()
+ }
+ };
+
+ devToolsWindow.Show();
+ }));
+#endif
}
private void OnWalletManager()
@@ -67,5 +93,12 @@ namespace WalletWasabi.Gui.Shell.Commands
[ExportCommandDefinition("Tools.Settings")]
public CommandDefinition SettingsCommand { get; }
+
+#if DEBUG
+
+ [ExportCommandDefinition("Tools.DevTools")]
+ public CommandDefinition DevToolsCommand { get; }
+
+#endif
}
}

MODIFY
WalletWasabi.Gui/Shell/MainMenu/HelpMainMenuItems.cs
WalletWasabi.Gui/Shell/MainMenu/HelpMainMenuItems.cs
@@ -48,42 +48,33 @@ namespace WalletWasabi.Gui.Shell.MainMenu
[DefaultGroup("About")]
public IMenuItem About => MenuItemFactory.CreateCommandMenuItem("Help.About");
-#if DEBUG
-
- [ExportMainMenuItem("Help", "Dev Tools")]
- [DefaultOrder(1)]
- [DefaultGroup("About")]
- public IMenuItem DevTools => MenuItemFactory.CreateCommandMenuItem("Help.DevTools");
-
-#endif
-
[ExportMainMenuItem("Help", "Customer Support")]
- [DefaultOrder(2)]
+ [DefaultOrder(1)]
[DefaultGroup("Support")]
public IMenuItem CustomerSupport => MenuItemFactory.CreateCommandMenuItem("Help.CustomerSupport");
[ExportMainMenuItem("Help", "Report Bug")]
- [DefaultOrder(3)]
+ [DefaultOrder(2)]
[DefaultGroup("Support")]
public IMenuItem ReportBug => MenuItemFactory.CreateCommandMenuItem("Help.ReportBug");
[ExportMainMenuItem("Help", "Documentation")]
- [DefaultOrder(4)]
+ [DefaultOrder(3)]
[DefaultGroup("Support")]
public IMenuItem Docs => MenuItemFactory.CreateCommandMenuItem("Help.Documentation");
[ExportMainMenuItem("Help", "Privacy Policy")]
- [DefaultOrder(5)]
+ [DefaultOrder(4)]
[DefaultGroup("Legal")]
public IMenuItem PrivacyPolicy => MenuItemFactory.CreateCommandMenuItem("Help.PrivacyPolicy");
[ExportMainMenuItem("Help", "Terms And Conditions")]
- [DefaultOrder(6)]
+ [DefaultOrder(5)]
[DefaultGroup("Legal")]
public IMenuItem TermsAndConditions => MenuItemFactory.CreateCommandMenuItem("Help.TermsAndConditions");
[ExportMainMenuItem("Help", "Legal Issues")]
- [DefaultOrder(7)]
+ [DefaultOrder(6)]
[DefaultGroup("Legal")]
public IMenuItem LegalIssues => MenuItemFactory.CreateCommandMenuItem("Help.LegalIssues");

MODIFY
WalletWasabi.Gui/Shell/MainMenu/ToolsMainMenuItems.cs
WalletWasabi.Gui/Shell/MainMenu/ToolsMainMenuItems.cs
@@ -44,8 +44,17 @@ namespace WalletWasabi.Gui.Shell.MainMenu
[DefaultGroup("Managers")]
public IMenuItem WalletManager => MenuItemFactory.CreateCommandMenuItem("Tools.WalletManager");
- [ExportMainMenuItem("Tools", "Settings")]
+#if DEBUG
+
+ [ExportMainMenuItem("Tools", "Dev Tools")]
[DefaultOrder(1)]
+ [DefaultGroup("Managers")]
+ public IMenuItem DevTools => MenuItemFactory.CreateCommandMenuItem("Tools.DevTools");
+
+#endif
+
+ [ExportMainMenuItem("Tools", "Settings")]
+ [DefaultOrder(2)]
[DefaultGroup("Settings")]
public IMenuItem Settings => MenuItemFactory.CreateCommandMenuItem("Tools.Settings");

Move Dev Tools MenuItem from Help to Tools