[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
2026-04-05 10:46:33 +02:00 · 2024-01-12 18:01:40 +01:00
parent 30402d5d35
commit d2d9cc6bff
74 changed files with 1560 additions and 1602 deletions
--- 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"
--- 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">
    <UserControl.Resources>
        <converters:ColorFormatConverter x:Key="ColorFormatConverter" />
-        <DataTemplate x:Key="FormatParameterTemplate" x:DataType="local:ColorFormatParameter">
+        <DataTemplate x:Key="FormatParameterTemplate" x:DataType="controls:ColorFormatParameter">
            <Grid>
                <Grid.ColumnDefinitions>
                    <ColumnDefinition Width="34" />
@@ -36,7 +36,7 @@
            </Grid>
        </DataTemplate>

-        <DataTemplate x:Key="ColorParameterTemplate" x:DataType="local:ColorFormatParameter">
+        <DataTemplate x:Key="ColorParameterTemplate" x:DataType="controls:ColorFormatParameter">
            <Grid>
                <Grid.ColumnDefinitions>
                    <ColumnDefinition Width="18" />
@@ -60,7 +60,7 @@
        </DataTemplate>

        <ItemsPanelTemplate x:Key="ItemPanelTemplate">
-            <CommunityToolkit:WrapPanel
+            <tk7controls:WrapPanel
                HorizontalSpacing="20"
                Orientation="Horizontal"
                VerticalSpacing="4" />
--- 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"
--- 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 @@
 <ResourceDictionary
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Microsoft.PowerToys.Settings.UI.Controls">
+    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls">

-    <Style BasedOn="{StaticResource DefaultFlyoutMenuButtonStyle}" TargetType="local:FlyoutMenuButton" />
+    <Style BasedOn="{StaticResource DefaultFlyoutMenuButtonStyle}" TargetType="controls:FlyoutMenuButton" />

-    <Style x:Key="DefaultFlyoutMenuButtonStyle" TargetType="local:FlyoutMenuButton">
+    <Style x:Key="DefaultFlyoutMenuButtonStyle" TargetType="controls:FlyoutMenuButton">
        <Setter Property="HorizontalAlignment" Value="Stretch" />
        <Setter Property="VerticalAlignment" Value="Stretch" />
        <Setter Property="Width" Value="116" />
@@ -21,7 +21,7 @@
        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
        <Setter Property="Template">
            <Setter.Value>
-                <ControlTemplate TargetType="local:FlyoutMenuButton">
+                <ControlTemplate TargetType="controls:FlyoutMenuButton">
                    <Grid
                        x:Name="RootGrid"
                        Width="{TemplateBinding Width}"
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/IsEnabledTextBlock/IsEnabledTextBlock.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/IsEnabledTextBlock/IsEnabledTextBlock.xaml
@@ -1,14 +1,14 @@
 <ResourceDictionary
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Microsoft.PowerToys.Settings.UI.Controls">
+    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls">

-    <Style x:Key="DefaultIsEnabledTextBlockStyle" TargetType="local:IsEnabledTextBlock">
+    <Style x:Key="DefaultIsEnabledTextBlockStyle" TargetType="controls:IsEnabledTextBlock">
        <Setter Property="Foreground" Value="{ThemeResource DefaultTextForegroundThemeBrush}" />
        <Setter Property="IsTabStop" Value="False" />
        <Setter Property="Template">
            <Setter.Value>
-                <ControlTemplate TargetType="local:IsEnabledTextBlock">
+                <ControlTemplate TargetType="controls:IsEnabledTextBlock">
                    <Grid>
                        <TextBlock
                            x:Name="Label"
@@ -36,7 +36,7 @@
    <Style
        x:Key="SecondaryIsEnabledTextBlockStyle"
        BasedOn="{StaticResource DefaultIsEnabledTextBlockStyle}"
-        TargetType="local:IsEnabledTextBlock">
+        TargetType="controls:IsEnabledTextBlock">
        <Setter Property="Foreground" Value="{ThemeResource TextFillColorSecondaryBrush}" />
        <Setter Property="FontSize" Value="{StaticResource SecondaryTextFontSize}" />
    </Style>
--- 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 @@
 <ResourceDictionary
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Microsoft.PowerToys.Settings.UI.Controls">
+    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls">

    <x:Double x:Key="DefaultIconSize">16</x:Double>
    <x:Double x:Key="SmallIconSize">12</x:Double>
-    <Style x:Key="DefaultTextKeyVisualStyle" TargetType="local:KeyVisual">
+    <Style x:Key="DefaultTextKeyVisualStyle" TargetType="controls:KeyVisual">
        <Setter Property="MinWidth" Value="56" />
        <Setter Property="MinHeight" Value="48" />
        <Setter Property="Background" Value="{ThemeResource AccentButtonBackground}" />
@@ -19,7 +19,7 @@
        <Setter Property="FontSize" Value="18" />
        <Setter Property="Template">
            <Setter.Value>
-                <ControlTemplate TargetType="local:KeyVisual">
+                <ControlTemplate TargetType="controls:KeyVisual">
                    <Grid>
                        <Grid>
                            <Rectangle
@@ -74,7 +74,7 @@
    <Style
        x:Key="SmallTextKeyVisualStyle"
        BasedOn="{StaticResource DefaultTextKeyVisualStyle}"
-        TargetType="local:KeyVisual">
+        TargetType="controls:KeyVisual">
        <Setter Property="MinWidth" Value="40" />
        <Setter Property="Height" Value="36" />
        <Setter Property="FontWeight" Value="SemiBold" />
@@ -86,7 +86,7 @@
    <Style
        x:Key="SmallOutlineTextKeyVisualStyle"
        BasedOn="{StaticResource DefaultTextKeyVisualStyle}"
-        TargetType="local:KeyVisual">
+        TargetType="controls:KeyVisual">
        <Setter Property="MinWidth" Value="40" />
        <Setter Property="Background" Value="{ThemeResource ButtonBackground}" />
        <Setter Property="Foreground" Value="{ThemeResource ButtonForeground}" />
@@ -103,7 +103,7 @@
    <Style
        x:Key="DefaultIconKeyVisualStyle"
        BasedOn="{StaticResource DefaultTextKeyVisualStyle}"
-        TargetType="local:KeyVisual">
+        TargetType="controls:KeyVisual">
        <Setter Property="MinWidth" Value="56" />
        <Setter Property="MinHeight" Value="48" />
        <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
@@ -115,7 +115,7 @@
    <Style
        x:Key="SmallIconKeyVisualStyle"
        BasedOn="{StaticResource DefaultTextKeyVisualStyle}"
-        TargetType="local:KeyVisual">
+        TargetType="controls:KeyVisual">
        <Setter Property="MinWidth" Value="40" />
        <Setter Property="Height" Value="36" />
        <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
@@ -128,7 +128,7 @@
    <Style
        x:Key="SmallOutlineIconKeyVisualStyle"
        BasedOn="{StaticResource DefaultTextKeyVisualStyle}"
-        TargetType="local:KeyVisual">
+        TargetType="controls:KeyVisual">
        <Setter Property="MinWidth" Value="40" />
        <Setter Property="Background" Value="{ThemeResource ButtonBackground}" />
        <Setter Property="Foreground" Value="{ThemeResource ButtonForeground}" />
@@ -144,7 +144,7 @@
    <Style
        x:Key="OnlyTextKeyVisualStyle"
        BasedOn="{StaticResource DefaultTextKeyVisualStyle}"
-        TargetType="local:KeyVisual">
+        TargetType="controls:KeyVisual">
        <Setter Property="MinHeight" Value="12" />
        <Setter Property="MinWidth" Value="12" />
        <Setter Property="Background" Value="Transparent" />
@@ -159,7 +159,7 @@
    <Style
        x:Key="OnlyIconKeyVisualStyle"
        BasedOn="{StaticResource DefaultTextKeyVisualStyle}"
-        TargetType="local:KeyVisual">
+        TargetType="controls:KeyVisual">
        <Setter Property="MinHeight" Value="10" />
        <Setter Property="MinWidth" Value="10" />
        <Setter Property="Background" Value="Transparent" />
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/PowerAccentShortcutControl.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/PowerAccentShortcutControl.xaml
@@ -2,10 +2,10 @@
    x:Class="Microsoft.PowerToys.Settings.UI.Controls.PowerAccentShortcutControl"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    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:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
    d:DesignHeight="300"
    d:DesignWidth="400"
    mc:Ignorable="d">
@@ -27,7 +27,7 @@
            </ItemsControl.ItemsPanel>
            <ItemsControl.ItemTemplate>
                <DataTemplate>
-                    <custom:KeyVisual
+                    <controls:KeyVisual
                        VerticalAlignment="Center"
                        AutomationProperties.AccessibilityView="Raw"
                        Content="{Binding}"
@@ -36,7 +36,7 @@
                </DataTemplate>
            </ItemsControl.ItemTemplate>
        </ItemsControl>
-        <toolkitcontrols:MarkdownTextBlock
+        <tk7controls:MarkdownTextBlock
            Grid.Column="1"
            Margin="8,0,0,0"
            VerticalAlignment="Center"
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsPageControl/SettingsPageControl.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsPageControl/SettingsPageControl.xaml
@@ -2,17 +2,17 @@
    x:Class="Microsoft.PowerToys.Settings.UI.Controls.SettingsPageControl"
    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:custom="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
    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"
+    xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters"
    Loaded="UserControl_Loaded"
    mc:Ignorable="d">

    <UserControl.Resources>
        <x:Double x:Key="PageMaxWidth">1000</x:Double>
-        <converters:DoubleToVisibilityConverter
+        <tkconverters:DoubleToVisibilityConverter
            x:Name="doubleToVisibilityConverter"
            FalseValue="Collapsed"
            GreaterThan="0"
@@ -82,7 +82,7 @@
                            IsTabStop="False"
                            ItemsSource="{x:Bind PrimaryLinks}">
                            <ItemsControl.ItemTemplate>
-                                <DataTemplate x:DataType="local:PageLink">
+                                <DataTemplate x:DataType="controls:PageLink">
                                    <HyperlinkButton NavigateUri="{x:Bind Link}" Style="{StaticResource TextButtonStyle}">
                                        <TextBlock Text="{x:Bind Text}" TextWrapping="Wrap" />
                                    </HyperlinkButton>
@@ -90,7 +90,7 @@
                            </ItemsControl.ItemTemplate>
                            <ItemsControl.ItemsPanel>
                                <ItemsPanelTemplate>
-                                    <custom:WrapPanel HorizontalSpacing="24" Orientation="Horizontal" />
+                                    <tk7controls:WrapPanel HorizontalSpacing="24" Orientation="Horizontal" />
                                </ItemsPanelTemplate>
                            </ItemsControl.ItemsPanel>
                        </ItemsControl>
@@ -123,7 +123,7 @@
                        IsTabStop="False"
                        ItemsSource="{x:Bind SecondaryLinks}">
                        <ItemsControl.ItemTemplate>
-                            <DataTemplate x:DataType="local:PageLink">
+                            <DataTemplate x:DataType="controls:PageLink">
                                <HyperlinkButton NavigateUri="{x:Bind Link}" Style="{StaticResource TextButtonStyle}">
                                    <TextBlock Text="{x:Bind Text}" TextWrapping="Wrap" />
                                </HyperlinkButton>
@@ -131,7 +131,7 @@
                        </ItemsControl.ItemTemplate>
                        <ItemsControl.ItemsPanel>
                            <ItemsPanelTemplate>
-                                <custom:WrapPanel HorizontalSpacing="24" Orientation="Horizontal" />
+                                <tk7controls:WrapPanel HorizontalSpacing="24" Orientation="Horizontal" />
                            </ItemsPanelTemplate>
                        </ItemsControl.ItemsPanel>
                    </ItemsControl>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutControl.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutControl.xaml
@@ -2,8 +2,8 @@
    x:Class="Microsoft.PowerToys.Settings.UI.Controls.ShortcutControl"
    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: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"
    x:Name="LayoutRoot"
    d:DesignHeight="300"
@@ -33,7 +33,7 @@
                        </ItemsControl.ItemsPanel>
                        <ItemsControl.ItemTemplate>
                            <DataTemplate>
-                                <local:KeyVisual
+                                <controls:KeyVisual
                                    VerticalAlignment="Center"
                                    AutomationProperties.AccessibilityView="Raw"
                                    Content="{Binding}"
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutDialogContentControl.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutDialogContentControl.xaml
@@ -2,10 +2,10 @@
    x:Class="Microsoft.PowerToys.Settings.UI.Controls.ShortcutDialogContentControl"
    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: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:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
    x:Name="ShortcutContentControl"
    mc:Ignorable="d">
    <Grid MinWidth="498" MinHeight="220">
@@ -33,7 +33,7 @@
            </ItemsControl.ItemsPanel>
            <ItemsControl.ItemTemplate>
                <DataTemplate>
-                    <local:KeyVisual
+                    <controls:KeyVisual
                        Height="56"
                        AutomationProperties.AccessibilityView="Raw"
                        Content="{Binding}"
@@ -66,7 +66,7 @@
                    IsTabStop="{Binding ElementName=ShortcutContentControl, Path=IsWarningAltGr, Mode=OneWay}"
                    Severity="Warning" />
            </Grid>
-            <toolkitcontrols:MarkdownTextBlock
+            <tk7controls:MarkdownTextBlock
                x:Uid="InvalidShortcutWarningLabel"
                Background="Transparent"
                FontSize="12"
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml
@@ -2,11 +2,10 @@
    x:Class="Microsoft.PowerToys.Settings.UI.Controls.ShortcutWithTextLabelControl"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    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:local="using:Microsoft.PowerToys.Settings.UI.Controls"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
    d:DesignHeight="300"
    d:DesignWidth="400"
    mc:Ignorable="d">
@@ -28,7 +27,7 @@
            </ItemsControl.ItemsPanel>
            <ItemsControl.ItemTemplate>
                <DataTemplate>
-                    <custom:KeyVisual
+                    <controls:KeyVisual
                        VerticalAlignment="Center"
                        AutomationProperties.AccessibilityView="Raw"
                        Content="{Binding}"
@@ -37,7 +36,7 @@
                </DataTemplate>
            </ItemsControl.ItemTemplate>
        </ItemsControl>
-        <toolkitcontrols:MarkdownTextBlock
+        <tk7controls:MarkdownTextBlock
            Grid.Column="1"
            VerticalAlignment="Center"
            Background="Transparent"