Bundles!!

Files.Launcher/Program.cs

@@ -406,145 +406,148 @@ bool filterMenuItemsImpl(string menuItem)
 
         private static async Task ParseFileOperationAsync(AppServiceRequestReceivedEventArgs args)
         {
-            var fileOp = (string)args.Request.Message["fileop"];
-
-            switch (fileOp)
+            if (args.Request.Message.ContainsKey("fileop"))
             {
-                case "Clipboard":
-                    await Win32API.StartSTATask(() =>
-                    {
-                        System.Windows.Forms.Clipboard.Clear();
-                        var fileToCopy = (string)args.Request.Message["filepath"];
-                        var operation = (DataPackageOperation)(int)args.Request.Message["operation"];
-                        var fileList = new System.Collections.Specialized.StringCollection();
-                        fileList.AddRange(fileToCopy.Split('|'));
-                        if (operation == DataPackageOperation.Copy)
+                string fileOp = (string)args.Request.Message["fileop"];
+
+                switch (fileOp)
+                {
+                    case "Clipboard":
+                        await Win32API.StartSTATask(() =>
                         {
-                            System.Windows.Forms.Clipboard.SetFileDropList(fileList);
-                        }
-                        else if (operation == DataPackageOperation.Move)
+                            System.Windows.Forms.Clipboard.Clear();
+                            var fileToCopy = (string)args.Request.Message["filepath"];
+                            var operation = (DataPackageOperation)(int)args.Request.Message["operation"];
+                            var fileList = new System.Collections.Specialized.StringCollection();
+                            fileList.AddRange(fileToCopy.Split('|'));
+                            if (operation == DataPackageOperation.Copy)
+                            {
+                                System.Windows.Forms.Clipboard.SetFileDropList(fileList);
+                            }
+                            else if (operation == DataPackageOperation.Move)
+                            {
+                                byte[] moveEffect = new byte[] { 2, 0, 0, 0 };
+                                MemoryStream dropEffect = new MemoryStream();
+                                dropEffect.Write(moveEffect, 0, moveEffect.Length);
+                                var data = new System.Windows.Forms.DataObject();
+                                data.SetFileDropList(fileList);
+                                data.SetData("Preferred DropEffect", dropEffect);
+                                System.Windows.Forms.Clipboard.SetDataObject(data, true);
+                            }
+                            return true;
+                        });
+                        break;
+
+                    case "DragDrop":
+                        cancellation.Cancel();
+                        cancellation.Dispose();
+                        cancellation = new CancellationTokenSource();
+                        var dropPath = (string)args.Request.Message["droppath"];
+                        var dropText = (string)args.Request.Message["droptext"];
+                        var drops = Win32API.StartSTATask<List<string>>(() =>
                         {
-                            byte[] moveEffect = new byte[] { 2, 0, 0, 0 };
-                            MemoryStream dropEffect = new MemoryStream();
-                            dropEffect.Write(moveEffect, 0, moveEffect.Length);
-                            var data = new System.Windows.Forms.DataObject();
-                            data.SetFileDropList(fileList);
-                            data.SetData("Preferred DropEffect", dropEffect);
-                            System.Windows.Forms.Clipboard.SetDataObject(data, true);
-                        }
-                        return true;
-                    });
-                    break;
-
-                case "DragDrop":
-                    cancellation.Cancel();
-                    cancellation.Dispose();
-                    cancellation = new CancellationTokenSource();
-                    var dropPath = (string)args.Request.Message["droppath"];
-                    var dropText = (string)args.Request.Message["droptext"];
-                    var drops = Win32API.StartSTATask<List<string>>(() =>
-                    {
-                        var form = new DragDropForm(dropPath, dropText, cancellation.Token);
-                        System.Windows.Forms.Application.Run(form);
-                        return form.DropTargets;
-                    });
-                    break;
+                            var form = new DragDropForm(dropPath, dropText, cancellation.Token);
+                            System.Windows.Forms.Application.Run(form);
+                            return form.DropTargets;
+                        });
+                        break;
 
-                case "DeleteItem":
-                    var fileToDeletePath = (string)args.Request.Message["filepath"];
-                    var permanently = (bool)args.Request.Message["permanently"];
-                    using (var op = new ShellFileOperations())
-                    {
-                        op.Options = ShellFileOperations.OperationFlags.NoUI;
-                        if (!permanently)
+                    case "DeleteItem":
+                        var fileToDeletePath = (string)args.Request.Message["filepath"];
+                        var permanently = (bool)args.Request.Message["permanently"];
+                        using (var op = new ShellFileOperations())
                         {
-                            op.Options |= ShellFileOperations.OperationFlags.AllowUndo;
-                        }
-                        using var shi = new ShellItem(fileToDeletePath);
-                        op.QueueDeleteOperation(shi);
-                        var deleteTcs = new TaskCompletionSource<bool>();
-                        op.PostDeleteItem += (s, e) => deleteTcs.TrySetResult(e.Result.Succeeded);
-                        op.PerformOperations();
-                        var result = await deleteTcs.Task;
-                        await args.Request.SendResponseAsync(new ValueSet() {
+                            op.Options = ShellFileOperations.OperationFlags.NoUI;
+                            if (!permanently)
+                            {
+                                op.Options |= ShellFileOperations.OperationFlags.AllowUndo;
+                            }
+                            using var shi = new ShellItem(fileToDeletePath);
+                            op.QueueDeleteOperation(shi);
+                            var deleteTcs = new TaskCompletionSource<bool>();
+                            op.PostDeleteItem += (s, e) => deleteTcs.TrySetResult(e.Result.Succeeded);
+                            op.PerformOperations();
+                            var result = await deleteTcs.Task;
+                            await args.Request.SendResponseAsync(new ValueSet() {
                             { "Success", result } });
-                    }
-                    break;
+                        }
+                        break;
 
-                case "ParseLink":
-                    var linkPath = (string)args.Request.Message["filepath"];
-                    try
-                    {
-                        if (linkPath.EndsWith(".lnk"))
+                    case "ParseLink":
+                        var linkPath = (string)args.Request.Message["filepath"];
+                        try
                         {
-                            using var link = new ShellLink(linkPath, LinkResolution.NoUIWithMsgPump, null, TimeSpan.FromMilliseconds(100));
-                            await args.Request.SendResponseAsync(new ValueSet()
+                            if (linkPath.EndsWith(".lnk"))
                             {
-                                { "TargetPath", link.TargetPath },
-                                { "Arguments", link.Arguments },
-                                { "WorkingDirectory", link.WorkingDirectory },
-                                { "RunAsAdmin", link.RunAsAdministrator },
-                                { "IsFolder", !string.IsNullOrEmpty(link.TargetPath) && link.Target.IsFolder }
-                            });
+                                using var link = new ShellLink(linkPath, LinkResolution.NoUIWithMsgPump, null, TimeSpan.FromMilliseconds(100));
+                                await args.Request.SendResponseAsync(new ValueSet()
+                                {
+                                    { "TargetPath", link.TargetPath },
+                                    { "Arguments", link.Arguments },
+                                    { "WorkingDirectory", link.WorkingDirectory },
+                                    { "RunAsAdmin", link.RunAsAdministrator },
+                                    { "IsFolder", !string.IsNullOrEmpty(link.TargetPath) && link.Target.IsFolder }
+                                });
+                            }
+                            else if (linkPath.EndsWith(".url"))
+                            {
+                                var linkUrl = await Win32API.StartSTATask(() =>
+                                {
+                                    var ipf = new Url.IUniformResourceLocator();
+                                    (ipf as System.Runtime.InteropServices.ComTypes.IPersistFile).Load(linkPath, 0);
+                                    ipf.GetUrl(out var retVal);
+                                    return retVal;
+                                });
+                                await args.Request.SendResponseAsync(new ValueSet()
+                                {
+                                    { "TargetPath", linkUrl },
+                                    { "Arguments", null },
+                                    { "WorkingDirectory", null },
+                                    { "RunAsAdmin", false },
+                                    { "IsFolder", false }
+                                });
+                            }
                         }
-                        else if (linkPath.EndsWith(".url"))
+                        catch (Exception ex)
                         {
-                            var linkUrl = await Win32API.StartSTATask(() =>
-                            {
-                                var ipf = new Url.IUniformResourceLocator();
-                                (ipf as System.Runtime.InteropServices.ComTypes.IPersistFile).Load(linkPath, 0);
-                                ipf.GetUrl(out var retVal);
-                                return retVal;
-                            });
+                            // Could not parse shortcut
+                            Logger.Warn(ex, ex.Message);
                             await args.Request.SendResponseAsync(new ValueSet()
                             {
-                                { "TargetPath", linkUrl },
+                                { "TargetPath", null },
                                 { "Arguments", null },
                                 { "WorkingDirectory", null },
                                 { "RunAsAdmin", false },
                                 { "IsFolder", false }
                             });
                         }
-                    }
-                    catch (Exception ex)
-                    {
-                        // Could not parse shortcut
-                        Logger.Warn(ex, ex.Message);
-                        await args.Request.SendResponseAsync(new ValueSet()
-                        {
-                            { "TargetPath", null },
-                            { "Arguments", null },
-                            { "WorkingDirectory", null },
-                            { "RunAsAdmin", false },
-                            { "IsFolder", false }
-                        });
-                    }
-                    break;
+                        break;
 
-                case "CreateLink":
-                case "UpdateLink":
-                    var linkSavePath = (string)args.Request.Message["filepath"];
-                    var targetPath = (string)args.Request.Message["targetpath"];
-                    if (linkSavePath.EndsWith(".lnk"))
-                    {
-                        var arguments = (string)args.Request.Message["arguments"];
-                        var workingDirectory = (string)args.Request.Message["workingdir"];
-                        var runAsAdmin = (bool)args.Request.Message["runasadmin"];
-                        using var newLink = new ShellLink(targetPath, arguments, workingDirectory);
-                        newLink.RunAsAdministrator = runAsAdmin;
-                        newLink.SaveAs(linkSavePath); // Overwrite if exists
-                    }
-                    else if (linkSavePath.EndsWith(".url"))
-                    {
-                        await Win32API.StartSTATask(() =>
+                    case "CreateLink":
+                    case "UpdateLink":
+                        var linkSavePath = (string)args.Request.Message["filepath"];
+                        var targetPath = (string)args.Request.Message["targetpath"];
+                        if (linkSavePath.EndsWith(".lnk"))
+                        {
+                            var arguments = (string)args.Request.Message["arguments"];
+                            var workingDirectory = (string)args.Request.Message["workingdir"];
+                            var runAsAdmin = (bool)args.Request.Message["runasadmin"];
+                            using var newLink = new ShellLink(targetPath, arguments, workingDirectory);
+                            newLink.RunAsAdministrator = runAsAdmin;
+                            newLink.SaveAs(linkSavePath); // Overwrite if exists
+                        }
+                        else if (linkSavePath.EndsWith(".url"))
                         {
-                            var ipf = new Url.IUniformResourceLocator();
-                            ipf.SetUrl(targetPath, Url.IURL_SETURL_FLAGS.IURL_SETURL_FL_GUESS_PROTOCOL);
-                            (ipf as System.Runtime.InteropServices.ComTypes.IPersistFile).Save(linkSavePath, false); // Overwrite if exists
+                            await Win32API.StartSTATask(() =>
+                            {
+                                var ipf = new Url.IUniformResourceLocator();
+                                ipf.SetUrl(targetPath, Url.IURL_SETURL_FLAGS.IURL_SETURL_FL_GUESS_PROTOCOL);
+                                (ipf as System.Runtime.InteropServices.ComTypes.IPersistFile).Save(linkSavePath, false); // Overwrite if exists
                             return true;
-                        });
-                    }
-                    break;
+                            });
+                        }
+                        break;
+                }
             }
         }
 

Files/App.xaml.cs

@@ -3,6 +3,7 @@
 using Files.Filesystem;
 using Files.Filesystem.FilesystemHistory;
 using Files.Helpers;
+using Files.SettingsInterfaces;
 using Files.UserControls.MultitaskingControl;
 using Files.ViewModels;
 using Files.Views;
@@ -12,7 +13,6 @@
 using Microsoft.Toolkit.Uwp.Extensions;
 using Microsoft.Toolkit.Uwp.Helpers;
 using Microsoft.Toolkit.Uwp.Notifications;
-using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using NLog;
 using System;
@@ -44,6 +44,8 @@ sealed partial class App : Application
         public static SemaphoreSlim SemaphoreSlim = new SemaphoreSlim(1, 1);
         public static StorageHistoryWrapper HistoryWrapper = new StorageHistoryWrapper();
 
+        public static IBundlesSettings BundlesSettings = new BundlesSettingsViewModel();
+
         public static SettingsViewModel AppSettings { get; set; }
         public static InteractionViewModel InteractionViewModel { get; set; }
         public static JumpListManager JumpList { get; } = new JumpListManager();

Files/Constants.cs

@@ -22,10 +22,23 @@ public static class GenericFileBrowser
             }
         }
 
+        public static class Widgets
+        {
+            public static class Bundles
+            {
+                public const int MaxAmountOfItemsPerBundle = 8;
+            }
+        }
+
         public static class LocalSettings
         {
             public const string DateTimeFormat = "datetimeformat";
+
             public const string Theme = "theme";
+
+            public const string SettingsFolderName = "settings";
+
+            public const string BundlesSettingsFileName = "bundles.json";
         }
     }
 }

Files/Converters/VisiblityInvertConverter.cs

@@ -0,0 +1,19 @@
+using System;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Data;
+
+namespace Files.Converters
+{
+    public class VisiblityInvertConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            return (Visibility)value == Visibility.Visible ? Visibility.Collapsed : Visibility.Visible;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

Files/Dialogs/DynamicDialog.xaml

@@ -0,0 +1,61 @@
+<ContentDialog
+    x:Class="Files.Dialogs.DynamicDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:icore="using:Microsoft.Xaml.Interactions.Core"
+    xmlns:i="using:Microsoft.Xaml.Interactivity"
+    mc:Ignorable="d"
+    Title="{Binding TitleText, Mode=OneWay}"
+    DefaultButton="Primary"
+    CornerRadius="4"
+    PrimaryButtonText="{Binding PrimaryButtonText, Mode=OneWay}"
+    SecondaryButtonText="{Binding SecondaryButtonText, Mode=OneWay}"
+    CloseButtonText="{Binding CloseButtonText, Mode=OneWay}"
+    PrimaryButtonStyle="{StaticResource AccentButtonStyle}"
+    SecondaryButtonStyle="{StaticResource DefaultButtonStyle}"
+    CloseButtonStyle="{StaticResource DefaultButtonStyle}">
+
+    <i:Interaction.Behaviors>
+        <!--  No need to specify CommandParameter - `e` is passed by default  -->
+        <icore:EventTriggerBehavior EventName="PrimaryButtonClick">
+            <icore:InvokeCommandAction Command="{Binding PrimaryButtonCommand, Mode=OneWay}" />
+        </icore:EventTriggerBehavior>
+        <!--  No need to specify CommandParameter - `e` is passed by default  -->
+        <icore:EventTriggerBehavior EventName="SecondaryButtonClick">
+            <icore:InvokeCommandAction Command="{Binding SecondaryButtonCommand, Mode=OneWay}" />
+        </icore:EventTriggerBehavior>
+        <!--  No need to specify CommandParameter - `e` is passed by default  -->
+        <icore:EventTriggerBehavior EventName="CloseButtonClick">
+            <icore:InvokeCommandAction Command="{Binding CloseButtonCommand, Mode=OneWay}" />
+        </icore:EventTriggerBehavior>
+        <!--  No need to specify CommandParameter - `e` is passed by default  -->
+        <icore:EventTriggerBehavior EventName="KeyDown">
+            <icore:InvokeCommandAction Command="{Binding DynamicKeyDownCommand, Mode=OneWay}" />
+        </icore:EventTriggerBehavior>
+    </i:Interaction.Behaviors>
+
+    <Grid RowSpacing="25">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition/>
+        </Grid.RowDefinitions>
+
+        <!-- Subtitle -->
+        <TextBlock
+            Text="{Binding SubtitleText, Mode=OneWay}"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Center"
+            Grid.Row="0" />
+
+        <!-- The dynamic content control -->
+        <ContentControl
+            Content="{Binding DisplayControl, Mode=OneWay}"
+            VerticalAlignment="Stretch"
+            HorizontalAlignment="Stretch"
+            VerticalContentAlignment="Stretch"
+            HorizontalContentAlignment="Stretch"
+            Grid.Row="1" />
+    </Grid>
+</ContentDialog>