Skip to content

master to dev #45

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 23 commits into from
Jun 26, 2023
Merged

master to dev #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
1eceff8
Merge pull request #30 from WPFDevelopersOrg/dev
yanjinhuagood Apr 2, 2023
930134c
Merge pull request #31 from WPFDevelopersOrg/dev
yanjinhuagood Apr 2, 2023
22bb419
Merge pull request #32 from WPFDevelopersOrg/dev
yanjinhuagood Apr 5, 2023
bd65975
Merge pull request #33 from WPFDevelopersOrg/dev
yanjinhuagood Apr 16, 2023
73cf1a0
Update README.md
yanjinhuagood Apr 16, 2023
f908b7f
Update README.md
yanjinhuagood Apr 16, 2023
89b5a0c
Update README-zh.md
yanjinhuagood Apr 16, 2023
664b32f
Update README-zh.md
yanjinhuagood Apr 16, 2023
ad87e93
Update README.md
yanjinhuagood Apr 18, 2023
df3c6f0
Update README-zh.md
yanjinhuagood Apr 18, 2023
5759fbd
Merge pull request #34 from WPFDevelopersOrg/dev
yanjinhuagood May 14, 2023
f587e2c
Update README.md
yanjinhuagood May 14, 2023
c7aafca
Update README-zh.md
yanjinhuagood May 14, 2023
bfc8f64
Update README-zh.md
yanjinhuagood May 14, 2023
f408577
Update README-zh.md
yanjinhuagood May 14, 2023
4d13c0c
Merge pull request #36 from WPFDevelopersOrg/dev
yanjinhuagood May 27, 2023
23b39c7
Merge pull request #37 from WPFDevelopersOrg/dev
yanjinhuagood May 28, 2023
0d206ad
Merge pull request #38 from WPFDevelopersOrg/dev
yanjinhuagood May 30, 2023
55045f6
Merge pull request #40 from WPFDevelopersOrg/dev
yanjinhuagood Jun 4, 2023
bec9215
Merge pull request #41 from WPFDevelopersOrg/dev
yanjinhuagood Jun 7, 2023
5536996
Merge pull request #44 from WPFDevelopersOrg/dev
yanjinhuagood Jun 15, 2023
8c67d63
Update README.md
yanjinhuagood Jun 15, 2023
2ffd5eb
Update README-zh.md
yanjinhuagood Jun 15, 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
39 changes: 23 additions & 16 deletions README-zh.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

## Welcome to WPFDevelopers

# __最新请使用 Nuget 预览版包__ |[下载可执行程序EXE](https://gitee.com/WPFDevelopersOrg/WPFDevelopers/releases/download/WPFDevelopers1.1.0.1-preview1/WPFDevelopersSample.zip) |[项目模板下载VSIX](https://gitee.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/WPFDevelopers.vsix)
# __最新请使用 Nuget 预览版包__ |[下载可执行程序EXE](https://gitee.com/WPFDevelopersOrg/WPFDevelopers/releases/download/WPFDevelopers1.1.0.1-preview7/WPFDevelopers1.1.0.1-preview7.zip) |[项目模板下载VSIX](https://gitee.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/WPFDevelopers.vsix)

# [下载完 WPFDevelopers 项目如何编译通过 👀](https://b23.tv/RTijGF8 )

Expand Down Expand Up @@ -69,42 +69,49 @@ Install-Package WPFDevelopers


### 第二步： App.xaml中增加节点;

### Nuget 版本 >= 1.0.8-preview

``` XML
xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
```
``` XML
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/WPFDevelopers;component/Themes/Light.Blue.xaml"/>
<!--需要注意ws:Resources 必须再配色主题后，Theme="Dark" 为黑色皮肤-->
<ws:Resources Theme="Light"/>
<!--需要注意 wd:Resources 必须在配色主题后，Theme="Dark" 为黑色皮肤-->
<wd:Resources Theme="Light"/>
<ResourceDictionary Source="pack://application:,,,/WPFDevelopers;component/Themes/Theme.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
```
### Nuget 版本 < 1.0.8-preview
``` XML
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/WPFDevelopers;component/Generic.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
```

### 第三步：添加命名空间;


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

***
### CropImage

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

----------

### BreakCrumbBar

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

----------
### MultiSelectionSearchComboBox

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

----------
### ScrollIntoView.IsPosition

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

----------
### ControlLoading

<img src="https://gitee.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/ControlLoading.gif"/>
Expand Down
37 changes: 21 additions & 16 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,35 +61,40 @@ If you think our open source software is helpful to you, please scan the QR code
Install-Package WPFDevelopers
```
### Step 2: Add nodes to App.xaml;

### Nuget Version >= 1.0.8-preview

``` XML
xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
```
``` XML
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/WPFDevelopers;component/Themes/Light.Blue.xaml"/>
<!--需要注意ws:Resources 必须再配色主题后，Theme="Dark" 为黑色皮肤-->
<ws:Resources Theme="Light"/>
<!--需要注意 wd:Resources 必须在配色主题后，Theme="Dark" 为黑色皮肤-->
<wd:Resources Theme="Light"/>
<ResourceDictionary Source="pack://application:,,,/WPFDevelopers;component/Themes/Theme.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
```
### Nuget Version < 1.0.8-preview

``` XML
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/WPFDevelopers;component/Generic.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
```
### Step 3: Add the namespace;

`xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"`
`xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"`
----------
### CropImage

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

----------
### BreakCrumbBar

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

----------
### MultiSelectionSearchComboBox

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

----------
### ScrollIntoView.IsPosition

Expand Down