From 6af6f4f43f8736aae7f0cffce8a30a7cdea19758 Mon Sep 17 00:00:00 2001 From: Niels Laute Date: Thu, 14 Sep 2023 18:41:31 +0200 Subject: [PATCH 1/4] [Deps]Upgrading to CommunityToolkit.WinUI v8.0 (#28205) * Adding new package references * Updating namespaces and controls * Fixing GridSplitter * Bump up version numbers * Fix namespaces for Settings * Fixing FontIcon extensions * Use Toolkit converters * Update notice * Remove unused reference * Namespace fixes * Update MainPage.xaml * Upgrading packages to latest * Resolve CI issues * Fix Hosts merge --- Directory.Packages.props | 15 +- NOTICE.md | 15 +- .../Converters/PidToIconConverter.cs | 1 - .../FileLocksmithUI/FileLocksmithUI.csproj | 5 +- .../FileLocksmithXAML/Views/MainPage.xaml | 120 ++--- src/modules/Hosts/Hosts/Hosts.csproj | 4 +- .../Hosts/Hosts/HostsXAML/Views/MainPage.xaml | 134 +++--- .../Hosts/Hosts/ViewModels/MainViewModel.cs | 2 +- .../RegistryPreviewUI.csproj | 4 +- .../RegistryPreviewXAML/MainWindow.xaml | 131 +++--- .../NegativeBoolToVisibilityConverter.cs | 29 -- .../Converters/VisibleIfNotEmptyConverter.cs | 24 - .../Settings.UI/PowerToys.Settings.csproj | 10 +- .../Settings.UI/SettingsXAML/App.xaml | 4 +- .../FlyoutMenuButton/FlyoutMenuButton.cs | 3 - .../Controls/PowerAccentShortcutControl.xaml | 4 +- .../SettingsPageControl.xaml | 8 +- .../ShortcutControl/ShortcutControl.xaml.cs | 2 +- .../ShortcutWithTextLabelControl.xaml | 4 +- .../SettingsXAML/Flyout/LaunchPage.xaml | 39 +- .../OOBE/Views/OobeAlwaysOnTop.xaml | 12 +- .../SettingsXAML/OOBE/Views/OobeAwake.xaml | 10 +- .../OOBE/Views/OobeColorPicker.xaml | 12 +- .../OOBE/Views/OobeCropAndLock.xaml | 14 +- .../OOBE/Views/OobeFancyZones.xaml | 12 +- .../OOBE/Views/OobeFileExplorer.xaml | 10 +- .../OOBE/Views/OobeFileLocksmith.xaml | 10 +- .../SettingsXAML/OOBE/Views/OobeHosts.xaml | 10 +- .../OOBE/Views/OobeImageResizer.xaml | 10 +- .../SettingsXAML/OOBE/Views/OobeKBM.xaml | 10 +- .../OOBE/Views/OobeMeasureTool.xaml | 12 +- .../OOBE/Views/OobeMouseUtils.xaml | 10 +- .../OOBE/Views/OobeMouseWithoutBorders.xaml | 10 +- .../SettingsXAML/OOBE/Views/OobeOverview.xaml | 10 +- .../OOBE/Views/OobeOverviewAlternate.xaml | 18 +- .../OOBE/Views/OobePastePlain.xaml | 12 +- .../SettingsXAML/OOBE/Views/OobePeek.xaml | 12 +- .../OOBE/Views/OobePowerAccent.xaml | 10 +- .../SettingsXAML/OOBE/Views/OobePowerOCR.xaml | 12 +- .../OOBE/Views/OobePowerRename.xaml | 10 +- .../OOBE/Views/OobeRegistryPreview.xaml | 10 +- .../SettingsXAML/OOBE/Views/OobeRun.xaml | 12 +- .../OOBE/Views/OobeShellPage.xaml | 6 +- .../OOBE/Views/OobeShortcutGuide.xaml | 12 +- .../OOBE/Views/OobeVideoConference.xaml | 18 +- .../SettingsXAML/OOBE/Views/OobeWhatsNew.xaml | 2 +- .../SettingsXAML/Views/AlwaysOnTopPage.xaml | 162 +++---- .../SettingsXAML/Views/AwakePage.xaml | 100 ++--- .../SettingsXAML/Views/ColorPickerPage.xaml | 103 ++--- .../Views/ColorPickerPage.xaml.cs | 2 +- .../SettingsXAML/Views/CropAndLockPage.xaml | 72 ++- .../SettingsXAML/Views/FancyZonesPage.xaml | 419 +++++++----------- .../SettingsXAML/Views/FileLocksmithPage.xaml | 49 +- .../SettingsXAML/Views/GeneralPage.xaml | 127 +++--- .../SettingsXAML/Views/HostsPage.xaml | 79 ++-- .../SettingsXAML/Views/ImageResizerPage.xaml | 82 ++-- .../Views/KeyboardManagerPage.xaml | 131 ++---- .../SettingsXAML/Views/MeasureToolPage.xaml | 112 ++--- .../SettingsXAML/Views/MouseUtilsPage.xaml | 358 +++++++-------- .../Views/MouseWithoutBordersPage.xaml | 277 ++++++------ .../Views/MouseWithoutBordersPage.xaml.cs | 5 - .../SettingsXAML/Views/PastePlainPage.xaml | 55 +-- .../SettingsXAML/Views/PeekPage.xaml | 54 ++- .../SettingsXAML/Views/PowerAccentPage.xaml | 135 ++---- .../SettingsXAML/Views/PowerLauncherPage.xaml | 336 +++++--------- .../SettingsXAML/Views/PowerOcrPage.xaml | 79 ++-- .../SettingsXAML/Views/PowerPreviewPage.xaml | 208 ++++----- .../SettingsXAML/Views/PowerRenamePage.xaml | 121 ++--- .../Views/RegistryPreviewPage.xaml | 42 +- .../SettingsXAML/Views/ShellPage.xaml | 14 +- .../SettingsXAML/Views/ShortcutGuidePage.xaml | 125 ++---- .../SettingsXAML/Views/VideoConference.xaml | 168 +++---- 72 files changed, 1767 insertions(+), 2492 deletions(-) delete mode 100644 src/settings-ui/Settings.UI/Converters/NegativeBoolToVisibilityConverter.cs delete mode 100644 src/settings-ui/Settings.UI/Converters/VisibleIfNotEmptyConverter.cs diff --git a/Directory.Packages.props b/Directory.Packages.props index e02ed27170..ff66334176 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -4,11 +4,16 @@ - - - - + + + + + + + + + @@ -33,7 +38,7 @@ - + diff --git a/NOTICE.md b/NOTICE.md index 92d55e955e..a62d7bf15d 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -281,11 +281,16 @@ SOFTWARE. ## NuGet Packages used by PowerToys -- CommunityToolkit.Labs.WinUI.SettingsControls 0.0.18 - CommunityToolkit.Mvvm 8.2.0 -- CommunityToolkit.WinUI.UI 7.1.2 -- CommunityToolkit.WinUI.UI.Animations 7.1.2 -- CommunityToolkit.WinUI.UI.Controls 7.1.2 +- CommunityToolkit.WinUI.Animations 8.0.230907 +- CommunityToolkit.WinUI.Collections 8.0.230907 +- CommunityToolkit.WinUI.Controls.Primitives 8.0.230907 +- CommunityToolkit.WinUI.Controls.SettingsControls 8.0.230907 +- CommunityToolkit.WinUI.Controls.Sizers 8.0.230907 +- CommunityToolkit.WinUI.Converters 8.0.230907 +- CommunityToolkit.WinUI.Extensions 8.0.230907 +- CommunityToolkit.WinUI.UI.Controls.DataGrid 7.1.2 +- CommunityToolkit.WinUI.UI.Controls.Markdown 7.1.2 - ControlzEx 6.0.0 - HelixToolkit 2.20.2 - HelixToolkit.Core.Wpf 2.20.2 @@ -306,7 +311,7 @@ SOFTWARE. - Microsoft.Windows.Compatibility 7.0.3 - Microsoft.Windows.CsWin32 0.2.46-beta - Microsoft.Windows.CsWinRT 2.0.3 -- Microsoft.Windows.SDK.BuildTools 10.0.22621.755 +- Microsoft.Windows.SDK.BuildTools 10.0.22621.756 - Microsoft.Windows.SDK.Contracts 10.0.19041.1 - Microsoft.WindowsAppSDK 1.4.230822000 - Microsoft.Xaml.Behaviors.WinUI.Managed 2.0.9 diff --git a/src/modules/FileLocksmith/FileLocksmithUI/Converters/PidToIconConverter.cs b/src/modules/FileLocksmith/FileLocksmithUI/Converters/PidToIconConverter.cs index be66f94c23..20f724e261 100644 --- a/src/modules/FileLocksmith/FileLocksmithUI/Converters/PidToIconConverter.cs +++ b/src/modules/FileLocksmith/FileLocksmithUI/Converters/PidToIconConverter.cs @@ -5,7 +5,6 @@ using System; using System.Drawing; using System.IO; -using CommunityToolkit.WinUI.UI; using Microsoft.UI.Xaml.Data; using Microsoft.UI.Xaml.Media.Imaging; using Windows.Storage; diff --git a/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj index 4772e0cc63..1adec90526 100644 --- a/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj +++ b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj @@ -71,9 +71,10 @@ - + + + - diff --git a/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/Views/MainPage.xaml b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/Views/MainPage.xaml index c2d98d5f50..848974dce0 100644 --- a/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/Views/MainPage.xaml +++ b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/Views/MainPage.xaml @@ -7,17 +7,18 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:interactivity="using:Microsoft.Xaml.Interactivity" xmlns:interop="using:FileLocksmith.Interop" - xmlns:labs="using:CommunityToolkit.Labs.WinUI" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:toolkitConverters="using:CommunityToolkit.WinUI.UI.Converters" + xmlns:tkControls="using:CommunityToolkit.WinUI.Controls" + xmlns:tkConverters="using:CommunityToolkit.WinUI.Converters" + xmlns:ui="using:CommunityToolkit.WinUI" mc:Ignorable="d"> - - - + - @@ -65,10 +62,9 @@ Spacing="8"> - - - + + + - - + + - - - + + + - - + + - - - + + + - + - - + - - - + + + diff --git a/src/modules/Hosts/Hosts/Hosts.csproj b/src/modules/Hosts/Hosts/Hosts.csproj index f0d323a74a..f884172d9a 100644 --- a/src/modules/Hosts/Hosts/Hosts.csproj +++ b/src/modules/Hosts/Hosts/Hosts.csproj @@ -57,7 +57,9 @@ - + + + diff --git a/src/modules/Hosts/Hosts/HostsXAML/Views/MainPage.xaml b/src/modules/Hosts/Hosts/HostsXAML/Views/MainPage.xaml index 6c59b6f4e1..2474c56412 100644 --- a/src/modules/Hosts/Hosts/HostsXAML/Views/MainPage.xaml +++ b/src/modules/Hosts/Hosts/HostsXAML/Views/MainPage.xaml @@ -2,7 +2,7 @@ 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.UI.Converters" + 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 +10,7 @@ xmlns:local="using:Hosts.Views" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:models="using:Hosts.Models" + xmlns:ui="using:CommunityToolkit.WinUI" x:Name="Page" Loaded="Page_Loaded" mc:Ignorable="d"> @@ -28,8 +29,8 @@ + FalseValue="Visible" + TrueValue="Collapsed" /> - + - - + + + + - - - @@ -74,19 +69,16 @@ x:Uid="AdditionalLinesBtn" Height="32" Command="{x:Bind AdditionalLinesDialogCommand}" - Style="{StaticResource SubtleButtonStyle}"> - - + Content="{ui:FontIcon Glyph=, + FontSize=16}" + Style="{StaticResource SubtleButtonStyle}" /> + Content="{ui:FontIcon Glyph=, + FontSize=16}" + Style="{StaticResource SubtleButtonStyle}" /> + + Content="{ui:FontIcon Glyph=, + FontSize=16}" + Style="{StaticResource SubtleButtonStyle}" /> @@ -166,9 +153,7 @@ CanDragItems="{x:Bind ViewModel.Filtered, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}" CanReorderItems="{x:Bind ViewModel.Filtered, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}" --> - + @@ -181,9 +166,9 @@ BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}" BorderThickness="1" CornerRadius="{StaticResource OverlayCornerRadius}" + GotFocus="Entries_GotFocus" IsItemClickEnabled="True" ItemClick="Entries_ItemClick" - GotFocus="Entries_GotFocus" RightTapped="Entries_RightTapped" ItemsSource="{x:Bind ViewModel.Entries, Mode=TwoWay}" SelectedItem="{x:Bind ViewModel.Selected, Mode=TwoWay}"> @@ -271,8 +256,8 @@ Height="20" IsActive="{x:Bind Pinging, Mode=OneWay}" /> @@ -325,8 +310,8 @@ - + + Foreground="{ThemeResource TextFillColorSecondaryBrush}" + TextWrapping="Wrap" /> - + + Foreground="{ThemeResource TextFillColorSecondaryBrush}" + TextWrapping="Wrap" /> - + - - - + - + - - + - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml.cs index 2c7a4ef86d..1a408c88cd 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml.cs +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Windows.Input; -using CommunityToolkit.Labs.WinUI; +using CommunityToolkit.WinUI.Controls; using Microsoft.PowerToys.Settings.UI.Helpers; using Microsoft.PowerToys.Settings.UI.Library; using Microsoft.PowerToys.Settings.UI.ViewModels; diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/CropAndLockPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/CropAndLockPage.xaml index a3fc18873a..f1326feb6b 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/CropAndLockPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/CropAndLockPage.xaml @@ -2,72 +2,56 @@ x:Class="Microsoft.PowerToys.Settings.UI.Views.CropAndLockPage" 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:controls="using:CommunityToolkit.WinUI.Controls" + xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:labs="using:CommunityToolkit.Labs.WinUI" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:ui="using:CommunityToolkit.WinUI.UI" + xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" 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 5ac5c7ffd6..de957df76c 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml @@ -2,27 +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:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:CommunityToolkit.WinUI.Controls" + xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:labs="using:CommunityToolkit.Labs.WinUI" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:ui="using:CommunityToolkit.WinUI.UI" + xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - - - + + + - - + + - - + - - - + + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - + + + - - + - - - + + - - - - - + + + + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + - - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + - + - - - + + - - - - + + + + - + - - - - + + + + \ 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 6237f7bdaf..4eda4d9625 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml @@ -2,26 +2,24 @@ 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:Microsoft.PowerToys.Settings.UI.Controls" - xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters" + xmlns:controls="using:CommunityToolkit.WinUI.Controls" + xmlns:converters="using:CommunityToolkit.WinUI.Converters" + xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:labs="using:CommunityToolkit.Labs.WinUI" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:ui="using:CommunityToolkit.WinUI.UI" + 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 e3579dddcb..07e415dd14 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml @@ -2,12 +2,12 @@ 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:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:CommunityToolkit.WinUI.Controls" + xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:labs="using:CommunityToolkit.Labs.WinUI" xmlns:localConverters="using:Microsoft.PowerToys.Settings.UI.Converters" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:ui="using:CommunityToolkit.WinUI.UI" + xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> @@ -16,12 +16,12 @@ - - + + - - - + + + @@ -33,7 +33,7 @@ FontWeight="SemiBold" NavigateUri="https://github.com/microsoft/PowerToys/releases/" /> - + - + - - + - + - - + - + - + - - + - + @@ -309,10 +308,10 @@ Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="{Binding LastSettingsBackupDate, Mode=OneWay}" /> - - - - + + + + - - - + + + - + - + - + - - - - - - - - - - - - + + + + + + + + + + + + \ 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 1b89ea36d7..ab083d3caa 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml @@ -2,76 +2,69 @@ 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:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:CommunityToolkit.WinUI.Controls" + xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:labs="using:CommunityToolkit.Labs.WinUI" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:ui="using:CommunityToolkit.WinUI.UI" + 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 bc29ac6ac2..f59d888a57 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml @@ -2,14 +2,14 @@ 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:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:CommunityToolkit.WinUI.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:labs="using:CommunityToolkit.Labs.WinUI" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:models="using:Microsoft.PowerToys.Settings.UI.Library" xmlns:toolkitconverters="using:CommunityToolkit.WinUI.UI.Converters" - xmlns:ui="using:CommunityToolkit.WinUI.UI" + xmlns:ui="using:CommunityToolkit.WinUI" x:Name="RootPage" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> @@ -21,15 +21,15 @@ FalseValue="1" TrueValue="0" /> - - + + - - + - - + + - + - + - - + + @@ -191,25 +191,25 @@ - + - + - + - + - + - + @@ -219,11 +219,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 81b8c7f2e2..f4ef3b5ece 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml @@ -3,38 +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:Microsoft.PowerToys.Settings.UI.Controls" - xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters" + xmlns:controls="using:CommunityToolkit.WinUI.Controls" + xmlns:converters="using:CommunityToolkit.WinUI.Converters" + xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:labs="using:CommunityToolkit.Labs.WinUI" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:ui="using:CommunityToolkit.WinUI.UI" + xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - - - - + + - - + + - - - - + + + - - + + - + - - + + - - + + Visibility="{x:Bind Path=ViewModel.RemapKeys, Mode=OneWay, Converter={StaticResource CollectionVisibilityConverter}}"> - + - + - - + - + - + - - + + Visibility="{x:Bind Path=ViewModel.RemapShortcuts, Mode=OneWay, Converter={StaticResource CollectionVisibilityConverter}}"> - + - + - - + @@ -207,24 +174,20 @@ VerticalAlignment="Center" CornerRadius="12"> - + - + - + - - - - - + + + + + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml index bdcb0c57df..80a4ce4aeb 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml @@ -2,65 +2,49 @@ 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:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:CommunityToolkit.WinUI.Controls" + xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:labs="using:CommunityToolkit.Labs.WinUI" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:ui="using:CommunityToolkit.WinUI.UI" + xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - - - + + + - - + + - - - - - + + + + + - + - + - + - - - - + + + + - - - + + + - + - + - + --> - - - + + + - - - - + + + + - - - - - - - - + + + + + + + + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml index db8db47282..27aadf6d50 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml @@ -2,57 +2,51 @@ 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:Microsoft.PowerToys.Settings.UI.Controls" - xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters" + xmlns:controls="using:CommunityToolkit.WinUI.Controls" + xmlns:converters="using:CommunityToolkit.WinUI.Converters" + xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:labs="using:CommunityToolkit.Labs.WinUI" xmlns:localConverters="using:Microsoft.PowerToys.Settings.UI.Converters" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:ui="using:CommunityToolkit.WinUI.UI" + 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 8016c469e1..74678b3d38 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml @@ -2,27 +2,26 @@ 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:Microsoft.PowerToys.Settings.UI.Controls" - xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters" + xmlns:controls="using:CommunityToolkit.WinUI.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:labs="using:CommunityToolkit.Labs.WinUI" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:toolkitConverters="using:CommunityToolkit.WinUI.UI.Converters" - xmlns:ui="using:CommunityToolkit.WinUI.UI" + xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - + - - + + - - + @@ -30,28 +29,27 @@ x:Uid="ToggleSwitch" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.CanBeEnabled}" IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.IsEnabled}" /> - + - - - + + - - + + + x:Uid="MWB_SecurityKeyLabel" + Width="248" /> - - + + - - - - + + + @@ -125,10 +123,10 @@ Width="136" Height="90" Margin="4" - BorderThickness="2" AllowDrop="{Binding Mode=OneWay, Path=Item.CanDragDrop}" Background="{ThemeResource SolidBackgroundFillColorBaseAltBrush}" BorderBrush="{Binding Item.StatusBrush}" + BorderThickness="2" CanDrag="{Binding Mode=OneWay, Path=Item.CanDragDrop}" CornerRadius="4" DataContext="{Binding}" @@ -161,14 +159,14 @@ - + + - - - - + + + + - + - - - - + IsClickEnabled="{x:Bind Mode=OneWay, Path=ViewModel.CanUninstallService}" + IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.CanUninstallService}" /> + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - - - - - - - - + - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - - + + - - - - - - - - - + + + + + + + + + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml.cs index 2670aa5ead..1eb2cf5064 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml.cs +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml.cs @@ -3,14 +3,9 @@ // See the LICENSE file in the project root for more information. using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; using System.IO.Abstractions; -using System.Net; using System.Threading.Tasks; using System.Windows.Input; -using System.Xml.Linq; -using CommunityToolkit.Labs.WinUI; using Microsoft.PowerToys.Settings.UI.Helpers; using Microsoft.PowerToys.Settings.UI.Library; using Microsoft.PowerToys.Settings.UI.Library.Utilities; diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PastePlainPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PastePlainPage.xaml index 7faef7d381..39d792f1a8 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PastePlainPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PastePlainPage.xaml @@ -2,28 +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:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:CommunityToolkit.WinUI.Controls" + xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:labs="using:CommunityToolkit.Labs.WinUI" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:ui="using:CommunityToolkit.WinUI.UI" + 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 07ed57cb53..3b1b9eca1a 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:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:CommunityToolkit.WinUI.Controls" + xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:labs="using:CommunityToolkit.Labs.WinUI" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:ui="using:CommunityToolkit.WinUI.UI" + 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 a57a114974..89ac7f5c6f 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml @@ -2,28 +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:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:CommunityToolkit.WinUI.Controls" + xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:labs="using:CommunityToolkit.Labs.WinUI" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:ui="using:CommunityToolkit.WinUI.UI" + xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - - - + + - - + + - - - + + + - - + + - - - + + + - + @@ -91,19 +75,12 @@ - - + + - - - + + + @@ -114,25 +91,20 @@ - - + + - - + + - - + + - - + + - - + + - + - - - + + + - - - - + + + + - + - - - - - - - + + + + + + + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml index 8df089122a..31ea523a4f 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml @@ -3,30 +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:Microsoft.PowerToys.Settings.UI.Controls" + xmlns:controls="using:CommunityToolkit.WinUI.Controls" + xmlns:custom="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:labs="using:CommunityToolkit.Labs.WinUI" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:ui="using:CommunityToolkit.WinUI.UI" + xmlns:ui="using:CommunityToolkit.WinUI" AutomationProperties.LandmarkType="Main" mc:Ignorable="d"> - - + + - - + - - + + - - + - - - - - - - - - - - + + + + + + + + + + + - - + - - + + - - + + - - - + + + - - - - - - - + + + + + + - - - + + - - - - - - + + + + + + - - - + + + - - - + + + - + - - - + + + - + - - - - - + + + + + - - + + - + - + - - + + - + - + - + @@ -302,9 +242,7 @@ IsTabStop="{x:Bind ViewModel.ShowAllPluginsDisabledWarning, Mode=OneWay}" Severity="Error" /> - + - + - + - - + + - - + + - 4706;26451;4267;4244;%(DisableSpecificWarnings) + 4706;26451;4267;4244;%(DisableSpecificWarnings)