Skip to content
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

master pull request dev #63

Merged
merged 6 commits into from
Aug 16, 2023
Merged

master pull request dev #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
44a4e6d
Merge pull request #59 from WPFDevelopersOrg/dev
yanjinhuagood Aug 2, 2023
43c94b8
Update README.md
yanjinhuagood Aug 2, 2023
635dfe3
Update README-zh.md
yanjinhuagood Aug 2, 2023
77c2d0a
Update README.md
yanjinhuagood Aug 16, 2023
d033b41
Update README-zh.md
yanjinhuagood Aug 16, 2023
dab5cdb
Merge pull request #62 from WPFDevelopersOrg/dev
yanjinhuagood Aug 16, 2023
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
17 changes: 15 additions & 2 deletions README-zh.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@

### [码云](https://gitee.com/WPFDevelopersOrg) https://gitee.com/WPFDevelopersOrg

### [ 只使用基础控件可跳转 →](https://github.com/WPFDevelopersOrg/WPFDevelopers.Minimal) https://github.com/WPFDevelopersOrg/WPFDevelopers.Minimal
<!--![Blue](https://gitee.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopers.Minimal/Blue.png) -->
### [ Wiki→ 正在进行快速更新](https://gitee.com/WPFDevelopersOrg/WPFDevelopers/wikis/pages)

### 此项目包含了 微信公众号 《 WPF开发者》 日常开发分享，欢迎<kbd>Star</kbd>。
Expand Down Expand Up @@ -91,6 +89,21 @@ xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
`xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"`

***
### ColorPicker

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

----------
### NumericBox

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

----------
### PathIcon

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

----------
### Window

<img src="https://gitee.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/window.jpg"/>
Expand Down
17 changes: 15 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@

### [码云](https://gitee.com/WPFDevelopersOrg) https://gitee.com/WPFDevelopersOrg

### [ Use only the base control to jump →](https://github.com/WPFDevelopersOrg/WPFDevelopers.Minimal) https://github.com/WPFDevelopersOrg/WPFDevelopers.Minimal
<!-- ![Blue](https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopers.Minimal/Blue.png) -->
### [ Wiki → Quick update in progress](https://github.com/WPFDevelopersOrg/WPFDevelopers/wiki)
### Visual Studio 2022

Expand Down Expand Up @@ -81,6 +79,21 @@ xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"

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

----------
### ColorPicker

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

----------
### NumericBox

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

----------
### PathIcon

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

----------
### Window

Expand Down