Merge branch 'main' into 5bfa/CQ-Omnibar2

Author: 0x5bfa

.github/scripts/Configure-AppxManifest.ps1

@@ -60,7 +60,7 @@ elseif ($Branch -eq "StorePreview")
     $xmlDoc.Package.Identity.Name="49306atecsolution.FilesPreview"
     $xmlDoc.Package.Properties.DisplayName="Files - Preview"
     $xmlDoc.Package.Applications.Application.VisualElements.DisplayName="Files - Preview"
-    $xmlDoc.Package.Applications.Application.VisualElements.DefaultTile.ShortName="49306atecsolution.FilesPreview"
+    $xmlDoc.Package.Applications.Application.VisualElements.DefaultTile.ShortName="Files - Preview"
 
     # Remove capability that is only used for the sideload package
     $nsmgr = New-Object System.Xml.XmlNamespaceManager($xmlDoc.NameTable)

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

@@ -16,7 +16,7 @@
     <Identity
         Name="FilesDev"
         Publisher="CN=Files"
-        Version="3.9.8.0" />
+        Version="3.9.9.0" />
 
     <Properties>
         <DisplayName>Files - Dev</DisplayName>

src/Files.App.CsWin32/NativeMethods.txt

@@ -97,7 +97,6 @@ SendMessage
 IsWindowVisible
 COPYDATASTRUCT
 WINDOW_LONG_PTR_INDEX
-GetDpiForWindow
 CallWindowProc
 MINMAXINFO
 SUBCLASSPROC
@@ -226,3 +225,6 @@ _SICHINTF
 RoGetAgileReference
 IQueryInfo
 QITIPF_FLAGS
+GetKeyboardState
+MapVirtualKey
+GetKeyboardLayout

src/Files.App/Data/Commands/HotKey/HotKey.cs

@@ -4,6 +4,7 @@
 using System.Collections.Frozen;
 using System.Runtime.InteropServices;
 using System.Text;
+using Windows.Win32;
 using Forms = System.Windows.Forms;
 
 namespace Files.App.Data.Commands
@@ -374,17 +375,17 @@ private static string GetKeyCharacter(Forms.Keys key)
 			var state = new byte[256];
 
 			// Get the current keyboard state
-			if (!Win32PInvoke.GetKeyboardState(state))
+			if (!PInvoke.GetKeyboardState(state))
 				return buffer.ToString();
 
 			// Convert the key to its virtual key code
 			var virtualKey = (uint)key;
 
 			// Map the virtual key to a scan code
-			var scanCode = Win32PInvoke.MapVirtualKey(virtualKey, 0);
+			var scanCode = PInvoke.MapVirtualKey(virtualKey, 0);
 
 			// Get the active keyboard layout
-			var keyboardLayout = Win32PInvoke.GetKeyboardLayout(0);
+			var keyboardLayout = PInvoke.GetKeyboardLayout(0);
 
 			if (Win32PInvoke.ToUnicodeEx(virtualKey, scanCode, state, buffer, buffer.Capacity, 0, keyboardLayout) > 0)
 				return buffer[^1].ToString();

src/Files.App/Data/Models/AppModel.cs

@@ -4,6 +4,8 @@
 using Microsoft.UI.Xaml.Controls;
 using System.Runtime.InteropServices;
 using Windows.ApplicationModel.DataTransfer;
+using Windows.Win32;
+using Windows.Win32.Foundation;
 
 namespace Files.App.Data.Models
 {
@@ -127,9 +129,8 @@ public string PCloudDrivePath
 
 		/// <summary>
 		/// Gets or sets a value indicating the AppWindow DPI.
-		/// TODO update value if the DPI changes
 		/// </summary>
-		private float _AppWindowDPI = Win32PInvoke.GetDpiForWindow(MainWindow.Instance.WindowHandle) / 96f;
+		private float _AppWindowDPI = PInvoke.GetDpiForWindow((HWND)MainWindow.Instance.WindowHandle) / 96f;
 		public float AppWindowDPI
 		{
 			get => _AppWindowDPI;

src/Files.App/Helpers/Win32/Win32PInvoke.Methods.cs

@@ -76,11 +76,6 @@ public static extern bool SetEvent(
 			IntPtr hEvent
 		);
 
-		[DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-		public static extern int GetDpiForWindow(
-			IntPtr hwnd
-		);
-
 		[DllImport("ole32.dll")]
 		public static extern uint CoWaitForMultipleObjects(
 			uint dwFlags,
@@ -228,23 +223,6 @@ public static extern int ToUnicodeEx(
 			IntPtr keyboardLayout
 		);
 
-		[DllImport("user32.dll")]
-		public static extern bool GetKeyboardState(
-			byte[] lpKeyState
-		);
-
-		[DllImport("user32.dll", CharSet = CharSet.Auto)]
-		public static extern IntPtr GetKeyboardLayout
-		(
-			uint idThread
-		);
-
-		[DllImport("user32.dll")]
-		public static extern uint MapVirtualKey(
-			uint code,
-			uint mapType
-		);
-
 		[DllImport("user32.dll")]
 		public static extern bool TranslateMessage(
 			ref MSG lpMsg

src/Files.App/UserControls/NavigationToolbar.xaml

@@ -346,7 +346,7 @@
 				IconOnActive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Path}, IsFilled=True}"
 				IconOnInactive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Path}, IconType=Outline}"
 				IsDefault="True"
-				ModeName="{helpers:ResourceString Name=Path}"
+				ModeName="{x:Bind Commands.EditPath.LabelWithHotKey, Mode=OneWay}"
 				PlaceholderText="{helpers:ResourceString Name=OmnibarPathModeTextPlaceholder}"
 				SuggestionItemsSource="{x:Bind ViewModel.PathModeSuggestionItems, Mode=OneWay}"
 				Text="{x:Bind ViewModel.PathText, Mode=TwoWay}"
@@ -382,7 +382,7 @@
 				x:Name="OmnibarCommandPaletteMode"
 				IconOnActive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Commands}, IsFilled=True}"
 				IconOnInactive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Commands}, IconType=Outline}"
-				ModeName="{helpers:ResourceString Name=CommandPalette}"
+				ModeName="{x:Bind Commands.OpenCommandPalette.LabelWithHotKey, Mode=OneWay}"
 				PlaceholderText="{helpers:ResourceString Name=OmnibarCommandPaletteModeTextPlaceholder}"
 				SuggestionItemsSource="{x:Bind ViewModel.OmnibarCommandPaletteModeSuggestionItems, Mode=OneWay}"
 				Text="{x:Bind ViewModel.OmnibarCommandPaletteModeText, Mode=TwoWay}"
@@ -425,7 +425,7 @@
 				x:Name="OmnibarSearchMode"
 				IconOnActive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Search}, IsFilled=True}"
 				IconOnInactive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Search}, IconType=Outline}"
-				ModeName="{helpers:ResourceString Name=Search}"
+				ModeName="{x:Bind Commands.Search.LabelWithHotKey, Mode=OneWay}"
 				PlaceholderText="{helpers:ResourceString Name=OmnibarSearchModeTextPlaceholder}" />
 
 		</controls:Omnibar>

src/Files.App/Utils/Cloud/CloudDrivesDetector.cs

@@ -91,16 +91,16 @@ private static Task<IEnumerable<ICloudProvider>> DetectGenericCloudDrive()
 						"ProtonDrive" => CloudProviders.ProtonDrive,
 						"kDrive" => CloudProviders.kDrive,
 						"Lucid" => CloudProviders.LucidLink,
+						"SyncCom" => CloudProviders.SyncDrive,
+						"MagentaCLOUD" => CloudProviders.MagentaCloud,
 						_ => null,
 					};
 
 					if (cloudProvider is null)
 						continue;
 
 					var nextCloudValue = (string?)namespaceSubKey?.GetValue(string.Empty);
-					var ownCloudValue = (string?)clsidSubKey?.GetValue(string.Empty);
-					var kDriveValue = (string?)clsidSubKey?.GetValue(string.Empty);
-					var lucidLinkValue = (string?)clsidSubKey?.GetValue(string.Empty);
+					var clsidDefaultValue = (string?)clsidSubKey?.GetValue(string.Empty);
 
 					using var defaultIconKey = clsidSubKey?.OpenSubKey(@"DefaultIcon");
 					var iconPath = (string?)defaultIconKey?.GetValue(string.Empty);
@@ -115,10 +115,12 @@ private static Task<IEnumerable<ICloudProvider>> DetectGenericCloudDrive()
 							CloudProviders.AppleCloudDrive => $"iCloud Drive",
 							CloudProviders.AppleCloudPhotos => $"iCloud Photos",
 							CloudProviders.AdobeCreativeCloud => $"Creative Cloud Files",
-							CloudProviders.ownCloud => !string.IsNullOrEmpty(ownCloudValue) ? ownCloudValue : "ownCloud",
+							CloudProviders.ownCloud => !string.IsNullOrEmpty(clsidDefaultValue) ? clsidDefaultValue : "ownCloud",
 							CloudProviders.ProtonDrive => $"Proton Drive",
-							CloudProviders.kDrive => !string.IsNullOrEmpty(kDriveValue) ? kDriveValue : "kDrive",
-							CloudProviders.LucidLink => !string.IsNullOrEmpty(lucidLinkValue) ? lucidLinkValue : "lucidLink",
+							CloudProviders.kDrive => !string.IsNullOrEmpty(clsidDefaultValue) ? clsidDefaultValue : "kDrive",
+							CloudProviders.LucidLink => !string.IsNullOrEmpty(clsidDefaultValue) ? clsidDefaultValue : "lucidLink",
+							CloudProviders.SyncDrive => !string.IsNullOrEmpty(clsidDefaultValue) ? clsidDefaultValue : "Sync",
+							CloudProviders.MagentaCloud => !string.IsNullOrEmpty(clsidDefaultValue) ? clsidDefaultValue : "MagentaCLOUD",
 							_ => null
 						},
 						SyncFolder = syncedFolder,
@@ -349,6 +351,8 @@ private static string GetDriveType(string driveIdentifier, RegistryKey? namespac
 				return "ownCloud";
 			if (driveIdentifier.StartsWith("ProtonDrive"))
 				return "ProtonDrive";
+			if (driveIdentifier.StartsWith("SyncCom"))
+				return "SyncCom";
 
 			// Nextcloud specific
 			var appNameFromNamespace = (string?)namespaceSubKey?.GetValue("ApplicationName");

src/Files.App/Utils/Cloud/CloudProviders.cs

@@ -45,6 +45,10 @@ public enum CloudProviders
 
 		LucidLink,
 
-		kDrive
+		kDrive,
+
+		SyncDrive,
+
+		MagentaCloud
 	}
 }