Skip to content

Commit 46dfed3

Browse files
LamparterLamparter
authored
Merge branch 'files-community:main' into no-adaptive-layout
2 parents d5424a0 + 49594e3 commit 46dfed3

File tree

65 files changed

+3165
-634
lines changed

Some content is hidden

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

65 files changed

+3165
-634
lines changed

‎src/Files.App.Controls/ThemedIcon/Styles/Icons.Common.xaml‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1172,4 +1172,96 @@
11721172
</Setter>
11731173
</Style>
11741174

1175+
1176+
<Style
1177+
x:Key="App.ThemedIcons.AppUpdateAvailable"
1178+
BasedOn="{StaticResource DefaultThemedIconStyle}"
1179+
TargetType="local:ThemedIcon">
1180+
1181+
1182+
<Setter Property="IconSize" Value="16" />
1183+
1184+
<Setter Property="OutlineIconData" Value="m1.5,12.99c-.28,0-.5-.22-.5-.5v-4.09l.65-.65c.2-.2.51-.2.71,0l3.65,3.65c0-.43.06-.85.16-1.25l-3.1-3.1c-.57-.57-1.47-.59-2.06-.06V2.49c0-.28.22-.5.5-.5h3.67c.27,0,.52.11.71.29l3.96,3.96c.38-.12.77-.2,1.18-.23l-2.02-2.02h4.5c.28,0,.5.22.5.5v2.1c.36.18.69.4,1,.66v-2.76c0-.83-.67-1.5-1.5-1.5h-5.5l-1.41-1.41c-.38-.38-.88-.59-1.41-.59H1.5C.67.99,0,1.66,0,2.49v10C0,13.32.67,13.99,1.5,13.99h5.1c-.16-.32-.29-.65-.39-1H1.5Zm10-6c-2.49,0-4.5,2.01-4.5,4.5s2.01,4.5,4.5,4.5,4.5-2.01,4.5-4.5-2.01-4.5-4.5-4.5Zm2.12,6.37c-.28.28-.62.51-1,.66-.37.15-.77.22-1.18.22-.4,0-.8-.1-1.17-.26-.1-.04-.19-.09-.28-.14v.15c0,.28-.22.5-.5.5s-.5-.22-.5-.5v-1.5c0-.28.22-.5.5-.5h1.5c.28,0,.5.22.5.5s-.22.5-.5.5h-.47c.05.03.1.05.15.08.25.11.51.17.78.17.27,0,.54-.04.78-.15.25-.1.48-.25.67-.44s.51-.2.71,0c.2.2.2.51,0,.71Zm.38-2.87c0,.28-.22.5-.5.5h-1.5c-.28,0-.5-.22-.5-.5s.22-.5.5-.5h.47c-.05-.03-.1-.05-.15-.08-.25-.11-.51-.17-.78-.17-.27,0-.54.04-.78.15s-.48.25-.67.44c-.2.2-.51.2-.71,0-.2-.2-.2-.51,0-.71.28-.28.62-.51,1-.66.37-.15.77-.23,1.18-.22.4,0,.8.1,1.17.26.1.04.19.09.28.14v-.15c0-.28.22-.5.5-.5s.5.22.5.5v1.5Z" />
1185+
<Setter Property="FilledIconData" Value="m3.24,7.05l2.94,3.04c.49-1.88,1.96-3.36,3.82-3.89L5.38,1.57c-.38-.38-.88-.59-1.41-.59H1.5C.67.99,0,1.66,0,2.49v5.29l.75-.75c.69-.69,1.81-.68,2.49.02Zm8.26-1.06c1.33,0,2.55.47,3.5,1.26v-2.76c0-.83-.67-1.5-1.5-1.5h-5.29l3.01,3.01c.09,0,.19,0,.29,0Zm-5.5,5.35l-3.48-3.59c-.29-.3-.77-.3-1.07,0L0,9.19v3.29C0,13.32.67,13.99,1.5,13.99h5.1c-.38-.75-.6-1.6-.6-2.5,0-.05,0-.1,0-.15Zm5.5-4.35c-2.49,0-4.5,2.01-4.5,4.5s2.01,4.5,4.5,4.5,4.5-2.01,4.5-4.5-2.01-4.5-4.5-4.5Zm2.12,6.37c-.28.28-.62.51-1,.66-.37.15-.77.22-1.18.22-.4,0-.8-.1-1.17-.26-.1-.04-.19-.09-.28-.14v.15c0,.28-.22.5-.5.5s-.5-.22-.5-.5v-1.5c0-.28.22-.5.5-.5h1.5c.28,0,.5.22.5.5s-.22.5-.5.5h-.47c.05.03.1.05.15.08.25.11.51.17.78.17.27,0,.54-.04.78-.15.25-.1.48-.25.67-.44s.51-.2.71,0c.2.2.2.51,0,.71Zm.38-2.87c0,.28-.22.5-.5.5h-1.5c-.28,0-.5-.22-.5-.5s.22-.5.5-.5h.47c-.05-.03-.1-.05-.15-.08-.25-.11-.51-.17-.78-.17-.27,0-.54.04-.78.15s-.48.25-.67.44c-.2.2-.51.2-.71,0-.2-.2-.2-.51,0-.71.28-.28.62-.51,1-.66.37-.15.77-.23,1.18-.22.4,0,.8.1,1.17.26.1.04.19.09.28.14v-.15c0-.28.22-.5.5-.5s.5.22.5.5v1.5Z" />
1186+
1187+
<Setter Property="Layers">
1188+
<Setter.Value>
1189+
<local:ThemedIconLayers>
1190+
<local:ThemedIconLayer
1191+
LayerSize="16"
1192+
LayerType="Base"
1193+
PathData="m0,2.49C0,1.66.67.99,1.5.99h3.67c.53,0,1.04.21,1.41.59l1.41,1.41h5.5c.83,0,1.5.67,1.5,1.5v2.76c-.31-.25-.64-.47-1-.66v-2.1c0-.28-.22-.5-.5-.5h-4.5l2.02,2.02c-.41.04-.8.11-1.18.23l-3.96-3.96c-.19-.19-.44-.29-.71-.29H1.5c-.28,0-.5.22-.5.5v4.5c.59-.53,1.49-.51,2.06.06l3.1,3.1c-.1.4-.16.82-.16,1.25l-3.65-3.65c-.2-.2-.51-.2-.71,0l-.65.65v4.09c0,.28.22.5.5.5h4.71c.1.35.23.68.39,1H1.5c-.83,0-1.5-.67-1.5-1.5V2.49Z" />
1194+
<local:ThemedIconLayer
1195+
LayerSize="16"
1196+
LayerType="Accent"
1197+
PathData="m7,11.49c0,2.49,2.01,4.5,4.5,4.5s4.5-2.01,4.5-4.5-2.01-4.5-4.5-4.5-4.5,2.01-4.5,4.5Z" />
1198+
<local:ThemedIconLayer
1199+
LayerSize="16"
1200+
LayerType="AccentContrast"
1201+
PathData="m13.5,8.49c.28,0,.5.22.5.5v1.5c0,.28-.22.5-.5.5h-1.5c-.28,0-.5-.22-.5-.5s.22-.5.5-.5h.47c-.05-.03-.1-.05-.15-.08-.25-.11-.51-.17-.78-.17-.27,0-.54.04-.78.15-.25.1-.48.25-.67.44-.2.2-.51.2-.71,0-.2-.2-.2-.51,0-.71.28-.28.62-.51,1-.66.37-.15.77-.23,1.18-.22.4,0,.8.1,1.17.26.1.04.19.09.28.14v-.15c0-.28.22-.5.5-.5Zm-.88,5.53c-.37.15-.77.23-1.18.22-.4,0-.8-.1-1.17-.26-.1-.04-.19-.09-.28-.14v.15c0,.28-.22.5-.5.5s-.5-.22-.5-.5v-1.5c0-.28.22-.5.5-.5h1.5c.28,0,.5.22.5.5s-.22.5-.5.5h-.47c.05.03.1.05.15.08.25.11.51.17.78.17.27,0,.54-.04.78-.15.25-.1.48-.25.67-.44s.51-.2.71,0c.2.2.2.51,0,.71-.28.28-.62.51-1,.66Z" />
1202+
</local:ThemedIconLayers>
1203+
</Setter.Value>
1204+
</Setter>
1205+
</Style>
1206+
1207+
1208+
<Style
1209+
x:Key="App.ThemedIcons.AppUpdated"
1210+
BasedOn="{StaticResource DefaultThemedIconStyle}"
1211+
TargetType="local:ThemedIcon">
1212+
1213+
1214+
<Setter Property="IconSize" Value="16" />
1215+
1216+
<Setter Property="OutlineIconData" Value="m1.5,12.99c-.28,0-.5-.22-.5-.5v-4.09l.65-.65c.2-.2.51-.2.71,0l3.65,3.65c0-.43.06-.85.16-1.25l-3.1-3.1c-.57-.57-1.47-.59-2.06-.06V2.49c0-.28.22-.5.5-.5h3.67c.27,0,.52.11.71.29l3.96,3.96c.38-.12.77-.2,1.18-.23l-2.02-2.02h4.5c.28,0,.5.22.5.5v2.1c.36.18.69.4,1,.66v-2.76c0-.83-.67-1.5-1.5-1.5h-5.5l-1.41-1.41c-.38-.38-.88-.59-1.41-.59H1.5C.67.99,0,1.66,0,2.49v10C0,13.32.67,13.99,1.5,13.99h5.1c-.16-.32-.29-.65-.39-1H1.5Zm10-6c-2.49,0-4.5,2.01-4.5,4.5s2.01,4.5,4.5,4.5,4.5-2.01,4.5-4.5-2.01-4.5-4.5-4.5Zm2.35,3.35l-3,3c-.2.2-.51.2-.71,0l-1-1c-.2-.2-.2-.51,0-.71s.51-.2.71,0l.65.65,2.65-2.65c.2-.2.51-.2.71,0,.2.2.2.51,0,.71Z" />
1217+
<Setter Property="FilledIconData" Value="m3.24,7.05l2.94,3.04c.49-1.88,1.96-3.36,3.82-3.89L5.38,1.57c-.38-.38-.88-.59-1.41-.59H1.5C.67.99,0,1.66,0,2.49v5.29l.75-.75c.69-.69,1.81-.68,2.49.02Zm8.26-1.06c1.33,0,2.55.47,3.5,1.26v-2.76c0-.83-.67-1.5-1.5-1.5h-5.29l3.01,3.01c.09,0,.19,0,.29,0Zm-5.5,5.35l-3.48-3.59c-.29-.3-.77-.3-1.07,0L0,9.19v3.29C0,13.32.67,13.99,1.5,13.99h5.1c-.38-.75-.6-1.6-.6-2.5,0-.05,0-.1,0-.15Zm5.5-4.35c-2.49,0-4.5,2.01-4.5,4.5s2.01,4.5,4.5,4.5,4.5-2.01,4.5-4.5-2.01-4.5-4.5-4.5Zm2.35,3.35l-3,3c-.2.2-.51.2-.71,0l-1-1c-.2-.2-.2-.51,0-.71s.51-.2.71,0l.65.65,2.65-2.65c.2-.2.51-.2.71,0,.2.2.2.51,0,.71Z" />
1218+
1219+
<Setter Property="Layers">
1220+
<Setter.Value>
1221+
<local:ThemedIconLayers>
1222+
<local:ThemedIconLayer
1223+
LayerSize="16"
1224+
LayerType="Base"
1225+
PathData="m0,2.49C0,1.66.67.99,1.5.99h3.67c.53,0,1.04.21,1.41.59l1.41,1.41h5.5c.83,0,1.5.67,1.5,1.5v2.76c-.31-.25-.64-.47-1-.66v-2.1c0-.28-.22-.5-.5-.5h-4.5l2.02,2.02c-.41.04-.8.11-1.18.23l-3.96-3.96c-.19-.19-.44-.29-.71-.29H1.5c-.28,0-.5.22-.5.5v4.5c.59-.53,1.49-.51,2.06.06l3.1,3.1c-.1.4-.16.82-.16,1.25l-3.65-3.65c-.2-.2-.51-.2-.71,0l-.65.65v4.09c0,.28.22.5.5.5h4.71c.1.35.23.68.39,1H1.5c-.83,0-1.5-.67-1.5-1.5V2.49Z" />
1226+
<local:ThemedIconLayer
1227+
LayerSize="16"
1228+
LayerType="Accent"
1229+
PathData="m7,11.49c0,2.49,2.01,4.5,4.5,4.5s4.5-2.01,4.5-4.5-2.01-4.5-4.5-4.5-4.5,2.01-4.5,4.5Z" />
1230+
<local:ThemedIconLayer
1231+
LayerSize="16"
1232+
LayerType="AccentContrast"
1233+
PathData="m13.85,9.63c-.2-.2-.51-.2-.71,0l-2.65,2.65-.65-.65c-.2-.2-.51-.2-.71,0-.2.2-.2.51,0,.71l1,1c.2.2.51.2.71,0l3-3c.2-.2.2-.51,0-.71Z" />
1234+
</local:ThemedIconLayers>
1235+
</Setter.Value>
1236+
</Setter>
1237+
</Style>
1238+
1239+
1240+
<Style
1241+
x:Key="App.ThemedIcons.AppUpdatedBox"
1242+
BasedOn="{StaticResource DefaultThemedIconStyle}"
1243+
TargetType="local:ThemedIcon">
1244+
1245+
1246+
<Setter Property="IconSize" Value="16" />
1247+
1248+
<Setter Property="OutlineIconData" Value="m11.5,2.24c.41,0,.75-.34.75-.75s-.34-.75-.75-.75-.75.34-.75.75.34.75.75.75Zm2,2.75h.5v.5c0,.28.22.5.5.5s.5-.22.5-.5v-.5h.5c.28,0,.5-.22.5-.5s-.22-.5-.5-.5h-.5v-.5c0-.28-.22-.5-.5-.5s-.5.22-.5.5v.5h-.5c-.28,0-.5.22-.5.5s.22.5.5.5Zm-6.5,3.5c1.1,0,2-.9,2-2,0-.83-.67-1.5-1.5-1.5-.55,0-1,.45-1,1,0,.28.22.5.5.5s.5-.22.5-.5c.28,0,.5.22.5.5,0,.55-.45,1-1,1-.83,0-1.5-.67-1.5-1.5,0-1.1.9-2,2-2,1.38,0,2.5,1.12,2.5,2.5,0,1.66-1.34,3-3,3-.28,0-.5.22-.5.5s.22.5.5.5c2.21,0,4-1.79,4-4,0-1.93-1.57-3.5-3.5-3.5-1.66,0-3,1.34-3,3,0,1.38,1.12,2.5,2.5,2.5Zm6.85-.35c-.14-.14-.36-.19-.54-.11-.19.08-.31.26-.31.46v5c0,.83-.67,1.5-1.5,1.5h-7c-.83,0-1.5-.67-1.5-1.5v-5c0-.2-.12-.38-.31-.46s-.4-.03-.54.11L.15,10.14c-.2.2-.2.51,0,.71.2.2.51.2.71,0l1.15-1.15v3.79c0,1.38,1.12,2.5,2.5,2.5h7c1.38,0,2.5-1.12,2.5-2.5v-3.79l1.15,1.15c.2.2.51.2.71,0,.2-.2.2-.51,0-.71l-2-2Z" />
1249+
<Setter Property="FilledIconData" Value="m11.5,2.24c.41,0,.75-.34.75-.75s-.34-.75-.75-.75-.75.34-.75.75.34.75.75.75Zm2,2.75h.5v.5c0,.28.22.5.5.5s.5-.22.5-.5v-.5h.5c.28,0,.5-.22.5-.5s-.22-.5-.5-.5h-.5v-.5c0-.28-.22-.5-.5-.5s-.5.22-.5.5v.5h-.5c-.28,0-.5.22-.5.5s.22.5.5.5Zm-6.5,3.5c1.1,0,2-.9,2-2,0-.83-.67-1.5-1.5-1.5-.55,0-1,.45-1,1,0,.28.22.5.5.5s.5-.22.5-.5c.28,0,.5.22.5.5,0,.55-.45,1-1,1-.83,0-1.5-.67-1.5-1.5,0-1.1.9-2,2-2,1.38,0,2.5,1.12,2.5,2.5,0,1.66-1.34,3-3,3-.28,0-.5.22-.5.5s.22.5.5.5c2.21,0,4-1.79,4-4,0-1.93-1.57-3.5-3.5-3.5-1.66,0-3,1.34-3,3,0,1.38,1.12,2.5,2.5,2.5Zm6.85-.35c-.1-.1-.22-.15-.35-.15h-1.73c-.64,2.03-2.53,3.5-4.77,3.5-.83,0-1.5-.67-1.5-1.5,0-.27.07-.53.2-.75-.64-.26-1.18-.69-1.57-1.25h-1.63c-.13,0-.26.05-.35.15L.15,10.14c-.2.2-.2.51,0,.71.2.2.51.2.71,0l1.15-1.15v3.79c0,1.38,1.12,2.5,2.5,2.5h7c1.38,0,2.5-1.12,2.5-2.5v-3.79l1.15,1.15c.2.2.51.2.71,0,.2-.2.2-.51,0-.71l-2-2Z" />
1250+
1251+
<Setter Property="Layers">
1252+
<Setter.Value>
1253+
<local:ThemedIconLayers>
1254+
<local:ThemedIconLayer
1255+
LayerSize="16"
1256+
LayerType="Base"
1257+
PathData="m2.69,8.03c.19.08.31.26.31.46v5c0,.83.67,1.5,1.5,1.5h7c.83,0,1.5-.67,1.5-1.5v-5c0-.2.12-.38.31-.46.19-.08.4-.03.54.11l2,2c.2.2.2.51,0,.71-.2.2-.51.2-.71,0l-1.15-1.15v3.79c0,1.38-1.12,2.5-2.5,2.5h-7c-1.38,0-2.5-1.12-2.5-2.5v-3.79l-1.15,1.15c-.2.2-.51.2-.71,0-.2-.2-.2-.51,0-.71l2-2c.14-.14.36-.19.54-.11Z" />
1258+
<local:ThemedIconLayer
1259+
LayerSize="16"
1260+
LayerType="Accent"
1261+
PathData="m11.5,2.24c.41,0,.75-.34.75-.75s-.34-.75-.75-.75-.75.34-.75.75.34.75.75.75Zm3,.75c.28,0,.5.22.5.5v.5h.5c.28,0,.5.22.5.5s-.22.5-.5.5h-.5v.5c0,.28-.22.5-.5.5s-.5-.22-.5-.5v-.5h-.5c-.28,0-.5-.22-.5-.5s.22-.5.5-.5h.5v-.5c0-.28.22-.5.5-.5Zm-7,0c-1.66,0-3,1.34-3,3,0,1.38,1.12,2.5,2.5,2.5,1.1,0,2-.9,2-2,0-.83-.67-1.5-1.5-1.5-.55,0-1,.45-1,1,0,.28.22.5.5.5s.5-.22.5-.5c.28,0,.5.22.5.5,0,.55-.45,1-1,1-.83,0-1.5-.67-1.5-1.5,0-1.1.9-2,2-2,1.38,0,2.5,1.12,2.5,2.5,0,1.66-1.34,3-3,3-.28,0-.5.22-.5.5s.22.5.5.5c2.21,0,4-1.79,4-4,0-1.93-1.57-3.5-3.5-3.5Z" />
1262+
</local:ThemedIconLayers>
1263+
</Setter.Value>
1264+
</Setter>
1265+
</Style>
1266+
11751267
</ResourceDictionary>

‎src/Files.App/Data/Items/ListedItem.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using System.IO;
1111
using System.Text;
1212
using Windows.Storage;
13+
using Windows.Win32.UI.WindowsAndMessaging;
1314

1415
#pragma warning disable CS0618 // Type or member is obsolete
1516

@@ -526,6 +527,7 @@ public override string Name
526527
public string Arguments { get; set; }
527528
public string WorkingDirectory { get; set; }
528529
public bool RunAsAdmin { get; set; }
530+
public SHOW_WINDOW_CMD ShowWindowCommand { get; set; }
529531
public bool IsUrl { get; set; }
530532
public bool IsSymLink { get; set; }
531533
public override bool IsExecutable => FileExtensionHelpers.IsExecutableFile(TargetPath, true);
@@ -678,7 +680,7 @@ public string? GitLastCommitFullSha
678680
set => SetProperty(ref _GitLastCommitFullSha, value);
679681
}
680682
}
681-
public sealed class GitShortcutItem : GitItem,IShortcutItem
683+
public sealed class GitShortcutItem : GitItem, IShortcutItem
682684
{
683685
private volatile int statusPropertiesInitialized = 0;
684686
public bool StatusPropertiesInitialized
@@ -762,6 +764,7 @@ public override string Name
762764
public string Arguments { get; set; }
763765
public string WorkingDirectory { get; set; }
764766
public bool RunAsAdmin { get; set; }
767+
public SHOW_WINDOW_CMD ShowWindowCommand { get; set; }
765768
public bool IsUrl { get; set; }
766769
public bool IsSymLink { get; set; }
767770
public override bool IsExecutable => FileExtensionHelpers.IsExecutableFile(TargetPath, true);
@@ -800,11 +803,9 @@ public interface IShortcutItem
800803
public string Arguments { get; set; }
801804
public string WorkingDirectory { get; set; }
802805
public bool RunAsAdmin { get; set; }
806+
public SHOW_WINDOW_CMD ShowWindowCommand { get; set; }
803807
public bool IsUrl { get; set; }
804808
public bool IsSymLink { get; set; }
805-
806809
public bool IsExecutable { get; }
807-
808-
809810
}
810811
}

‎src/Files.App/Data/Items/ShellLinkItem.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// Copyright (c) Files Community
22
// Licensed under the MIT License.
33

4+
using Windows.Win32.UI.WindowsAndMessaging;
5+
46
namespace Files.App.Data.Items
57
{
68
public sealed class ShellLinkItem : ShellFileItem
@@ -15,6 +17,8 @@ public sealed class ShellLinkItem : ShellFileItem
1517

1618
public bool InvalidTarget { get; set; }
1719

20+
public SHOW_WINDOW_CMD ShowWindowCommand { get; set; }
21+
1822
public ShellLinkItem()
1923
{
2024
}

‎src/Files.App/Data/Models/SelectedItemsPropertiesViewModel.cs‎

Lines changed: 51 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using Files.Shared.Helpers;
66
using System.Windows.Input;
77
using TagLib;
8+
using Windows.Win32.UI.WindowsAndMessaging;
89

910
namespace Files.App.Data.Models
1011
{
@@ -526,7 +527,6 @@ public bool IsItemSelected
526527

527528
public SelectedItemsPropertiesViewModel()
528529
{
529-
530530
}
531531

532532
private bool isSelectedItemImage = false;
@@ -782,6 +782,56 @@ public bool RunAsAdminEnabled
782782
set => SetProperty(ref runAsAdminEnabled, value);
783783
}
784784

785+
private static readonly IReadOnlyDictionary<SHOW_WINDOW_CMD, string> showWindowCommandTypes = new Dictionary<SHOW_WINDOW_CMD, string>
786+
{
787+
{ SHOW_WINDOW_CMD.SW_NORMAL, Strings.NormalWindow.GetLocalizedResource() },
788+
{ SHOW_WINDOW_CMD.SW_SHOWMINNOACTIVE, Strings.Minimized.GetLocalizedResource() },
789+
{ SHOW_WINDOW_CMD.SW_MAXIMIZE, Strings.Maximized.GetLocalizedResource() }
790+
}.AsReadOnly();
791+
792+
/// <summary>
793+
/// The available show window command types.
794+
/// </summary>
795+
public IReadOnlyDictionary<SHOW_WINDOW_CMD, string> ShowWindowCommandTypes { get => showWindowCommandTypes; }
796+
797+
/// <summary>
798+
/// The localized string of the currently selected ShowWindowCommand.
799+
/// This value can be used for display in the UI.
800+
/// </summary>
801+
public string SelectedShowWindowCommand
802+
{
803+
get => ShowWindowCommandTypes.GetValueOrDefault(ShowWindowCommandEditedValue)!;
804+
set => ShowWindowCommandEditedValue = ShowWindowCommandTypes.First(e => e.Value == value).Key;
805+
}
806+
807+
private SHOW_WINDOW_CMD showWindowCommand;
808+
/// <summary>
809+
/// The current <see cref="SHOW_WINDOW_CMD"/> property of the item.
810+
/// </summary>
811+
public SHOW_WINDOW_CMD ShowWindowCommand
812+
{
813+
get => showWindowCommand;
814+
set
815+
{
816+
if (SetProperty(ref showWindowCommand, value))
817+
ShowWindowCommandEditedValue = value;
818+
}
819+
}
820+
821+
private SHOW_WINDOW_CMD showWindowCommandEditedValue;
822+
/// <summary>
823+
/// The edited <see cref="SHOW_WINDOW_CMD"/> property of the item.
824+
/// </summary>
825+
public SHOW_WINDOW_CMD ShowWindowCommandEditedValue
826+
{
827+
get => showWindowCommandEditedValue;
828+
set
829+
{
830+
if (SetProperty(ref showWindowCommandEditedValue, value))
831+
OnPropertyChanged(nameof(SelectedShowWindowCommand));
832+
}
833+
}
834+
785835
private bool isPropertiesLoaded;
786836
public bool IsPropertiesLoaded
787837
{

‎src/Files.App/Helpers/UI/UIFilesystemHelpers.cs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using System.Text;
99
using Windows.ApplicationModel.DataTransfer;
1010
using Windows.Storage;
11+
using Windows.Win32.UI.WindowsAndMessaging;
1112

1213
namespace Files.App.Helpers
1314
{
@@ -245,17 +246,13 @@ public static async Task<bool> HandleShortcutCannotBeCreated(string shortcutName
245246
/// <summary>
246247
/// Updates ListedItem properties for a shortcut
247248
/// </summary>
248-
/// <param name="item"></param>
249-
/// <param name="targetPath"></param>
250-
/// <param name="arguments"></param>
251-
/// <param name="workingDir"></param>
252-
/// <param name="runAsAdmin"></param>
253-
public static void UpdateShortcutItemProperties(IShortcutItem item, string targetPath, string arguments, string workingDir, bool runAsAdmin)
249+
public static void UpdateShortcutItemProperties(IShortcutItem item, string targetPath, string arguments, string workingDir, bool runAsAdmin, SHOW_WINDOW_CMD showWindowCommand)
254250
{
255251
item.TargetPath = Environment.ExpandEnvironmentVariables(targetPath);
256252
item.Arguments = arguments;
257253
item.WorkingDirectory = workingDir;
258254
item.RunAsAdmin = runAsAdmin;
255+
item.ShowWindowCommand = showWindowCommand;
259256
}
260257

261258
public async static Task<StorageCredential> RequestPassword(IPasswordProtectedItem sender)

‎src/Files.App/Strings/af/Resources.resw‎

Lines changed: 51 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1839,6 +1839,18 @@
18391839
<data name="CompatibilityRegisterThisProgramForRestart" xml:space="preserve">
18401840
<value>Register this program for restart</value>
18411841
</data>
1842+
<data name="StartWindow" xml:space="preserve">
1843+
<value>Start window</value>
1844+
</data>
1845+
<data name="NormalWindow" xml:space="preserve">
1846+
<value>Normal window</value>
1847+
</data>
1848+
<data name="Minimized" xml:space="preserve">
1849+
<value>Minimized</value>
1850+
</data>
1851+
<data name="Maximized" xml:space="preserve">
1852+
<value>Maximized</value>
1853+
</data>
18421854
<data name="RunAsAdministrator" xml:space="preserve">
18431855
<value>Laat loop as administrateur</value>
18441856
</data>
@@ -2196,6 +2208,9 @@
21962208
<data name="WhatsNew" xml:space="preserve">
21972209
<value>What's new</value>
21982210
</data>
2211+
<data name="WhatsNewDescription" xml:space="preserve">
2212+
<value>Open Release Notes</value>
2213+
</data>
21992214
<data name="CannotCreateShortcutDialogTitle" xml:space="preserve">
22002215
<value>Creating a shortcut in this location requires administrator privileges</value>
22012216
</data>
@@ -3967,7 +3982,7 @@
39673982
<value>Navigate to the home page</value>
39683983
</data>
39693984
<data name="ShowHomeButton" xml:space="preserve">
3970-
<value>Show Home in address bar</value>
3985+
<value>Show home button in address bar</value>
39713986
</data>
39723987
<data name="Toolbars" xml:space="preserve">
39733988
<value>Toolbars</value>
@@ -3978,6 +3993,9 @@
39783993
<data name="BulkRename" xml:space="preserve">
39793994
<value>Bulk rename</value>
39803995
</data>
3996+
<data name="CompressContents" xml:space="preserve">
3997+
<value>Compress contents</value>
3998+
</data>
39813999
<data name="ShowCreateAlternateDataStream" xml:space="preserve">
39824000
<value>Show option to create alternate data stream</value>
39834001
</data>
@@ -4005,4 +4023,36 @@
40054023
<data name="ManageTags" xml:space="preserve">
40064024
<value>Manage tags</value>
40074025
</data>
4026+
<data name="Available" xml:space="preserve">
4027+
<value>Available</value>
4028+
</data>
4029+
<data name="Total" xml:space="preserve">
4030+
<value>Total</value>
4031+
</data>
4032+
<data name="AlwaysSwitchToNewlyOpenedTab" xml:space="preserve">
4033+
<value>Always switch focus to newly created tab</value>
4034+
</data>
4035+
<data name="ToggleShelfPane" xml:space="preserve">
4036+
<value>Toggle the shelf pane</value>
4037+
</data>
4038+
<data name="ToggleShelfPaneDescription" xml:space="preserve">
4039+
<value>Toggle the shelf pane visibility</value>
4040+
</data>
4041+
<data name="ShowShelfPaneButtonInAddressBar" xml:space="preserve">
4042+
<value>Show shelf pane toggle in address bar</value>
4043+
</data>
4044+
<data name="Shelf" xml:space="preserve">
4045+
<value>Shelf</value>
4046+
<comment>'Shelf' refers to the Shelf Pane feature, where users can conveniently drag and drop files for quick access and perform bulk actions with ease.</comment>
4047+
</data>
4048+
<data name="ClearItems" xml:space="preserve">
4049+
<value>Clear items</value>
4050+
</data>
4051+
<data name="RemoveFromShelf" xml:space="preserve">
4052+
<value>Remove from shelf</value>
4053+
</data>
4054+
<data name="AddToShelf" xml:space="preserve">
4055+
<value>Add to shelf</value>
4056+
<comment>Tooltip that displays when dragging items to the Shelf Pane</comment>
4057+
</data>
40084058
</root>

0 commit comments

Comments
 (0)