Skip to content

Commit 47768f1

Browse files
yaira2yaira2
committed
Merge branch 'main' into pr/7762
2 parents 6d30dd7 + 8858090 commit 47768f1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+16376
-815
lines changed

‎src/BackgroundTasks/BackgroundTasks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AssemblyName>BackgroundTasks</AssemblyName>
1212
<DefaultLanguage>it-IT</DefaultLanguage>
1313
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
14-
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
14+
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.22000.0</TargetPlatformVersion>
1515
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
1616
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
1717
<FileAlignment>512</FileAlignment>

‎src/Files.Launcher/Files.Launcher.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
3+
<TargetFramework>net6.0-windows10.0.22000.0</TargetFramework>
44
<OutputType>WinExe</OutputType>
55
<RootNamespace>FilesFullTrust</RootNamespace>
66
<AssemblyName>FilesFullTrust</AssemblyName>
@@ -17,6 +17,7 @@
1717
</PropertyGroup>
1818
<PropertyGroup>
1919
<StartupObject />
20+
<SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
2021
</PropertyGroup>
2122
<ItemGroup>
2223
<PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />

‎src/Files.Launcher/MessageHandlers/ContextMenuHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ private Func<string, bool> FilterMenuItems(bool showOpenMenu)
151151
"cut", "copy", "paste", "delete", "properties", "link",
152152
"Windows.ModernShare", "Windows.Share", "setdesktopwallpaper",
153153
"eject", "rename", "explore", "openinfiles", "extract",
154-
"copyaspath", "undelete", "empty",
154+
"copyaspath", "undelete", "empty", "Open in Windows Terminal",
155155
Win32API.ExtractStringFromDLL("shell32.dll", 30312), // SendTo menu
156156
Win32API.ExtractStringFromDLL("shell32.dll", 34593), // Add to collection
157157
};

‎src/Files.Package/Files.Package.wapproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
4444
<PropertyGroup>
4545
<ProjectGuid>3b15596c-3db9-4b58-b4c8-442d06a8c130</ProjectGuid>
46-
<TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
46+
<TargetPlatformVersion>10.0.22000.0</TargetPlatformVersion>
4747
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
4848
<DefaultLanguage>en-US</DefaultLanguage>
4949
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
@@ -55,7 +55,7 @@
5555
<DisableXbfLineInfo>False</DisableXbfLineInfo>
5656
<GenerateTestArtifacts>True</GenerateTestArtifacts>
5757
<AppxBundleAutoResourcePackageQualifiers>Scale|DXFeatureLevel</AppxBundleAutoResourcePackageQualifiers>
58-
<AppxDefaultResourceQualifiers>Language=en-US;af;ar;ca;da;da-DK;de-DE;el;en-GB;es-ES;es-419;fr-FR;he-IL;hi-IN;hr-HR;hu-HU;id-ID;it-IT;ja-JP;ka;ko-KR;lv-LV;nl-NL;or-IN;pl-PL;pt-BR;pt-PT;ru-RU;sv-SE;cs-CZ;ta;tr-TR;uk-UA;vi;zh-Hans;zh-Hant</AppxDefaultResourceQualifiers>
58+
<AppxDefaultResourceQualifiers>Language=en-US;af;ar;ca;da;da-DK;de-DE;el;en-GB;es-ES;es-419;fr-FR;he-IL;hi-IN;hr-HR;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;ru-RU;sk-SK;sv-SE;cs-CZ;ta;tr-TR;uk-UA;vi;zh-Hans;zh-Hant</AppxDefaultResourceQualifiers>
5959
<UapAppxPackageBuildMode>StoreUpload</UapAppxPackageBuildMode>
6060
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
6161
<EntryPointProjectUniqueName>..\Files\Files.csproj</EntryPointProjectUniqueName>

‎src/Files/Files.csproj

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<AssemblyName>Files</AssemblyName>
1212
<DefaultLanguage>en-US</DefaultLanguage>
1313
<AppxBundleAutoResourcePackageQualifiers>Scale|DXFeatureLevel</AppxBundleAutoResourcePackageQualifiers>
14-
<AppxDefaultResourceQualifiers>Language=en-US;af;ar;ca;da;da-DK;de-DE;el;en-GB;es-ES;es-419;fr-FR;he-IL;hi-IN;hu-HU;id-ID;it-IT;ja-JP;ka;ko-KR;lv-LV;nl-NL;or-IN;pl-PL;pt-BR;pt-PT;ru-RU;sv-SE;cs-CZ;ta;tr-TR;uk-UA;vi;zh-Hans;zh-Hant</AppxDefaultResourceQualifiers>
14+
<AppxDefaultResourceQualifiers>Language=en-US;af;ar;ca;da;da-DK;de-DE;el;en-GB;es-ES;es-419;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;ru-RU;sk-SK;sv-SE;cs-CZ;ta;tr-TR;uk-UA;vi;zh-Hans;zh-Hant</AppxDefaultResourceQualifiers>
1515
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
16-
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
16+
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.22000.0</TargetPlatformVersion>
1717
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
1818
<MinimumVisualStudioVersion>16</MinimumVisualStudioVersion>
1919
<FileAlignment>512</FileAlignment>
@@ -190,6 +190,7 @@
190190
<Compile Include="Filesystem\StorageItems\ZipStorageFile.cs" />
191191
<Compile Include="Filesystem\StorageItems\ZipStorageFolder.cs" />
192192
<Compile Include="Helpers\CommonPaths.cs" />
193+
<Compile Include="Helpers\FileExtensionHelpers.cs" />
193194
<Compile Include="Helpers\RegistryToJsonSettingsMerger.cs" />
194195
<Compile Include="Helpers\ResourceHelpers.cs" />
195196
<Compile Include="Helpers\FtpHelpers.cs" />
@@ -1031,6 +1032,8 @@
10311032
<Content Include="Assets\tile-0-300x300.png" />
10321033
<Content Include="Resources\AppCenterKey.txt" />
10331034
<Content Include="Resources\BingMapsKey.txt" />
1035+
<PRIResource Include="Strings\sk-SK\Resources.resw" />
1036+
<PRIResource Include="Strings\nb-NO\Resources.resw" />
10341037
<PRIResource Include="Strings\af\Resources.resw" />
10351038
<PRIResource Include="Strings\hr-HR\Resources.resw" />
10361039
<PRIResource Include="Strings\vi\Resources.resw" />
@@ -1063,6 +1066,8 @@
10631066
<Content Include="Assets\WSL\ubuntu.svg" />
10641067
<Content Include="Assets\WSL\ubuntupng.png" />
10651068
<Content Include="Properties\Default.rd.xml" />
1069+
<None Include="MultilingualResources\Files.nb-NO.xlf" />
1070+
<XliffResource Include="MultilingualResources\Files.sk-SK.xlf" />
10661071
<None Include="Resources\PreviewPanePropertiesInformation.json">
10671072
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
10681073
</None>
@@ -1613,11 +1618,10 @@
16131618
</ProjectReference>
16141619
</ItemGroup>
16151620
<ItemGroup>
1616-
<SDKReference Include="WindowsDesktop, Version=10.0.19041.0">
1621+
<SDKReference Include="WindowsDesktop, Version=10.0.22000.0">
16171622
<Name>Windows Desktop Extensions for the UWP</Name>
16181623
</SDKReference>
16191624
</ItemGroup>
1620-
<ItemGroup />
16211625
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '16.0' ">
16221626
<VisualStudioVersion>16.0</VisualStudioVersion>
16231627
</PropertyGroup>

‎src/Files/Filesystem/ListedItem.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,6 @@ public override string ToString()
414414
public bool IsLinkItem => IsShortcutItem && ((ShortcutItem)this).IsUrl;
415415
public bool IsFtpItem => this is FtpItem;
416416
public bool IsZipItem => this is ZipItem;
417-
418417
public virtual bool IsExecutable => new[] { ".exe", ".bat", ".cmd" }.Contains(Path.GetExtension(ItemPath), StringComparer.OrdinalIgnoreCase);
419418
public bool IsPinned => App.SidebarPinnedController.Model.FavoriteItems.Contains(itemPath);
420419

‎src/Files/Helpers/ContextFlyoutItemHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
503503
},
504504
new ContextMenuFlyoutItemViewModel()
505505
{
506-
Text = "OpenInTerminal".GetLocalized(),
506+
Text = "OpenIn".GetLocalized() + " " + App.TerminalController.Model.GetDefaultTerminal().Name,
507507
Glyph = "\uE756",
508508
Command = commandsViewModel.OpenDirectoryInDefaultTerminalCommand,
509509
},

‎src/Files/Helpers/FileExtensionHelpers.cs

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
using System;
2+
3+
namespace Files.Helpers
4+
{
5+
public static class FileExtensionHelpers
6+
{
7+
/// <summary>
8+
/// Check if the file extension is an image file.
9+
/// </summary>
10+
/// <param name="fileExtensionToCheck">The file extension to check.</param>
11+
/// <returns><c>true</c> if the fileExtensionToCheck is an image;
12+
/// otherwise, <c>false</c>.</returns>
13+
public static bool IsImageFile(string fileExtensionToCheck)
14+
{
15+
if (string.IsNullOrEmpty(fileExtensionToCheck))
16+
{
17+
return false;
18+
}
19+
20+
return fileExtensionToCheck.Equals(".png", StringComparison.OrdinalIgnoreCase) ||
21+
fileExtensionToCheck.Equals(".jpg", StringComparison.OrdinalIgnoreCase) ||
22+
fileExtensionToCheck.Equals(".bmp", StringComparison.OrdinalIgnoreCase) ||
23+
fileExtensionToCheck.Equals(".jpeg", StringComparison.OrdinalIgnoreCase);
24+
}
25+
26+
/// <summary>
27+
/// Check if the file extension is a PowerShell script.
28+
/// </summary>
29+
/// <param name="fileExtensionToCheck">The file extension to check.</param>
30+
/// <returns><c>true</c> if the fileExtensionToCheck is a PowerShell script;
31+
/// otherwise, <c>false</c>.</returns>
32+
public static bool IsPowerShellFile(string fileExtensionToCheck)
33+
{
34+
if (string.IsNullOrEmpty(fileExtensionToCheck))
35+
{
36+
return false;
37+
}
38+
39+
return fileExtensionToCheck.Equals(".ps1", StringComparison.OrdinalIgnoreCase);
40+
}
41+
42+
/// <summary>
43+
/// Check if the file extension is a zip file.
44+
/// </summary>
45+
/// <param name="fileExtensionToCheck">The file extension to check.</param>
46+
/// <returns><c>true</c> if the fileExtensionToCheck is a zip bundle file;
47+
/// otherwise <c>false</c>.</returns>
48+
public static bool IsZipFile(string fileExtensionToCheck)
49+
{
50+
if (string.IsNullOrEmpty(fileExtensionToCheck))
51+
{
52+
return false;
53+
}
54+
55+
return fileExtensionToCheck.Equals(".zip", StringComparison.OrdinalIgnoreCase) ||
56+
fileExtensionToCheck.Equals(".msix", StringComparison.OrdinalIgnoreCase) ||
57+
fileExtensionToCheck.Equals(".msixbundle", StringComparison.OrdinalIgnoreCase);
58+
}
59+
}
60+
}

‎src/Files/Helpers/MenuFlyoutHelper.cs

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,30 @@ internal MenuFlyoutSubItemViewModel(string text) : base(text)
5959

6060
#endregion ItemsSource
6161

62+
#region IsVisible
63+
64+
public static bool GetIsVisible(DependencyObject d) => (bool)d.GetValue(IsVisibleProperty);
65+
66+
public static void SetIsVisible(DependencyObject d, bool value) => d.SetValue(IsVisibleProperty, value);
67+
68+
public static readonly DependencyProperty IsVisibleProperty = DependencyProperty.RegisterAttached("IsVisible", typeof(bool), typeof(MenuFlyoutHelper), new PropertyMetadata(false, OnIsVisiblePropertyChanged));
69+
70+
private static void OnIsVisiblePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
71+
{
72+
if (d is not MenuFlyout flyout)
73+
{
74+
return;
75+
}
76+
77+
var boolValue = (bool)e.NewValue;
78+
79+
// hide the MenuFlyout if it's bool is false.
80+
if (!boolValue)
81+
flyout.Hide();
82+
}
83+
84+
#endregion IsVisible
85+
6286
private static async void SetupItems(MenuFlyout menu)
6387
{
6488
if (menu == null || Windows.ApplicationModel.DesignMode.DesignModeEnabled)

‎src/Files/MultilingualResources/Files.af.xlf

Lines changed: 46 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3002,19 +3002,15 @@
30023002
</trans-unit>
30033003
<trans-unit id="SettingsPrivacyPolicyMarkdownBlock.Text" translate="yes" xml:space="preserve">
30043004
<source>
3005-
*Personal Information Collection*
3006-
Files does not collect, store, share or publish any personal information.
3007-
3008-
*Non-personal Information Collection*
3009-
3010-
We use App Center to keep track of app usage, find bugs, and fix crashes. All information sent to App Center is anonymous and free of any user or contextual data.
3005+
We use App Center to track which settings are being used, find bugs, and fix crashes. Information sent to App Center is anonymous and free of any user or contextual data.
30113006
</source>
3012-
<target state="translated">*Persoonlike inligting versameling*
3007+
<target state="needs-review-translation">*Persoonlike inligting versameling*
30133008
Files versamel, stoor, deel of publiseer geen persoonlike inligting nie.
30143009

30153010
*Nie-persoonlike inligting versameling*
30163011

30173012
Ons gebruik App Center om tred te hou met programgebruik, foute te vind en ongelukke op te los. Alle inligting wat aan App Center gestuur word, is anoniem en vry van enige gebruiker of kontekstuele data.</target>
3013+
<note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
30183014
</trans-unit>
30193015
<trans-unit id="BaseLayoutContextFlyoutSortByFileTag.Text" translate="yes" xml:space="preserve">
30203016
<source>File tag</source>
@@ -3377,8 +3373,9 @@ Ons gebruik App Center om tred te hou met programgebruik, foute te vind en ongel
33773373
<target state="translated">Derde party lisensies</target>
33783374
</trans-unit>
33793375
<trans-unit id="SettingsSetAsDefaultFileManagerDescription" translate="yes" xml:space="preserve">
3380-
<source>This setting modifies system files and can have unexpected side effects on your device. The developers take no responsibility in the event an issue occurs as a result. Continuing with this option is an acknowledgment of the risks involved with this action. Please note, uninstalling Files will not undo these changes and may prevent you from opening file explorer unless you turn off this setting before removing Files from your device.</source>
3381-
<target state="translated">Hierdie instelling verander stelsellêers en kan onverwagte newe-effekte op jou toestel hê. Die ontwikkelaars neem geen verantwoordelikheid in die geval dat 'n probleem as gevolg daarvan plaasvind nie. Om voort te gaan met hierdie opsie is 'n erkenning van die risiko's wat by hierdie aksie betrokke is. Let asseblief daarop dat die deïnstalleer van Files nie hierdie veranderinge sal ongedaan maak nie en kan verhoed dat jy File Explorer oopmaak, tensy jy hierdie instelling afskakel voordat jy Files van jou toestel verwyder.</target>
3376+
<source>This option modifies the system registry and can have unexpected side effects on your device. Continue at your own risk.</source>
3377+
<target state="needs-review-translation">Hierdie instelling verander stelsellêers en kan onverwagte newe-effekte op jou toestel hê. Die ontwikkelaars neem geen verantwoordelikheid in die geval dat 'n probleem as gevolg daarvan plaasvind nie. Om voort te gaan met hierdie opsie is 'n erkenning van die risiko's wat by hierdie aksie betrokke is. Let asseblief daarop dat die deïnstalleer van Files nie hierdie veranderinge sal ongedaan maak nie en kan verhoed dat jy File Explorer oopmaak, tensy jy hierdie instelling afskakel voordat jy Files van jou toestel verwyder.</target>
3378+
<note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
33823379
</trans-unit>
33833380
<trans-unit id="ItemSizeNotCalculated" translate="yes" xml:space="preserve">
33843381
<source>Not calculated</source>
@@ -3460,6 +3457,46 @@ Ons gebruik App Center om tred te hou met programgebruik, foute te vind en ongel
34603457
<source>Bytes</source>
34613458
<target state="new">Bytes</target>
34623459
</trans-unit>
3460+
<trans-unit id="Extract" translate="yes" xml:space="preserve">
3461+
<source>Extract</source>
3462+
<target state="new">Extract</target>
3463+
</trans-unit>
3464+
<trans-unit id="ExtractFiles" translate="yes" xml:space="preserve">
3465+
<source>Extract files</source>
3466+
<target state="new">Extract files</target>
3467+
</trans-unit>
3468+
<trans-unit id="ExtractHere" translate="yes" xml:space="preserve">
3469+
<source>Extract here</source>
3470+
<target state="new">Extract here</target>
3471+
</trans-unit>
3472+
<trans-unit id="ExtractKeyboardAcceleratorTextOverride" translate="yes" xml:space="preserve">
3473+
<source>Ctrl+E</source>
3474+
<target state="new">Ctrl+E</target>
3475+
</trans-unit>
3476+
<trans-unit id="ExtractToChildFolder" translate="yes" xml:space="preserve">
3477+
<source>Extract to {0}</source>
3478+
<target state="new">Extract to {0}</target>
3479+
</trans-unit>
3480+
<trans-unit id="RunScript" translate="yes" xml:space="preserve">
3481+
<source>Run script</source>
3482+
<target state="new">Run script</target>
3483+
</trans-unit>
3484+
<trans-unit id="RunWithPowerShell" translate="yes" xml:space="preserve">
3485+
<source>Run with PowerShell</source>
3486+
<target state="new">Run with PowerShell</target>
3487+
</trans-unit>
3488+
<trans-unit id="SetAsBackground" translate="yes" xml:space="preserve">
3489+
<source>Set as desktop background</source>
3490+
<target state="new">Set as desktop background</target>
3491+
</trans-unit>
3492+
<trans-unit id="SetFilesAsDefaultWarning" translate="yes" xml:space="preserve">
3493+
<source>Do not remove Files from your device without turning off this option. Not doing so will prevent you from opening File Explorer.</source>
3494+
<target state="new">Do not remove Files from your device without turning off this option. Not doing so will prevent you from opening File Explorer.</target>
3495+
</trans-unit>
3496+
<trans-unit id="ShowFolderSizesWarning" translate="yes" xml:space="preserve">
3497+
<source>Calculating folder sizes is resource intensive and may cause your CPU usage to increase.</source>
3498+
<target state="new">Calculating folder sizes is resource intensive and may cause your CPU usage to increase.</target>
3499+
</trans-unit>
34633500
</group>
34643501
</body>
34653502
</file>

0 commit comments

Comments
 (0)