diff --git a/src/Files.App/Helpers/Dialog/DynamicDialogFactory.cs b/src/Files.App/Helpers/Dialog/DynamicDialogFactory.cs index 4c3b6af8c7ec..f7a8a20e3442 100644 --- a/src/Files.App/Helpers/Dialog/DynamicDialogFactory.cs +++ b/src/Files.App/Helpers/Dialog/DynamicDialogFactory.cs @@ -58,7 +58,7 @@ public static DynamicDialog GetFor_ShortcutNotFound(string targetPath) return dialog; } - public static DynamicDialog GetFor_RenameDialog() + public static DynamicDialog GetFor_CreateItemDialog(string itemType) { DynamicDialog? dialog = null; TextBox inputText = new() @@ -70,7 +70,7 @@ public static DynamicDialog GetFor_RenameDialog() { Title = "InvalidFilename/Text".GetLocalizedResource(), PreferredPlacement = TeachingTipPlacementMode.Bottom, - DataContext = new RenameDialogViewModel(), + DataContext = new CreateItemDialogViewModel(), }; warning.SetBinding(TeachingTip.TargetProperty, new Binding() @@ -88,7 +88,7 @@ public static DynamicDialog GetFor_RenameDialog() inputText.TextChanged += (textBox, args) => { var isInputValid = FilesystemHelpers.IsValidForFilename(inputText.Text); - ((RenameDialogViewModel)warning.DataContext).IsNameInvalid = !string.IsNullOrEmpty(inputText.Text) && !isInputValid; + ((CreateItemDialogViewModel)warning.DataContext).IsNameInvalid = !string.IsNullOrEmpty(inputText.Text) && !isInputValid; dialog!.ViewModel.DynamicButtonsEnabled = isInputValid ? DynamicDialogButtons.Primary | DynamicDialogButtons.Cancel : DynamicDialogButtons.Cancel; @@ -104,7 +104,7 @@ public static DynamicDialog GetFor_RenameDialog() dialog = new DynamicDialog(new DynamicDialogViewModel() { - TitleText = "EnterAnItemName".GetLocalizedResource(), + TitleText = string.Format("CreateNewItemTitle".GetLocalizedResource(), itemType), SubtitleText = null, DisplayControl = new Grid() { @@ -118,7 +118,7 @@ public static DynamicDialog GetFor_RenameDialog() { vm.HideDialog(); // Rename successful }, - PrimaryButtonText = "RenameDialog/PrimaryButtonText".GetLocalizedResource(), + PrimaryButtonText = "Create".GetLocalizedResource(), CloseButtonText = "Cancel".GetLocalizedResource(), DynamicButtonsEnabled = DynamicDialogButtons.Cancel, DynamicButtons = DynamicDialogButtons.Primary | DynamicDialogButtons.Cancel diff --git a/src/Files.App/Helpers/UI/UIFilesystemHelpers.cs b/src/Files.App/Helpers/UI/UIFilesystemHelpers.cs index 72f12c286621..ba850ba2f708 100644 --- a/src/Files.App/Helpers/UI/UIFilesystemHelpers.cs +++ b/src/Files.App/Helpers/UI/UIFilesystemHelpers.cs @@ -87,7 +87,7 @@ public static async Task CreateFileFromDialogResultTypeAsync(AddItemDialogItemTy string? userInput = null; if (itemType != AddItemDialogItemType.File || itemInfo?.Command is null) { - DynamicDialog dialog = DynamicDialogFactory.GetFor_RenameDialog(); + DynamicDialog dialog = DynamicDialogFactory.GetFor_CreateItemDialog(itemType.ToString().GetLocalizedResource()); await dialog.TryShowAsync(); // Show rename dialog if (dialog.DynamicResult != DynamicDialogResult.Primary) diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw index ed3df48d111f..b08160214dc8 100644 --- a/src/Files.App/Strings/en-US/Resources.resw +++ b/src/Files.App/Strings/en-US/Resources.resw @@ -291,8 +291,8 @@ <data name="EnterAnItemName" xml:space="preserve"> <value>Enter an item name</value> </data> - <data name="RenameDialog.PrimaryButtonText" xml:space="preserve"> - <value>Set name</value> + <data name="CreateNewItemTitle" xml:space="preserve"> + <value>Create new {0}</value> </data> <data name="LightTheme" xml:space="preserve"> <value>Light</value> diff --git a/src/Files.App/ViewModels/Dialogs/RenameDialogViewModel.cs b/src/Files.App/ViewModels/Dialogs/CreateItemDialogViewModel.cs similarity index 84% rename from src/Files.App/ViewModels/Dialogs/RenameDialogViewModel.cs rename to src/Files.App/ViewModels/Dialogs/CreateItemDialogViewModel.cs index a95864c5dda2..be59e1811ac3 100644 --- a/src/Files.App/ViewModels/Dialogs/RenameDialogViewModel.cs +++ b/src/Files.App/ViewModels/Dialogs/CreateItemDialogViewModel.cs @@ -3,7 +3,7 @@ namespace Files.App.ViewModels.Dialogs { - class RenameDialogViewModel : ObservableObject + class CreateItemDialogViewModel : ObservableObject { private bool isNameInvalid; public bool IsNameInvalid