Skip to content

Commit e806180

Browse files
committed
dev merge master
2 parents eeacf3a + a0676c9 commit e806180

File tree

16 files changed

+217
-13326
lines changed

16 files changed

+217
-13326
lines changed

README-zh.md

Lines changed: 162 additions & 108 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div align="center"><img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/Logo.png"/></div>
22

3-
[中文](https://github.com/WPFDevelopersOrg/WPFDevelopers/blob/master/README-zh.md)
3+
[中文](https://gitee.com/WPFDevelopersOrg/WPFDevelopers/blob/master/README-zh.md)
44

55
![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/">
66
<img alt="nuget-version" src="https://img.shields.io/nuget/v/WPFDevelopers.svg?color=%23409EF"></img>
@@ -26,7 +26,7 @@
2626
### .Net Version
2727
| .Net Version | Status |
2828
| ---- | ---- |
29-
| Net40 ||
29+
| net40 ||
3030
| net45 ||
3131
| net46 ||
3232
| net47 ||
@@ -81,6 +81,46 @@ xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
8181

8282
`xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"`
8383

84+
----------
85+
### DateRangePicker
86+
87+
<img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/DateRangePicker.gif"/>
88+
89+
----------
90+
### Spacing
91+
92+
<img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/Spacing.gif"/>
93+
94+
----------
95+
### NotifyIcon
96+
97+
<img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/NotifyIcon2.gif"/>
98+
99+
----------
100+
### ChartRadar
101+
102+
<img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/ChartRadar.gif"/>
103+
104+
----------
105+
### ChartLine
106+
107+
<img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/ChartLine.gif"/>
108+
109+
----------
110+
### ChartBar
111+
112+
<img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/ChartBar.gif"/>
113+
114+
----------
115+
### SearchText
116+
117+
<img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/SearchText.gif"/>
118+
119+
----------
120+
### ClearButton
121+
122+
<img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/ClearButton.gif"/>
123+
84124
----------
85125
### IPEditBox
86126

src/WPFDevelopers.Net40/Themes/Theme.xaml

Lines changed: 0 additions & 6603 deletions
Large diffs are not rendered by default.

src/WPFDevelopers.Net45x/Themes/Theme.xaml

Lines changed: 1 addition & 6603 deletions
Large diffs are not rendered by default.

src/WPFDevelopers.Samples.Shared/ExampleViews/AnimationAudioExample.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<UserControl
1+
<UserControl
22
x:Class="WPFDevelopers.Samples.ExampleViews.AnimationAudioExample"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/BallLoadingExample.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<UserControl
1+
<UserControl
22
x:Class="WPFDevelopers.Samples.ExampleViews.BallLoadingExample"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/CycleLoadingExample.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<UserControl
1+
<UserControl
22
x:Class="WPFDevelopers.Samples.ExampleViews.CycleLoadingExample"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/RingLoadingExample.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<UserControl
1+
<UserControl
22
x:Class="WPFDevelopers.Samples.ExampleViews.RingLoadingExample"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/RollLoadingExample.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<UserControl
1+
<UserControl
22
x:Class="WPFDevelopers.Samples.ExampleViews.RollLoadingExample"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/StreamerLoadingExample.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<UserControl
1+
<UserControl
22
x:Class="WPFDevelopers.Samples.ExampleViews.StreamerLoadingExample"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/WaitLoadingExample.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<UserControl
1+
<UserControl
22
x:Class="WPFDevelopers.Samples.ExampleViews.WaitLoadingExample"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

src/WPFDevelopers.Samples.Shared/ExampleViews/StarrySkyExample.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<UserControl
1+
<UserControl
22
x:Class="WPFDevelopers.Samples.ExampleViews.StarrySkyExample"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

src/WPFDevelopers.Shared/Controls/Charts/ChartBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System.Collections.Generic;
1+
using System.Collections.Generic;
22
using System.Linq;
33
using System.Windows;
44
using System.Windows.Controls;

src/WPFDevelopers.Shared/Controls/Charts/ChartLine.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System.Collections.Generic;
1+
using System.Collections.Generic;
22
using System.Linq;
33
using System.Windows;
44
using System.Windows.Media;

src/WPFDevelopers.Shared/Languages/Language.ko-KR.resx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@
144144
<data name="Rectangle" xml:space="preserve">
145145
<value>사각형</value>
146146
</data>
147+
</data>
147148
<data name="Ellipse" xml:space="preserve">
148149
<value>타원</value>
149150
</data>

src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
<Compile Include="$(MSBuildThisFileDirectory)Core\Helpers\PanelHelper.cs" />
6363
<Compile Include="$(MSBuildThisFileDirectory)Core\Helpers\TextBoxHelper.cs" />
6464
<Compile Include="$(MSBuildThisFileDirectory)Core\Utilities\FormatExtensions.cs" />
65+
<Compile Include="$(MSBuildThisFileDirectory)Core\Helpers\TextBoxHelper.cs" />
6566
<Compile Include="$(MSBuildThisFileDirectory)Languages\Language.Designer.cs" />
6667
<Compile Include="$(MSBuildThisFileDirectory)Core\TextBoxValueChangedEventArgs.cs" />
6768
<Compile Include="$(MSBuildThisFileDirectory)Core\Helpers\DatePickerHelper.cs" />

0 commit comments

Comments
 (0)