Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Code Quality: Enforced centralized Strings class in open & show actions #16943

Closed
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Files.App/Actions/Open/EditInNotepadAction.cs
Original file line number Diff line number Diff line change
@@ -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");
4 changes: 2 additions & 2 deletions src/Files.App/Actions/Open/OpenClassicPropertiesAction.cs
Original file line number Diff line number Diff line change
@@ -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");
4 changes: 2 additions & 2 deletions src/Files.App/Actions/Open/OpenCommandPaletteAction.cs
Original file line number Diff line number Diff line change
@@ -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);
4 changes: 2 additions & 2 deletions src/Files.App/Actions/Open/OpenInIDEAction.cs
Original file line number Diff line number Diff line change
@@ -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 =>
4 changes: 2 additions & 2 deletions src/Files.App/Actions/Open/OpenPropertiesAction.cs
Original file line number Diff line number Diff line change
@@ -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");
4 changes: 2 additions & 2 deletions src/Files.App/Actions/Open/OpenRepoInIDEAction.cs
Original file line number Diff line number Diff line change
@@ -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 &&
4 changes: 2 additions & 2 deletions src/Files.App/Actions/Open/OpenSettingsAction.cs
Original file line number Diff line number Diff line change
@@ -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);
4 changes: 2 additions & 2 deletions src/Files.App/Actions/Open/OpenTerminalAction.cs
Original file line number Diff line number Diff line change
@@ -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);
4 changes: 2 additions & 2 deletions src/Files.App/Actions/Open/OpenTerminalAsAdminAction.cs
Original file line number Diff line number Diff line change
@@ -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);
4 changes: 2 additions & 2 deletions src/Files.App/Actions/Open/OpenTerminalFromHomeAction.cs
Original file line number Diff line number Diff line change
@@ -8,10 +8,10 @@ internal sealed partial class OpenTerminalFromHomeAction : OpenTerminalAction
private IHomePageContext HomePageContext { get; } = Ioc.Default.GetRequiredService<IHomePageContext>();

public override string Label
=> "OpenTerminal".GetLocalizedResource();
=> Strings.OpenTerminal.GetLocalizedResource();

public override string Description
=> "OpenTerminalDescription".GetLocalizedResource();
=> Strings.OpenTerminalDescription.GetLocalizedResource();

public override bool IsExecutable =>
HomePageContext.IsAnyItemRightClicked &&
4 changes: 2 additions & 2 deletions src/Files.App/Actions/Open/OpenTerminalFromSidebarAction.cs
Original file line number Diff line number Diff line change
@@ -8,10 +8,10 @@ internal sealed partial class OpenTerminalFromSidebarAction : OpenTerminalAction
private ISidebarContext SidebarContext { get; } = Ioc.Default.GetRequiredService<ISidebarContext>();

public override string Label
=> "OpenTerminal".GetLocalizedResource();
=> Strings.OpenTerminal.GetLocalizedResource();

public override string Description
=> "OpenTerminalDescription".GetLocalizedResource();
=> Strings.OpenTerminalDescription.GetLocalizedResource();

public override bool IsExecutable =>
SidebarContext.IsItemRightClicked &&
4 changes: 2 additions & 2 deletions src/Files.App/Actions/Show/ToggleDotFilesSettingAction.cs
Original file line number Diff line number Diff line change
@@ -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;
4 changes: 2 additions & 2 deletions src/Files.App/Actions/Show/ToggleInfoPaneAction.cs
Original file line number Diff line number Diff line change
@@ -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");
4 changes: 2 additions & 2 deletions src/Files.App/Actions/Show/ToggleShowFileExtensionsAction.cs
Original file line number Diff line number Diff line change
@@ -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;
4 changes: 2 additions & 2 deletions src/Files.App/Actions/Show/ToggleShowHiddenItemsAction.cs
Original file line number Diff line number Diff line change
@@ -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);
4 changes: 2 additions & 2 deletions src/Files.App/Actions/Show/ToggleToolbarAction.cs
Original file line number Diff line number Diff line change
@@ -8,10 +8,10 @@ internal sealed partial class ToggleToolbarAction : ObservableObject, IToggleAct
private IAppearanceSettingsService AppearanceSettingsService { get; } = Ioc.Default.GetRequiredService<IAppearanceSettingsService>();

public string Label
=> "ToggleToolbar".GetLocalizedResource();
=> Strings.ToggleToolbar.GetLocalizedResource();

public string Description
=> "ToggleToolbar".GetLocalizedResource();
=> Strings.ToggleToolbar.GetLocalizedResource();

public HotKey HotKey
=> new(Keys.B, KeyModifiers.CtrlShift);
Loading
Oops, something went wrong.