From b4df2c472767675e2f1f0eca9a6f49cb97c9e6b5 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Sun, 16 Mar 2025 15:42:34 +0000 Subject: [PATCH 1/2] Files.App.Actions.Open --- src/Files.App/Actions/Open/EditInNotepadAction.cs | 4 ++-- src/Files.App/Actions/Open/OpenClassicPropertiesAction.cs | 4 ++-- src/Files.App/Actions/Open/OpenCommandPaletteAction.cs | 4 ++-- src/Files.App/Actions/Open/OpenInIDEAction.cs | 4 ++-- src/Files.App/Actions/Open/OpenPropertiesAction.cs | 4 ++-- src/Files.App/Actions/Open/OpenRepoInIDEAction.cs | 4 ++-- src/Files.App/Actions/Open/OpenSettingsAction.cs | 4 ++-- src/Files.App/Actions/Open/OpenTerminalAction.cs | 4 ++-- src/Files.App/Actions/Open/OpenTerminalAsAdminAction.cs | 4 ++-- src/Files.App/Actions/Open/OpenTerminalFromHomeAction.cs | 4 ++-- src/Files.App/Actions/Open/OpenTerminalFromSidebarAction.cs | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/Files.App/Actions/Open/EditInNotepadAction.cs b/src/Files.App/Actions/Open/EditInNotepadAction.cs index cd7d145a3611..fe39f2dae1e3 100644 --- a/src/Files.App/Actions/Open/EditInNotepadAction.cs +++ b/src/Files.App/Actions/Open/EditInNotepadAction.cs @@ -10,10 +10,10 @@ internal sealed partial class EditInNotepadAction : ObservableObject, IAction private readonly IContentPageContext context; public string Label - => "EditInNotepad".GetLocalizedResource(); + => Strings.EditInNotepad.GetLocalizedResource(); public string Description - => "EditInNotepadDescription".GetLocalizedResource(); + => Strings.EditInNotepadDescription.GetLocalizedResource(); public RichGlyph Glyph => new("\uE70F"); diff --git a/src/Files.App/Actions/Open/OpenClassicPropertiesAction.cs b/src/Files.App/Actions/Open/OpenClassicPropertiesAction.cs index 868057846cc3..5a8640e4d381 100644 --- a/src/Files.App/Actions/Open/OpenClassicPropertiesAction.cs +++ b/src/Files.App/Actions/Open/OpenClassicPropertiesAction.cs @@ -12,10 +12,10 @@ internal sealed partial class OpenClassicPropertiesAction : ObservableObject, IA private readonly IContentPageContext context; public string Label - => "OpenClassicProperties".GetLocalizedResource(); + => Strings.OpenClassicProperties.GetLocalizedResource(); public string Description - => "OpenClassicPropertiesDescription".GetLocalizedResource(); + => Strings.OpenClassicPropertiesDescription.GetLocalizedResource(); public RichGlyph Glyph => new(themedIconStyle: "App.ThemedIcons.Properties"); diff --git a/src/Files.App/Actions/Open/OpenCommandPaletteAction.cs b/src/Files.App/Actions/Open/OpenCommandPaletteAction.cs index bc20de159db0..723f4c8b21cd 100644 --- a/src/Files.App/Actions/Open/OpenCommandPaletteAction.cs +++ b/src/Files.App/Actions/Open/OpenCommandPaletteAction.cs @@ -8,10 +8,10 @@ internal sealed class OpenCommandPaletteAction : IAction private readonly IContentPageContext _context; public string Label - => "CommandPalette".GetLocalizedResource(); + => Strings.CommandPalette.GetLocalizedResource(); public string Description - => "OpenCommandPaletteDescription".GetLocalizedResource(); + => Strings.OpenCommandPaletteDescription.GetLocalizedResource(); public HotKey HotKey => new(Keys.P, KeyModifiers.CtrlShift); diff --git a/src/Files.App/Actions/Open/OpenInIDEAction.cs b/src/Files.App/Actions/Open/OpenInIDEAction.cs index 4c2d118ce42c..e8962a3273b6 100644 --- a/src/Files.App/Actions/Open/OpenInIDEAction.cs +++ b/src/Files.App/Actions/Open/OpenInIDEAction.cs @@ -11,12 +11,12 @@ internal sealed partial class OpenInIDEAction : ObservableObject, IAction public string Label => string.Format( - "OpenInIDE".GetLocalizedResource(), + Strings.OpenInIDE.GetLocalizedResource(), _devToolsSettingsService.IDEName); public string Description => string.Format( - "OpenInIDEDescription".GetLocalizedResource(), + Strings.OpenInIDEDescription.GetLocalizedResource(), _devToolsSettingsService.IDEName); public bool IsExecutable => diff --git a/src/Files.App/Actions/Open/OpenPropertiesAction.cs b/src/Files.App/Actions/Open/OpenPropertiesAction.cs index c5555c26da49..3e65026262d6 100644 --- a/src/Files.App/Actions/Open/OpenPropertiesAction.cs +++ b/src/Files.App/Actions/Open/OpenPropertiesAction.cs @@ -8,10 +8,10 @@ internal sealed partial class OpenPropertiesAction : ObservableObject, IAction private readonly IContentPageContext context; public string Label - => "OpenProperties".GetLocalizedResource(); + => Strings.OpenProperties.GetLocalizedResource(); public string Description - => "OpenPropertiesDescription".GetLocalizedResource(); + => Strings.OpenPropertiesDescription.GetLocalizedResource(); public RichGlyph Glyph => new(themedIconStyle: "App.ThemedIcons.Properties"); diff --git a/src/Files.App/Actions/Open/OpenRepoInIDEAction.cs b/src/Files.App/Actions/Open/OpenRepoInIDEAction.cs index d115ac8ec013..0d4d346850cd 100644 --- a/src/Files.App/Actions/Open/OpenRepoInIDEAction.cs +++ b/src/Files.App/Actions/Open/OpenRepoInIDEAction.cs @@ -10,10 +10,10 @@ internal sealed partial class OpenRepoInIDEAction : ObservableObject, IAction private readonly IContentPageContext _context; public string Label - => string.Format("OpenRepoInIDE".GetLocalizedResource(), _devToolsSettingsService.IDEName); + => string.Format(Strings.OpenRepoInIDE.GetLocalizedResource(), _devToolsSettingsService.IDEName); public string Description - => string.Format("OpenRepoInIDEDescription".GetLocalizedResource(), _devToolsSettingsService.IDEName); + => string.Format(Strings.OpenRepoInIDEDescription.GetLocalizedResource(), _devToolsSettingsService.IDEName); public bool IsExecutable => _context.Folder is not null && diff --git a/src/Files.App/Actions/Open/OpenSettingsAction.cs b/src/Files.App/Actions/Open/OpenSettingsAction.cs index 262ea3dd462c..80f1d03531f4 100644 --- a/src/Files.App/Actions/Open/OpenSettingsAction.cs +++ b/src/Files.App/Actions/Open/OpenSettingsAction.cs @@ -12,10 +12,10 @@ internal sealed partial class OpenSettingsAction : BaseUIAction, IAction private readonly SettingsDialogViewModel viewModel = new(); public string Label - => "Settings".GetLocalizedResource(); + => Strings.Settings.GetLocalizedResource(); public string Description - => "OpenSettingsDescription".GetLocalizedResource(); + => Strings.OpenSettingsDescription.GetLocalizedResource(); public HotKey HotKey => new(Keys.OemComma, KeyModifiers.Ctrl); diff --git a/src/Files.App/Actions/Open/OpenTerminalAction.cs b/src/Files.App/Actions/Open/OpenTerminalAction.cs index 2a60f9375081..6e7529333653 100644 --- a/src/Files.App/Actions/Open/OpenTerminalAction.cs +++ b/src/Files.App/Actions/Open/OpenTerminalAction.cs @@ -11,10 +11,10 @@ internal partial class OpenTerminalAction : ObservableObject, IAction private readonly IContentPageContext context; public virtual string Label - => "OpenTerminal".GetLocalizedResource(); + => Strings.OpenTerminal.GetLocalizedResource(); public virtual string Description - => "OpenTerminalDescription".GetLocalizedResource(); + => Strings.OpenTerminalDescription.GetLocalizedResource(); public virtual HotKey HotKey => new(Keys.Oem3, KeyModifiers.Ctrl); diff --git a/src/Files.App/Actions/Open/OpenTerminalAsAdminAction.cs b/src/Files.App/Actions/Open/OpenTerminalAsAdminAction.cs index c1deb9acd848..160f00f26230 100644 --- a/src/Files.App/Actions/Open/OpenTerminalAsAdminAction.cs +++ b/src/Files.App/Actions/Open/OpenTerminalAsAdminAction.cs @@ -6,10 +6,10 @@ namespace Files.App.Actions internal sealed partial class OpenTerminalAsAdminAction : OpenTerminalAction { public override string Label - => "OpenTerminalAsAdmin".GetLocalizedResource(); + => Strings.OpenTerminalAsAdmin.GetLocalizedResource(); public override string Description - => "OpenTerminalAsAdminDescription".GetLocalizedResource(); + => Strings.OpenTerminalAsAdminDescription.GetLocalizedResource(); public override HotKey HotKey => new(Keys.Oem3, KeyModifiers.CtrlShift); diff --git a/src/Files.App/Actions/Open/OpenTerminalFromHomeAction.cs b/src/Files.App/Actions/Open/OpenTerminalFromHomeAction.cs index dc5776bb22ef..066d508ff23e 100644 --- a/src/Files.App/Actions/Open/OpenTerminalFromHomeAction.cs +++ b/src/Files.App/Actions/Open/OpenTerminalFromHomeAction.cs @@ -8,10 +8,10 @@ internal sealed partial class OpenTerminalFromHomeAction : OpenTerminalAction private IHomePageContext HomePageContext { get; } = Ioc.Default.GetRequiredService(); public override string Label - => "OpenTerminal".GetLocalizedResource(); + => Strings.OpenTerminal.GetLocalizedResource(); public override string Description - => "OpenTerminalDescription".GetLocalizedResource(); + => Strings.OpenTerminalDescription.GetLocalizedResource(); public override bool IsExecutable => HomePageContext.IsAnyItemRightClicked && diff --git a/src/Files.App/Actions/Open/OpenTerminalFromSidebarAction.cs b/src/Files.App/Actions/Open/OpenTerminalFromSidebarAction.cs index 2c439c4379a7..91e7a29f1f1b 100644 --- a/src/Files.App/Actions/Open/OpenTerminalFromSidebarAction.cs +++ b/src/Files.App/Actions/Open/OpenTerminalFromSidebarAction.cs @@ -8,10 +8,10 @@ internal sealed partial class OpenTerminalFromSidebarAction : OpenTerminalAction private ISidebarContext SidebarContext { get; } = Ioc.Default.GetRequiredService(); public override string Label - => "OpenTerminal".GetLocalizedResource(); + => Strings.OpenTerminal.GetLocalizedResource(); public override string Description - => "OpenTerminalDescription".GetLocalizedResource(); + => Strings.OpenTerminalDescription.GetLocalizedResource(); public override bool IsExecutable => SidebarContext.IsItemRightClicked && From 3567dae317961380367d843a85b6e7cfa96a2c1e Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Sun, 16 Mar 2025 15:42:45 +0000 Subject: [PATCH 2/2] Files.App.Actions.Show --- src/Files.App/Actions/Show/ToggleDotFilesSettingAction.cs | 4 ++-- src/Files.App/Actions/Show/ToggleInfoPaneAction.cs | 4 ++-- src/Files.App/Actions/Show/ToggleShowFileExtensionsAction.cs | 4 ++-- src/Files.App/Actions/Show/ToggleShowHiddenItemsAction.cs | 4 ++-- src/Files.App/Actions/Show/ToggleToolbarAction.cs | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Files.App/Actions/Show/ToggleDotFilesSettingAction.cs b/src/Files.App/Actions/Show/ToggleDotFilesSettingAction.cs index 9811a60a1504..7b6a5a108131 100644 --- a/src/Files.App/Actions/Show/ToggleDotFilesSettingAction.cs +++ b/src/Files.App/Actions/Show/ToggleDotFilesSettingAction.cs @@ -8,10 +8,10 @@ internal sealed partial class ToggleDotFilesSettingAction : ObservableObject, IT private readonly IFoldersSettingsService FoldersSettingsService; public string Label - => "ShowDotFiles".GetLocalizedResource(); + => Strings.ShowDotFiles.GetLocalizedResource(); public string Description - => "ToggleDotFilesSettingDescription".GetLocalizedResource(); + => Strings.ToggleDotFilesSettingDescription.GetLocalizedResource(); public bool IsOn => FoldersSettingsService.ShowDotFiles; diff --git a/src/Files.App/Actions/Show/ToggleInfoPaneAction.cs b/src/Files.App/Actions/Show/ToggleInfoPaneAction.cs index c32bc249901d..e073fbae5f14 100644 --- a/src/Files.App/Actions/Show/ToggleInfoPaneAction.cs +++ b/src/Files.App/Actions/Show/ToggleInfoPaneAction.cs @@ -8,10 +8,10 @@ internal sealed partial class ToggleInfoPaneAction : ObservableObject, IToggleAc private readonly InfoPaneViewModel viewModel; public string Label - => "ToggleInfoPane".GetLocalizedResource(); + => Strings.ToggleInfoPane.GetLocalizedResource(); public string Description - => "ToggleInfoPaneDescription".GetLocalizedResource(); + => Strings.ToggleInfoPaneDescription.GetLocalizedResource(); public RichGlyph Glyph => new(themedIconStyle: "App.ThemedIcons.PanelRight"); diff --git a/src/Files.App/Actions/Show/ToggleShowFileExtensionsAction.cs b/src/Files.App/Actions/Show/ToggleShowFileExtensionsAction.cs index 62da66b2b434..dcc1e3f83929 100644 --- a/src/Files.App/Actions/Show/ToggleShowFileExtensionsAction.cs +++ b/src/Files.App/Actions/Show/ToggleShowFileExtensionsAction.cs @@ -8,10 +8,10 @@ internal sealed partial class ToggleShowFileExtensionsAction : ObservableObject, private readonly IFoldersSettingsService settings; public string Label - => "ShowFileExtensions".GetLocalizedResource(); + => Strings.ShowFileExtensions.GetLocalizedResource(); public string Description - => "ToggleShowFileExtensionsDescription".GetLocalizedResource(); + => Strings.ToggleShowFileExtensionsDescription.GetLocalizedResource(); public bool IsOn => settings.ShowFileExtensions; diff --git a/src/Files.App/Actions/Show/ToggleShowHiddenItemsAction.cs b/src/Files.App/Actions/Show/ToggleShowHiddenItemsAction.cs index 0a7b05a7264d..43db08ca078e 100644 --- a/src/Files.App/Actions/Show/ToggleShowHiddenItemsAction.cs +++ b/src/Files.App/Actions/Show/ToggleShowHiddenItemsAction.cs @@ -8,10 +8,10 @@ internal sealed partial class ToggleShowHiddenItemsAction : ObservableObject, IT private readonly IFoldersSettingsService settings; public string Label - => "ShowHiddenItems".GetLocalizedResource(); + => Strings.ShowHiddenItems.GetLocalizedResource(); public string Description - => "ToggleShowHiddenItemsDescription".GetLocalizedResource(); + => Strings.ToggleShowHiddenItemsDescription.GetLocalizedResource(); public HotKey HotKey => new(Keys.H, KeyModifiers.Ctrl); diff --git a/src/Files.App/Actions/Show/ToggleToolbarAction.cs b/src/Files.App/Actions/Show/ToggleToolbarAction.cs index aff01980e745..ba04e0c49b3e 100644 --- a/src/Files.App/Actions/Show/ToggleToolbarAction.cs +++ b/src/Files.App/Actions/Show/ToggleToolbarAction.cs @@ -8,10 +8,10 @@ internal sealed partial class ToggleToolbarAction : ObservableObject, IToggleAct private IAppearanceSettingsService AppearanceSettingsService { get; } = Ioc.Default.GetRequiredService(); public string Label - => "ToggleToolbar".GetLocalizedResource(); + => Strings.ToggleToolbar.GetLocalizedResource(); public string Description - => "ToggleToolbar".GetLocalizedResource(); + => Strings.ToggleToolbar.GetLocalizedResource(); public HotKey HotKey => new(Keys.B, KeyModifiers.CtrlShift);