Update upstream

Files.Launcher/DragDropForm.cs

@@ -2,9 +2,6 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace FilesFullTrust
@@ -45,7 +42,8 @@ public DragDropForm(string dropPath, string dropText, System.Threading.Cancellat
             this.Size = new System.Drawing.Size(lpRect.Width, lpRect.Height);
             this.Location = new System.Drawing.Point(lpRect.Location.X, lpRect.Location.Y);
 
-            token.Register(() => {
+            token.Register(() =>
+            {
                 if (this.IsHandleCreated)
                 {
                     // If another window is created, close this one
@@ -127,4 +125,4 @@ protected override CreateParams CreateParams
             }
         }
     }
-}
+}

Files.Launcher/Program.cs

@@ -462,9 +462,13 @@ await Win32API.StartSTATask(() =>
                         }
                         using var shi = new ShellItem(fileToDeletePath);
                         op.QueueDeleteOperation(shi);
+                        op.PostDeleteItem += async (s, e) =>
+                        {
+                            await args.Request.SendResponseAsync(new ValueSet() {
+                                { "Success", e.Result.Succeeded } });
+                        };
                         op.PerformOperations();
                     }
-                    //ShellFileOperations.Delete(fileToDeletePath, ShellFileOperations.OperationFlags.AllowUndo | ShellFileOperations.OperationFlags.NoUI);
                     break;
 
                 case "ParseLink":

Files.Package/Files.Package.wapproj

@@ -54,6 +54,8 @@
     <AppxBundlePlatforms>x86|x64|arm|arm64</AppxBundlePlatforms>
     <DisableXbfLineInfo>False</DisableXbfLineInfo>
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
+    <AppxBundleAutoResourcePackageQualifiers>Scale|DXFeatureLevel</AppxBundleAutoResourcePackageQualifiers>
+    <AppxDefaultResourceQualifiers>Language=en-US;de-DE;es-ES;fr-FR;he-IL;hi-IN;hu-HU;it-IT;ja-JP;nl-NL;or-IN;pl-PL;pt-BR;ru-RU;ta;tr-TR;uk-UA;zh-Hans;zh-Hant</AppxDefaultResourceQualifiers>
     <UapAppxPackageBuildMode>StoreUpload</UapAppxPackageBuildMode>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
     <EntryPointProjectUniqueName>..\Files\Files.csproj</EntryPointProjectUniqueName>
@@ -142,8 +144,6 @@
     <Content Include="Assets\Wide310x150Logo.scale-150.png" />
     <Content Include="Assets\Wide310x150Logo.scale-200.png" />
     <Content Include="Assets\Wide310x150Logo.scale-400.png" />
-    <Content Include="priconfig.default.xml" />
-    <Content Include="priconfig.packaging.xml" />
   </ItemGroup>
   <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
 </Project>

Files.Package/Package.appxmanifest

@@ -9,7 +9,7 @@
          xmlns:uap4="http://schemas.microsoft.com/appx/manifest/uap/windows10/4"
          xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5"
          IgnorableNamespaces="uap uap5 mp rescap desktop4 desktop">
-    <Identity Name="FilesDev" Publisher="CN=53EC4384-7F5B-4CF6-8C23-513FFE9D1AB7" Version="0.21.3.0" />
+    <Identity Name="FilesDev" Publisher="CN=53EC4384-7F5B-4CF6-8C23-513FFE9D1AB7" Version="0.22.1.0" />
     <Properties>
         <DisplayName>Files - Dev</DisplayName>
         <PublisherDisplayName>Yair A</PublisherDisplayName>

Files/BaseLayout.cs

@@ -1,4 +1,5 @@
 using Files.Common;
+using Files.DataModels;
 using Files.Filesystem;
 using Files.Helpers;
 using Files.UserControls;
@@ -9,9 +10,9 @@
 using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Newtonsoft.Json;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Runtime.CompilerServices;
@@ -136,6 +137,8 @@ internal set
 
         public ListedItem SelectedItem { get; private set; }
 
+        private List<ShellNewEntry> cachedNewContextMenuEntries { get; set; }
+
         public BaseLayout()
         {
             SelectedItemsPropertiesViewModel = new SelectedItemsPropertiesViewModel(this);
@@ -151,23 +154,49 @@ public BaseLayout()
             }
         }
 
+        public abstract void FocusFileList();
+
         public abstract void SelectAllItems();
 
-        public abstract void InvertSelection();
+        public virtual void InvertSelection()
+        {
+            List<ListedItem> newSelectedItems = GetAllItems()
+                .Cast<ListedItem>()
+                .Except(SelectedItems)
+                .ToList();
+
+            SetSelectedItemsOnUi(newSelectedItems);
+        }
 
         public abstract void ClearSelection();
 
         public abstract void SetDragModeForItems();
 
         public abstract void ScrollIntoView(ListedItem item);
 
-        public abstract int GetSelectedIndex();
+        protected abstract void AddSelectedItem(ListedItem item);
+
+        protected abstract IEnumerable GetAllItems();
 
-        public abstract void SetSelectedItemOnUi(ListedItem selectedItem);
+        public virtual void SetSelectedItemOnUi(ListedItem selectedItem)
+        {
+            ClearSelection();
+            AddSelectedItem(selectedItem);
+        }
 
-        public abstract void SetSelectedItemsOnUi(List<ListedItem> selectedItems);
+        public virtual void SetSelectedItemsOnUi(List<ListedItem> selectedItems)
+        {
+            ClearSelection();
+            AddSelectedItemsOnUi(selectedItems);
+        }
 
-        public abstract void AddSelectedItemsOnUi(List<ListedItem> selectedItems);
+        public virtual void AddSelectedItemsOnUi(List<ListedItem> selectedItems)
+        {
+            foreach (ListedItem selectedItem in selectedItems)
+            {
+                AddSelectedItem(selectedItem);
+            }
+        }
 
         private void ClearShellContextMenus(MenuFlyout menuFlyout)
         {
@@ -176,6 +205,7 @@ private void ClearShellContextMenus(MenuFlyout menuFlyout)
             {
                 menuFlyout.Items.RemoveAt(menuFlyout.Items.IndexOf(contextMenuItems[i]));
             }
+
             if (menuFlyout.Items[0] is MenuFlyoutSeparator flyoutSeperator)
             {
                 menuFlyout.Items.RemoveAt(menuFlyout.Items.IndexOf(flyoutSeperator));
@@ -219,9 +249,31 @@ public virtual void SetShellContextmenu(MenuFlyout menuFlyout, bool shiftPressed
 
         public abstract void StartRenameItem();
 
-        public abstract void ResetItemOpacity();
+        public virtual void ResetItemOpacity()
+        {
+            IEnumerable items = GetAllItems();
+            if (items == null)
+            {
+                return;
+            }
+
+            foreach (ListedItem listedItem in items)
+            {
+                if (listedItem.IsHiddenItem)
+                {
+                    listedItem.Opacity = 0.4;
+                }
+                else
+                {
+                    listedItem.Opacity = 1;
+                }
+            }
+        }
 
-        public abstract void SetItemOpacity(ListedItem item);
+        public virtual void SetItemOpacity(ListedItem item)
+        {
+            item.Opacity = 0.4;
+        }
 
         protected abstract ListedItem GetItemFromElement(object element);
 
@@ -301,6 +353,10 @@ protected override async void OnNavigatedTo(NavigationEventArgs eventArgs)
 
             ParentShellPageInstance.InstanceViewModel.IsPageTypeNotHome = true; // show controls that were hidden on the home page
             ParentShellPageInstance.Clipboard_ContentChanged(null, null);
+
+            cachedNewContextMenuEntries = await RegistryHelper.GetNewContextMenuEntries();
+
+            FocusFileList(); // Set focus on layout specific file list control
         }
 
         protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
@@ -314,10 +370,17 @@ protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
 
         private void UnloadMenuFlyoutItemByName(string nameToUnload)
         {
-            var menuItem = this.FindName(nameToUnload) as DependencyObject;
-            if (menuItem != null) // Prevent crash if the MenuFlyoutItem is missing
+            if (FindName(nameToUnload) is MenuFlyoutItemBase menuItem) // Prevent crash if the MenuFlyoutItem is missing
+            {
+                menuItem.Visibility = Visibility.Collapsed;
+            }
+        }
+
+        private void LoadMenuFlyoutItemByName(string nameToUnload)
+        {
+            if (FindName(nameToUnload) is MenuFlyoutItemBase menuItem) // Prevent crash if the MenuFlyoutItem is missing
             {
-                (menuItem as MenuFlyoutItemBase).Visibility = Visibility.Collapsed;
+                menuItem.Visibility = Visibility.Visible;
             }
         }
 
@@ -451,6 +514,48 @@ public void RightClickContextMenu_Opening(object sender, object e)
             ClearSelection();
             var shiftPressed = Window.Current.CoreWindow.GetKeyState(VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down);
             SetShellContextmenu(BaseLayoutContextFlyout, shiftPressed, false);
+            var newItemMenu = (MenuFlyoutSubItem)BaseLayoutContextFlyout.Items.SingleOrDefault(x => x.Name == "NewEmptySpace");
+            if (newItemMenu == null || cachedNewContextMenuEntries == null)
+            {
+                return;
+            }
+            if (!newItemMenu.Items.Any(x => (x.Tag as string) == "CreateNewFile"))
+            {
+                var separatorIndex = newItemMenu.Items.IndexOf(newItemMenu.Items.Single(x => x.Name == "NewMenuFileFolderSeparator"));
+                foreach (var newEntry in Enumerable.Reverse(cachedNewContextMenuEntries))
+                {
+                    MenuFlyoutItem menuLayoutItem;
+                    if (newEntry.Icon != null)
+                    {
+                        var image = new BitmapImage();
+#pragma warning disable CS4014
+                        image.SetSourceAsync(newEntry.Icon);
+#pragma warning restore CS4014
+                        menuLayoutItem = new MenuFlyoutItemWithImage()
+                        {
+                            Text = newEntry.Name,
+                            BitmapIcon = image,
+                            Tag = "CreateNewFile"
+                        };
+                    }
+                    else
+                    {
+                        menuLayoutItem = new MenuFlyoutItem()
+                        {
+                            Text = newEntry.Name,
+                            Icon = new FontIcon()
+                            {
+                                FontFamily = App.Current.Resources["FluentUIGlyphs"] as Windows.UI.Xaml.Media.FontFamily,
+                                Glyph = "\xea00"
+                            },
+                            Tag = "CreateNewFile"
+                        };
+                    }
+                    menuLayoutItem.Command = ParentShellPageInstance.InteractionOperations.CreateNewFile;
+                    menuLayoutItem.CommandParameter = newEntry;
+                    newItemMenu.Items.Insert(separatorIndex + 1, menuLayoutItem);
+                }
+            }
         }
 
         public void RightClickItemContextMenu_Opening(object sender, object e)
@@ -485,7 +590,7 @@ public void RightClickItemContextMenu_Opening(object sender, object e)
                     {
                         if (SelectedItem.IsShortcutItem)
                         {
-                            (this.FindName("OpenItem") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
+                            LoadMenuFlyoutItemByName("OpenItem");
                             UnloadMenuFlyoutItemByName("OpenItemWithAppPicker");
                             UnloadMenuFlyoutItemByName("RunAsAdmin");
                             UnloadMenuFlyoutItemByName("RunAsAnotherUser");
@@ -497,42 +602,42 @@ public void RightClickItemContextMenu_Opening(object sender, object e)
                             UnloadMenuFlyoutItemByName("OpenItemWithAppPicker");
                             UnloadMenuFlyoutItemByName("RunAsAdmin");
                             UnloadMenuFlyoutItemByName("RunAsAnotherUser");
-                            (this.FindName("CreateShortcut") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
+                            LoadMenuFlyoutItemByName("CreateShortcut");
                         }
                         else if (SelectedItem.FileExtension.Equals(".exe", StringComparison.OrdinalIgnoreCase)
                             || SelectedItem.FileExtension.Equals(".bat", StringComparison.OrdinalIgnoreCase))
                         {
-                            (this.FindName("OpenItem") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
+                            LoadMenuFlyoutItemByName("OpenItem");
                             UnloadMenuFlyoutItemByName("OpenItemWithAppPicker");
-                            (this.FindName("RunAsAdmin") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
-                            (this.FindName("RunAsAnotherUser") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
-                            (this.FindName("CreateShortcut") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
+                            LoadMenuFlyoutItemByName("RunAsAdmin");
+                            LoadMenuFlyoutItemByName("RunAsAnotherUser");
+                            LoadMenuFlyoutItemByName("CreateShortcut");
                         }
                         else if (SelectedItem.FileExtension.Equals(".msi", StringComparison.OrdinalIgnoreCase))
                         {
                             UnloadMenuFlyoutItemByName("OpenItem");
                             UnloadMenuFlyoutItemByName("OpenItemWithAppPicker");
                             UnloadMenuFlyoutItemByName("RunAsAdmin");
-                            (this.FindName("RunAsAnotherUser") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
-                            (this.FindName("CreateShortcut") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
+                            LoadMenuFlyoutItemByName("RunAsAnotherUser");
+                            LoadMenuFlyoutItemByName("CreateShortcut");
                         }
                         else if (SelectedItem.FileExtension.Equals(".appx", StringComparison.OrdinalIgnoreCase)
                             || SelectedItem.FileExtension.Equals(".msix", StringComparison.OrdinalIgnoreCase)
                             || SelectedItem.FileExtension.Equals(".appxbundle", StringComparison.OrdinalIgnoreCase)
                             || SelectedItem.FileExtension.Equals(".msixbundle", StringComparison.OrdinalIgnoreCase))
                         {
-                            (this.FindName("OpenItemWithAppPicker") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
+                            LoadMenuFlyoutItemByName("OpenItemWithAppPicker");
                             UnloadMenuFlyoutItemByName("RunAsAdmin");
                             UnloadMenuFlyoutItemByName("RunAsAnotherUser");
-                            (this.FindName("CreateShortcut") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
+                            LoadMenuFlyoutItemByName("CreateShortcut");
                         }
                         else
                         {
-                            (this.FindName("OpenItem") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
-                            (this.FindName("OpenItemWithAppPicker") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
+                            LoadMenuFlyoutItemByName("OpenItem");
+                            LoadMenuFlyoutItemByName("OpenItemWithAppPicker");
                             UnloadMenuFlyoutItemByName("RunAsAdmin");
                             UnloadMenuFlyoutItemByName("RunAsAnotherUser");
-                            (this.FindName("CreateShortcut") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
+                            LoadMenuFlyoutItemByName("CreateShortcut");
                         }
                     }
                 }
@@ -555,23 +660,20 @@ public void RightClickItemContextMenu_Opening(object sender, object e)
                 }
                 else if (SelectedItems.Count == 1)
                 {
-                    (this.FindName("SidebarPinItem") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
-                    (this.FindName("CreateShortcut") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
-                    (this.FindName("OpenItem") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
+                    LoadMenuFlyoutItemByName("SidebarPinItem");
+                    LoadMenuFlyoutItemByName("CreateShortcut");
+                    LoadMenuFlyoutItemByName("OpenItem");
                 }
                 else
                 {
-                    (this.FindName("SidebarPinItem") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
+                    LoadMenuFlyoutItemByName("SidebarPinItem");
                     UnloadMenuFlyoutItemByName("CreateShortcut");
                 }
 
                 if (SelectedItems.Count <= 5 && SelectedItems.Count > 0)
                 {
-                    (this.FindName("OpenInNewTab") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
-                    (this.FindName("OpenInNewWindowItem") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
-                    //this.FindName("SidebarPinItem");
-                    //this.FindName("OpenInNewTab");
-                    //this.FindName("OpenInNewWindowItem");
+                    LoadMenuFlyoutItemByName("OpenInNewTab");
+                    LoadMenuFlyoutItemByName("OpenInNewWindowItem");
                 }
                 else if (SelectedItems.Count > 5)
                 {

Files/Constants.cs

@@ -18,8 +18,8 @@ public static class GridViewBrowser
             }
 
             public static class GenericFileBrowser
-            { 
+            {
             }
         }
     }
-}
+}