From e0d20a20e871ac8609305d6781dc51786f035536 Mon Sep 17 00:00:00 2001 From: kworede5821 Date: Wed, 11 Oct 2023 10:22:48 -0700 Subject: [PATCH 1/3] Create new folder wiht Ctrl+Shift+N shortcut --- src/Files.App/Actions/FileSystem/AddItemAction.cs | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/Files.App/Actions/FileSystem/AddItemAction.cs b/src/Files.App/Actions/FileSystem/AddItemAction.cs index 88e07fd4686e..50acf8934a11 100644 --- a/src/Files.App/Actions/FileSystem/AddItemAction.cs +++ b/src/Files.App/Actions/FileSystem/AddItemAction.cs @@ -36,19 +36,9 @@ public AddItemAction() public async Task ExecuteAsync() { - await dialogService.ShowDialogAsync(viewModel); + await UIFilesystemHelpers.CreateFileFromDialogResultType( + AddItemDialogItemType.Folder, null, context.ShellPage!); - if (viewModel.ResultType.ItemType == AddItemDialogItemType.Shortcut) - { - await Ioc.Default.GetRequiredService().CreateShortcutFromDialog.ExecuteAsync(); - } - else if (viewModel.ResultType.ItemType != AddItemDialogItemType.Cancel) - { - await UIFilesystemHelpers.CreateFileFromDialogResultType( - viewModel.ResultType.ItemType, - viewModel.ResultType.ItemInfo, - context.ShellPage!); - } } private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) From b5ada698ec50996f8454cf43505a157763d84c22 Mon Sep 17 00:00:00 2001 From: Yair <39923744+yaira2@users.noreply.github.com> Date: Thu, 12 Oct 2023 13:25:40 -0400 Subject: [PATCH 2/3] Requested changes --- .../Actions/FileSystem/AddItemAction.cs | 18 +++++++++++++----- .../Actions/FileSystem/CreateFolderAction.cs | 3 +++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/Files.App/Actions/FileSystem/AddItemAction.cs b/src/Files.App/Actions/FileSystem/AddItemAction.cs index 50acf8934a11..4530f1382be0 100644 --- a/src/Files.App/Actions/FileSystem/AddItemAction.cs +++ b/src/Files.App/Actions/FileSystem/AddItemAction.cs @@ -17,9 +17,6 @@ public string Label public string Description => "AddItemDescription".GetLocalizedResource(); - public HotKey HotKey - => new(Keys.N, KeyModifiers.CtrlShift); - public RichGlyph Glyph => new(opacityStyle: "ColorIconNew"); @@ -36,8 +33,19 @@ public AddItemAction() public async Task ExecuteAsync() { - await UIFilesystemHelpers.CreateFileFromDialogResultType( - AddItemDialogItemType.Folder, null, context.ShellPage!); + await dialogService.ShowDialogAsync(viewModel); + + if (viewModel.ResultType.ItemType == AddItemDialogItemType.Shortcut) + { + await Ioc.Default.GetRequiredService().CreateShortcutFromDialog.ExecuteAsync(); + } + else if (viewModel.ResultType.ItemType != AddItemDialogItemType.Cancel) + { + await UIFilesystemHelpers.CreateFileFromDialogResultType( + viewModel.ResultType.ItemType, + viewModel.ResultType.ItemInfo, + context.ShellPage!); + } } diff --git a/src/Files.App/Actions/FileSystem/CreateFolderAction.cs b/src/Files.App/Actions/FileSystem/CreateFolderAction.cs index 43b5705a5963..28e7131bda72 100644 --- a/src/Files.App/Actions/FileSystem/CreateFolderAction.cs +++ b/src/Files.App/Actions/FileSystem/CreateFolderAction.cs @@ -13,6 +13,9 @@ public string Label public string Description => "CreateFolderDescription".GetLocalizedResource(); + public HotKey HotKey + => new(Keys.N, KeyModifiers.CtrlShift); + public RichGlyph Glyph => new(baseGlyph: "\uE8B7"); From 45ce9ef5e17c26dd3929153aeb692723699fc313 Mon Sep 17 00:00:00 2001 From: Yair <39923744+yaira2@users.noreply.github.com> Date: Thu, 12 Oct 2023 13:27:17 -0400 Subject: [PATCH 3/3] Update AddItemAction.cs --- src/Files.App/Actions/FileSystem/AddItemAction.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Files.App/Actions/FileSystem/AddItemAction.cs b/src/Files.App/Actions/FileSystem/AddItemAction.cs index 4530f1382be0..f894f1b73286 100644 --- a/src/Files.App/Actions/FileSystem/AddItemAction.cs +++ b/src/Files.App/Actions/FileSystem/AddItemAction.cs @@ -46,7 +46,6 @@ await UIFilesystemHelpers.CreateFileFromDialogResultType( viewModel.ResultType.ItemInfo, context.ShellPage!); } - } private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)