From 433edb4790592c896d4e52862f59dab2854b5093 Mon Sep 17 00:00:00 2001 From: Heiko <61519853+htcfreek@users.noreply.github.com> Date: Tue, 8 Aug 2023 20:33:11 +0200 Subject: [PATCH] [PTRun][Settings plugin]Update device and bluetooth results (#27823) * update settings list json * add strings * fix bthprops command --- .../Properties/Resources.Designer.cs | 54 +++++++++++++++++++ .../Properties/Resources.resx | 20 +++++++ .../WindowsSettings.json | 32 +++++++++-- 3 files changed, 102 insertions(+), 4 deletions(-) diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Properties/Resources.Designer.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Properties/Resources.Designer.cs index b4264cb128..c51facb076 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Properties/Resources.Designer.cs +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Properties/Resources.Designer.cs @@ -150,6 +150,15 @@ namespace Microsoft.PowerToys.Run.Plugin.WindowsSettings.Properties { } } + /// + /// Looks up a localized string similar to Add devices. + /// + internal static string AddDevices { + get { + return ResourceManager.GetString("AddDevices", resourceCulture); + } + } + /// /// Looks up a localized string similar to Add Hardware. /// @@ -393,6 +402,15 @@ namespace Microsoft.PowerToys.Run.Plugin.WindowsSettings.Properties { } } + /// + /// Looks up a localized string similar to Bluetooth & devices. + /// + internal static string AreaBluetoothAndDevices11 { + get { + return ResourceManager.GetString("AreaBluetoothAndDevices11", resourceCulture); + } + } + /// /// Looks up a localized string similar to Clock and Region. /// @@ -753,6 +771,15 @@ namespace Microsoft.PowerToys.Run.Plugin.WindowsSettings.Properties { } } + /// + /// Looks up a localized string similar to Bluetooth and other devices. + /// + internal static string BluetoothAndDevices10 { + get { + return ResourceManager.GetString("BluetoothAndDevices10", resourceCulture); + } + } + /// /// Looks up a localized string similar to Bluetooth devices. /// @@ -1311,6 +1338,15 @@ namespace Microsoft.PowerToys.Run.Plugin.WindowsSettings.Properties { } } + /// + /// Looks up a localized string similar to Devices. + /// + internal static string Devices { + get { + return ResourceManager.GetString("Devices", resourceCulture); + } + } + /// /// Looks up a localized string similar to Devices and printers. /// @@ -2157,6 +2193,15 @@ namespace Microsoft.PowerToys.Run.Plugin.WindowsSettings.Properties { } } + /// + /// Looks up a localized string similar to Manage devices. + /// + internal static string ManageDevices { + get { + return ResourceManager.GetString("ManageDevices", resourceCulture); + } + } + /// /// Looks up a localized string similar to Manage known networks. /// @@ -3210,6 +3255,15 @@ namespace Microsoft.PowerToys.Run.Plugin.WindowsSettings.Properties { } } + /// + /// Looks up a localized string similar to Phone Link. + /// + internal static string PhoneLink { + get { + return ResourceManager.GetString("PhoneLink", resourceCulture); + } + } + /// /// Looks up a localized string similar to Picture. /// diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Properties/Resources.resx b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Properties/Resources.resx index e3837eb792..abe0c86962 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Properties/Resources.resx +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Properties/Resources.resx @@ -157,6 +157,9 @@ Activity history Area Privacy + + Add devices + Add Hardware Area Control Panel (legacy settings) @@ -257,6 +260,10 @@ Apps + + Bluetooth & devices + Area Bluetooth&Devices in Win11 Settings app + Clock and Region @@ -394,6 +401,10 @@ Bluetooth Area Device + + Bluetooth and other devices + Page Bluetooth and devices in Win10 Settings app + Bluetooth devices Area Control Panel (legacy settings) @@ -623,6 +634,9 @@ Device Manager Name of MMC Snap-In. + + Devices + Devices and printers Area Control Panel (legacy settings) @@ -978,6 +992,9 @@ main.cpl File name, Should not translated + + Manage devices + Manage known networks Area NetworkAndInternet @@ -1391,6 +1408,9 @@ Phone - Default apps Area System + + Phone Link + Picture diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/WindowsSettings.json b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/WindowsSettings.json index 0f5412f463..c7a1a8e950 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/WindowsSettings.json +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/WindowsSettings.json @@ -183,10 +183,26 @@ "Command": "ms-settings:autoplay" }, { - "Name": "Bluetooth", + "Name": "BluetoothAndDevices10", "Areas": [ "AreaDevices" ], "Type": "AppSettingsApp", - "Command": "ms-settings:bluetooth" + "Command": "ms-settings:bluetooth", + "DeprecatedInBuild": 22000 + }, + { + "Name": "Devices", + "Areas": [ "AreaBluetoothAndDevices11" ], + "Type": "AppSettingsApp", + "Command": "ms-settings:bluetooth", + "AltNames": ["ManageDevices", "AddDevices", "BluetoothDevices"], + "IntroducedInBuild": 22000 + }, + { + "Name": "AreaBluetoothAndDevices11", + "Type": "AppSettingsApp", + "Command": "ms-settings:devices", + "AltNames": ["Devices", "BluetoothDevices", "PrintersAndScanners", "PhoneLink", "Camera", "Mouse", "Touchpad", "PenAndWindowsInk", "AutoPlay", "Usb"], + "IntroducedInBuild": 22000 }, { "Name": "ConnectedDevices", @@ -1334,7 +1350,7 @@ "Name": "BluetoothDevices", "Areas": [ "AreaHardwareAndSound", "bthprops.cpl" ], "Type": "AppControlPanel", - "Command": "control /name Microsoft.BluetoothDevices" + "Command": "control /bthprops.cpl" }, { "Name": "ColorManagement", @@ -1386,7 +1402,15 @@ "Name": "DevicesAndPrinters", "Areas": [ "AreaHardwareAndSound" ], "Type": "AppControlPanel", - "Command": "control /name Microsoft.DevicesAndPrinters" + "Command": "control /name Microsoft.DevicesAndPrinters", + "DeprecatedInBuild": 22000 + }, + { + "Name": "DevicesAndPrinters", + "Areas": [ "AreaHardwareAndSound" ], + "Type": "AppControlPanel", + "Command": "explorer.exe shell:::{A8A91A66-3A7D-4424-8D24-04E180695C7A}", + "IntroducedInBuild": 22000 }, { "Name": "EaseOfAccessCenter",