Skip to content
Merged
Show file tree
Hide file tree
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
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ internal sealed partial class InstallCertificateAction : ObservableObject, IActi
private readonly IContentPageContext context;

public string Label
=> Strings.Install.GetLocalizedResource();
=> Strings.InstallCertificate.GetLocalizedResource();

public string Description
=> Strings.InstallCertificateDescription.GetLocalizedFormatResource(context.SelectedItems.Count);
Expand Down
2 changes: 1 addition & 1 deletion src/Files.App/Actions/Content/Install/InstallFontAction.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ internal sealed partial class InstallFontAction : ObservableObject, IAction
private static readonly StatusCenterViewModel StatusCenterViewModel = Ioc.Default.GetRequiredService<StatusCenterViewModel>();

public string Label
=> Strings.Install.GetLocalizedResource();
=> Strings.InstallFont.GetLocalizedResource();

public string Description
=> Strings.InstallFontDescription.GetLocalizedFormatResource(context.SelectedItems.Count);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ internal sealed partial class InstallInfDriverAction : ObservableObject, IAction
private readonly IContentPageContext context;

public string Label
=> Strings.Install.GetLocalizedResource();
=> Strings.InstallDriver.GetLocalizedResource();

public string Description
=> Strings.InstallInfDriverDescription.GetLocalizedFormatResource(context.SelectedItems.Count);
Expand Down
2 changes: 1 addition & 1 deletion src/Files.App/Actions/FileSystem/CopyItemPathAction.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ internal sealed class CopyItemPathAction : IAction
private readonly IContentPageContext context;

public string Label
=> Strings.CopyPath.GetLocalizedResource();
=> Strings.CopyItemPath.GetLocalizedResource();

public string Description
=> Strings.CopyItemPathDescription.GetLocalizedResource();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ internal sealed partial class PasteItemToSelectionAction : BaseUIAction, IAction
private readonly IContentPageContext context;

public string Label
=> Strings.Paste.GetLocalizedResource();
=> Strings.PasteToSelectedFolder.GetLocalizedResource();

public string Description
=> Strings.PasteItemToSelectionDescription.GetLocalizedResource();
Expand Down
2 changes: 1 addition & 1 deletion src/Files.App/Actions/Show/ToggleShowHiddenItemsAction.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ internal sealed partial class ToggleShowHiddenItemsAction : ObservableObject, IT
private readonly IFoldersSettingsService settings;

public string Label
=> Strings.ShowHiddenItems.GetLocalizedResource();
=> Strings.HiddenItems.GetLocalizedResource();

public string Description
=> Strings.ToggleShowHiddenItemsDescription.GetLocalizedResource();
Expand Down
2 changes: 1 addition & 1 deletion src/Files.App/Actions/Show/ToggleToolbarAction.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public string Label
=> Strings.ToggleToolbar.GetLocalizedResource();

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

public HotKey HotKey
=> new(Keys.B, KeyModifiers.CtrlShift);
Expand Down
8 changes: 7 additions & 1 deletion src/Files.App/Dialogs/SettingsDialog.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,13 @@ private void UpdateDialogLayout()
{
ContainerGrid.Height = MainWindow.Instance.Bounds.Height <= 760 ? MainWindow.Instance.Bounds.Height - 70 : 690;
ContainerGrid.Width = MainWindow.Instance.Bounds.Width <= 1100 ? MainWindow.Instance.Bounds.Width : 1100;
MainSettingsNavigationView.PaneDisplayMode = MainWindow.Instance.Bounds.Width < 700 ? NavigationViewPaneDisplayMode.LeftCompact : NavigationViewPaneDisplayMode.Left;

var paneDisplayMode = MainWindow.Instance.Bounds.Width < 700
? NavigationViewPaneDisplayMode.LeftCompact
: NavigationViewPaneDisplayMode.Left;

if (MainSettingsNavigationView.PaneDisplayMode != paneDisplayMode)
MainSettingsNavigationView.PaneDisplayMode = paneDisplayMode;
}

private void MainSettingsNavigationView_SelectionChanged(NavigationView sender, NavigationViewSelectionChangedEventArgs args)
Expand Down
Loading
Loading