dev merge master

yanjinhuagood · yanjinhuagood · commit e806180ac775 · 2024-11-17T23:36:31.000+08:00
diff --git a/README-zh.md b/README-zh.md
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 <div align="center"><img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/Logo.png"/></div>   
 
-[中文](https://github.com/WPFDevelopersOrg/WPFDevelopers/blob/master/README-zh.md)   
+[中文](https://gitee.com/WPFDevelopersOrg/WPFDevelopers/blob/master/README-zh.md)   
 
  ![dotnet-version](https://img.shields.io/badge/.net%20framework-%E2%89%A54.0-blue)  ![Visual Studio 2019](https://img.shields.io/badge/Visual%20Studio%20-2019-blueviolet)  ![Visual Studio 2022](https://img.shields.io/badge/Visual%20Studio-2022-blueviolet)  [![Github](https://img.shields.io/badge/%20-github-%2324292e)](https://github.com/yanjinhuagood/WPFDevelopers)   <a href="https://www.nuget.org/packages/WPFDevelopers/">
         <img alt="nuget-version" src="https://img.shields.io/nuget/v/WPFDevelopers.svg?color=%23409EF"></img>
@@ -26,7 +26,7 @@
 ### .Net Version
 |  .Net Version   | Status  |
 |  ----  | ----  |
-| Net40  | ✅ |
+| net40  | ✅ |
 | net45  | ✅ |
 | net46  | ✅ |
 | net47  | ✅ |
@@ -81,6 +81,46 @@ xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
 
 `xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"`
 
+----------
+### DateRangePicker
+
+<img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/DateRangePicker.gif"/>   
+
+----------
+### Spacing
+
+<img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/Spacing.gif"/>   
+
+----------
+### NotifyIcon
+
+<img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/NotifyIcon2.gif"/>   
+
+----------
+### ChartRadar
+
+<img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/ChartRadar.gif"/>   
+
+----------
+### ChartLine
+
+<img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/ChartLine.gif"/>   
+
+----------
+### ChartBar
+
+<img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/ChartBar.gif"/>   
+
+----------
+### SearchText
+
+<img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/SearchText.gif"/>   
+
+----------
+### ClearButton
+
+<img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/ClearButton.gif"/>   
+
 ----------
 ### IPEditBox
 
diff --git a/src/WPFDevelopers.Net40/Themes/Theme.xaml b/src/WPFDevelopers.Net40/Themes/Theme.xaml
diff --git a/src/WPFDevelopers.Net45x/Themes/Theme.xaml b/src/WPFDevelopers.Net45x/Themes/Theme.xaml
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/AnimationAudioExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/AnimationAudioExample.xaml
@@ -1,4 +1,4 @@
-﻿<UserControl
+<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"
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/BallLoadingExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/BallLoadingExample.xaml
@@ -1,4 +1,4 @@
-﻿<UserControl
+<UserControl
     x:Class="WPFDevelopers.Samples.ExampleViews.BallLoadingExample"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/CycleLoadingExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/CycleLoadingExample.xaml
@@ -1,4 +1,4 @@
-﻿<UserControl
+<UserControl
     x:Class="WPFDevelopers.Samples.ExampleViews.CycleLoadingExample"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/RingLoadingExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/RingLoadingExample.xaml
@@ -1,4 +1,4 @@
-﻿<UserControl
+<UserControl
     x:Class="WPFDevelopers.Samples.ExampleViews.RingLoadingExample"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/RollLoadingExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/RollLoadingExample.xaml
@@ -1,4 +1,4 @@
-﻿<UserControl
+<UserControl
     x:Class="WPFDevelopers.Samples.ExampleViews.RollLoadingExample"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/StreamerLoadingExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/StreamerLoadingExample.xaml
@@ -1,4 +1,4 @@
-﻿<UserControl
+<UserControl
     x:Class="WPFDevelopers.Samples.ExampleViews.StreamerLoadingExample"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/WaitLoadingExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/WaitLoadingExample.xaml
@@ -1,4 +1,4 @@
-﻿<UserControl
+<UserControl
     x:Class="WPFDevelopers.Samples.ExampleViews.WaitLoadingExample"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/StarrySkyExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/StarrySkyExample.xaml
@@ -1,4 +1,4 @@
-﻿<UserControl
+<UserControl
     x:Class="WPFDevelopers.Samples.ExampleViews.StarrySkyExample"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/src/WPFDevelopers.Shared/Controls/Charts/ChartBase.cs b/src/WPFDevelopers.Shared/Controls/Charts/ChartBase.cs
@@ -1,4 +1,4 @@
-﻿using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
diff --git a/src/WPFDevelopers.Shared/Controls/Charts/ChartLine.cs b/src/WPFDevelopers.Shared/Controls/Charts/ChartLine.cs
@@ -1,4 +1,4 @@
-﻿using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
 using System.Windows.Media;
diff --git a/src/WPFDevelopers.Shared/Languages/Language.ko-KR.resx b/src/WPFDevelopers.Shared/Languages/Language.ko-KR.resx
@@ -144,6 +144,7 @@
   <data name="Rectangle" xml:space="preserve">
     <value>사각형</value>
   </data>
+  </data>
   <data name="Ellipse" xml:space="preserve">
     <value>타원</value>
   </data>
diff --git a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
@@ -62,6 +62,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Core\Helpers\PanelHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Helpers\TextBoxHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Utilities\FormatExtensions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Core\Helpers\TextBoxHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Languages\Language.Designer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\TextBoxValueChangedEventArgs.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Helpers\DatePickerHelper.cs" />

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<UserControl`
	`1`	`+<UserControl`
`2`	`2`	`x:Class="WPFDevelopers.Samples.ExampleViews.AnimationAudioExample"`
`3`	`3`	`xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"`
`4`	`4`	`xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"`