From f6283dd94ffc01823c8ef3bd26ed74941f2176ff Mon Sep 17 00:00:00 2001 From: Stefan Markovic <57057282+stefansjfw@users.noreply.github.com> Date: Tue, 9 Jan 2024 18:24:48 +0100 Subject: [PATCH 01/18] 0.77 changelog (#30758) * Update release notes * Spellcheck * Spellcheck 2 * Address PR feedback * Update README.md Co-authored-by: Davide Giacometti * Udpate installer hashes * Fix missing Thanks in highlights --------- Co-authored-by: Jaime Bernardo Co-authored-by: Davide Giacometti --- README.md | 174 +++++++++++++++++++++--------------------------------- 1 file changed, 66 insertions(+), 108 deletions(-) diff --git a/README.md b/README.md index 110865b35c..f2eb5effdb 100644 --- a/README.md +++ b/README.md @@ -40,19 +40,19 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline Go to the [Microsoft PowerToys GitHub releases page][github-release-link] and click on `Assets` at the bottom to show the files available in the release. Please use the appropriate PowerToys installer that matches your machine's architecture and install scope. For most, it is `x64` and per-user. -[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=project%3Amicrosoft%2FPowerToys%2F50 -[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=project%3Amicrosoft%2FPowerToys%2F49 -[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.76.2/PowerToysUserSetup-0.76.2-x64.exe -[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.76.2/PowerToysUserSetup-0.76.2-arm64.exe -[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.76.2/PowerToysSetup-0.76.2-x64.exe -[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.76.2/PowerToysSetup-0.76.2-arm64.exe +[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=project%3Amicrosoft%2FPowerToys%2F51 +[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=project%3Amicrosoft%2FPowerToys%2F50 +[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.77.0/PowerToysUserSetup-0.77.0-x64.exe +[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.77.0/PowerToysUserSetup-0.77.0-arm64.exe +[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.77.0/PowerToysSetup-0.77.0-x64.exe +[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.77.0/PowerToysSetup-0.77.0-arm64.exe | Description | Filename | sha256 hash | |----------------|----------|-------------| -| Per user - x64 | [PowerToysUserSetup-0.76.2-x64.exe][ptUserX64] | 73D734FC34B3F9D7484081EC0F0B6ACD4789A55203A185904CC5C62ABD02AF16 | -| Per user - ARM64 | [PowerToysUserSetup-0.76.2-arm64.exe][ptUserArm64] | 5284CC5DA399DC37858A2FD260C30F20C484BA1B5616D0EB67CD90A8A286CB8B | -| Machine wide - x64 | [PowerToysSetup-0.76.2-x64.exe][ptMachineX64] | 72B87381C9E5C7447FB59D7CE478B3102C9CEE3C6EB3A6BC7EC7EC7D9EFAB2A0 | -| Machine wide - ARM64 | [PowerToysSetup-0.76.2-arm64.exe][ptMachineArm64] | F28C7DA377C25309775AB052B2B19A299C26C41582D05B95C3492A4A8C952BFE | +| Per user - x64 | [PowerToysUserSetup-0.77.0-x64.exe][ptUserX64] | 3485D3F45A3DE6ED7FA151A4CE9D6F941491C30E83AB51FD59B4ADCD20611F1A | +| Per user - ARM64 | [PowerToysUserSetup-0.77.0-arm64.exe][ptUserArm64] | 762DF383A01006A20C0BAB2D321667E855236EBA7108CDD475E4E2A8AB752E0E | +| Machine wide - x64 | [PowerToysSetup-0.77.0-x64.exe][ptMachineX64] | 1B6D4247313C289B07A3BF3531E215B3F9BEDBE9254919637F2AC502B4773C31 | +| Machine wide - ARM64 | [PowerToysSetup-0.77.0-arm64.exe][ptMachineArm64] | CF740B3AC0EB5C23E18B07ACC2D0C6EC5F4CE4B3A2EDC67C2C9FDF6EF78F0352 | This is our preferred method. @@ -98,154 +98,112 @@ For guidance on developing for PowerToys, please read the [developer docs](/doc/ Our [prioritized roadmap][roadmap] of features and utilities that the core team is focusing on. -### 0.76 - November 2023 Update +### 0.77 - December 2023 Update In this release, we focused on new features, stability and improvements. **Highlights** - - Upgrade to .NET 8. Thanks [@snickler](https://github.com/snickler)! - - Keyboard Manager can now remap keys and shortcuts to send sequences of unicode text. - - Modernized the Keyboard Manager Editor UI. Thanks [@dillydylann](https://github.com/dillydylann)! - - Modernized the PowerToys Run, Quick Accent and Text Extractor UIs. Thanks [@niels9001](https://github.com/niels9001)! - - New File Explorer Add-ons: QOI image Preview Handler and Thumbnail Provider. Thanks [@pedrolamas](https://github.com/pedrolamas)! + - New utility: Command Not Found PowerShell 7.4 module - adds the ability to detect failed commands in PowerShell 7.4 and suggest a package to install using winget. Thanks [@carlos-zamora](https://github.com/carlos-zamora)! + - Keyboard manager does not register low level hook if there are no remappings anymore. + - Added support for QOI file type in Peek. Thanks [@pedrolamas](https://github.com/pedrolamas)! + - Added support for loading 3rd-party plugins with additional dependencies in PowerToys Run. Thanks [@coreyH](https://github.com/CoreyHayward)! ### General - - Updated the WebView 2 dependency to 1.0.2088.41. Thanks [@davidegiacometti](https://github.com/davidegiacometti)! - - Fixed unreadable color brushes used across WinUI3 applications for improved accessibility. Thanks [@niels9001](https://github.com/niels9001)! - - Flyouts used across WinUI3 applications are no longer constrained to the application's bounds. Thanks [@Jay-o-Way](https://github.com/Jay-o-Way)! - - Upgraded the WPF-UI dependency to preview.9 and then preview.11. Thanks [@niels9001](https://github.com/niels9001) and [@pomianowski](https://github.com/pomianowski)! - - Upgraded to .NET 8. Thanks [@snickler](https://github.com/snickler)! - - Updated the WinAppSDK dependency to 1.4.3. -### Awake + - Bump WPF-UI package version to fix crashes related to theme changes. (This was a hotfix for 0.76) + - Fixed typo in version change notification. Thanks [@PesBandi](https://github.com/PesBandi)! + - Code improvements and fixed silenced warnings introduced by upgrade to .NET 8. + - Update copyright year for 2024. + - Added setting to disable warning notifications about detecting an application running as Administrator. - - Added localization to the tray icon context menu. +### AlwaysOnTop -### Crop And Lock + - Show notification when elevated app is in the foreground but AlwaysOnTop is running non-elevated. - - Fixed restoring windows that were reparented while maximized. +### Command Not Found + + - Added a new utility: A Command Not Found PowerShell 7.4 module. It adds the ability to detect failed commands in PowerShell 7.4 and suggest a package to install using winget. Thanks [@carlos-zamora](https://github.com/carlos-zamora)! ### Environment Variables - - Fixed crash caused by WinAppSDK version bump by replacing ListView elements with ItemsControl. + - Fixed issue causing Environment Variables window not to appear as a foreground window. ### FancyZones - - Reverted a change that caused some applications, like the Windows Calculator, to not snap correctly. (This was a hotfix for 0.75) - - FancyZones Editor will no longer apply a layout to the current monitor after editing it. - - Fixed and refactored the code that detected if a window can be snapped. Added tests to it with known application window styles to avoid regressions in the future. + - Fixed snapping specific apps (e.g. Facebook messenger). (This was a hotfix for 0.76) + - Fixed behavior of Move newly created windows to current active monitor setting to keep maximize state on moving. Thanks [@quyenvsp](https://github.com/quyenvsp)! + - Fixed issue causing FancyZones Editor layout window to be zoned. ### File Explorer add-ons - - Solved an issue incorrectly detecting encoding when previewing code files preview. - - Fixed the background color for Gcode preview handler on dark theme. Thanks [@pedrolamas](https://github.com/pedrolamas)! - - New utilities: Preview Handler and Thumbnail Provider for QOI image files. Thanks [@pedrolamas](https://github.com/pedrolamas)! - - GCode Thumbnails are now in the 32 bit ARGB format. Thanks [@pedrolamas](https://github.com/pedrolamas)! - - Added the perceived type to SVG and QOI file thumbnails. Thanks [@pedrolamas](https://github.com/pedrolamas)! - -### GPO - - - Added the missing Environment Variables utility policy to the .admx and .adml files. (This was a hotfix for 0.75) - - Fixed some typos and text improvements in the .adml file. Thanks [@htcfreek](https://github.com/htcfreek)! + - Fixed WebView2 based previewers issue caused by the latest WebView update. (This was a hotfix for 0.76) ### Hosts File Editor - - Added a proper warning when the hosts file is read-only and a button to make it writable. Thanks [@davidegiacometti](https://github.com/davidegiacometti)! + - Fixed issue causing settings not to be preserved on update. ### Image Resizer - - - Fixed a WPF-UI issue regarding the application's background brushes. Thanks [@niels9001](https://github.com/niels9001)! -### Installer - - - Included the Text Extractor and Awake localization files in the install process. + - Fixed crash caused by WpfUI ThemeWatcher. (This was a hotfix for 0.76) ### Keyboard Manager - - Modernized the UI with the Fluent design. Thanks [@dillydylann](https://github.com/dillydylann)! - - Added the feature to remap keys and shortcuts to arbitrary unicode text sequences. - -### Mouse Without Borders - - - Removed Thread.Suspend calls when exiting the utility. That call is deprecated, unneeded and was causing a silent crash. + - Do not register low level hook if there are no remappings. ### Peek - - Added the possibility to pause/resume videos with the space bar. Thanks [@davidegiacometti](https://github.com/davidegiacometti)! - - Fixed high CPU usage when idle before initializing the main window. Thanks [@davidegiacometti](https://github.com/davidegiacometti)! - - Implemented Ctrl+W as a shortcut to close Peek. Thanks [@Physalis2](https://github.com/Physalis2)! - - Solved an issue incorrectly detecting encoding when previewing code files. - - Fixed background issues when peeking into HTML files after the WebView 2 upgrade. + - Improved icon and title showing for previewed files. Thanks [@davidegiacometti](https://github.com/davidegiacometti)! + - Added QOI file type support. Thanks [@pedrolamas](https://github.com/pedrolamas)! ### PowerToys Run - - Moved to WPF-UI and redesigned according to Fluent UX principles. Thanks [@niels9001](https://github.com/niels9001)! - - Fixed an issue causing 3rd party plugins to not have their custom settings correctly initialized with default values. (This was a hotfix for 0.75) Thanks [@waaverecords](https://github.com/waaverecords)! - - Fixed a crash in the VSCode plugin when the VSCode path had trailing backspaces. Thanks [@davidegiacometti](https://github.com/davidegiacometti)! - - Fixed a crash when trying to load invalid image icons. - - Fixed a crash in the Programs plugin when getting images for some .lnk files. - - Fixed a rare startup initialization error and removed cold start operations that were no longer needed. Thanks [@davidegiacometti](https://github.com/davidegiacometti)! - - Improved calculations for Windows File Time and Unix Epoch Time in the DateTime plugin. Thanks [@htcfreek](https://github.com/htcfreek)! - - Fixed a crash when trying to get the icon for a link that pointed to no file. - - Cleaned up code in the WindowWalker plugin improving the logic. Thanks [@davidegiacometti](https://github.com/davidegiacometti)! + - Fixed results list UI element height for different maximum number of results value. (This was a hotfix for 0.76) + - Fixed icon extraction for .lnk files. (This was a hotfix for 0.76) + - Fixed search box UI glitch when FlowDirection is RightToLeft. (This was a hotfix for 0.76) + - Fixed theme setting. (This was a hotfix for 0.76) + - Fixed error reporting window UI issue. Thanks [@niels9001](https://github.com/niels9001)! + - UI improvements and ability to show/hide plugins overview panel. Thanks [@niels9001](https://github.com/niels9001)! + - Allow interaction with plugin hints. Thanks [@davidegiacometti](https://github.com/davidegiacometti)! + - Switch to WPF-UI theme manager. Thanks [@davidegiacometti](https://github.com/davidegiacometti)! + - Fixed issue causing 3rd party plugin's dependencies dll not being loaded properly. Thanks [@coreyH](https://github.com/CoreyHayward)! + - Added configurable font sizes. Thanks [@niels9001](https://github.com/niels9001)! + - Changed the text color of plugin hints to improve the contrast when light theme is used. Thanks [@davidegiacometti](https://github.com/davidegiacometti)! + - Fix scientific notation errors in Calculator plugin. Thanks [@viggyd](https://github.com/viggyd)! + - Add URI/URL features to Value generator plugin. Thanks [@htcfreek](https://github.com/htcfreek)! ### Quick Accent - - Moved from ModernWPF to WPF-UI. Thanks [@niels9001](https://github.com/niels9001)! - - Added support to the Finnish language character set. Thanks [@davidtlascelles](https://github.com/davidtlascelles)! - - Added currency symbols for Croatian, Gaeilge, Gàidhlig and Welsh. Thanks [@PesBandi](https://github.com/PesBandi)! - - Added a missing Latin letter ꝡ. Thanks [@cubedhuang](https://github.com/cubedhuang)! - - Added fraction characters. Thanks [@PesBandi](https://github.com/PesBandi)! - - Added support to the Danish language character set. Thanks [@PesBandi](https://github.com/PesBandi)! - - Added the Kazakhstani Tenge character to the Currencies characters set. Thanks [@PesBandi](https://github.com/PesBandi)! - - Renamed Slovakian to Slovak, which is the correct term. Thanks [@PesBandi](https://github.com/PesBandi)! - - Added the Greek language character set. Thanks [@mcbabo](https://github.com/mcbabo)! + - Moved Greek specific characters from All language set to Greek. Thanks [@Aaron-Junker](https://github.com/Aaron-Junker)! + - Add more mathematical symbols. Thanks [@kevinfu2](https://github.com/kevinfu2)! ### Settings - - When clicking a module's name on the Dashboard, it will navigate to that module's page. - - Fixed the clipping of information in the Backup and Restore section of the General Settings page. Thanks [@niels9001](https://github.com/niels9001)! - - Updated the File Explorer Add-ons fluent icon. Thanks [@niels9001](https://github.com/niels9001)! - - Added a warning when trying to set a shortcut that might conflict with "Alt Gr" key combinations. - - Added a direct link to the OOBE's "What's New page" from the main Settings window. Thanks [@iakrayna](https://github.com/iakrayna)! - - Changed mentions from Microsoft Docs to Microsoft Learn. - - Fixed the slow reaction to system theme changes. - -### Text Extractor - - - Move to WPF-UI, localization and light theme support. Thanks [@niels9001](https://github.com/niels9001)! - - Disabled by default on Windows 11, with a information box on Settings to prefer using the Windows Snipping Tool, which now supports OCR. + - Fixed exception occurring on theme change. + - Fix "What's new" icon. Thanks [@niels9001](https://github.com/niels9001)! + - Remove obsolete UI Font icon properties. Thanks [@Jay-o-Way](https://github.com/Jay-o-Way)! + - OOBE UI improvements. Thanks [@Jay-o-Way](https://github.com/Jay-o-Way)! + - XAML Binding improvements. Thanks [@Jay-o-Way](https://github.com/Jay-o-Way)! + - Fixed crash caused by ThemeListener constructor exceptions. ### Documentation - - Fixed some typos in the README. Thanks [@Asymtode712](https://github.com/Asymtode712)! - - Reworked the gpo docs on learn.microsoft.com, adding .admx, registry and Intune information. Thanks [@htcfreek](https://github.com/htcfreek)! + - Improved docs for adding new languages to monaco. Thanks [@PesBandi](https://github.com/PesBandi)! + - Update README.md to directly state x64 & ARM processor in requirements. + - Added Scoop plugin to PowerToys Run thirdPartyRunPlugins.md docs. Thanks [@Quriz](https://github.com/Quriz)! ### Development - - Updated the check-spelling ci action to 0.22. Thanks [@jsoref](https://github.com/jsoref)! - - Refactored the modules data model used between the Settings Dashboard and Flyout. - - Fixed a flaky interop test that was causing automated CI to hang occasionally. - - Increased the WebView 2 loading timeout to reduce flakiness in those tests. Thanks [@davidegiacometti](https://github.com/davidegiacometti)! - - Added support for building with the Dev Drive CopyOnWrite feature, increasing build speed. Thanks [@pedrolamas](https://github.com/pedrolamas)! - - Addressed the C# static analyzers suggestions. Thanks [@davidegiacometti](https://github.com/davidegiacometti)! - - Addressed the C++ static analyzers suggestions. - - PRs that only contain Markdown or text files changes no longer trigger the full CI. Thanks [@snickler](https://github.com/snickler)! - - Updated the Microsoft.Windows.CsWinRT to 2.0.4 to fix building with the official Visual Studio 17.8 release. - - Fixed new code quality issues caught by the official Visual Studio 17.8 release. - - Added a bot trigger to point contributors to the main new contribution issue on GitHub. Thanks [@Aaron-Junker](https://github.com/Aaron-Junker)! - - Removed unneeded entries from expect.txt. - - Turned off a new feature from Visual Studio that was adding the commit hash to the binary files Product Version. - - Refactored and reviewed the spellcheck entries into different files. Thanks [@Jay-o-Way](https://github.com/Jay-o-Way)! - - Added Spectre mitigation and SHA256 hash creation for some DLLs. - - Reverted the release pipeline template to a previous release that's stable for shipping PowerToys. + - Adopted XamlStyler for PowerToys Run source code. Thanks [@davidegiacometti](https://github.com/davidegiacometti)! + - Consolidate Microsoft.Windows.SDK.BuildTools across solution. + - Upgraded Boost's lib to v1.84. + - Upgraded HelixToolkit packages to the latest versions. + - Updated sdl baselines. -#### What is being planned for version 0.77 +#### What is being planned for version 0.78 -For [v0.77][github-next-release-work], we'll work on the items below: +For [v0.78][github-next-release-work], we'll work on the items below: - - New utility: Command Not Found - Language selection - Automated UI testing through WinAppDriver - Develop support for Desired State Configuration From 8bdbeb41d4fe143425648c153c06049d1865380e Mon Sep 17 00:00:00 2001 From: Clint Rutkas Date: Tue, 9 Jan 2024 16:23:29 -0800 Subject: [PATCH 02/18] Update README.md (#30840) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f2eb5effdb..4d8e8276d7 100644 --- a/README.md +++ b/README.md @@ -174,7 +174,7 @@ In this release, we focused on new features, stability and improvements. ### Quick Accent - - Moved Greek specific characters from All language set to Greek. Thanks [@Aaron-Junker](https://github.com/Aaron-Junker)! + - Moved Greek specific characters from All language set to Greek. Thanks [@PesBandi](https://github.com/PesBandi)! - Add more mathematical symbols. Thanks [@kevinfu2](https://github.com/kevinfu2)! ### Settings From 50b24d0779a98719bc95393b9b237349c17e9cc0 Mon Sep 17 00:00:00 2001 From: Jaime Bernardo Date: Thu, 11 Jan 2024 16:11:32 +0000 Subject: [PATCH 03/18] [Deps]Fix .NET 8.0.1 dependency version conflicts (#30892) * Fix System.Drawing.Common version conflicts * Fix System.Data.OleDb dependencies * Fix System.Diagnostics.EventLog dll version incompatibility * Fix System.CodeDom dll version incompatibility * Update NOTICE.md --- Directory.Packages.props | 7 ++++- NOTICE.md | 7 ++++- .../Hosts/Hosts.Tests/Hosts.Tests.csproj | 8 ++++++ .../MouseJumpUI.UnitTests.csproj | 4 +++ .../UnitTest-ColorPickerUI.csproj | 8 ++++++ .../UnitTests-FancyZonesEditor.csproj | 4 +++ .../tests/ImageResizerUITest.csproj | 4 +++ ....PowerToys.Run.Plugin.UnitConverter.csproj | 8 ++++++ ...werToys.Run.Plugin.VSCodeWorkspaces.csproj | 8 ++++++ ...PowerToys.Run.Plugin.ValueGenerator.csproj | 11 ++++++++ ...nity.PowerToys.Run.Plugin.WebSearch.csproj | 11 ++++++++ .../Microsoft.Plugin.Folder.csproj | 8 ++++++ .../Microsoft.Plugin.Indexer.csproj | 20 ++++++++++++++ .../Microsoft.Plugin.Program.csproj | 13 ++++++++- .../Microsoft.Plugin.Shell.csproj | 11 ++++++++ .../Microsoft.Plugin.Uri.csproj | 11 ++++++++ .../Microsoft.Plugin.WindowWalker.csproj | 11 ++++++++ ...oft.PowerToys.Run.Plugin.Calculator.csproj | 8 ++++++ ...rosoft.PowerToys.Run.Plugin.History.csproj | 27 +++++++++++++++++++ ...rosoft.PowerToys.Run.Plugin.OneNote.csproj | 8 ++++++ ...soft.PowerToys.Run.Plugin.PowerToys.csproj | 8 ++++++ ...osoft.PowerToys.Run.Plugin.Registry.csproj | 11 ++++++++ ...rosoft.PowerToys.Run.Plugin.Service.csproj | 8 ++++++ ...crosoft.PowerToys.Run.Plugin.System.csproj | 11 ++++++++ ...osoft.PowerToys.Run.Plugin.TimeDate.csproj | 11 ++++++++ ...owerToys.Run.Plugin.WindowsSettings.csproj | 11 ++++++++ ...owerToys.Run.Plugin.WindowsTerminal.csproj | 11 ++++++++ .../PowerLauncher/PowerLauncher.csproj | 7 +++++ .../Wox.Infrastructure.csproj | 19 ++++++++++++- .../launcher/Wox.Plugin/Wox.Plugin.csproj | 8 ++++++ src/modules/launcher/Wox.Test/Wox.Test.csproj | 24 +++++++++++++++++ .../Settings.UI.UnitTests.csproj | 8 ++++++ 32 files changed, 330 insertions(+), 4 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 9ac2c6d6e8..c529d1cd4e 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -37,6 +37,7 @@ + @@ -59,17 +60,21 @@ + - + + + + diff --git a/NOTICE.md b/NOTICE.md index ca21dfc79c..b8b9a82f4a 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -1325,6 +1325,7 @@ EXHIBIT A -Mozilla Public License. - Microsoft.NET.Test.Sdk 17.6.3 - Microsoft.Toolkit.Uwp.Notifications 7.1.2 - Microsoft.Web.WebView2 1.0.2088.41 +- Microsoft.Win32.SystemEvents 8.0.0 - Microsoft.Windows.Compatibility 8.0.0 - Microsoft.Windows.CsWin32 0.2.46-beta - Microsoft.Windows.CsWinRT 2.0.4 @@ -1343,17 +1344,21 @@ EXHIBIT A -Mozilla Public License. - SharpCompress 0.33.0 - StreamJsonRpc 2.14.24 - StyleCop.Analyzers 1.2.0-beta.507 +- System.CodeDom 8.0.0 - System.CommandLine 2.0.0-beta4.22272.1 - System.ComponentModel.Composition 8.0.0 - System.Configuration.ConfigurationManager 8.0.0 - System.Data.OleDb 8.0.0 -- System.Drawing.Common 8.0.0 +- System.Diagnostics.EventLog 8.0.0 +- System.Diagnostics.PerformanceCounter 8.0.0 +- System.Drawing.Common 8.0.1 - System.IO.Abstractions 17.2.3 - System.IO.Abstractions.TestingHelpers 17.2.3 - System.Management 8.0.0 - System.Management.Automation 7.4.0 - System.Reactive 6.0.0-preview.9 - System.Runtime.Caching 8.0.0 +- System.Security.Cryptography.ProtectedData 8.0.0 - System.ServiceProcess.ServiceController 8.0.0 - System.Text.Encoding.CodePages 8.0.0 - UnicodeInformation 2.6.0 diff --git a/src/modules/Hosts/Hosts.Tests/Hosts.Tests.csproj b/src/modules/Hosts/Hosts.Tests/Hosts.Tests.csproj index c4ee03077a..3e789295e5 100644 --- a/src/modules/Hosts/Hosts.Tests/Hosts.Tests.csproj +++ b/src/modules/Hosts/Hosts.Tests/Hosts.Tests.csproj @@ -22,6 +22,14 @@ + + + runtime + + + + runtime + diff --git a/src/modules/MouseUtils/MouseJumpUI.UnitTests/MouseJumpUI.UnitTests.csproj b/src/modules/MouseUtils/MouseJumpUI.UnitTests/MouseJumpUI.UnitTests.csproj index 86100f4a8d..66b91f1443 100644 --- a/src/modules/MouseUtils/MouseJumpUI.UnitTests/MouseJumpUI.UnitTests.csproj +++ b/src/modules/MouseUtils/MouseJumpUI.UnitTests/MouseJumpUI.UnitTests.csproj @@ -22,6 +22,10 @@ + + + runtime + diff --git a/src/modules/colorPicker/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj b/src/modules/colorPicker/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj index 009be36014..8219d398c6 100644 --- a/src/modules/colorPicker/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj +++ b/src/modules/colorPicker/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj @@ -22,6 +22,14 @@ + + + runtime + + + + runtime + diff --git a/src/modules/fancyzones/UnitTests-FancyZonesEditor/UnitTests-FancyZonesEditor.csproj b/src/modules/fancyzones/UnitTests-FancyZonesEditor/UnitTests-FancyZonesEditor.csproj index 8d1972207f..750c3a8c6e 100644 --- a/src/modules/fancyzones/UnitTests-FancyZonesEditor/UnitTests-FancyZonesEditor.csproj +++ b/src/modules/fancyzones/UnitTests-FancyZonesEditor/UnitTests-FancyZonesEditor.csproj @@ -20,6 +20,10 @@ + + + runtime + diff --git a/src/modules/imageresizer/tests/ImageResizerUITest.csproj b/src/modules/imageresizer/tests/ImageResizerUITest.csproj index cbcfa6aed7..b0839981e6 100644 --- a/src/modules/imageresizer/tests/ImageResizerUITest.csproj +++ b/src/modules/imageresizer/tests/ImageResizerUITest.csproj @@ -56,5 +56,9 @@ + + + runtime + diff --git a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter/Community.PowerToys.Run.Plugin.UnitConverter.csproj b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter/Community.PowerToys.Run.Plugin.UnitConverter.csproj index 9d81ee857e..99c7afcafc 100644 --- a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter/Community.PowerToys.Run.Plugin.UnitConverter.csproj +++ b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter/Community.PowerToys.Run.Plugin.UnitConverter.csproj @@ -45,6 +45,14 @@ + + + runtime + + + + runtime + diff --git a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Community.PowerToys.Run.Plugin.VSCodeWorkspaces.csproj b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Community.PowerToys.Run.Plugin.VSCodeWorkspaces.csproj index 52a1b4b1e0..1f686fab7e 100644 --- a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Community.PowerToys.Run.Plugin.VSCodeWorkspaces.csproj +++ b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/Community.PowerToys.Run.Plugin.VSCodeWorkspaces.csproj @@ -41,6 +41,14 @@ + + + runtime + + + + runtime + diff --git a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Community.PowerToys.Run.Plugin.ValueGenerator.csproj b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Community.PowerToys.Run.Plugin.ValueGenerator.csproj index fde3e7f4ab..80fb46deea 100644 --- a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Community.PowerToys.Run.Plugin.ValueGenerator.csproj +++ b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.ValueGenerator/Community.PowerToys.Run.Plugin.ValueGenerator.csproj @@ -36,6 +36,17 @@ + + + + runtime + + + + runtime + + + PreserveNewest diff --git a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.WebSearch/Community.PowerToys.Run.Plugin.WebSearch.csproj b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.WebSearch/Community.PowerToys.Run.Plugin.WebSearch.csproj index f5740c38dd..fb6c164ad4 100644 --- a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.WebSearch/Community.PowerToys.Run.Plugin.WebSearch.csproj +++ b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.WebSearch/Community.PowerToys.Run.Plugin.WebSearch.csproj @@ -37,6 +37,17 @@ + + + + runtime + + + + runtime + + + PreserveNewest diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Microsoft.Plugin.Folder.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Microsoft.Plugin.Folder.csproj index 384b278b2d..9f003281f3 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Microsoft.Plugin.Folder.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Microsoft.Plugin.Folder.csproj @@ -54,6 +54,14 @@ + + + runtime + + + + runtime + diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj index bf3b3cb1ee..43e1920f46 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj @@ -30,6 +30,26 @@ + + + runtime + + + + runtime + + + + runtime + + + + runtime + + + + runtime + diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Microsoft.Plugin.Program.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Microsoft.Plugin.Program.csproj index c334a5876b..4507376b06 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Microsoft.Plugin.Program.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Microsoft.Plugin.Program.csproj @@ -45,7 +45,18 @@ false - + + + + + runtime + + + + runtime + + + PreserveNewest diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Microsoft.Plugin.Shell.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Microsoft.Plugin.Shell.csproj index b8218ad90f..7e16361c9c 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Microsoft.Plugin.Shell.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Microsoft.Plugin.Shell.csproj @@ -40,6 +40,17 @@ + + + + runtime + + + + runtime + + + PreserveNewest diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Uri/Microsoft.Plugin.Uri.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Uri/Microsoft.Plugin.Uri.csproj index cff4db6b21..dc10119fe0 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Uri/Microsoft.Plugin.Uri.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Uri/Microsoft.Plugin.Uri.csproj @@ -37,6 +37,17 @@ + + + + runtime + + + + runtime + + + PreserveNewest diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Microsoft.Plugin.WindowWalker.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Microsoft.Plugin.WindowWalker.csproj index cbb35f51c2..5077812e5c 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Microsoft.Plugin.WindowWalker.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Microsoft.Plugin.WindowWalker.csproj @@ -43,6 +43,17 @@ + + + + runtime + + + + runtime + + + True diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Microsoft.PowerToys.Run.Plugin.Calculator.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Microsoft.PowerToys.Run.Plugin.Calculator.csproj index 62b691a493..cb639ef60e 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Microsoft.PowerToys.Run.Plugin.Calculator.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Microsoft.PowerToys.Run.Plugin.Calculator.csproj @@ -45,6 +45,14 @@ + + + runtime + + + + runtime + diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.History/Microsoft.PowerToys.Run.Plugin.History.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.History/Microsoft.PowerToys.Run.Plugin.History.csproj index 31ba17e106..d1d5af5918 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.History/Microsoft.PowerToys.Run.Plugin.History.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.History/Microsoft.PowerToys.Run.Plugin.History.csproj @@ -52,6 +52,33 @@ + + runtime + + + + runtime + + + + runtime + + + + runtime + + + + runtime + + + + runtime + + + + runtime + diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.OneNote/Microsoft.PowerToys.Run.Plugin.OneNote.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.OneNote/Microsoft.PowerToys.Run.Plugin.OneNote.csproj index 06c24f5007..9a882257ff 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.OneNote/Microsoft.PowerToys.Run.Plugin.OneNote.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.OneNote/Microsoft.PowerToys.Run.Plugin.OneNote.csproj @@ -53,6 +53,14 @@ runtime; build; native; contentfiles; analyzers; buildtransitive + + + runtime + + + + runtime + diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.PowerToys/Microsoft.PowerToys.Run.Plugin.PowerToys.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.PowerToys/Microsoft.PowerToys.Run.Plugin.PowerToys.csproj index f56985e9ff..057a41460d 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.PowerToys/Microsoft.PowerToys.Run.Plugin.PowerToys.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.PowerToys/Microsoft.PowerToys.Run.Plugin.PowerToys.csproj @@ -49,6 +49,14 @@ + + + runtime + + + + runtime + diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Registry/Microsoft.PowerToys.Run.Plugin.Registry.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Registry/Microsoft.PowerToys.Run.Plugin.Registry.csproj index 6a95fe6800..b59ea0d6f7 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Registry/Microsoft.PowerToys.Run.Plugin.Registry.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Registry/Microsoft.PowerToys.Run.Plugin.Registry.csproj @@ -34,6 +34,17 @@ + + + + runtime + + + + runtime + + + PreserveNewest diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Service/Microsoft.PowerToys.Run.Plugin.Service.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Service/Microsoft.PowerToys.Run.Plugin.Service.csproj index 1e22a25ae2..7b9bde7411 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Service/Microsoft.PowerToys.Run.Plugin.Service.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Service/Microsoft.PowerToys.Run.Plugin.Service.csproj @@ -34,6 +34,14 @@ + + + runtime + + + + runtime + diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Microsoft.PowerToys.Run.Plugin.System.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Microsoft.PowerToys.Run.Plugin.System.csproj index 26b17adf3c..56843e6d81 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Microsoft.PowerToys.Run.Plugin.System.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Microsoft.PowerToys.Run.Plugin.System.csproj @@ -33,6 +33,17 @@ + + + + runtime + + + + runtime + + + PreserveNewest diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Microsoft.PowerToys.Run.Plugin.TimeDate.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Microsoft.PowerToys.Run.Plugin.TimeDate.csproj index e6b18cf4a9..a6b86ea8d9 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Microsoft.PowerToys.Run.Plugin.TimeDate.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Microsoft.PowerToys.Run.Plugin.TimeDate.csproj @@ -33,6 +33,17 @@ + + + + runtime + + + + runtime + + + PreserveNewest diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Microsoft.PowerToys.Run.Plugin.WindowsSettings.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Microsoft.PowerToys.Run.Plugin.WindowsSettings.csproj index b463d5d77e..bf0bde3415 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Microsoft.PowerToys.Run.Plugin.WindowsSettings.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsSettings/Microsoft.PowerToys.Run.Plugin.WindowsSettings.csproj @@ -42,6 +42,17 @@ + + + + runtime + + + + runtime + + + PreserveNewest diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsTerminal/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsTerminal/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.csproj index 3728ab8e30..7bd545a21e 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsTerminal/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.csproj +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.WindowsTerminal/Microsoft.PowerToys.Run.Plugin.WindowsTerminal.csproj @@ -33,6 +33,17 @@ + + + + runtime + + + + runtime + + + PreserveNewest diff --git a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj index 56d463e9f3..90c91ea27d 100644 --- a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj +++ b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj @@ -81,6 +81,9 @@ + + runtime + @@ -88,6 +91,10 @@ + + + runtime + diff --git a/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj b/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj index f145197420..ec105cc0b7 100644 --- a/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj +++ b/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj @@ -15,6 +15,13 @@ ..\..\..\..\$(Platform)\$(Configuration)\WoxInfrastructure + + win-x64 + + + win-arm64 + + true DEBUG;TRACE @@ -43,7 +50,17 @@ - + + + runtime + + + + runtime + + + runtime + \ No newline at end of file diff --git a/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj b/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj index d8feef2270..03204ca6cd 100644 --- a/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj +++ b/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj @@ -51,6 +51,14 @@ + + + runtime + + + + runtime + diff --git a/src/modules/launcher/Wox.Test/Wox.Test.csproj b/src/modules/launcher/Wox.Test/Wox.Test.csproj index eb518a2301..c46792ea1d 100644 --- a/src/modules/launcher/Wox.Test/Wox.Test.csproj +++ b/src/modules/launcher/Wox.Test/Wox.Test.csproj @@ -54,6 +54,30 @@ + + + runtime + + + + runtime + + + + runtime + + + + runtime + + + + runtime + + + + runtime + diff --git a/src/settings-ui/Settings.UI.UnitTests/Settings.UI.UnitTests.csproj b/src/settings-ui/Settings.UI.UnitTests/Settings.UI.UnitTests.csproj index 17b5681ffc..7b24f07257 100644 --- a/src/settings-ui/Settings.UI.UnitTests/Settings.UI.UnitTests.csproj +++ b/src/settings-ui/Settings.UI.UnitTests/Settings.UI.UnitTests.csproj @@ -39,6 +39,14 @@ + + + runtime + + + + runtime + From 1477983ee74f72b8af8939720e84abf0d2458f96 Mon Sep 17 00:00:00 2001 From: Davide Giacometti Date: Fri, 12 Jan 2024 13:03:01 +0100 Subject: [PATCH 04/18] [PTRun]Remove unused settings from code (#30865) --- .../UserSettings/CustomPluginHotkey.cs | 15 ---- .../UserSettings/HttpProxy.cs | 19 ----- .../UserSettings/PowerToysRunSettings.cs | 84 ------------------- 3 files changed, 118 deletions(-) delete mode 100644 src/modules/launcher/Wox.Infrastructure/UserSettings/CustomPluginHotkey.cs delete mode 100644 src/modules/launcher/Wox.Infrastructure/UserSettings/HttpProxy.cs diff --git a/src/modules/launcher/Wox.Infrastructure/UserSettings/CustomPluginHotkey.cs b/src/modules/launcher/Wox.Infrastructure/UserSettings/CustomPluginHotkey.cs deleted file mode 100644 index f02353beb8..0000000000 --- a/src/modules/launcher/Wox.Infrastructure/UserSettings/CustomPluginHotkey.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (c) Microsoft Corporation -// The Microsoft Corporation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using Wox.Plugin; - -namespace Wox.Infrastructure.UserSettings -{ - public class CustomPluginHotkey : BaseModel - { - public string Hotkey { get; set; } - - public string ActionKeyword { get; set; } - } -} diff --git a/src/modules/launcher/Wox.Infrastructure/UserSettings/HttpProxy.cs b/src/modules/launcher/Wox.Infrastructure/UserSettings/HttpProxy.cs deleted file mode 100644 index 3e2071ca34..0000000000 --- a/src/modules/launcher/Wox.Infrastructure/UserSettings/HttpProxy.cs +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) Microsoft Corporation -// The Microsoft Corporation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -namespace Wox.Infrastructure.UserSettings -{ - public class HttpProxy - { - public bool Enabled { get; set; } - - public string Server { get; set; } - - public int Port { get; set; } - - public string UserName { get; set; } - - public string Password { get; set; } - } -} diff --git a/src/modules/launcher/Wox.Infrastructure/UserSettings/PowerToysRunSettings.cs b/src/modules/launcher/Wox.Infrastructure/UserSettings/PowerToysRunSettings.cs index cb993dc4fe..0478e63f09 100644 --- a/src/modules/launcher/Wox.Infrastructure/UserSettings/PowerToysRunSettings.cs +++ b/src/modules/launcher/Wox.Infrastructure/UserSettings/PowerToysRunSettings.cs @@ -2,9 +2,6 @@ // The Microsoft Corporation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; -using System.Collections.ObjectModel; -using System.Drawing; using System.Text.Json.Serialization; using ManagedCommon; @@ -177,35 +174,16 @@ namespace Wox.Infrastructure.UserSettings } } - public string Language { get; set; } = "en"; - public Theme Theme { get; set; } = Theme.System; public StartupPosition StartupPosition { get; set; } = StartupPosition.Cursor; - public string QueryBoxFont { get; set; } = FontFamily.GenericSansSerif.Name; - - public string QueryBoxFontStyle { get; set; } - - public string QueryBoxFontWeight { get; set; } - public bool PTRunNonDelayedSearchInParallel { get; set; } = true; public string PTRunStartNewSearchAction { get; set; } public bool PTRSearchQueryFastResultsWithDelay { get; set; } - // public bool PTRSearchQueryFastResultsWithPartialDelay { get; set; } - public string QueryBoxFontStretch { get; set; } - - public string ResultFont { get; set; } = FontFamily.GenericSansSerif.Name; - - public string ResultFontStyle { get; set; } - - public string ResultFontWeight { get; set; } - - public string ResultFontStretch { get; set; } - /// /// Gets or sets a value indicating whether when false Alphabet static service will always return empty results /// @@ -213,38 +191,6 @@ namespace Wox.Infrastructure.UserSettings internal StringMatcher.SearchPrecisionScore QuerySearchPrecision { get; private set; } = StringMatcher.SearchPrecisionScore.Regular; - [JsonIgnore] - public string QuerySearchPrecisionString - { - get - { - return QuerySearchPrecision.ToString(); - } - - set - { - try - { - var precisionScore = (StringMatcher.SearchPrecisionScore)Enum - .Parse(typeof(StringMatcher.SearchPrecisionScore), value); - - QuerySearchPrecision = precisionScore; - StringMatcher.Instance.UserSettingSearchPrecision = precisionScore; - } - catch (ArgumentException e) - { - Wox.Plugin.Logger.Log.Exception("Failed to load QuerySearchPrecisionString value from Settings file", e, GetType()); - - QuerySearchPrecision = StringMatcher.SearchPrecisionScore.Regular; - StringMatcher.Instance.UserSettingSearchPrecision = StringMatcher.SearchPrecisionScore.Regular; - - throw; - } - } - } - - public bool AutoUpdates { get; set; } - public double WindowLeft { get; set; } public double WindowTop { get; set; } @@ -283,34 +229,6 @@ namespace Wox.Infrastructure.UserSettings } } - public ObservableCollection CustomPluginHotkeys { get; } = new ObservableCollection(); - - public bool DontPromptUpdateMsg { get; set; } - - public bool EnableUpdateLog { get; set; } - - public bool StartWoxOnSystemStartup { get; set; } = true; - - public bool HideOnStartup { get; set; } - - private bool _hideNotifyIcon; - - public bool HideNotifyIcon - { - get - { - return _hideNotifyIcon; - } - - set - { - _hideNotifyIcon = value; - OnPropertyChanged(); - } - } - - public bool LeaveCmdOpen { get; set; } - public bool HideWhenDeactivated { get; set; } = true; public bool ClearInputOnLaunch { get; set; } @@ -349,8 +267,6 @@ namespace Wox.Infrastructure.UserSettings public bool GenerateThumbnailsFromFiles { get; set; } = true; - public HttpProxy Proxy { get; set; } = new HttpProxy(); - [JsonConverter(typeof(JsonStringEnumConverter))] public LastQueryMode LastQueryMode { get; set; } = LastQueryMode.Selected; } From f8d075f1d6f15dbcd78845b801d20c72c45b7910 Mon Sep 17 00:00:00 2001 From: Niels Laute Date: Fri, 12 Jan 2024 13:21:14 +0100 Subject: [PATCH 05/18] [PTRun]Bump WPFUI version to preview-13 and fix scrollbar issue (#30859) * Bump wpfui version to preview 13 * Fix margin for results list * Fix margin on results listview as well --- Directory.Packages.props | 2 +- NOTICE.md | 2 +- src/modules/launcher/PowerLauncher/MainWindow.xaml | 9 +++++++++ src/modules/launcher/PowerLauncher/ResultList.xaml | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index c529d1cd4e..8bd4961c6d 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -83,7 +83,7 @@ - + diff --git a/NOTICE.md b/NOTICE.md index b8b9a82f4a..91c60eb2be 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -1367,5 +1367,5 @@ EXHIBIT A -Mozilla Public License. - Vanara.PInvoke.Shell32 3.4.11 - Vanara.PInvoke.User32 3.4.11 - WinUIEx 2.2.0 -- WPF-UI 3.0.0-preview.12 +- WPF-UI 3.0.0-preview.13 diff --git a/src/modules/launcher/PowerLauncher/MainWindow.xaml b/src/modules/launcher/PowerLauncher/MainWindow.xaml index 89255fc6bb..43f7d9ac27 100644 --- a/src/modules/launcher/PowerLauncher/MainWindow.xaml +++ b/src/modules/launcher/PowerLauncher/MainWindow.xaml @@ -72,6 +72,7 @@ x:Name="pluginsHintsList" Grid.Row="1" Margin="16,0,0,0" + Padding="0,0,32,0" ItemContainerStyle="{StaticResource PluginsListViewItemStyle}" ItemsSource="{Binding Plugins}" PreviewMouseLeftButtonUp="PluginsHintsList_PreviewMouseLeftButtonUp" @@ -79,6 +80,14 @@ ScrollViewer.VerticalScrollBarVisibility="Auto" SelectedItem="{Binding SelectedPlugin, Mode=TwoWay}" SelectionMode="Single"> + + + + + diff --git a/src/modules/launcher/PowerLauncher/ResultList.xaml b/src/modules/launcher/PowerLauncher/ResultList.xaml index fb040144be..0c8f69b21e 100644 --- a/src/modules/launcher/PowerLauncher/ResultList.xaml +++ b/src/modules/launcher/PowerLauncher/ResultList.xaml @@ -45,7 +45,7 @@ From 47761e27921c4a2aea7ab603aa2d4844c674ab31 Mon Sep 17 00:00:00 2001 From: Davide Giacometti Date: Fri, 12 Jan 2024 15:43:59 +0100 Subject: [PATCH 06/18] [Dev]Update StyleCop to 1.2.0-beta.556 (#30808) --- Directory.Packages.props | 2 +- NOTICE.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 8bd4961c6d..e58b7d99c1 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -59,7 +59,7 @@ - + diff --git a/NOTICE.md b/NOTICE.md index 91c60eb2be..4e7c8bf674 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -1343,7 +1343,7 @@ EXHIBIT A -Mozilla Public License. - ScipBe.Common.Office.OneNote 3.0.1 - SharpCompress 0.33.0 - StreamJsonRpc 2.14.24 -- StyleCop.Analyzers 1.2.0-beta.507 +- StyleCop.Analyzers 1.2.0-beta.556 - System.CodeDom 8.0.0 - System.CommandLine 2.0.0-beta4.22272.1 - System.ComponentModel.Composition 8.0.0 From 4ce38d192d11b6c1ddd8211c7ce6378cde3582ce Mon Sep 17 00:00:00 2001 From: gokcekantarci <115616017+gokcekantarci@users.noreply.github.com> Date: Fri, 12 Jan 2024 18:01:19 +0300 Subject: [PATCH 07/18] [AlwaysOnTop]Fix border visibility with black color (#30868) --- src/modules/alwaysontop/AlwaysOnTop/WindowBorder.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/modules/alwaysontop/AlwaysOnTop/WindowBorder.cpp b/src/modules/alwaysontop/AlwaysOnTop/WindowBorder.cpp index da335bb101..763a9770f7 100644 --- a/src/modules/alwaysontop/AlwaysOnTop/WindowBorder.cpp +++ b/src/modules/alwaysontop/AlwaysOnTop/WindowBorder.cpp @@ -126,6 +126,11 @@ bool WindowBorder::Init(HINSTANCE hinstance) return false; } + if (!SetLayeredWindowAttributes(m_window, 0, 255, LWA_ALPHA)) + { + return false; + } + // set position of the border-window behind the tracking window // helps to prevent border overlapping (happens after turning borders off and on) SetWindowPos(m_trackingWindow From 4f06f2a6595037d495e6eaf03ec8a75c5ffb0e35 Mon Sep 17 00:00:00 2001 From: Davide Giacometti Date: Fri, 12 Jan 2024 16:23:00 +0100 Subject: [PATCH 08/18] [Common]Use folder_change_reader in file watcher to improve performance (#30827) --- src/common/SettingsAPI/FileWatcher.cpp | 72 +++++++++---------- src/common/SettingsAPI/FileWatcher.h | 10 ++- src/common/SettingsAPI/SettingsAPI.vcxproj | 6 ++ src/common/SettingsAPI/pch.h | 2 + src/modules/alwaysontop/AlwaysOnTop/pch.h | 1 + src/modules/fancyzones/FancyZonesLib/pch.h | 5 +- .../VideoConferenceModule/pch.h | 1 + 7 files changed, 52 insertions(+), 45 deletions(-) diff --git a/src/common/SettingsAPI/FileWatcher.cpp b/src/common/SettingsAPI/FileWatcher.cpp index 7a0c778cf6..dc25e15c7a 100644 --- a/src/common/SettingsAPI/FileWatcher.cpp +++ b/src/common/SettingsAPI/FileWatcher.cpp @@ -1,5 +1,6 @@ #include "pch.h" #include "FileWatcher.h" +#include std::optional FileWatcher::MyFileTime() { @@ -19,50 +20,47 @@ std::optional FileWatcher::MyFileTime() return result; } -void FileWatcher::Run() -{ - while (1) - { - auto lastWrite = MyFileTime(); - if (!m_lastWrite.has_value()) - { - m_lastWrite = lastWrite; - } - else if (lastWrite.has_value()) - { - if (m_lastWrite->dwHighDateTime != lastWrite->dwHighDateTime || - m_lastWrite->dwLowDateTime != lastWrite->dwLowDateTime) - { - m_lastWrite = lastWrite; - m_callback(); - } - } - - if (WaitForSingleObject(m_abortEvent, m_refreshPeriod) == WAIT_OBJECT_0) - { - return; - } - } -} - -FileWatcher::FileWatcher(const std::wstring& path, std::function callback, DWORD refreshPeriod) : - m_refreshPeriod(refreshPeriod), +FileWatcher::FileWatcher(const std::wstring& path, std::function callback) : m_path(path), m_callback(callback) { - m_abortEvent = CreateEventW(nullptr, TRUE, FALSE, nullptr); - if (m_abortEvent) + std::filesystem::path fsPath(path); + m_file_name = fsPath.filename(); + std::transform(m_file_name.begin(), m_file_name.end(), m_file_name.begin(), ::towlower); + m_folder_change_reader = wil::make_folder_change_reader_nothrow( + fsPath.parent_path().c_str(), + false, + wil::FolderChangeEvents::LastWriteTime, + [this](wil::FolderChangeEvent, PCWSTR fileName) { + std::wstring lowerFileName(fileName); + std::transform(lowerFileName.begin(), lowerFileName.end(), lowerFileName.begin(), ::towlower); + + if (m_file_name.compare(fileName) == 0) + { + auto lastWrite = MyFileTime(); + if (!m_lastWrite.has_value()) + { + m_lastWrite = lastWrite; + } + else if (lastWrite.has_value()) + { + if (m_lastWrite->dwHighDateTime != lastWrite->dwHighDateTime || + m_lastWrite->dwLowDateTime != lastWrite->dwLowDateTime) + { + m_lastWrite = lastWrite; + m_callback(); + } + } + } + }); + + if (!m_folder_change_reader) { - m_thread = std::thread([this]() { Run(); }); + Logger::error(L"Failed to start folder change reader for path {}. {}", path, get_last_error_or_default(GetLastError())); } } FileWatcher::~FileWatcher() { - if (m_abortEvent) - { - SetEvent(m_abortEvent); - m_thread.join(); - CloseHandle(m_abortEvent); - } + m_folder_change_reader.reset(); } diff --git a/src/common/SettingsAPI/FileWatcher.h b/src/common/SettingsAPI/FileWatcher.h index 206c1cd747..073a33a0c8 100644 --- a/src/common/SettingsAPI/FileWatcher.h +++ b/src/common/SettingsAPI/FileWatcher.h @@ -11,16 +11,14 @@ class FileWatcher { - DWORD m_refreshPeriod; std::wstring m_path; + std::wstring m_file_name; std::optional m_lastWrite; std::function m_callback; - HANDLE m_abortEvent; - std::thread m_thread; - + wil::unique_folder_change_reader_nothrow m_folder_change_reader; + std::optional MyFileTime(); - void Run(); public: - FileWatcher(const std::wstring& path, std::function callback, DWORD refreshPeriod = 1000); + FileWatcher(const std::wstring& path, std::function callback); ~FileWatcher(); }; diff --git a/src/common/SettingsAPI/SettingsAPI.vcxproj b/src/common/SettingsAPI/SettingsAPI.vcxproj index 306b4a8c3b..45f53ce67e 100644 --- a/src/common/SettingsAPI/SettingsAPI.vcxproj +++ b/src/common/SettingsAPI/SettingsAPI.vcxproj @@ -47,10 +47,15 @@ {cc6e41ac-8174-4e8a-8d22-85dd7f4851df} + + {d9b8fc84-322a-4f9f-bbb9-20915c47ddfd} + + + @@ -58,5 +63,6 @@ + \ No newline at end of file diff --git a/src/common/SettingsAPI/pch.h b/src/common/SettingsAPI/pch.h index 9526a2f072..86f6eff283 100644 --- a/src/common/SettingsAPI/pch.h +++ b/src/common/SettingsAPI/pch.h @@ -9,3 +9,5 @@ #include #include +#include +#include diff --git a/src/modules/alwaysontop/AlwaysOnTop/pch.h b/src/modules/alwaysontop/AlwaysOnTop/pch.h index 1a3b9fd1fd..848c90fea2 100644 --- a/src/modules/alwaysontop/AlwaysOnTop/pch.h +++ b/src/modules/alwaysontop/AlwaysOnTop/pch.h @@ -3,6 +3,7 @@ #include #include #include +#include #include #include diff --git a/src/modules/fancyzones/FancyZonesLib/pch.h b/src/modules/fancyzones/FancyZonesLib/pch.h index db90d123e2..70a402b0fa 100644 --- a/src/modules/fancyzones/FancyZonesLib/pch.h +++ b/src/modules/fancyzones/FancyZonesLib/pch.h @@ -13,8 +13,9 @@ #include #include #include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/modules/videoconference/VideoConferenceModule/pch.h b/src/modules/videoconference/VideoConferenceModule/pch.h index 8e268511bc..3f4849aa44 100644 --- a/src/modules/videoconference/VideoConferenceModule/pch.h +++ b/src/modules/videoconference/VideoConferenceModule/pch.h @@ -9,6 +9,7 @@ #include #include +#include #include #include From 30402d5d35dfcba516adfb604d4bd43aad33ce6f Mon Sep 17 00:00:00 2001 From: Michael Nadeau <48649516+waaverecords@users.noreply.github.com> Date: Fri, 12 Jan 2024 11:21:13 -0500 Subject: [PATCH 09/18] [PTRun][Docs]Add Spotify third party plugin to third party Run plugin list (#30762) --- .github/actions/spell-check/allow/names.txt | 2 ++ doc/thirdPartyRunPlugins.md | 1 + 2 files changed, 3 insertions(+) diff --git a/.github/actions/spell-check/allow/names.txt b/.github/actions/spell-check/allow/names.txt index 7b3543e06f..0ebacd1b41 100644 --- a/.github/actions/spell-check/allow/names.txt +++ b/.github/actions/spell-check/allow/names.txt @@ -116,6 +116,7 @@ talynone TBM tilovell Triet +waaverecords ycv Yuniardi yuyoyuppe @@ -140,6 +141,7 @@ onenote Quickime regedit roslyn +Spotify Vanara WEX windowwalker diff --git a/doc/thirdPartyRunPlugins.md b/doc/thirdPartyRunPlugins.md index bf85dd421c..1ac63c7f87 100644 --- a/doc/thirdPartyRunPlugins.md +++ b/doc/thirdPartyRunPlugins.md @@ -34,3 +34,4 @@ Contact the developers of a plugin directly for assistance with a specific plugi | [Visual Studio](https://github.com/davidegiacometti/PowerToys-Run-VisualStudio) | [davidegiacometti](https://github.com/davidegiacometti) | Open Visual Studio recents | | [WinGet](https://github.com/bostrot/PowerToysRunPluginWinget) | [bostrot](https://github.com/bostrot) | Search and install packages from WinGet | | [Scoop](https://github.com/Quriz/PowerToysRunScoop) | [Quriz](https://github.com/Quriz) | Search and install packages from Scoop | +| [Spotify](https://github.com/waaverecords/PowerToys-Run-Spotify) | [waaverecords](https://github.com/waaverecords) | Search Spotify and control its player | \ No newline at end of file From d2d9cc6bff5cbc006a5283c435bbdc669290c462 Mon Sep 17 00:00:00 2001 From: Jay <65828559+Jay-o-Way@users.noreply.github.com> Date: Fri, 12 Jan 2024 18:01:40 +0100 Subject: [PATCH 10/18] [Dev]Consolidate XAML Namespaces (#30728) * xmlns CommunityToolkit.WinUI.UI.Controls * remove unneeded tk7controls * xmlns CommunityToolkit.WinUI.Controls * xmlns Microsoft.PowerToys.Settings.UI.Converters * remove unneeded Microsoft.PowerToys.Settings.UI.OOBE.Views * xmlns Microsoft.PowerToys.Settings.UI.Controls * xmlns CommunityToolkit.WinUI.Converters * remove unneeded "controls" * xmlns Microsoft.PowerToys.Settings.UI.Controls * remove unneeded "controls" * change WinUI.UI to WinUI * Styler * fixes * Styler * fixes * fixes * Update expect and MainPage --- .github/actions/spell-check/expect.txt | 2 + .../Views/MainPage.xaml | 72 ++--- .../FileLocksmithXAML/Views/MainPage.xaml | 44 +-- .../Hosts/Hosts/HostsXAML/Views/MainPage.xaml | 12 +- .../RegistryPreviewXAML/MainWindow.xaml | 28 +- .../Settings.UI/SettingsXAML/App.xaml | 14 +- .../Controls/AlphaColorPickerButton.xaml | 1 - .../Controls/ColorFormatEditor.xaml | 10 +- .../Controls/ColorPickerButton.xaml | 1 - .../FlyoutMenuButton/FlyoutMenuButton.xaml | 8 +- .../IsEnabledTextBlock.xaml | 8 +- .../Controls/KeyVisual/KeyVisual.xaml | 20 +- .../Controls/PowerAccentShortcutControl.xaml | 8 +- .../SettingsPageControl.xaml | 16 +- .../ShortcutControl/ShortcutControl.xaml | 4 +- .../ShortcutDialogContentControl.xaml | 8 +- .../ShortcutWithTextLabelControl.xaml | 9 +- .../SettingsXAML/Flyout/AppsListPage.xaml | 6 +- .../SettingsXAML/Flyout/LaunchPage.xaml | 18 +- .../SettingsXAML/Flyout/ShellPage.xaml | 1 - .../OOBE/Views/OobeAlwaysOnTop.xaml | 17 +- .../SettingsXAML/OOBE/Views/OobeAwake.xaml | 16 +- .../OOBE/Views/OobeCmdNotFound.xaml | 13 +- .../OOBE/Views/OobeColorPicker.xaml | 17 +- .../OOBE/Views/OobeCropAndLock.xaml | 16 +- .../OOBE/Views/OobeEnvironmentVariables.xaml | 2 - .../OOBE/Views/OobeFancyZones.xaml | 18 +- .../OOBE/Views/OobeFileExplorer.xaml | 15 +- .../OOBE/Views/OobeFileLocksmith.xaml | 17 +- .../SettingsXAML/OOBE/Views/OobeHosts.xaml | 12 +- .../OOBE/Views/OobeImageResizer.xaml | 17 +- .../SettingsXAML/OOBE/Views/OobeKBM.xaml | 18 +- .../OOBE/Views/OobeMeasureTool.xaml | 19 +- .../OOBE/Views/OobeMouseUtils.xaml | 20 +- .../OOBE/Views/OobeMouseWithoutBorders.xaml | 19 +- .../SettingsXAML/OOBE/Views/OobeOverview.xaml | 14 +- .../OOBE/Views/OobeOverviewAlternate.xaml | 21 +- .../OOBE/Views/OobeOverviewPlaceholder.xaml | 1 - .../OOBE/Views/OobePastePlain.xaml | 14 +- .../SettingsXAML/OOBE/Views/OobePeek.xaml | 14 +- .../OOBE/Views/OobePowerAccent.xaml | 15 +- .../SettingsXAML/OOBE/Views/OobePowerOCR.xaml | 19 +- .../OOBE/Views/OobePowerRename.xaml | 19 +- .../OOBE/Views/OobeRegistryPreview.xaml | 19 +- .../SettingsXAML/OOBE/Views/OobeRun.xaml | 19 +- .../OOBE/Views/OobeShortcutGuide.xaml | 14 +- .../OOBE/Views/OobeVideoConference.xaml | 25 +- .../SettingsXAML/OOBE/Views/OobeWhatsNew.xaml | 9 +- .../SettingsXAML/Views/AlwaysOnTopPage.xaml | 102 +++---- .../SettingsXAML/Views/AwakePage.xaml | 60 ++-- .../SettingsXAML/Views/CmdNotFoundPage.xaml | 95 +++---- .../SettingsXAML/Views/ColorPickerPage.xaml | 78 +++--- .../SettingsXAML/Views/CropAndLockPage.xaml | 46 +-- .../SettingsXAML/Views/DashboardPage.xaml | 42 +-- .../Views/EnvironmentVariablesPage.xaml | 12 +- .../SettingsXAML/Views/FancyZonesPage.xaml | 240 ++++++++-------- .../SettingsXAML/Views/FileLocksmithPage.xaml | 31 +- .../SettingsXAML/Views/GeneralPage.xaml | 126 ++++----- .../SettingsXAML/Views/HostsPage.xaml | 52 ++-- .../SettingsXAML/Views/ImageResizerPage.xaml | 80 +++--- .../Views/KeyboardManagerPage.xaml | 58 ++-- .../SettingsXAML/Views/MeasureToolPage.xaml | 72 ++--- .../SettingsXAML/Views/MouseUtilsPage.xaml | 264 +++++++++--------- .../Views/MouseWithoutBordersPage.xaml | 186 ++++++------ .../SettingsXAML/Views/PastePlainPage.xaml | 32 +-- .../SettingsXAML/Views/PeekPage.xaml | 66 ++--- .../SettingsXAML/Views/PowerAccentPage.xaml | 84 +++--- .../SettingsXAML/Views/PowerLauncherPage.xaml | 244 ++++++++-------- .../SettingsXAML/Views/PowerOcrPage.xaml | 42 +-- .../SettingsXAML/Views/PowerPreviewPage.xaml | 124 ++++---- .../SettingsXAML/Views/PowerRenamePage.xaml | 72 ++--- .../Views/RegistryPreviewPage.xaml | 33 ++- .../SettingsXAML/Views/ShortcutGuidePage.xaml | 76 ++--- .../SettingsXAML/Views/VideoConference.xaml | 116 ++++---- 74 files changed, 1560 insertions(+), 1602 deletions(-) diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt index 40a6a085f5..09d852ed7c 100644 --- a/.github/actions/spell-check/expect.txt +++ b/.github/actions/spell-check/expect.txt @@ -1565,6 +1565,8 @@ timediff timeunion timeutil Titlecase +tkcontrols +tkconverters TKey TLayout tlb diff --git a/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/Views/MainPage.xaml b/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/Views/MainPage.xaml index 7f22dac332..5be8dc688d 100644 --- a/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/Views/MainPage.xaml +++ b/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/Views/MainPage.xaml @@ -2,14 +2,14 @@ x:Class="EnvironmentVariables.Views.MainPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" xmlns:converters="using:EnvironmentVariables.Converters" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:i="using:Microsoft.Xaml.Interactivity" xmlns:ic="using:Microsoft.Xaml.Interactions.Core" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:models="using:EnvironmentVariables.Models" - xmlns:toolkitConverters="using:CommunityToolkit.WinUI.Converters" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" + xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters" xmlns:ui="using:CommunityToolkit.WinUI" x:Name="RootPage" mc:Ignorable="d"> @@ -22,12 +22,12 @@ - - + - - + + - + - + @@ -98,12 +98,12 @@ - - - + + @@ -194,17 +194,17 @@ - - + - + - + @@ -253,17 +253,17 @@ - - + - + - + - - + + - - + + - + - + - - - - - + - - + @@ -676,8 +676,8 @@ x:Uid="AddNewVariableValue" Margin="0,16,0,0" /> - - + + - - + + diff --git a/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/Views/MainPage.xaml b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/Views/MainPage.xaml index 848974dce0..72519afe72 100644 --- a/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/Views/MainPage.xaml +++ b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/Views/MainPage.xaml @@ -8,17 +8,17 @@ xmlns:interactivity="using:Microsoft.Xaml.Interactivity" xmlns:interop="using:FileLocksmith.Interop" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:tkControls="using:CommunityToolkit.WinUI.Controls" - xmlns:tkConverters="using:CommunityToolkit.WinUI.Converters" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" + xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters" xmlns:ui="using:CommunityToolkit.WinUI" mc:Ignorable="d"> - - - - + + 0 - - + + - - + + - - - + + + - - + + - - - + + + - + @@ -162,9 +162,9 @@ - - - + + + diff --git a/src/modules/Hosts/Hosts/HostsXAML/Views/MainPage.xaml b/src/modules/Hosts/Hosts/HostsXAML/Views/MainPage.xaml index 16a6ec5c61..700c9da144 100644 --- a/src/modules/Hosts/Hosts/HostsXAML/Views/MainPage.xaml +++ b/src/modules/Hosts/Hosts/HostsXAML/Views/MainPage.xaml @@ -2,7 +2,6 @@ x:Class="Hosts.Views.MainPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:converters="using:CommunityToolkit.WinUI.Converters" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:helpers="using:Hosts.Helpers" xmlns:i="using:Microsoft.Xaml.Interactivity" @@ -10,6 +9,7 @@ xmlns:local="using:Hosts.Views" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:models="using:Hosts.Models" + xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters" xmlns:ui="using:CommunityToolkit.WinUI" x:Name="Page" Loaded="Page_Loaded" @@ -21,17 +21,17 @@ - - - - + + - - - - + - + - - - + + - - - + + - - + xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters"> @@ -17,27 +17,27 @@ - - - - - - + + 6,16,16,16 diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/AlphaColorPickerButton.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/AlphaColorPickerButton.xaml index 7571434778..c077042d96 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/AlphaColorPickerButton.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/AlphaColorPickerButton.xaml @@ -3,7 +3,6 @@ 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:local="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" d:DesignHeight="300" d:DesignWidth="400" diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorFormatEditor.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorFormatEditor.xaml index 207887ecdf..4622609b95 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorFormatEditor.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorFormatEditor.xaml @@ -5,15 +5,15 @@ x:Class="Microsoft.PowerToys.Settings.UI.Controls.ColorFormatEditor" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:CommunityToolkit="using:CommunityToolkit.WinUI.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:local="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls" mc:Ignorable="d"> - + @@ -36,7 +36,7 @@ - + @@ -60,7 +60,7 @@ - diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorPickerButton.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorPickerButton.xaml index cd4d0b6ac3..10a1e01236 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorPickerButton.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorPickerButton.xaml @@ -3,7 +3,6 @@ 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:local="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" d:DesignHeight="300" d:DesignWidth="400" diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/FlyoutMenuButton/FlyoutMenuButton.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/FlyoutMenuButton/FlyoutMenuButton.xaml index e9b3a6a55f..7cf88ac0f6 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/FlyoutMenuButton/FlyoutMenuButton.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/FlyoutMenuButton/FlyoutMenuButton.xaml @@ -4,11 +4,11 @@ + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"> - diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.xaml index 469a8be795..00192a215a 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.xaml @@ -1,11 +1,11 @@  + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"> 16 12 - - - - - + + + - + - + @@ -78,7 +78,7 @@ - - - - - - - - @@ -394,7 +394,7 @@ - diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/EnvironmentVariablesPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/EnvironmentVariablesPage.xaml index 0df3a73a58..7d61d944da 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/EnvironmentVariablesPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/EnvironmentVariablesPage.xaml @@ -3,21 +3,21 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" - xmlns:controls1="using:CommunityToolkit.WinUI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:ui="using:CommunityToolkit.WinUI" mc:Ignorable="d"> - - + - - - + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml index 5fb3ddeb22..7c7cf18e0c 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml @@ -2,23 +2,23 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.FancyZonesPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - + + - - + - - + - - - + + + - + - - + + - - - - + + + - - + + - - + + - - + + - - - - - + + + + + - - - + + + - @@ -87,9 +87,9 @@ - - - + + - - + + - - + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - + - - - - - - - - - + + + + + + + + + - - - + + - + @@ -196,40 +196,40 @@ - + - - + + - - - - + + + + - - + + - - + + - - - - + + + + - + - - - + + - - - - + + + + - + - - - - + + + + \ No newline at end of file diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml index ca62c8589a..41a1921809 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml @@ -2,24 +2,23 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.FileLocksmithPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" - xmlns:converters="using:CommunityToolkit.WinUI.Converters" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - + + - - + - - + + - + - + - - - - - + + + + + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml index b6832d837e..2a5fb16385 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml @@ -2,26 +2,26 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.GeneralPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:localConverters="using:Microsoft.PowerToys.Settings.UI.Converters" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - + + - - + + - - - + + + @@ -33,7 +33,7 @@ FontWeight="SemiBold" NavigateUri="https://github.com/microsoft/PowerToys/releases/" /> - + - + - - + - + - - + - + - + - - + @@ -322,10 +322,10 @@ Text="{x:Bind ViewModel.LastSettingsBackupDate, Mode=OneWay}" TextWrapping="WrapWholeWords" /> - - - - + + + + - - - + + + - + - + - + - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml index 3b8284d334..f99c21dd46 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml @@ -2,68 +2,68 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.HostsPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:ui="using:CommunityToolkit.WinUI" mc:Ignorable="d"> - - + + - - + - - + - - - + + - - + + - - + + - - + + - - + + - - + + - + - - - - + + + + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml index e57857e78f..ad4a3b868b 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml @@ -2,12 +2,12 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.ImageResizerPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:models="using:Microsoft.PowerToys.Settings.UI.Library" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:toolkitconverters="using:CommunityToolkit.WinUI.UI.Converters" xmlns:ui="using:CommunityToolkit.WinUI" x:Name="RootPage" @@ -21,15 +21,15 @@ FalseValue="1" TrueValue="0" /> - - + + - - + - - + + - + - + - - + + @@ -188,25 +188,25 @@ - + - + - + - + - + - + @@ -216,11 +216,11 @@ - - + + - - + + - + - + - - + + - + - - - - - - - + + + + + + + \ No newline at end of file diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml index 19ca095034..f4ac4d7448 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml @@ -3,27 +3,27 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:Lib="using:Microsoft.PowerToys.Settings.UI.Library" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" - xmlns:converters="using:CommunityToolkit.WinUI.Converters" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" + xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters" xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - + - + - + - - + + - - + - - + + - - + - + - - + - + - - + - + - - + - + - - - - - + + + + + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml index 44fa437f92..65ab8bc363 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml @@ -2,34 +2,34 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.MeasureToolPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - + + - - + - - - - - + + + + + @@ -37,14 +37,14 @@ - + - + - - + + - + - + - + - + - + - + --> - + - + - - - - + + + + - - - - - - - - + + + + + + + + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml index 9ab3612f11..0228c9f2d4 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml @@ -2,39 +2,39 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.MouseUtilsPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" - xmlns:converters="using:CommunityToolkit.WinUI.Converters" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:localConverters="using:Microsoft.PowerToys.Settings.UI.Converters" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" + xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters" xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - + - - + + - - + - + - - - + + - - + - - - + + + - - - + + + - - - + + - - - - - - - - + + + + + + + + - - + + - - + + - - - + + + - - - + + - - - - + + + + - - + - + - - - - + + + - - - - + + + - - - - - - - - - - - + + + + + + + + + + + - - + + - - + + - - - - + + + + - - + - + - - - - + + - + - + - - + + - - + - + - - - - + + + - - - + + + - - - - - - + + + + + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - - - - + + + + - - - - - - - - - + + + + + + + + + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml index eafcb80448..493a94f0d0 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml @@ -2,11 +2,11 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.MouseWithoutBordersPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> @@ -17,11 +17,11 @@ FalseValue="2" TrueValue="4" /> - - + + - - + @@ -29,22 +29,22 @@ x:Uid="ToggleSwitch" IsEnabled="{x:Bind ViewModel.CanBeEnabled, Mode=OneWay}" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" /> - + - - - + + - - + + - - + + - - - - + + + @@ -166,7 +166,7 @@ - + + - - - - + + + + - + - - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - + - - + - + - - + - + - - + - + - - + - + - + - - - - - - + + + + + + - - - - - - + + + + + - + - - + + - - - - - - - - - + + + + + + + + + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PastePlainPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PastePlainPage.xaml index fbabda26c7..2573cfcd29 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PastePlainPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PastePlainPage.xaml @@ -2,26 +2,26 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.PastePlainPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - + + - - + - - - - + + + + - + - + - - - - + + + + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml index e4d98693f5..eca6e43f7d 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml @@ -2,23 +2,23 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.PeekPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - + + - - + - - - - - - - + + + + + + + - - + + - - + + - - + - - + + - - - + + - - - - + + + + - - - - - + + + + + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml index 2c19fae660..87f0b7b625 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml @@ -2,26 +2,26 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.PowerAccentPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - + - - + - - + + - - + + - - + + @@ -78,11 +78,11 @@ - - + + - - + + @@ -94,20 +94,20 @@ - - + + - - + + - - + + - - + + - - + + - + - - - + + + - - - - + + + + - + - - - - - - - + + + + + + + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml index 825ecfb41c..ec56a0bbbc 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml @@ -3,26 +3,26 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:ViewModels="using:Microsoft.PowerToys.Settings.UI.ViewModels" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:i="using:Microsoft.Xaml.Interactivity" xmlns:ic="using:Microsoft.Xaml.Interactions.Core" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - + + - - + - - + - - - - - - + + + + + + - - - - + + + + - - + - - + + - - + + - - - + + + - @@ -120,20 +120,20 @@ Minimum="1" SpinButtonPlacementMode="Compact" Value="{x:Bind ViewModel.MaximumNumberOfResults, Mode=TwoWay}" /> - - + + - - - + + + - - - + + - - - - - - + + + + + + - + - + - + - + - + - - + + - - + + - + - - + + - + - + - + - + - + - - + + - + - - + + - + - + - - + + - + - - - + - - + - - + - - + - - - - + - + - - - - + - + - - - - + - + - - + @@ -594,24 +594,24 @@ - - - + + + - + - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml index f5f09f14d3..f5f4387eaf 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml @@ -2,26 +2,26 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.PowerOcrPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - + + - - + - - - - - + + + + + - - + + - + - - - - - - - + + + + + + + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml index cd865c0a83..97aa896cfb 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml @@ -2,31 +2,31 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.PowerPreviewPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - + + - + - - - + + - - - - - + + + + + - - - + + + - - + - - - + + - - - + + - - + + - - - + + + - - + - - + - - + - + - + - - + - - + - - + - - - - - - - + + + + + + - - + - + - + - - - - - - - - + + + + + + + + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml index 3af561bb30..bcb784c1e6 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml @@ -2,84 +2,84 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.PowerRenamePage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - + + - - + - - + + - - + + - - - + + + - + - - + + - - + + - - - + + + - + - - - - + + + + - - + + - + - - - - - - - + + + + + + + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml index 02bc3b1c83..d9374e94b0 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml @@ -2,24 +2,23 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.RegistryPreviewPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" - xmlns:converters="using:CommunityToolkit.WinUI.Converters" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - + + - - + - - + - + - - + + - + - - - - + + + + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml index 9075931860..a0decd0bd5 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml @@ -2,45 +2,45 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.ShortcutGuidePage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - + + - - + - - + + - + - - - + + - @@ -51,9 +51,9 @@ SmallChange="50" SpinButtonPlacementMode="Compact" Value="{x:Bind ViewModel.PressTime, Mode=TwoWay}" /> - + - @@ -64,7 +64,7 @@ SmallChange="50" SpinButtonPlacementMode="Compact" Value="{x:Bind ViewModel.DelayTime, Mode=TwoWay}" /> - + - + - - - + + + - + - + - + - - + + - - + - - + + - - - - + + + + - - - - - + + + + + \ No newline at end of file diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/VideoConference.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/VideoConference.xaml index c34dac09ba..69fc869690 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/VideoConference.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/VideoConference.xaml @@ -2,27 +2,27 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.VideoConferencePage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:CommunityToolkit.WinUI.Controls" - xmlns:converters="using:CommunityToolkit.WinUI.Converters" - xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls" + xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters" xmlns:ui="using:CommunityToolkit.WinUI" mc:Ignorable="d"> - - - - + + - - + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - + + - + - + - - + + - - + @@ -98,8 +98,8 @@ IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" ItemsSource="{x:Bind ViewModel.CameraNames, Mode=OneTime}" SelectedIndex="{x:Bind ViewModel.SelectedCameraIndex, Mode=TwoWay}" /> - - + +