Merge pull request #45 from WPFDevelopersOrg/master

master to dev

Author: yanjinhuagood

README-zh.md

@@ -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  )
 
@@ -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"/>   

README.md

@@ -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