WPFDevelopersOrg · yanjinhuagood · Nov 17, 2024 · May 27, 2024 · May 27, 2024 · May 28, 2024
diff --git a/README-zh.md b/README-zh.md
@@ -26,7 +26,7 @@
 
 ### [ Wiki→ 正在进行快速更新](https://gitee.com/WPFDevelopersOrg/WPFDevelopers/wikis/pages)   
 
-### 此项目包含了 微信公众号 《 WPF开发者》 日常开发分享，欢迎<kbd>Star🌟</kbd>。   
+### 此项目包含了 微信公众号 《 WPF开发者》 日常开发分享，欢迎<kbd>Star</kbd>。   
 
 ### 运行环境 Visual Studio 2022  
 

diff --git a/src/WPFDevelopers.Net40/Themes/Theme.xaml b/src/WPFDevelopers.Net40/Themes/Theme.xaml
diff --git a/src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj b/src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj
@@ -3,7 +3,6 @@
 	<PropertyGroup>
 		<TargetFramework>net40</TargetFramework>
 		<SignAssembly>True</SignAssembly>
-		<AssemblyOriginatorKeyFile>E:\Code\git\WPFDevelopers\WPFDevelopersMultiple\WPFDevelopers.snk</AssemblyOriginatorKeyFile>
 	</PropertyGroup>
 	<Import Project="..\WPFDevelopers.Shared\WPFDevelopers.Shared.projitems" Label="Shared" />
 	<Import Project="..\Microsoft.Windows.Shell\Microsoft.Windows.Shell.projitems" Label="Shared" />

diff --git a/src/WPFDevelopers.Net45x/Themes/Theme.xaml b/src/WPFDevelopers.Net45x/Themes/Theme.xaml
diff --git a/src/WPFDevelopers.Net45x/WPFDevelopers.Net45x.csproj b/src/WPFDevelopers.Net45x/WPFDevelopers.Net45x.csproj
@@ -4,7 +4,6 @@
 	<PropertyGroup>
 		<UseWindowsForms>true</UseWindowsForms>
 		<SignAssembly>True</SignAssembly>
-		<AssemblyOriginatorKeyFile>E:\Code\git\WPFDevelopers\WPFDevelopersMultiple\WPFDevelopers.snk</AssemblyOriginatorKeyFile>
 	</PropertyGroup>
 	<Import Project="..\WPFDevelopers.Shared\WPFDevelopers.Shared.projitems" Label="Shared" />
 	<Import Project="..\Microsoft.Windows.Shell\Microsoft.Windows.Shell.projitems" Label="Shared" />

diff --git a/src/WPFDevelopers.Samples.Shared/App.xaml b/src/WPFDevelopers.Samples.Shared/App.xaml
@@ -31,6 +31,7 @@
                 <ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/TransformLayout/TransformLayout.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/ExampleViews/DrapView/Controls/TransformThumb.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/NavigateMenu/NavigateMenu.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/Loadings/StreamerLoading.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <Style TargetType="avalonedit:TextEditor">
                 <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />

diff --git a/...ared/Controls/Loadings/StreamerLoading.cs → ...ared/Controls/Loadings/StreamerLoading.cs b/...ared/Controls/Loadings/StreamerLoading.cs → ...ared/Controls/Loadings/StreamerLoading.cs
@@ -1,7 +1,7 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace WPFDevelopers.Controls
+namespace WPFDevelopers.Samples.Controls
 {
     public class StreamerLoading : Control
     {

diff --git a/src/WPFDevelopers.Samples.Shared/Controls/Loadings/StreamerLoading.xaml b/src/WPFDevelopers.Samples.Shared/Controls/Loadings/StreamerLoading.xaml
@@ -0,0 +1,66 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
+    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers">
+    <Style
+        x:Key="WD.StreamerLoading"
+        BasedOn="{StaticResource WD.ControlBasicStyle}"
+        TargetType="{x:Type controls:StreamerLoading}">
+        <Setter Property="Width" Value="100" />
+        <Setter Property="Height" Value="100" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="Background">
+            <Setter.Value>
+                <SolidColorBrush Color="{DynamicResource WD.PrimaryNormalColor}" />
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:StreamerLoading}">
+                    <Rectangle
+                        x:Name="PART_Rectangle"
+                        Width="{TemplateBinding Width}"
+                        Height="{TemplateBinding Height}"
+                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                        VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                        CacheMode="BitmapCache"
+                        StrokeThickness="3">
+                        <Rectangle.Stroke>
+                            <LinearGradientBrush Opacity=".6" StartPoint="0.5,0" EndPoint="0.5,1">
+                                <GradientStop Offset="0" Color="Transparent" />
+                                <GradientStop Offset="1" Color="{Binding Path=Background.Color, RelativeSource={RelativeSource TemplatedParent}}" />
+                            </LinearGradientBrush>
+                        </Rectangle.Stroke>
+                    </Rectangle>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsVisible" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard>
+                                    <Storyboard DesiredFrameRate="30" RepeatBehavior="Forever">
+                                        <PointAnimationUsingKeyFrames Storyboard.TargetName="PART_Rectangle" Storyboard.TargetProperty="(Shape.Stroke).(LinearGradientBrush.StartPoint)">
+                                            <EasingPointKeyFrame KeyTime="0:0:0.5" Value="0.855,0.148" />
+                                            <EasingPointKeyFrame KeyTime="0:0:1" Value="0.852,0.855" />
+                                            <EasingPointKeyFrame KeyTime="0:0:1.5" Value="0.148,0.855" />
+                                            <EasingPointKeyFrame KeyTime="0:0:2" Value="0.144,0.149" />
+                                            <EasingPointKeyFrame KeyTime="0:0:2.5" Value="0,0" />
+                                        </PointAnimationUsingKeyFrames>
+                                        <PointAnimationUsingKeyFrames Storyboard.TargetName="PART_Rectangle" Storyboard.TargetProperty="(Shape.Stroke).(LinearGradientBrush.EndPoint)">
+                                            <EasingPointKeyFrame KeyTime="0:0:0.5" Value="0.145,0.852" />
+                                            <EasingPointKeyFrame KeyTime="0:0:1" Value="0.148,0.145" />
+                                            <EasingPointKeyFrame KeyTime="0:0:1.5" Value="0.852,0.145" />
+                                            <EasingPointKeyFrame KeyTime="0:0:2" Value="0.856,0.851" />
+                                            <EasingPointKeyFrame KeyTime="0:0:2.5" Value="0,1" />
+                                        </PointAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.EnterActions>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.StreamerLoading}" TargetType="{x:Type controls:StreamerLoading}" />
+</ResourceDictionary>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/AnimationAudioExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/AnimationAudioExample.xaml
@@ -1,52 +1,65 @@
-<UserControl x:Class="WPFDevelopers.Samples.ExampleViews.AnimationAudioExample"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
-             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
-             xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
+<UserControl
+    x:Class="WPFDevelopers.Samples.ExampleViews.AnimationAudioExample"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
     <controls:CodeViewer>
-        <UniformGrid Columns="2" x:Name="MyUniformGrid">
-        <StackPanel Orientation="Horizontal">
-            <wd:BreathLamp Width="60" Height="60" LampEffect="Ripple"  IsLampStart="true"
-                                   VerticalAlignment="Center" HorizontalAlignment="Left"
-                               Margin="10,0">
-                <Ellipse>
-                    <Ellipse.Fill>
-                            <ImageBrush ImageSource="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/Breathe/0.jpg"/>
-                    </Ellipse.Fill>
-                </Ellipse>
-            </wd:BreathLamp>
-            <wd:AnimationAudio x:Name="AnimationAudioLeft" MouseDown="AnimationAudioLeft_MouseDown"/>
-        </StackPanel>
-        <StackPanel Orientation="Horizontal"
-                    HorizontalAlignment="Right">
-            <wd:AnimationAudio x:Name="AnimationAudioRight" IsRight ="true" 
-                               Background="{DynamicResource WD.SuccessSolidColorBrush}"
-                               Foreground="Black"
-                               MouseDown="AnimationAudioLeft_MouseDown"/>
-            <wd:BreathLamp Width="60" Height="60" LampEffect="Streamer"  IsLampStart="True"
-                               VerticalAlignment="Center" HorizontalAlignment="Left" 
-                               GradientStopColor1="#FF00cec9" GradientStopColor2="#2000cec9"
-                               Margin="10,0">
-                <Ellipse>
-                    <Ellipse.Fill>
-                            <ImageBrush ImageSource="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/Chat/UserImages/yanjinhua.png"/>
-                    </Ellipse.Fill>
-                </Ellipse>
-            </wd:BreathLamp>
-        </StackPanel>
+        <UniformGrid x:Name="MyUniformGrid" Columns="2">
+            <StackPanel Orientation="Horizontal">
+                <wd:BreathLamp
+                    Width="60"
+                    Height="60"
+                    Margin="10,0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    IsLampStart="true"
+                    LampEffect="Ripple">
+                    <Ellipse>
+                        <Ellipse.Fill>
+                            <ImageBrush ImageSource="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/Breathe/0.jpg" />
+                        </Ellipse.Fill>
+                    </Ellipse>
+                </wd:BreathLamp>
+                <wd:AnimationAudio
+                    x:Name="AnimationAudioLeft"
+                    wd:ElementHelper.CornerRadius="4"
+                    MouseDown="AnimationAudioLeft_MouseDown" />
+            </StackPanel>
+            <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+                <wd:AnimationAudio
+                    x:Name="AnimationAudioRight"
+                    Background="{DynamicResource WD.SuccessSolidColorBrush}"
+                    Foreground="Black"
+                    IsRight="true"
+                    MouseDown="AnimationAudioLeft_MouseDown" />
+                <wd:BreathLamp
+                    Width="60"
+                    Height="60"
+                    Margin="10,0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    GradientStopColor1="#FF00cec9"
+                    GradientStopColor2="#2000cec9"
+                    IsLampStart="True"
+                    LampEffect="Streamer">
+                    <Ellipse>
+                        <Ellipse.Fill>
+                            <ImageBrush ImageSource="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/Chat/UserImages/yanjinhua.png" />
+                        </Ellipse.Fill>
+                    </Ellipse>
+                </wd:BreathLamp>
+            </StackPanel>
         </UniformGrid>
         <controls:CodeViewer.SourceCodes>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/AnimationAudioExample.xaml" 
-                CodeType="Xaml"/>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/AnimationAudioExample.xaml.cs" 
-                CodeType="CSharp"/>
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/AnimationAudioExample.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/AnimationAudioExample.xaml.cs" CodeType="CSharp" />
         </controls:CodeViewer.SourceCodes>
     </controls:CodeViewer>
 </UserControl>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/BadgeExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/BadgeExample.xaml
@@ -20,10 +20,12 @@
                 x:Name="MyBadgeToggleButton"
                 Margin="10"
                 HorizontalAlignment="Center"
-                Content="显示Badge" />
+                Content="显示Badge"
+                IsChecked="True" />
             <UniformGrid
                 Grid.Row="1"
                 HorizontalAlignment="Center"
+                wd:PanelHelper.Spacing="10"
                 Rows="1">
                 <Button
                     Width="100"
@@ -33,12 +35,11 @@
                     Style="{DynamicResource WD.PrimaryButton}" />
                 <Button
                     Width="100"
-                    Margin="10,0"
                     wd:Badge.FontSize="12"
                     wd:Badge.IsShow="{Binding ElementName=MyBadgeToggleButton, Path=IsChecked}"
-                    wd:Badge.Text="{Binding Text,RelativeSource={RelativeSource AncestorType=UserControl}}"
+                    wd:Badge.Text="{Binding Text, RelativeSource={RelativeSource AncestorType=UserControl}}"
+                    Click="myButton_Click"
                     Content="Success"
-                    Click="myButton_Click" 
                     Style="{DynamicResource WD.SuccessDefaultButton}" />
                 <Button
                     Width="100"
@@ -49,7 +50,6 @@
                     Style="{DynamicResource WD.WarningDefaultButton}" />
                 <Button
                     Width="100"
-                    Margin="10,0"
                     wd:Badge.IsShow="{Binding ElementName=MyBadgeToggleButton, Path=IsChecked}"
                     wd:Badge.Text="NEW"
                     Content="Danger"

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
@@ -39,15 +39,16 @@
                                 Padding="0,10"
                                 FontSize="20"
                                 Foreground="{DynamicResource WD.PrimaryNormalSolidColorBrush}">
-                                <Hyperlink NavigateUri="https://github.com/yanjinhuagood/WPFDevelopers.Minimal.git" RequestNavigate="GithubHyperlink_RequestNavigate">Github 源码</Hyperlink>
+                                <Hyperlink NavigateUri="https://github.com/WPFDevelopersOrg/WPFDevelopers" RequestNavigate="GithubHyperlink_RequestNavigate">Github 源码</Hyperlink>
                                 <Run />
                                 <Run />
                                 <Run />
-                                <Hyperlink NavigateUri="https://gitee.com/WPFDevelopersOrg/WPFDevelopers.Minimal.git" RequestNavigate="GiteeHyperlink_RequestNavigate">码云源码</Hyperlink>
+                                <Hyperlink NavigateUri="https://gitee.com/WPFDevelopersOrg/WPFDevelopers" RequestNavigate="GiteeHyperlink_RequestNavigate">码云源码</Hyperlink>
                                 <Run />
                                 <Run />
                                 <Run />
-                                <Hyperlink NavigateUri="https://gitee.com/yanjinhua/WPFDevelopers.git" RequestNavigate="QQHyperlink_RequestNavigate">加入QQ群：458041663</Hyperlink>
+                                <Hyperlink NavigateUri="https://gitee.com/WPFDevelopersOrg/WPFDevelopers" RequestNavigate="QQHyperlink_RequestNavigate">加入QQ群：458041663</Hyperlink>
+                                <Hyperlink>、340500857、929469013</Hyperlink>
                             </TextBlock>
                         </StackPanel>
 
@@ -56,7 +57,7 @@
                         Margin="0,20,0,0"
                         FontSize="20"
                         Text="Theme" />
-                    <wd:ThemeControl Margin="0,10" ItemsSource="{Binding ThemesCollection, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=OneWayToSource}" />
+                    <wd:Theme Margin="0,10" ItemsSource="{Binding ThemesCollection, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=OneWayToSource}" />
                     <TextBlock
                         Margin="0,20,0,0"
                         FontSize="20"
@@ -120,6 +121,7 @@
                         Margin="0,10"
                         Rows="1">
                         <Button
+                            wd:ElementHelper.CornerRadius="3"
                             Click="Button_Click"
                             Content="ToolWindow"
                             Style="{DynamicResource WD.PrimaryButton}" />
@@ -138,12 +140,14 @@
                         Margin="0,10"
                         Rows="1">
                         <Button
+                            wd:ElementHelper.CornerRadius="3"
                             Click="Loading_Click"
                             Content="Loading"
                             Style="{DynamicResource WD.PrimaryButton}" />
                         <Button
                             Name="btnLoadingTask"
                             Margin="10,0"
+                            wd:ElementHelper.CornerRadius="3"
                             Click="LoadingTask_Click"
                             Content="LoadingTask"
                             Style="{DynamicResource WD.SuccessPrimaryButton}" />
@@ -756,12 +760,6 @@
                         Margin="0,10"
                         Columns="2"
                         Rows="2">
-                        <UniformGrid.Resources>
-                            <Style TargetType="{x:Type Rectangle}">
-                                <Setter Property="Width" Value="{x:Static SystemParameters.PrimaryScreenWidth}" />
-                                <Setter Property="Height" Value="400" />
-                            </Style>
-                        </UniformGrid.Resources>
                         <TabControl Margin="4" wd:ElementHelper.CornerRadius="3">
                             <TabItem Padding="10" Header="TabItem1">
                                 <Rectangle Fill="{DynamicResource WD.DangerSolidColorBrush}" />

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml.cs
@@ -94,7 +94,7 @@ private void MainView_Loaded(object sender, RoutedEventArgs e)
 
         private void btnInformation_Click(object sender, RoutedEventArgs e)
         {
-            MessageBox.Show("文件删除成功。", "消息", MessageBoxButton.OK, MessageBoxImage.Information);
+            MessageBox.Show("文件删除成功。", "消息", MessageBoxButton.OK, MessageBoxImage.Information, buttonRadius: 4);
         }
 
         private void btnWarning_Click(object sender, RoutedEventArgs e)
@@ -109,7 +109,7 @@ private void btnError_Click(object sender, RoutedEventArgs e)
 
         private void btnQuestion_Click(object sender, RoutedEventArgs e)
         {
-            MessageBox.Show("当前文件不存在,是否继续?", "询问", MessageBoxButton.OKCancel, MessageBoxImage.Question);
+            MessageBox.Show("当前文件不存在,是否继续?", "询问", MessageBoxButton.OKCancel, MessageBoxImage.Question, buttonRadius: 4);
         }
 
         private void GithubHyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e)