Skip to content

Commit 7a91f48

Browse files
lukeblevinslukeblevins
authored
Merge branch 'main' into dev/lubl/drives-mgr
2 parents f252501 + 73700e2 commit 7a91f48

File tree

62 files changed

+1160
-1056
lines changed

Some content is hidden

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

62 files changed

+1160
-1056
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Files also offers advanced features such as file tagging for easy organization,
2727
- MSVC v143 - VS 2022 C++ x64/x86 or ARM64 build tools (latest)
2828
- C++ ATL for latest v143 build tools (x86 & x64 or ARM64)
2929
- Git for Windows
30-
- [Windows App SDK 1.2](https://learn.microsoft.com/windows/apps/windows-app-sdk/downloads#current-releases)
30+
- [Windows App SDK 1.3](https://learn.microsoft.com/windows/apps/windows-app-sdk/downloads#current-releases)
3131

3232
### 2. Clone the repository
3333

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
xmlns:uap4="http://schemas.microsoft.com/appx/manifest/uap/windows10/4"
1111
xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5"
1212
IgnorableNamespaces="uap uap5 mp rescap desktop6 desktop4 desktop">
13-
<Identity Name="FilesDev" Publisher="CN=Files" Version="2.4.61.0" />
13+
<Identity Name="FilesDev" Publisher="CN=Files" Version="2.4.62.0" />
1414
<Properties>
1515
<DisplayName>Files - Dev</DisplayName>
1616
<PublisherDisplayName>Yair A</PublisherDisplayName>

‎src/Files.App/Actions/BaseUIAction.cs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,18 @@
11
using CommunityToolkit.Mvvm.ComponentModel;
22
using Files.App.Helpers;
33
using System.ComponentModel;
4-
using System.Threading.Tasks;
54

65
namespace Files.App.Actions
76
{
8-
internal abstract class BaseUIAction : ObservableObject, IAction
7+
internal abstract class BaseUIAction : ObservableObject
98
{
10-
public abstract string Label { get; }
11-
12-
public abstract string Description { get; }
13-
149
public virtual bool IsExecutable => UIHelpers.CanShowDialog;
1510

1611
public BaseUIAction()
1712
{
1813
UIHelpers.PropertyChanged += UIHelpers_PropertyChanged;
1914
}
2015

21-
public abstract Task ExecuteAsync();
22-
2316
private void UIHelpers_PropertyChanged(object? sender, PropertyChangedEventArgs e)
2417
{
2518
if (e.PropertyName is nameof(UIHelpers.CanShowDialog))

‎src/Files.App/Actions/Content/Archives/CompressIntoArchiveAction.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010

1111
namespace Files.App.Actions
1212
{
13-
internal class CompressIntoArchiveAction : BaseUIAction
13+
internal class CompressIntoArchiveAction : BaseUIAction, IAction
1414
{
1515
private readonly IContentPageContext context = Ioc.Default.GetRequiredService<IContentPageContext>();
1616

17-
public override string Label => "CreateArchive".GetLocalizedResource();
17+
public string Label => "CreateArchive".GetLocalizedResource();
1818

19-
public override string Description => "TODO: Need to be described.";
19+
public string Description => "TODO: Need to be described.";
2020

2121
public override bool IsExecutable =>
2222
IsContextPageTypeAdaptedToCommand() &&
@@ -28,7 +28,7 @@ public CompressIntoArchiveAction()
2828
context.PropertyChanged += Context_PropertyChanged;
2929
}
3030

31-
public override async Task ExecuteAsync()
31+
public async Task ExecuteAsync()
3232
{
3333
var (sources, directory, fileName) = ArchiveHelpers.GetCompressDestination(context.ShellPage);
3434

‎src/Files.App/Actions/Content/Archives/DecompressArchive.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88

99
namespace Files.App.Actions
1010
{
11-
internal class DecompressArchive : BaseUIAction
11+
internal class DecompressArchive : BaseUIAction, IAction
1212
{
1313
private readonly IContentPageContext context = Ioc.Default.GetRequiredService<IContentPageContext>();
1414

15-
public override string Label => "ExtractFiles".GetLocalizedResource();
15+
public string Label => "ExtractFiles".GetLocalizedResource();
1616

17-
public override string Description => "TODO: Need to be described.";
17+
public string Description => "TODO: Need to be described.";
1818

1919
public HotKey HotKey { get; } = new(Keys.E, KeyModifiers.Ctrl);
2020

@@ -28,7 +28,7 @@ public DecompressArchive()
2828
context.PropertyChanged += Context_PropertyChanged;
2929
}
3030

31-
public override async Task ExecuteAsync()
31+
public async Task ExecuteAsync()
3232
{
3333
await ArchiveHelpers.DecompressArchive(context.ShellPage);
3434
}

‎src/Files.App/Actions/Content/Archives/DecompressArchiveHere.cs

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

88
namespace Files.App.Actions
99
{
10-
internal class DecompressArchiveHere : BaseUIAction
10+
internal class DecompressArchiveHere : BaseUIAction, IAction
1111
{
1212
private readonly IContentPageContext context = Ioc.Default.GetRequiredService<IContentPageContext>();
1313

14-
public override string Label => "ExtractHere".GetLocalizedResource();
14+
public string Label => "ExtractHere".GetLocalizedResource();
1515

16-
public override string Description => "TODO: Need to be described.";
16+
public string Description => "TODO: Need to be described.";
1717

1818
public override bool IsExecutable =>
1919
IsContextPageTypeAdaptedToCommand() &&
@@ -25,7 +25,7 @@ public DecompressArchiveHere()
2525
context.PropertyChanged += Context_PropertyChanged;
2626
}
2727

28-
public override async Task ExecuteAsync()
28+
public async Task ExecuteAsync()
2929
{
3030
await ArchiveHelpers.DecompressArchiveHere(context.ShellPage);
3131
}

‎src/Files.App/Actions/Content/Archives/DecompressArchiveToChildFolderAction.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99

1010
namespace Files.App.Actions
1111
{
12-
internal class DecompressArchiveToChildFolderAction : BaseUIAction
12+
internal class DecompressArchiveToChildFolderAction : BaseUIAction, IAction
1313
{
1414
private readonly IContentPageContext context = Ioc.Default.GetRequiredService<IContentPageContext>();
1515

16-
public override string Label => ComputeLabel();
16+
public string Label => ComputeLabel();
1717

18-
public override string Description => "TODO: Need to be described.";
18+
public string Description => "TODO: Need to be described.";
1919

2020
public override bool IsExecutable =>
2121
IsContextPageTypeAdaptedToCommand() &&
@@ -27,7 +27,7 @@ public DecompressArchiveToChildFolderAction()
2727
context.PropertyChanged += Context_PropertyChanged;
2828
}
2929

30-
public override async Task ExecuteAsync()
30+
public async Task ExecuteAsync()
3131
{
3232
await ArchiveHelpers.DecompressArchiveToChildFolder(context.ShellPage);
3333
}

‎src/Files.App/Actions/FileSystem/CreateFolderAction.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99

1010
namespace Files.App.Actions
1111
{
12-
internal class CreateFolderAction : BaseUIAction
12+
internal class CreateFolderAction : BaseUIAction, IAction
1313
{
1414
private readonly IContentPageContext context = Ioc.Default.GetRequiredService<IContentPageContext>();
1515

16-
public override string Label { get; } = "Folder".GetLocalizedResource();
16+
public string Label { get; } = "Folder".GetLocalizedResource();
1717

18-
public override string Description => "TODO: Need to be described.";
18+
public string Description => "TODO: Need to be described.";
1919

2020
public RichGlyph Glyph { get; } = new RichGlyph(baseGlyph: "\uE8B7");
2121

@@ -26,7 +26,7 @@ public CreateFolderAction()
2626
context.PropertyChanged += Context_PropertyChanged;
2727
}
2828

29-
public override Task ExecuteAsync()
29+
public Task ExecuteAsync()
3030
{
3131
if (context.ShellPage is not null)
3232
UIFilesystemHelpers.CreateFileFromDialogResultType(AddItemDialogItemType.Folder, null!, context.ShellPage);

‎src/Files.App/Actions/FileSystem/CreateShortcutAction.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010

1111
namespace Files.App.Actions
1212
{
13-
internal class CreateShortcutAction : BaseUIAction
13+
internal class CreateShortcutAction : BaseUIAction, IAction
1414
{
1515
private readonly IContentPageContext context = Ioc.Default.GetRequiredService<IContentPageContext>();
1616

17-
public override string Label { get; } = "CreateShortcut".GetLocalizedResource();
17+
public string Label { get; } = "CreateShortcut".GetLocalizedResource();
1818

19-
public override string Description => "TODO: Need to be described.";
19+
public string Description => "TODO: Need to be described.";
2020

2121
public RichGlyph Glyph { get; } = new RichGlyph(opacityStyle: "ColorIconShortcut");
2222

@@ -27,7 +27,7 @@ public CreateShortcutAction()
2727
context.PropertyChanged += Context_PropertyChanged;
2828
}
2929

30-
public override async Task ExecuteAsync()
30+
public async Task ExecuteAsync()
3131
{
3232
var currentPath = context.ShellPage?.FilesystemViewModel.WorkingDirectory;
3333

‎src/Files.App/Actions/FileSystem/CreateShortcutFromDialogAction.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88

99
namespace Files.App.Actions
1010
{
11-
internal class CreateShortcutFromDialogAction : BaseUIAction
11+
internal class CreateShortcutFromDialogAction : BaseUIAction, IAction
1212
{
1313
private readonly IContentPageContext context = Ioc.Default.GetRequiredService<IContentPageContext>();
1414

15-
public override string Label { get; } = "Shortcut".GetLocalizedResource();
15+
public string Label { get; } = "Shortcut".GetLocalizedResource();
1616

17-
public override string Description => "TODO: Need to be described.";
17+
public string Description => "TODO: Need to be described.";
1818

1919
public RichGlyph Glyph { get; } = new RichGlyph(opacityStyle: "ColorIconShortcut");
2020

@@ -25,7 +25,7 @@ public CreateShortcutFromDialogAction()
2525
context.PropertyChanged += Context_PropertyChanged;
2626
}
2727

28-
public override async Task ExecuteAsync()
28+
public async Task ExecuteAsync()
2929
{
3030
await UIFilesystemHelpers.CreateShortcutFromDialogAsync(context.ShellPage);
3131
}

0 commit comments

Comments
 (0)