Skip to content

Commit 71f293b

Browse files
committed
Requested changes
1 parent 33466e8 commit 71f293b

File tree

4 files changed

+5
-16
lines changed

4 files changed

+5
-16
lines changed

src/Files.App/Data/Enums/StatusCenterVisibility.cs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,13 @@ namespace Files.App.Data.Enums
66
public enum StatusCenterVisibility
77
{
88
/// <summary>
9-
/// During active file operations until dismissed.
9+
/// Always displayed.
1010
/// </summary>
11-
DuringFileOperationsUntilDismissed,
11+
Always,
1212

1313
/// <summary>
1414
/// During active file operations.
1515
/// </summary>
1616
DuringOngoingFileOperations,
17-
18-
/// <summary>
19-
/// Always displayed.
20-
/// </summary>
21-
Always,
2217
}
2318
}

src/Files.App/Strings/en-US/Resources.resw

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4226,11 +4226,8 @@
42264226
<data name="OmnibarSearchModeTextPlaceholder" xml:space="preserve">
42274227
<value>Search for files and folders...</value>
42284228
</data>
4229-
<data name="DuringFileOperationsUntilDismissed" xml:space="preserve">
4230-
<value>During active operations and displayed until dismissed</value>
4231-
</data>
42324229
<data name="DuringOngoingFileOperations" xml:space="preserve">
4233-
<value>Only during active operations</value>
4230+
<value>During file operations</value>
42344231
</data>
42354232
<data name="ShowStatusCenterButton" xml:space="preserve">
42364233
<value>Show status center button</value>

src/Files.App/ViewModels/Settings/AppearanceViewModel.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,8 @@ public AppearanceViewModel(IUserSettingsService userSettingsService, IResourcesS
7979
UpdateSelectedResource();
8080

8181
// StatusCenterVisibility
82-
StatusCenterVisibilityOptions.Add(StatusCenterVisibility.DuringFileOperationsUntilDismissed, Strings.DuringFileOperationsUntilDismissed.GetLocalizedResource());
83-
StatusCenterVisibilityOptions.Add(StatusCenterVisibility.DuringOngoingFileOperations, Strings.DuringOngoingFileOperations.GetLocalizedResource());
8482
StatusCenterVisibilityOptions.Add(StatusCenterVisibility.Always, Strings.Always.GetLocalizedResource());
83+
StatusCenterVisibilityOptions.Add(StatusCenterVisibility.DuringOngoingFileOperations, Strings.DuringOngoingFileOperations.GetLocalizedResource());
8584
SelectedStatusCenterVisibilityOption = StatusCenterVisibilityOptions[UserSettingsService.AppearanceSettingsService.StatusCenterVisibility];
8685

8786
SelectImageCommand = new RelayCommand(SelectBackgroundImage);

src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,7 @@ public sealed partial class NavigationToolbarViewModel : ObservableObject, IAddr
8282
public bool EnableOmnibar => GeneralSettingsService.EnableOmnibar;
8383
public bool ShowStatusCenterButton =>
8484
AppearanceSettingsService.StatusCenterVisibility == StatusCenterVisibility.Always ||
85-
(AppearanceSettingsService.StatusCenterVisibility == StatusCenterVisibility.DuringOngoingFileOperations && OngoingTasksViewModel.HasAnyItemInProgress) ||
86-
(AppearanceSettingsService.StatusCenterVisibility == StatusCenterVisibility.DuringFileOperationsUntilDismissed && OngoingTasksViewModel.HasAnyItem);
85+
(AppearanceSettingsService.StatusCenterVisibility == StatusCenterVisibility.DuringOngoingFileOperations && OngoingTasksViewModel.HasAnyItem);
8786

8887
public bool ShowShelfPaneToggleButton => AppearanceSettingsService.ShowShelfPaneToggleButton && AppLifecycleHelper.AppEnvironment is AppEnvironment.Dev;
8988

@@ -396,7 +395,6 @@ public NavigationToolbarViewModel()
396395
switch (e.PropertyName)
397396
{
398397
case nameof(OngoingTasksViewModel.HasAnyItem):
399-
case nameof(OngoingTasksViewModel.HasAnyItemInProgress):
400398
OnPropertyChanged(nameof(ShowStatusCenterButton));
401399
break;
402400
}

0 commit comments

Comments
 (0)