add XmlnsPrefix

2019-05-21 23:04:03 +08:00
1 parent 6ec2b954ab
commit 86b634e85c
@@ -1,9 +1,9 @@
-<controls:Window x:Class="HandyControlDemo.Window.AboutWindow"
+<hc:Window x:Class="HandyControlDemo.Window.AboutWindow"
                 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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                 xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+                 xmlns:hc="https://handyorg.github.io/handycontrol"
                 mc:Ignorable="d"
                 xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
                 Title="{x:Static langs:Lang.About}"
@@ -16,11 +16,11 @@
                 WindowStartupLocation="CenterOwner"
                 Width="340"
                 Height="220">
-    <controls:SimplePanel>
+    <hc:SimplePanel>
        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,30,0,0">
            <TextBlock Text="HandyControl" FontSize="30" Foreground="{StaticResource PrimaryBrush}" VerticalAlignment="Top" HorizontalAlignment="Center"/>
            <TextBlock Text="{Binding Version}" HorizontalAlignment="Center" Margin="0,10,0,0" Foreground="{StaticResource PrimaryBrush}"/>
        </StackPanel>
        <TextBlock Text="{Binding CopyRight}" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,14" Foreground="{StaticResource ThirdlyTextBrush}"/>
-    </controls:SimplePanel>
-</controls:Window>
+    </hc:SimplePanel>
+</hc:Window>
@@ -1,9 +1,9 @@
-<controls:BlurWindow x:Class="HandyControlDemo.Window.BlurWindow"
+<hc:BlurWindow x:Class="HandyControlDemo.Window.BlurWindow"
                     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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                     xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+                     xmlns:hc="https://handyorg.github.io/handycontrol"
                     xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
                     mc:Ignorable="d"
                     WindowStartupLocation="CenterScreen"
@@ -13,4 +13,4 @@
                     Height="450" 
                     Width="800" 
                     Icon="/HandyControlDemo;component/Resources/Img/icon.ico">
-</controls:BlurWindow>
+</hc:BlurWindow>
@@ -1,18 +1,18 @@
-<controls:Window x:Class="HandyControlDemo.Window.CommonWindow"
-                           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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                           xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
-                           xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-                           mc:Ignorable="d"
-                           ShowTitle="True"
-                           Background="{DynamicResource MainContentBackgroundBrush}"
-                           WindowStartupLocation="CenterScreen"
-                           Style="{StaticResource WindowWin10}"
-                           Title="{x:Static langs:Lang.Title}" 
-                           Height="450" 
-                           Width="800" 
-                           Icon="/HandyControlDemo;component/Resources/Img/icon.ico">
+<hc:Window x:Class="HandyControlDemo.Window.CommonWindow"
+           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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+           xmlns:hc="https://handyorg.github.io/handycontrol"
+           xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
+           mc:Ignorable="d"
+           ShowTitle="True"
+           Background="{DynamicResource MainContentBackgroundBrush}"
+           WindowStartupLocation="CenterScreen"
+           Style="{StaticResource WindowWin10}"
+           Title="{x:Static langs:Lang.Title}" 
+           Height="450" 
+           Width="800" 
+           Icon="/HandyControlDemo;component/Resources/Img/icon.ico">
    <Border Background="{DynamicResource MainContentForegroundDrawingBrush}"/>
-</controls:Window>
+</hc:Window>
@@ -1,23 +1,23 @@
-<controls:Window x:Class="HandyControlDemo.Window.CustomNonClientAreaWindow"
-                           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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                           xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-                           xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
-                           mc:Ignorable="d"
-                           OtherButtonForeground="{DynamicResource ReverseTextBrush}"
-                           CloseButtonForeground="{DynamicResource ReverseTextBrush}"
-                           OtherButtonHoverBackground="{DynamicResource ReverseTextBrush}"
-                           NonClientAreaBackground="{DynamicResource ToolBarBackground}"
-                           NonClientAreaHeight="69"
-                           Background="{DynamicResource MainContentBackgroundBrush}"
-                           WindowStartupLocation="CenterScreen"
-                           Style="{StaticResource WindowWin10}"
-                           Title="{x:Static langs:Lang.Title}" 
-                           Height="450" 
-                           Width="800">
-    <controls:Window.NonClientAreaContent>
+<hc:Window x:Class="HandyControlDemo.Window.CustomNonClientAreaWindow"
+           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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+           xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
+           xmlns:hc="https://handyorg.github.io/handycontrol"
+           mc:Ignorable="d"
+           OtherButtonForeground="{DynamicResource ReverseTextBrush}"
+           CloseButtonForeground="{DynamicResource ReverseTextBrush}"
+           OtherButtonHoverBackground="{DynamicResource ReverseTextBrush}"
+           NonClientAreaBackground="{DynamicResource ToolBarBackground}"
+           NonClientAreaHeight="69"
+           Background="{DynamicResource MainContentBackgroundBrush}"
+           WindowStartupLocation="CenterScreen"
+           Style="{StaticResource WindowWin10}"
+           Title="{x:Static langs:Lang.Title}" 
+           Height="450" 
+           Width="800">
+    <hc:Window.NonClientAreaContent>
        <StackPanel Orientation="Horizontal" Height="69">
            <Path Data="{StaticResource LogoGeometry}" Width="40" Height="40" Stretch="Uniform" Fill="#F76B1C" Margin="20,0,0,0"></Path>
            <Button Style="{StaticResource ButtonCustom}" Margin="32,0,0,0">
@@ -56,6 +56,6 @@
                </Border>
            </Button>
        </StackPanel>
-    </controls:Window.NonClientAreaContent>
+    </hc:Window.NonClientAreaContent>
    <Border Background="{DynamicResource MainContentForegroundDrawingBrush}"/>
-</controls:Window>
+</hc:Window>
@@ -1,18 +1,18 @@
 <Window x:Class="HandyControlDemo.Window.DialogDemoWindow"
        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+        xmlns:hc="https://handyorg.github.io/handycontrol"
        xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
        xmlns:data="clr-namespace:HandyControlDemo.Data"
-        controls:Dialog.Token="{x:Static data:MessageToken.DialogDemoWindow}"
+        hc:Dialog.Token="{x:Static data:MessageToken.DialogDemoWindow}"
        DataContext="{Binding DialogDemo,Source={StaticResource Locator}}"
        Title="{x:Static langs:Lang.DialogDemo}"
        Width="800"
        Height="500">
-    <controls:TransitioningContentControl>
+    <hc:TransitioningContentControl>
        <StackPanel Margin="32" VerticalAlignment="Center">
            <Button Content="{x:Static langs:Lang.ShowInCurrentWindow}" Command="{Binding ShowWithTokenCmd}" CommandParameter="{x:Static data:MessageToken.DialogDemoWindow}"/>
            <Button Margin="0,10,0,0" Content="{x:Static langs:Lang.ShowInMainWindow}" Command="{Binding ShowWithTokenCmd}" CommandParameter="{x:Static data:MessageToken.MainWindow}"/>
        </StackPanel>
-    </controls:TransitioningContentControl>
+    </hc:TransitioningContentControl>
 </Window>
@@ -1,15 +1,15 @@
 <Window x:Class="HandyControlDemo.Window.GrowlDemoWindow"
        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+        xmlns:hc="https://handyorg.github.io/handycontrol"
        xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
        xmlns:data="clr-namespace:HandyControlDemo.Data"
        DataContext="{Binding GrowlDemoWithToken,Source={StaticResource Locator}}"
        Title="{x:Static langs:Lang.GrowlDemo}"
        Width="800"
        Height="500">
-    <controls:TransitioningContentControl>
-        <controls:SimplePanel Margin="32">
+    <hc:TransitioningContentControl>
+        <hc:SimplePanel Margin="32">
            <WrapPanel>
                <Button Command="{Binding InfoCmd}" Content="{x:Static langs:Lang.Info}" Margin="0,5,5,5" Style="{StaticResource ButtonInfo}"/>
                <Button Command="{Binding SuccessCmd}" Content="{x:Static langs:Lang.Success}" Margin="5" Style="{StaticResource ButtonSuccess}"/>
@@ -19,9 +19,9 @@
                <Button Command="{Binding FatalCmd}" Content="{x:Static langs:Lang.Fatal}" Margin="5,0"/>
                <Button Command="{Binding ClearCmd}" Content="{x:Static langs:Lang.Clear}" Margin="5,0,0,0" Style="{StaticResource ButtonPrimary}"/>
            </WrapPanel>
-            <controls:ScrollViewer VerticalScrollBarVisibility="Hidden" HorizontalAlignment="Right" IsEnableInertia="True" IsPenetrating="True">
-                <StackPanel controls:Growl.Token="{x:Static data:MessageToken.GrowlDemoPanel}" VerticalAlignment="Top" Margin="0,10,10,10"/>
-            </controls:ScrollViewer>
-        </controls:SimplePanel>
-    </controls:TransitioningContentControl>
+            <hc:ScrollViewer VerticalScrollBarVisibility="Hidden" HorizontalAlignment="Right" IsEnableInertia="True" IsPenetrating="True">
+                <StackPanel hc:Growl.Token="{x:Static data:MessageToken.GrowlDemoPanel}" VerticalAlignment="Top" Margin="0,10,10,10"/>
+            </hc:ScrollViewer>
+        </hc:SimplePanel>
+    </hc:TransitioningContentControl>
 </Window>
@@ -1,24 +1,24 @@
-<controls:BlurWindow x:Class="HandyControlDemo.Window.NoNonClientAreaDragableWindow"
-                     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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                     xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
-                     xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-                     mc:Ignorable="d"
-                     WindowStartupLocation="CenterScreen"
-                     ShowTitle="True"
-                     Style="{StaticResource WindowBlur}"
-                     Icon="/HandyControlDemo;component/Resources/Img/icon.ico"
-                     ShowNonClientArea="False"
-                     Title="NoClientDragableWindow" 
-                     Height="450" 
-                     Width="800">
-    <controls:SimplePanel>
+<hc:BlurWindow x:Class="HandyControlDemo.Window.NoNonClientAreaDragableWindow"
+               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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+               xmlns:hc="https://handyorg.github.io/handycontrol"
+               xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
+               mc:Ignorable="d"
+               WindowStartupLocation="CenterScreen"
+               ShowTitle="True"
+               Style="{StaticResource WindowBlur}"
+               Icon="/HandyControlDemo;component/Resources/Img/icon.ico"
+               ShowNonClientArea="False"
+               Title="NoClientDragableWindow" 
+               Height="450" 
+               Width="800">
+    <hc:SimplePanel>
        <Rectangle VerticalAlignment="Top" Margin="10" Height="30" RadiusX="4" RadiusY="4" Stroke="{DynamicResource BorderBrush}" StrokeDashArray="2,2"/>
-        <Border controls:WindowAttach.IsDragElement="True" VerticalAlignment="Top" Margin="11" Height="28" Background="{DynamicResource DarkDefaultBrush}" CornerRadius="4">
+        <Border hc:WindowAttach.IsDragElement="True" VerticalAlignment="Top" Margin="11" Height="28" Background="{DynamicResource DarkDefaultBrush}" CornerRadius="4">
            <TextBlock Text="{x:Static langs:Lang.DragHere}" Style="{StaticResource TextBlockDefault}"/>
        </Border>
-        <Button Click="ButtonClose_OnClick" HorizontalAlignment="Right" Margin="0,15,15,0" VerticalAlignment="Top" Padding="0" Height="20" Width="20" Style="{StaticResource ButtonPrimary}" controls:IconElement.Geometry="{StaticResource CloseGeometry}" controls:BorderElement.CornerRadius="15"/>
-    </controls:SimplePanel>
-</controls:BlurWindow>
+        <Button Click="ButtonClose_OnClick" HorizontalAlignment="Right" Margin="0,15,15,0" VerticalAlignment="Top" Padding="0" Height="20" Width="20" Style="{StaticResource ButtonPrimary}" hc:IconElement.Geometry="{StaticResource CloseGeometry}" hc:BorderElement.CornerRadius="15"/>
+    </hc:SimplePanel>
+</hc:BlurWindow>