Skip to content

Commit 449014f

Browse files
QuaintMakoQuaintMako
authored
Merge branch 'main' into Feature_Close_Column
2 parents 6de1984 + a49a679 commit 449014f

32 files changed

+279
-297
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ body:
4444
required: true
4545
- type: textarea
4646
attributes:
47-
label: Relevant Assets/Logs
47+
label: Log file
4848
description: |
49-
A list of assets (logs, screenshots, etc) relevant to this bug. This issue will be closed if the applications log file is not included.
49+
This issue will be closed if the apps log file is not attatched. Do not enter text into this field, it's for attaching the log file only.
5050
51-
Tip: You can attach image(s) or log file(s) by clicking this area to highlight it and then dragging files in.
51+
Tip: You can upload the log file by clicking this area to highlight it and then dragging file in.
5252
placeholder: |
5353
To upload the log, access it from Settings -> About -> Open log location; Or
5454
- Copy the `debug.log` file from `%localappdata%\Packages\49306atecsolution.FilesUWP_et10x9a9vyk8t\LocalState`

‎src/Files.App (Package)/Files.Package.wapproj

Lines changed: 87 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,90 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '17.0'">
4-
<VisualStudioVersion>17.0</VisualStudioVersion>
5-
</PropertyGroup>
6-
<ItemGroup Label="ProjectConfigurations">
7-
<ProjectConfiguration Include="Debug|x86">
8-
<Configuration>Debug</Configuration>
9-
<Platform>x86</Platform>
10-
</ProjectConfiguration>
11-
<ProjectConfiguration Include="Release|x86">
12-
<Configuration>Release</Configuration>
13-
<Platform>x86</Platform>
14-
</ProjectConfiguration>
15-
<ProjectConfiguration Include="Sideload|x86">
16-
<Configuration>Sideload</Configuration>
17-
<Platform>x86</Platform>
18-
</ProjectConfiguration>
19-
<ProjectConfiguration Include="Debug|x64">
20-
<Configuration>Debug</Configuration>
21-
<Platform>x64</Platform>
22-
</ProjectConfiguration>
23-
<ProjectConfiguration Include="Release|x64">
24-
<Configuration>Release</Configuration>
25-
<Platform>x64</Platform>
26-
</ProjectConfiguration>
27-
<ProjectConfiguration Include="Sideload|x64">
28-
<Configuration>Sideload</Configuration>
29-
<Platform>x64</Platform>
30-
</ProjectConfiguration>
31-
<ProjectConfiguration Include="Debug|ARM64">
32-
<Configuration>Debug</Configuration>
33-
<Platform>ARM64</Platform>
34-
</ProjectConfiguration>
35-
<ProjectConfiguration Include="Release|ARM64">
36-
<Configuration>Release</Configuration>
37-
<Platform>ARM64</Platform>
38-
</ProjectConfiguration>
39-
<ProjectConfiguration Include="Sideload|ARM64">
40-
<Configuration>Sideload</Configuration>
41-
<Platform>ARM64</Platform>
42-
</ProjectConfiguration>
43-
</ItemGroup>
44-
<PropertyGroup>
45-
<WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
46-
<PathToXAMLWinRTImplementations>Files.App\</PathToXAMLWinRTImplementations>
47-
</PropertyGroup>
48-
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
49-
<PropertyGroup>
50-
<ProjectGuid>8f60fd8e-1921-47d6-97b0-d26d7b3a4999</ProjectGuid>
51-
<TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
52-
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
53-
<AssetTargetFallback>net7.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
54-
<DefaultLanguage>en-US</DefaultLanguage>
55-
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
56-
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
57-
<AppInstallerUpdateFrequency>0</AppInstallerUpdateFrequency>
58-
<AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
59-
<AppxSymbolPackageEnabled>True</AppxSymbolPackageEnabled>
60-
<AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
61-
<DisableXbfLineInfo>False</DisableXbfLineInfo>
62-
<GenerateTestArtifacts>True</GenerateTestArtifacts>
63-
<AppxBundleAutoResourcePackageQualifiers>Scale|DXFeatureLevel</AppxBundleAutoResourcePackageQualifiers>
64-
<AppxDefaultResourceQualifiers>Language=en-US;af;ar;bg;ca;cs-CZ;da;da-DK;de-DE;el;en-GB;es-ES;es-419;fi-FI;fil-PH;fr-FR;he-IL;hi-IN;hu-HU;id-ID;it-IT;ja-JP;ka;ko-KR;lv-LV;nb-NO;nl-NL;or-IN;pl-PL;pt-BR;pt-PT;ro-RO;ru-RU;sk-SK;sv-SE;ta;th-TH;tr-TR;uk-UA;vi;zh-Hans;zh-Hant</AppxDefaultResourceQualifiers>
65-
<UapAppxPackageBuildMode>StoreUpload</UapAppxPackageBuildMode>
66-
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
67-
<EntryPointProjectUniqueName>..\Files.App\Files.App.csproj</EntryPointProjectUniqueName>
68-
<AppxBundle>Always</AppxBundle>
69-
</PropertyGroup>
70-
<ItemGroup>
71-
<AppxManifest Include="Package.appxmanifest">
72-
<SubType>Designer</SubType>
73-
</AppxManifest>
74-
</ItemGroup>
75-
<ItemGroup>
76-
<Content Include="Assets\AppTiles\Dev\**" />
77-
<Content Include="Package.appinstaller" />
78-
</ItemGroup>
79-
<ItemGroup>
80-
<ProjectReference Include="..\Files.App\Files.App.csproj">
81-
<SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
82-
<PublishProfile>Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile>
83-
</ProjectReference>
84-
</ItemGroup>
85-
<ItemGroup>
86-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.221209.1" IncludeAssets="build" />
87-
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" IncludeAssets="build" />
88-
</ItemGroup>
89-
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
3+
<PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '17.0'">
4+
<VisualStudioVersion>17.0</VisualStudioVersion>
5+
</PropertyGroup>
6+
<ItemGroup Label="ProjectConfigurations">
7+
<ProjectConfiguration Include="Debug|x86">
8+
<Configuration>Debug</Configuration>
9+
<Platform>x86</Platform>
10+
</ProjectConfiguration>
11+
<ProjectConfiguration Include="Release|x86">
12+
<Configuration>Release</Configuration>
13+
<Platform>x86</Platform>
14+
</ProjectConfiguration>
15+
<ProjectConfiguration Include="Sideload|x86">
16+
<Configuration>Sideload</Configuration>
17+
<Platform>x86</Platform>
18+
</ProjectConfiguration>
19+
<ProjectConfiguration Include="Debug|x64">
20+
<Configuration>Debug</Configuration>
21+
<Platform>x64</Platform>
22+
</ProjectConfiguration>
23+
<ProjectConfiguration Include="Release|x64">
24+
<Configuration>Release</Configuration>
25+
<Platform>x64</Platform>
26+
</ProjectConfiguration>
27+
<ProjectConfiguration Include="Sideload|x64">
28+
<Configuration>Sideload</Configuration>
29+
<Platform>x64</Platform>
30+
</ProjectConfiguration>
31+
<ProjectConfiguration Include="Debug|ARM64">
32+
<Configuration>Debug</Configuration>
33+
<Platform>ARM64</Platform>
34+
</ProjectConfiguration>
35+
<ProjectConfiguration Include="Release|ARM64">
36+
<Configuration>Release</Configuration>
37+
<Platform>ARM64</Platform>
38+
</ProjectConfiguration>
39+
<ProjectConfiguration Include="Sideload|ARM64">
40+
<Configuration>Sideload</Configuration>
41+
<Platform>ARM64</Platform>
42+
</ProjectConfiguration>
43+
</ItemGroup>
44+
<PropertyGroup>
45+
<WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
46+
<PathToXAMLWinRTImplementations>Files.App\</PathToXAMLWinRTImplementations>
47+
</PropertyGroup>
48+
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
49+
<PropertyGroup>
50+
<ProjectGuid>8f60fd8e-1921-47d6-97b0-d26d7b3a4999</ProjectGuid>
51+
<TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
52+
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
53+
<AssetTargetFallback>net7.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
54+
<DefaultLanguage>en-US</DefaultLanguage>
55+
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
56+
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
57+
<AppInstallerUpdateFrequency>0</AppInstallerUpdateFrequency>
58+
<AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
59+
<AppxSymbolPackageEnabled>True</AppxSymbolPackageEnabled>
60+
<AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
61+
<DisableXbfLineInfo>False</DisableXbfLineInfo>
62+
<GenerateTestArtifacts>True</GenerateTestArtifacts>
63+
<AppxBundleAutoResourcePackageQualifiers>Scale|DXFeatureLevel</AppxBundleAutoResourcePackageQualifiers>
64+
<AppxDefaultResourceQualifiers>Language=en-US;af;ar;bg;ca;cs-CZ;da;da-DK;de-DE;el;en-GB;es-ES;es-419;fi-FI;fil-PH;fr-FR;he-IL;hi-IN;hu-HU;id-ID;it-IT;ja-JP;ka;ko-KR;lv-LV;nb-NO;nl-NL;or-IN;pl-PL;pt-BR;pt-PT;ro-RO;ru-RU;sk-SK;sv-SE;ta;th-TH;tr-TR;uk-UA;vi;zh-Hans;zh-Hant</AppxDefaultResourceQualifiers>
65+
<UapAppxPackageBuildMode>StoreUpload</UapAppxPackageBuildMode>
66+
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
67+
<EntryPointProjectUniqueName>..\Files.App\Files.App.csproj</EntryPointProjectUniqueName>
68+
<AppxBundle>Always</AppxBundle>
69+
</PropertyGroup>
70+
<ItemGroup>
71+
<AppxManifest Include="Package.appxmanifest">
72+
<SubType>Designer</SubType>
73+
</AppxManifest>
74+
</ItemGroup>
75+
<ItemGroup>
76+
<Content Include="Assets\AppTiles\Dev\**" />
77+
<Content Include="Package.appinstaller" />
78+
</ItemGroup>
79+
<ItemGroup>
80+
<ProjectReference Include="..\Files.App\Files.App.csproj">
81+
<SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
82+
<PublishProfile>Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile>
83+
</ProjectReference>
84+
</ItemGroup>
85+
<ItemGroup>
86+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.230118.102" IncludeAssets="build" />
87+
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" IncludeAssets="build" />
88+
</ItemGroup>
89+
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
9090
</Project>

‎src/Files.App (Package)/Package.appxmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<Resource Language="pt-PT"/>
5757
<Resource Language="ro-RO"/>
5858
<Resource Language="ru-RU"/>
59-
<Resource Language="sk-SK"/>
59+
<Resource Language="sk-SK"/>
6060
<Resource Language="sv-SE"/>
6161
<Resource Language="ta"/>
6262
<Resource Language="th-TH"/>

‎src/Files.App/BaseLayout.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ private void AddNewFileTagsToMenu(CommandBarFlyout contextMenu)
635635
private void AddShellItemsToMenu(List<ContextMenuFlyoutItemViewModel> shellMenuItems, CommandBarFlyout contextMenuFlyout, bool shiftPressed)
636636
{
637637
var openWithSubItems = ItemModelListToContextFlyoutHelper.GetMenuFlyoutItemsFromModel(ShellContextmenuHelper.GetOpenWithItems(shellMenuItems));
638-
var mainShellMenuItems = shellMenuItems.RemoveFrom(!UserSettingsService.AppearanceSettingsService.MoveOverflowMenuItemsToSubMenu ? int.MaxValue : shiftPressed ? 6 : 4);
638+
var mainShellMenuItems = shellMenuItems.RemoveFrom(!UserSettingsService.AppearanceSettingsService.MoveShellExtensionsToSubMenu ? int.MaxValue : shiftPressed ? 6 : 0);
639639
var overflowShellMenuItems = shellMenuItems.Except(mainShellMenuItems).ToList();
640640

641641
var overflowItems = ItemModelListToContextFlyoutHelper.GetMenuFlyoutItemsFromModel(overflowShellMenuItems);

‎src/Files.App/Files.App.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
7777
<PackageReference Include="SevenZipSharp" Version="1.0.0" />
7878
<PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.1.4" />
79-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.221209.1" />
79+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.230118.102" />
8080
<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.4" />
8181
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.355802" PrivateAssets="all" />
8282
<PackageReference Include="CommunityToolkit.WinUI.Notifications" Version="7.1.2" />

‎src/Files.App/Filesystem/ListedItem.cs

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
using System.Collections.Generic;
1616
using System.Collections.ObjectModel;
1717
using System.IO;
18+
using System.Text;
1819
using System.Threading;
1920
using System.Threading.Tasks;
2021
using Windows.Storage;
@@ -46,12 +47,16 @@ public string ItemTooltipText
4647
{
4748
get
4849
{
49-
return $"{"ToolTipDescriptionName".GetLocalizedResource()} {Name}{Environment.NewLine}" +
50-
$"{"ToolTipDescriptionType".GetLocalizedResource()} {itemType}{Environment.NewLine}" +
51-
$"{"ToolTipDescriptionDate".GetLocalizedResource()} {ItemDateModified}" +
52-
(SyncStatusUI.LoadSyncStatus
53-
? $"{Environment.NewLine}{"syncStatusColumn/Header".GetLocalizedResource()}: {syncStatusUI.SyncStatusString}"
54-
: string.Empty);
50+
var tooltipBuilder = new StringBuilder();
51+
tooltipBuilder.AppendLine($"{"ToolTipDescriptionName".GetLocalizedResource()} {Name}");
52+
tooltipBuilder.AppendLine($"{"ToolTipDescriptionType".GetLocalizedResource()} {itemType}");
53+
tooltipBuilder.Append($"{"ToolTipDescriptionDate".GetLocalizedResource()} {ItemDateModified}");
54+
if(!string.IsNullOrWhiteSpace(FileSize))
55+
tooltipBuilder.Append($"{Environment.NewLine}{"ToolTipDescriptionSize".GetLocalizedResource()} {FileSize}");
56+
if(SyncStatusUI.LoadSyncStatus)
57+
tooltipBuilder.Append($"{Environment.NewLine}{"syncStatusColumn/Header".GetLocalizedResource()}: {syncStatusUI.SyncStatusString}");
58+
59+
return tooltipBuilder.ToString();
5560
}
5661
}
5762

‎src/Files.App/Filesystem/RecentItems.cs

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@ public async Task UpdateRecentFilesAsync()
8484
/// </summary>
8585
public async Task UpdateRecentFoldersAsync()
8686
{
87-
// enumerate with fulltrust process
88-
var enumeratedFolders = await Task.Run(() => ListRecentFolders());
87+
var enumeratedFolders = await Task.Run(ListRecentFoldersAsync); // run off the UI thread
8988
if (enumeratedFolders is not null)
9089
{
9190
lock (recentFolders)
@@ -115,36 +114,44 @@ public async Task<List<RecentItem>> ListRecentFilesAsync()
115114
/// <summary>
116115
/// Enumerate recently accessed folders via `Windows\Recent`.
117116
/// </summary>
118-
public List<RecentItem> ListRecentFolders()
117+
public async Task<List<RecentItem>> ListRecentFoldersAsync()
119118
{
120119
var recentItems = new List<RecentItem>();
121120
var excludeMask = FileAttributes.Hidden;
122121
var linkFilePaths = Directory.EnumerateFiles(CommonPaths.RecentItemsPath).Where(f => (new FileInfo(f).Attributes & excludeMask) == 0);
123122

124-
foreach (var linkFilePath in linkFilePaths)
123+
Task<RecentItem?> GetRecentItemFromLink(string linkPath)
125124
{
126-
try
125+
return Task.Run(() =>
127126
{
128-
using var link = new ShellLink(linkFilePath, LinkResolution.NoUIWithMsgPump, default, TimeSpan.FromMilliseconds(100));
127+
try
128+
{
129+
using var link = new ShellLink(linkPath, LinkResolution.NoUIWithMsgPump, default, TimeSpan.FromMilliseconds(100));
129130

130-
if (!string.IsNullOrEmpty(link.TargetPath) && link.Target.IsFolder)
131+
if (!string.IsNullOrEmpty(link.TargetPath) && link.Target.IsFolder)
132+
{
133+
var shellLinkItem = ShellFolderExtensions.GetShellLinkItem(link);
134+
return new RecentItem(shellLinkItem);
135+
}
136+
}
137+
catch (FileNotFoundException)
131138
{
132-
var shellLinkItem = ShellFolderExtensions.GetShellLinkItem(link);
133-
recentItems.Add(new RecentItem(shellLinkItem));
139+
// occurs when shortcut or shortcut target is deleted and accessed (link.Target)
140+
// consequently, we shouldn't include the item as a recent item
134141
}
135-
}
136-
catch (FileNotFoundException)
137-
{
138-
// occurs when shortcut or shortcut target is deleted and accessed (link.Target)
139-
// consequently, we shouldn't include the item as a recent item
140-
}
141-
catch (Exception ex)
142-
{
143-
App.Logger.Warn(ex, ex.Message);
144-
}
142+
catch (Exception ex)
143+
{
144+
App.Logger.Warn(ex, ex.Message);
145+
}
146+
147+
return null;
148+
});
145149
}
146150

147-
return recentItems;
151+
var recentFolderTasks = linkFilePaths.Select(GetRecentItemFromLink);
152+
var result = await Task.WhenAll(recentFolderTasks);
153+
154+
return result.OfType<RecentItem>().ToList();
148155
}
149156

150157
/// <summary>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public static bool PredictLayoutMode(FolderSettingsViewModel folderSettings, str
1616
{
1717
IUserSettingsService userSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();
1818

19-
if (userSettingsService.FoldersSettingsService.EnableOverridingFolderPreferences
19+
if (!userSettingsService.FoldersSettingsService.SyncFolderPreferencesAcrossDirectories
2020
&& folderSettings.IsAdaptiveLayoutEnabled
2121
&& !folderSettings.IsLayoutModeFixed)
2222
{

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public static List<ContextMenuFlyoutItemViewModel> Filter(List<ContextMenuFlyout
5555
var overflow = items.Where(x => x.ID == "ItemOverflow").FirstOrDefault();
5656
if (overflow is not null)
5757
{
58-
if (!shiftPressed && userSettingsService.AppearanceSettingsService.MoveOverflowMenuItemsToSubMenu) // items with ShowOnShift to overflow menu
58+
if (!shiftPressed && userSettingsService.AppearanceSettingsService.MoveShellExtensionsToSubMenu) // items with ShowOnShift to overflow menu
5959
{
6060
var overflowItems = items.Where(x => x.ShowOnShift).ToList();
6161

@@ -609,7 +609,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
609609
},
610610
new ContextMenuFlyoutItemViewModel()
611611
{
612-
Text = "ContextMenuMoreItemsLabel".GetLocalizedResource(),
612+
Text = "ShowMoreOptions".GetLocalizedResource(),
613613
Glyph = "\xE712",
614614
Items = new List<ContextMenuFlyoutItemViewModel>(),
615615
ID = "ItemOverflow",
@@ -1074,7 +1074,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(BaseLayo
10741074
},
10751075
new ContextMenuFlyoutItemViewModel()
10761076
{
1077-
Text = "ContextMenuMoreItemsLabel".GetLocalizedResource(),
1077+
Text = "ShowMoreOptions".GetLocalizedResource(),
10781078
Glyph = "\xE712",
10791079
Items = new List<ContextMenuFlyoutItemViewModel>(),
10801080
ID = "ItemOverflow",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public static void LoadMenuFlyoutItem(IList<ContextMenuFlyoutItemViewModel> menu
8888
{
8989
var menuLayoutSubItem = new ContextMenuFlyoutItemViewModel()
9090
{
91-
Text = "ContextMenuMoreItemsLabel".GetLocalizedResource(),
91+
Text = "ShowMoreOptions".GetLocalizedResource(),
9292
Glyph = "\xE712",
9393
};
9494
LoadMenuFlyoutItem(menuLayoutSubItem.Items, contextMenu, overflowItems, cancellationToken, showIcons);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public bool IsSidebarOpen
2626
set => Set(value);
2727
}
2828

29-
public bool MoveOverflowMenuItemsToSubMenu
29+
public bool MoveShellExtensionsToSubMenu
3030
{
3131
get => Get(true);
3232
set => Set(value);
@@ -77,7 +77,7 @@ protected override void RaiseOnSettingChangedEvent(object sender, SettingChanged
7777
{
7878
switch (e.SettingName)
7979
{
80-
case nameof(MoveOverflowMenuItemsToSubMenu):
80+
case nameof(MoveShellExtensionsToSubMenu):
8181
case nameof(UseCompactStyles):
8282
case nameof(AppThemeBackgroundColor):
8383
case nameof(AppThemeAddressBarBackgroundColor):

0 commit comments

Comments
 (0)