Skip to content

Commit 0a4985b

Browse files
LouisFriedmannLouisFriedmann
authored
Feature: Renamed Preferences to General (#12086)
1 parent 025692a commit 0a4985b

34 files changed

+214
-217
lines changed

‎src/Files.App/App.xaml.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -122,19 +122,19 @@ private static async Task InitializeAppComponentsAsync()
122122
{
123123
var userSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();
124124
var addItemService = Ioc.Default.GetRequiredService<IAddItemService>();
125-
var preferencesSettingsService = userSettingsService.PreferencesSettingsService;
125+
var generalSettingsService = userSettingsService.GeneralSettingsService;
126126

127127
// Start off a list of tasks we need to run before we can continue startup
128128
await Task.Run(async () =>
129129
{
130130
await Task.WhenAll(
131131
StartAppCenter(),
132132
DrivesManager.UpdateDrivesAsync(),
133-
OptionalTask(CloudDrivesManager.UpdateDrivesAsync(), preferencesSettingsService.ShowCloudDrivesSection),
133+
OptionalTask(CloudDrivesManager.UpdateDrivesAsync(), generalSettingsService.ShowCloudDrivesSection),
134134
LibraryManager.UpdateLibrariesAsync(),
135-
OptionalTask(NetworkDrivesManager.UpdateDrivesAsync(), preferencesSettingsService.ShowNetworkDrivesSection),
136-
OptionalTask(WSLDistroManager.UpdateDrivesAsync(), preferencesSettingsService.ShowWslSection),
137-
OptionalTask(FileTagsManager.UpdateFileTagsAsync(), preferencesSettingsService.ShowFileTagsSection),
135+
OptionalTask(NetworkDrivesManager.UpdateDrivesAsync(), generalSettingsService.ShowNetworkDrivesSection),
136+
OptionalTask(WSLDistroManager.UpdateDrivesAsync(), generalSettingsService.ShowWslSection),
137+
OptionalTask(FileTagsManager.UpdateFileTagsAsync(), generalSettingsService.ShowFileTagsSection),
138138
QuickAccessManager.InitializeAsync()
139139
);
140140

@@ -187,7 +187,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
187187
services
188188
.AddSingleton<IUserSettingsService, UserSettingsService>()
189189
.AddSingleton<IAppearanceSettingsService, AppearanceSettingsService>((sp) => new AppearanceSettingsService((sp.GetService<IUserSettingsService>() as UserSettingsService).GetSharingContext()))
190-
.AddSingleton<IPreferencesSettingsService, PreferencesSettingsService>((sp) => new PreferencesSettingsService((sp.GetService<IUserSettingsService>() as UserSettingsService).GetSharingContext()))
190+
.AddSingleton<IGeneralSettingsService, GeneralSettingsService>((sp) => new GeneralSettingsService((sp.GetService<IUserSettingsService>() as UserSettingsService).GetSharingContext()))
191191
.AddSingleton<IFoldersSettingsService, FoldersSettingsService>((sp) => new FoldersSettingsService((sp.GetService<IUserSettingsService>() as UserSettingsService).GetSharingContext()))
192192
.AddSingleton<IApplicationSettingsService, ApplicationSettingsService>((sp) => new ApplicationSettingsService((sp.GetService<IUserSettingsService>() as UserSettingsService).GetSharingContext()))
193193
.AddSingleton<IPreviewPaneSettingsService, PreviewPaneSettingsService>((sp) => new PreviewPaneSettingsService((sp.GetService<IUserSettingsService>() as UserSettingsService).GetSharingContext()))
@@ -341,7 +341,7 @@ public static void SaveSessionTabs()
341341

342342
bundlesSettingsService.FlushSettings();
343343

344-
userSettingsService.PreferencesSettingsService.LastSessionTabList = MainPageViewModel.AppInstances.DefaultIfEmpty().Select(tab =>
344+
userSettingsService.GeneralSettingsService.LastSessionTabList = MainPageViewModel.AppInstances.DefaultIfEmpty().Select(tab =>
345345
{
346346
if (tab is not null && tab.TabItemArguments is not null)
347347
{

‎src/Files.App/BaseLayout.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ private void AddNewFileTagsToMenu(CommandBarFlyout contextMenu)
705705
index = index >= 0 ? index : contextMenu.SecondaryCommands.Count;
706706

707707
// Only show the edit tags flyout if settings is enabled
708-
if (!UserSettingsService.PreferencesSettingsService.ShowEditTagsMenu)
708+
if (!UserSettingsService.GeneralSettingsService.ShowEditTagsMenu)
709709
return;
710710

711711
contextMenu.SecondaryCommands.Insert(index, new AppBarSeparator());
@@ -725,7 +725,7 @@ private async Task AddShellMenuItemsAsync(List<ContextMenuFlyoutItemViewModel> s
725725
var openWithMenuItem = shellMenuItems.FirstOrDefault(x => x.Tag is Win32ContextMenuItem { CommandString: "openas" });
726726
var sendToMenuItem = shellMenuItems.FirstOrDefault(x => x.Tag is Win32ContextMenuItem { CommandString: "sendto" });
727727
var shellMenuItemsFiltered = shellMenuItems.Where(x => x != openWithMenuItem && x != sendToMenuItem).ToList();
728-
var mainShellMenuItems = shellMenuItemsFiltered.RemoveFrom(!UserSettingsService.PreferencesSettingsService.MoveShellExtensionsToSubMenu ? int.MaxValue : shiftPressed ? 6 : 0);
728+
var mainShellMenuItems = shellMenuItemsFiltered.RemoveFrom(!UserSettingsService.GeneralSettingsService.MoveShellExtensionsToSubMenu ? int.MaxValue : shiftPressed ? 6 : 0);
729729
var overflowShellMenuItemsUnfiltered = shellMenuItemsFiltered.Except(mainShellMenuItems).ToList();
730730
var overflowShellMenuItems = overflowShellMenuItemsUnfiltered.Where(
731731
(x, i) => (x.ItemType == ItemType.Separator &&
@@ -780,12 +780,12 @@ private async Task AddShellMenuItemsAsync(List<ContextMenuFlyoutItemViewModel> s
780780
index++;
781781
}
782782

783-
if (overflowItemFlyout.Items.Count > 0 && UserSettingsService.PreferencesSettingsService.MoveShellExtensionsToSubMenu)
783+
if (overflowItemFlyout.Items.Count > 0 && UserSettingsService.GeneralSettingsService.MoveShellExtensionsToSubMenu)
784784
{
785785
overflowItem.Label = "ShowMoreOptions".GetLocalizedResource();
786786
overflowItem.IsEnabled = true;
787787
}
788-
else if (!UserSettingsService.PreferencesSettingsService.MoveShellExtensionsToSubMenu)
788+
else if (!UserSettingsService.GeneralSettingsService.MoveShellExtensionsToSubMenu)
789789
overflowItem.Visibility = Visibility.Collapsed;
790790
}
791791
}

‎src/Files.App/DataModels/SidebarPinnedModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ private void AddLocationItemToSidebar(LocationItem locationItem)
173173
/// </summary>
174174
public async Task AddAllItemsToSidebar()
175175
{
176-
if (userSettingsService.PreferencesSettingsService.ShowFavoritesSection)
176+
if (userSettingsService.GeneralSettingsService.ShowFavoritesSection)
177177
foreach (string path in FavoriteItems)
178178
await AddItemToSidebarAsync(path);
179179
}

‎src/Files.App/Dialogs/SettingsDialog.xaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,22 +72,22 @@
7272
<!-- Menu Items -->
7373
<NavigationView.MenuItems>
7474
<NavigationViewItem
75-
AccessKey="A"
76-
AutomationProperties.AutomationId="SettingsItemAppearance"
77-
Content="{helpers:ResourceString Name=Appearance}"
75+
AccessKey="P"
76+
AutomationProperties.AutomationId="SettingsItemGeneral"
77+
Content="{helpers:ResourceString Name=General}"
7878
IsSelected="True"
7979
Tag="0">
8080
<NavigationViewItem.Icon>
81-
<FontIcon HorizontalAlignment="Left" Glyph="&#xE790;" />
81+
<FontIcon Glyph="&#xE9E9;" />
8282
</NavigationViewItem.Icon>
8383
</NavigationViewItem>
8484
<NavigationViewItem
85-
AccessKey="P"
86-
AutomationProperties.AutomationId="SettingsItemPreferences"
87-
Content="{helpers:ResourceString Name=SettingsNavPreferences/Content}"
85+
AccessKey="A"
86+
AutomationProperties.AutomationId="SettingsItemAppearance"
87+
Content="{helpers:ResourceString Name=Appearance}"
8888
Tag="1">
8989
<NavigationViewItem.Icon>
90-
<FontIcon Glyph="&#xE9E9;" />
90+
<FontIcon HorizontalAlignment="Left" Glyph="&#xE790;" />
9191
</NavigationViewItem.Icon>
9292
</NavigationViewItem>
9393
<NavigationViewItem

‎src/Files.App/Dialogs/SettingsDialog.xaml.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ private void MainSettingsNavigationView_SelectionChanged(NavigationView sender,
4545

4646
_ = selectedItemTag switch
4747
{
48-
0 => SettingsContentFrame.Navigate(typeof(AppearancePage)),
49-
1 => SettingsContentFrame.Navigate(typeof(PreferencesPage)),
48+
0 => SettingsContentFrame.Navigate(typeof(GeneralPage)),
49+
1 => SettingsContentFrame.Navigate(typeof(AppearancePage)),
5050
2 => SettingsContentFrame.Navigate(typeof(FoldersPage)),
5151
3 => SettingsContentFrame.Navigate(typeof(TagsPage)),
5252
4 => SettingsContentFrame.Navigate(typeof(AdvancedPage)),

‎src/Files.App/Helpers/ContextFlyoutItemHelper.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public static List<ContextMenuFlyoutItemViewModel> Filter(List<ContextMenuFlyout
5050
var overflow = items.Where(x => x.ID == "ItemOverflow").FirstOrDefault();
5151
if (overflow is not null)
5252
{
53-
if (!shiftPressed && userSettingsService.PreferencesSettingsService.MoveShellExtensionsToSubMenu) // items with ShowOnShift to overflow menu
53+
if (!shiftPressed && userSettingsService.GeneralSettingsService.MoveShellExtensionsToSubMenu) // items with ShowOnShift to overflow menu
5454
{
5555
var overflowItems = items.Where(x => x.ShowOnShift).ToList();
5656

@@ -273,7 +273,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
273273
OpacityIconStyle = "ColorIconOpenInNewTab"
274274
},
275275
Command = commandsViewModel.OpenDirectoryInNewTabCommand,
276-
ShowItem = itemsSelected && selectedItems.Count < 5 && areAllItemsFolders && userSettingsService.PreferencesSettingsService.ShowOpenInNewTab,
276+
ShowItem = itemsSelected && selectedItems.Count < 5 && areAllItemsFolders && userSettingsService.GeneralSettingsService.ShowOpenInNewTab,
277277
ShowInSearchPage = true,
278278
ShowInFtpPage = true,
279279
ShowInZipPage = true,
@@ -286,7 +286,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
286286
OpacityIconStyle = "ColorIconOpenInNewWindow"
287287
},
288288
Command = commandsViewModel.OpenInNewWindowItemCommand,
289-
ShowItem = itemsSelected && selectedItems.Count < 5 && areAllItemsFolders && userSettingsService.PreferencesSettingsService.ShowOpenInNewWindow,
289+
ShowItem = itemsSelected && selectedItems.Count < 5 && areAllItemsFolders && userSettingsService.GeneralSettingsService.ShowOpenInNewWindow,
290290
ShowInSearchPage = true,
291291
ShowInFtpPage = true,
292292
ShowInZipPage = true,
@@ -295,7 +295,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
295295
{
296296
Text = "OpenInNewPane".GetLocalizedResource(),
297297
Command = commandsViewModel.OpenDirectoryInNewPaneCommand,
298-
ShowItem = itemsSelected && userSettingsService.PreferencesSettingsService.ShowOpenInNewPane && areAllItemsFolders,
298+
ShowItem = itemsSelected && userSettingsService.GeneralSettingsService.ShowOpenInNewPane && areAllItemsFolders,
299299
SingleItemOnly = true,
300300
ShowInSearchPage = true,
301301
ShowInFtpPage = true,
@@ -398,11 +398,11 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
398398
new ContextMenuFlyoutItemViewModelBuilder(commands.OpenParentFolder).Build(),
399399
new ContextMenuFlyoutItemViewModelBuilder(commands.PinItemToFavorites)
400400
{
401-
IsVisible = commands.PinItemToFavorites.IsExecutable && userSettingsService.PreferencesSettingsService.ShowFavoritesSection,
401+
IsVisible = commands.PinItemToFavorites.IsExecutable && userSettingsService.GeneralSettingsService.ShowFavoritesSection,
402402
}.Build(),
403403
new ContextMenuFlyoutItemViewModelBuilder(commands.UnpinItemFromFavorites)
404404
{
405-
IsVisible = commands.UnpinItemFromFavorites.IsExecutable && userSettingsService.PreferencesSettingsService.ShowFavoritesSection,
405+
IsVisible = commands.UnpinItemFromFavorites.IsExecutable && userSettingsService.GeneralSettingsService.ShowFavoritesSection,
406406
}.Build(),
407407
new ContextMenuFlyoutItemViewModelBuilder(commands.PinToStart)
408408
{

‎src/Files.App/Helpers/ShellContextMenuHelper.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ public static async Task LoadShellMenuItems(
265265
if (sendToItem is not null)
266266
shellMenuItems.Remove(sendToItem);
267267

268-
if (!UserSettingsService.PreferencesSettingsService.MoveShellExtensionsToSubMenu)
268+
if (!UserSettingsService.GeneralSettingsService.MoveShellExtensionsToSubMenu)
269269
{
270270
var (_, secondaryElements) = ItemModelListToContextFlyoutHelper.GetAppBarItemsFromModel(shellMenuItems);
271271
if (secondaryElements.Any())
@@ -340,7 +340,7 @@ public static async Task LoadShellMenuItems(
340340
shellMenuItems.Where(x => x.LoadSubMenuAction is not null).ForEach(async x => {
341341
await x.LoadSubMenuAction.Invoke();
342342

343-
if (!UserSettingsService.PreferencesSettingsService.MoveShellExtensionsToSubMenu)
343+
if (!UserSettingsService.GeneralSettingsService.MoveShellExtensionsToSubMenu)
344344
{
345345
AddItemsToMainMenu(itemContextMenuFlyout.SecondaryCommands, x);
346346
}

‎src/Files.App/Helpers/WidgetsHelpers.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ namespace Files.App.Helpers
77
{
88
public static class WidgetsHelpers
99
{
10-
public static TWidget? TryGetWidget<TWidget>(IPreferencesSettingsService preferencesSettingsService, WidgetsListControlViewModel widgetsViewModel, out bool shouldReload, TWidget? defaultValue = default) where TWidget : IWidgetItemModel, new()
10+
public static TWidget? TryGetWidget<TWidget>(IGeneralSettingsService generalSettingsService, WidgetsListControlViewModel widgetsViewModel, out bool shouldReload, TWidget? defaultValue = default) where TWidget : IWidgetItemModel, new()
1111
{
1212
bool canAddWidget = widgetsViewModel.CanAddWidget(typeof(TWidget).Name);
13-
bool isWidgetSettingEnabled = TryGetIsWidgetSettingEnabled<TWidget>(preferencesSettingsService);
13+
bool isWidgetSettingEnabled = TryGetIsWidgetSettingEnabled<TWidget>(generalSettingsService);
1414

1515
if (canAddWidget && isWidgetSettingEnabled)
1616
{
@@ -35,27 +35,27 @@ public static class WidgetsHelpers
3535
return (defaultValue);
3636
}
3737

38-
public static bool TryGetIsWidgetSettingEnabled<TWidget>(IPreferencesSettingsService preferencesSettingsService) where TWidget : IWidgetItemModel
38+
public static bool TryGetIsWidgetSettingEnabled<TWidget>(IGeneralSettingsService generalSettingsService) where TWidget : IWidgetItemModel
3939
{
4040
if (typeof(TWidget) == typeof(QuickAccessWidget))
4141
{
42-
return preferencesSettingsService.ShowQuickAccessWidget;
42+
return generalSettingsService.ShowQuickAccessWidget;
4343
}
4444
if (typeof(TWidget) == typeof(DrivesWidget))
4545
{
46-
return preferencesSettingsService.ShowDrivesWidget;
46+
return generalSettingsService.ShowDrivesWidget;
4747
}
4848
if (typeof(TWidget) == typeof(FileTagsWidget))
4949
{
50-
return preferencesSettingsService.ShowFileTagsWidget;
50+
return generalSettingsService.ShowFileTagsWidget;
5151
}
5252
if (typeof(TWidget) == typeof(BundlesWidget))
5353
{
54-
return preferencesSettingsService.ShowBundlesWidget;
54+
return generalSettingsService.ShowBundlesWidget;
5555
}
5656
if (typeof(TWidget) == typeof(RecentFilesWidget))
5757
{
58-
return preferencesSettingsService.ShowRecentFilesWidget;
58+
return generalSettingsService.ShowRecentFilesWidget;
5959
}
6060

6161
// A custom widget it is - TWidget implements ICustomWidgetItemModel

‎src/Files.App/ServicesImplementation/DateTimeFormatter/UserDateTimeFormatter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ public ITimeSpanLabel ToTimeSpanLabel(DateTimeOffset offset)
3333

3434
private void Update()
3535
{
36-
var dateTimeFormat = UserSettingsService.PreferencesSettingsService.DateTimeFormat;
36+
var dateTimeFormat = UserSettingsService.GeneralSettingsService.DateTimeFormat;
3737
var factory = Ioc.Default.GetService<IDateTimeFormatterFactory>();
3838

3939
formatter = factory.GetDateTimeFormatter(dateTimeFormat);
4040
}
4141

4242
private void UserSettingsService_OnSettingChangedEvent(object sender, SettingChangedEventArgs e)
4343
{
44-
if (e.SettingName is nameof(UserSettingsService.PreferencesSettingsService.DateTimeFormat))
44+
if (e.SettingName is nameof(UserSettingsService.GeneralSettingsService.DateTimeFormat))
4545
Update();
4646
}
4747
}

‎src/Files.App/ServicesImplementation/Settings/PreferencesSettingsService.cs renamed to ‎src/Files.App/ServicesImplementation/Settings/GeneralSettingsService.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
namespace Files.App.ServicesImplementation.Settings
99
{
10-
internal sealed class PreferencesSettingsService : BaseObservableJsonSettings, IPreferencesSettingsService
10+
internal sealed class GeneralSettingsService : BaseObservableJsonSettings, IGeneralSettingsService
1111
{
12-
public PreferencesSettingsService(ISettingsSharingContext settingsSharingContext)
12+
public GeneralSettingsService(ISettingsSharingContext settingsSharingContext)
1313
{
1414
// Register root
1515
RegisterSettingsContext(settingsSharingContext);

‎src/Files.App/ServicesImplementation/Settings/UserSettingsService.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ namespace Files.App.ServicesImplementation.Settings
1212
{
1313
internal sealed class UserSettingsService : BaseJsonSettings, IUserSettingsService
1414
{
15-
private IPreferencesSettingsService _PreferencesSettingsService;
16-
public IPreferencesSettingsService PreferencesSettingsService
15+
private IGeneralSettingsService _GeneralSettingsService;
16+
public IGeneralSettingsService GeneralSettingsService
1717
{
18-
get => GetSettingsService(ref _PreferencesSettingsService);
18+
get => GetSettingsService(ref _GeneralSettingsService);
1919
}
2020

2121
private IFoldersSettingsService _FoldersSettingsService;
@@ -68,7 +68,7 @@ public override object ExportSettings()
6868
var export = (Dictionary<string, object>)base.ExportSettings();
6969

7070
// Remove session settings
71-
export.Remove(nameof(PreferencesSettingsService.LastSessionTabList));
71+
export.Remove(nameof(GeneralSettingsService.LastSessionTabList));
7272

7373
return JsonSettingsSerializer.SerializeToJson(export);
7474
}

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,6 @@
216216
<data name="Advanced" xml:space="preserve">
217217
<value>Advanced</value>
218218
</data>
219-
<data name="SettingsNavPreferences.Content" xml:space="preserve">
220-
<value>Preferences</value>
221-
</data>
222219
<data name="SettingsOnStartupContinueWhereYouLeftOff.Content" xml:space="preserve">
223220
<value>Continue where you left off</value>
224221
</data>

‎src/Files.App/UserControls/SidebarControl.xaml.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ private List<ContextMenuFlyoutItemViewModel> GetLocationItemMenuItems(INavigatio
219219
OpacityIconStyle = "ColorIconOpenInNewTab",
220220
},
221221
Command = OpenInNewTabCommand,
222-
ShowItem = options.IsLocationItem && userSettingsService.PreferencesSettingsService.ShowOpenInNewTab
222+
ShowItem = options.IsLocationItem && userSettingsService.GeneralSettingsService.ShowOpenInNewTab
223223
},
224224
new ContextMenuFlyoutItemViewModel()
225225
{
@@ -229,13 +229,13 @@ private List<ContextMenuFlyoutItemViewModel> GetLocationItemMenuItems(INavigatio
229229
OpacityIconStyle = "ColorIconOpenInNewWindow",
230230
},
231231
Command = OpenInNewWindowCommand,
232-
ShowItem = options.IsLocationItem && userSettingsService.PreferencesSettingsService.ShowOpenInNewTab
232+
ShowItem = options.IsLocationItem && userSettingsService.GeneralSettingsService.ShowOpenInNewTab
233233
},
234234
new ContextMenuFlyoutItemViewModel()
235235
{
236236
Text = "OpenInNewPane".GetLocalizedResource(),
237237
Command = OpenInNewPaneCommand,
238-
ShowItem = options.IsLocationItem && userSettingsService.PreferencesSettingsService.ShowOpenInNewPane
238+
ShowItem = options.IsLocationItem && userSettingsService.GeneralSettingsService.ShowOpenInNewPane
239239
},
240240
new ContextMenuFlyoutItemViewModel()
241241
{
@@ -319,25 +319,25 @@ private void HideSection()
319319
switch (rightClickedItem.Section)
320320
{
321321
case SectionType.Favorites:
322-
userSettingsService.PreferencesSettingsService.ShowFavoritesSection = false;
322+
userSettingsService.GeneralSettingsService.ShowFavoritesSection = false;
323323
break;
324324
case SectionType.Library:
325-
userSettingsService.PreferencesSettingsService.ShowLibrarySection = false;
325+
userSettingsService.GeneralSettingsService.ShowLibrarySection = false;
326326
break;
327327
case SectionType.CloudDrives:
328-
userSettingsService.PreferencesSettingsService.ShowCloudDrivesSection = false;
328+
userSettingsService.GeneralSettingsService.ShowCloudDrivesSection = false;
329329
break;
330330
case SectionType.Drives:
331-
userSettingsService.PreferencesSettingsService.ShowDrivesSection = false;
331+
userSettingsService.GeneralSettingsService.ShowDrivesSection = false;
332332
break;
333333
case SectionType.Network:
334-
userSettingsService.PreferencesSettingsService.ShowNetworkDrivesSection = false;
334+
userSettingsService.GeneralSettingsService.ShowNetworkDrivesSection = false;
335335
break;
336336
case SectionType.WSL:
337-
userSettingsService.PreferencesSettingsService.ShowWslSection = false;
337+
userSettingsService.GeneralSettingsService.ShowWslSection = false;
338338
break;
339339
case SectionType.FileTag:
340-
userSettingsService.PreferencesSettingsService.ShowFileTagsSection = false;
340+
userSettingsService.GeneralSettingsService.ShowFileTagsSection = false;
341341
break;
342342
}
343343
}

‎src/Files.App/UserControls/Widgets/BundlesWidget.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public BundlesViewModel ViewModel
2727

2828
public string WidgetHeader => "Bundles".GetLocalizedResource();
2929

30-
public bool IsWidgetSettingEnabled => UserSettingsService.PreferencesSettingsService.ShowBundlesWidget;
30+
public bool IsWidgetSettingEnabled => UserSettingsService.GeneralSettingsService.ShowBundlesWidget;
3131

3232
public bool ShowMenuFlyout => false;
3333

0 commit comments

Comments
 (0)