Skip to content

merge master into #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 15, 2025
Merged

merge master into #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
96c65ae
Update README.md
yanjinhuagood Dec 26, 2024
e56925e
Merge pull request #130 from WPFDevelopersOrg/dev
yanjinhuagood Dec 26, 2024
ac574b5
Update README.md
yanjinhuagood Mar 15, 2025
a736245
Update README-zh.md
yanjinhuagood Mar 15, 2025
77b29ea
Merge pull request #147 from WPFDevelopersOrg/dev
yanjinhuagood Mar 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion README-zh.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,24 @@ Install-Package WPFDevelopers
``` XML
xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
```
#### 1.1.0.3-preview1 以上版本
``` XML
<Application.Resources>
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/WPFDevelopers;component/Themes/Theme.xaml" />
<!-- 需要注意 wd:Resources 必须在Theme.xaml后 -->
<!-- 默认情况下，Theme 会跟随系统主题（适用于 Windows 10 及以上版本），自动切换为 Light 或 Dark 模式。
若要手动设置为 Light 模式，可以使用 Theme="Light"。
你还可以自定义主题色，使用 Color="Fuchsia"（例如设置为 Fuchsia）-->
<wd:Resources />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
```
#### 1.1.0.3-preview1 以下版本
``` XML
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/WPFDevelopers;component/Themes/Light.Blue.xaml"/>
Expand Down
33 changes: 27 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,24 @@ Install-Package WPFDevelopers
``` XML
xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
```
#### 1.1.0.3-preview1 and above versions
``` XML
<Application.Resources>
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/WPFDevelopers;component/Themes/Theme.xaml" />
<!-- 需要注意 wd:Resources 必须在Theme.xaml后 -->
<!-- 默认情况下，Theme 会跟随系统主题（适用于 Windows 10 及以上版本），自动切换为 Light 或 Dark 模式。
若要手动设置为 Light 模式，可以使用 Theme="Light"。
你还可以自定义主题色，使用 Color="Fuchsia"（例如设置为 Fuchsia）-->
<wd:Resources />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
```
#### 1.1.0.3-preview1 and below versions
``` XML
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/WPFDevelopers;component/Themes/Light.Blue.xaml"/>
Expand All @@ -81,6 +97,16 @@ xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"

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

----------
### Gauge

<img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/Gauge.gif"/>

----------
### Message

<img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/Message.png"/>

----------
### DateRangePicker

Expand Down Expand Up @@ -166,11 +192,6 @@ xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"

<img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/window.jpg"/>

----------
### Message

<img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/Message.gif"/>

----------
### Badge

Expand Down