Place data folder open to file open
MODIFY
WalletWasabi.Gui/Shell/Commands/HelpCommands.cs
WalletWasabi.Gui/Shell/Commands/HelpCommands.cs
@@ -29,14 +29,6 @@ namespace WalletWasabi.Gui.Shell.Commands
IoC.Get<IShell>().AddOrSelectDocument(() => new AboutViewModel());
}));
- DataFolderCommand = new CommandDefinition(
- "Data Folder",
- commandIconService.GetCompletionKindImage("DataFolder"),
- ReactiveCommand.Create(() =>
- {
- IoHelpers.OpenFolderInFileExplorer(Global.DataDir);
- }));
-
CustomerSupportCommand = new CommandDefinition(
"Customer Support",
commandIconService.GetCompletionKindImage("CustomerSupport"),
@@ -108,9 +100,6 @@ namespace WalletWasabi.Gui.Shell.Commands
[ExportCommandDefinition("Help.About")]
public CommandDefinition AboutCommand { get; }
- [ExportCommandDefinition("Help.DataFolder")]
- public CommandDefinition DataFolderCommand { get; }
-
[ExportCommandDefinition("Help.CustomerSupport")]
public CommandDefinition CustomerSupportCommand { get; }

MODIFY
WalletWasabi.Gui/Shell/MainMenu/FileMainMenuItems.cs
WalletWasabi.Gui/Shell/MainMenu/FileMainMenuItems.cs
@@ -21,22 +21,35 @@ namespace WalletWasabi.Gui.Shell.MainMenu
[DefaultOrder(0)]
public IMenuItem File => MenuItemFactory.CreateHeaderMenuItem("File", null);
- [ExportMainMenuDefaultGroup("File", "Wallet")]
+ [ExportMainMenuDefaultGroup("File", "Disk")]
+ [DefaultOrder(0)]
+ public object DiskGroup => null;
+
+ [ExportMainMenuItem("File", "Open")]
[DefaultOrder(0)]
+ public IMenuItem Open => MenuItemFactory.CreateHeaderMenuItem("Open", null);
+
+ [ExportMainMenuItem("File", "Open", "Data Folder")]
+ [DefaultOrder(1)]
+ [DefaultGroup("Disk")]
+ public IMenuItem OpenDataFolder => MenuItemFactory.CreateCommandMenuItem("File.Open.DataFolder");
+
+ [ExportMainMenuDefaultGroup("File", "Wallet")]
+ [DefaultOrder(1)]
public object WalletGroup => null;
[ExportMainMenuItem("File", "Generate Wallet")]
- [DefaultOrder(0)]
+ [DefaultOrder(10)]
[DefaultGroup("Wallet")]
public IMenuItem GenerateWallet => MenuItemFactory.CreateCommandMenuItem("File.GenerateWallet");
[ExportMainMenuItem("File", "Recover Wallet")]
- [DefaultOrder(10)]
+ [DefaultOrder(11)]
[DefaultGroup("Wallet")]
public IMenuItem Recover => MenuItemFactory.CreateCommandMenuItem("File.RecoverWallet");
[ExportMainMenuItem("File", "Load Wallet")]
- [DefaultOrder(20)]
+ [DefaultOrder(12)]
[DefaultGroup("Wallet")]
public IMenuItem LoadWallet => MenuItemFactory.CreateCommandMenuItem("File.LoadWallet");

MODIFY
WalletWasabi.Gui/Shell/MainMenu/HelpMainMenuItems.cs
WalletWasabi.Gui/Shell/MainMenu/HelpMainMenuItems.cs
@@ -30,11 +30,6 @@ namespace WalletWasabi.Gui.Shell.MainMenu
[DefaultGroup("About")]
public IMenuItem About => MenuItemFactory.CreateCommandMenuItem("Help.About");
- [ExportMainMenuItem("Help", "DataFolder")]
- [DefaultOrder(0)]
- [DefaultGroup("DataFolder")]
- public IMenuItem DataFolder => MenuItemFactory.CreateCommandMenuItem("Help.DataFolder");
-
[ExportMainMenuDefaultGroup("Help", "Support")]
[DefaultOrder(100)]
public object SupportGroup => null;

MODIFY
WalletWasabi.Gui/Tabs/WalletManager/WalletManagerViewModel.cs
WalletWasabi.Gui/Tabs/WalletManager/WalletManagerViewModel.cs
@@ -33,14 +33,14 @@ namespace WalletWasabi.Gui.Tabs.WalletManager
public ObservableCollection<CategoryViewModel> Categories
{
- get { return _categories; }
- set { this.RaiseAndSetIfChanged(ref _categories, value); }
+ get => _categories;
+ set => this.RaiseAndSetIfChanged(ref _categories, value);
}
public CategoryViewModel SelectedCategory
{
- get { return _selectedCategory; }
- set { this.RaiseAndSetIfChanged(ref _selectedCategory, value); }
+ get => _selectedCategory;
+ set => this.RaiseAndSetIfChanged(ref _selectedCategory, value);
}
public void SelectGenerateWallet()
@@ -60,8 +60,8 @@ namespace WalletWasabi.Gui.Tabs.WalletManager
public ViewModelBase CurrentView
{
- get { return _currentView; }
- set { this.RaiseAndSetIfChanged(ref _currentView, value); }
+ get => _currentView;
+ set => this.RaiseAndSetIfChanged(ref _currentView, value);
}
}
}

Place data folder open to file open