Skip to content

Commit f86523e

Browse files
ghost1372ghost1372
committed
Merge branch 'master' into develop
2 parents 450125f + 79b32d5 commit f86523e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1360
-355
lines changed

‎README-cn.md‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,13 +205,17 @@ Step 4: 开始编码
205205

206206
## 最新示例
207207

208+
### ConfettiCannon
209+
210+
![ConfettiCannon](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/ConfettiCannon.gif)
211+
208212
### Watermark
209213

210-
![Watermark](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/Watermark.png)
214+
![Watermark](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/Watermark.png)
211215

212216
### AutoCompleteTextBox
213217

214-
![AutoCompleteTextBox](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/AutoCompleteTextBox.gif)
218+
![AutoCompleteTextBox](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/AutoCompleteTextBox.gif)
215219

216220
### ElementGroup
217221

@@ -221,12 +225,12 @@ Step 4: 开始编码
221225

222226
![UniformSpacingPanel](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/UniformSpacingPanel.png)
223227

228+
## 历史发布
229+
224230
### FlexPanel
225231

226232
![FlexPanel](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/FlexPanel.gif)
227233

228-
## 历史发布
229-
230234
### CheckComboBox
231235

232236
![CheckComboBox](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/CheckComboBox.png)

‎README.md‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,10 @@ Step 4: Enjoy coding
174174

175175
## Latest examples
176176

177+
### ConfettiCannon
178+
179+
![ConfettiCannon](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/ConfettiCannon.gif)
180+
177181
### WinUI Mica Material
178182

179183
![image](https://user-images.githubusercontent.com/9213496/139542436-037f0233-e8c6-4c04-9e16-4d50035ed0b3.png)
@@ -193,12 +197,12 @@ Step 4: Enjoy coding
193197

194198
![UniformSpacingPanel](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/UniformSpacingPanel.png)
195199

200+
## History publication
201+
196202
### FlexPanel
197203

198204
![FlexPanel](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/FlexPanel.gif)
199205

200-
## History publication
201-
202206
### CheckComboBox
203207

204208
![CheckComboBox](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/CheckComboBox.png)

‎src/Avalonia/HandyControlDemo_Avalonia/Properties/Langs/Lang.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Avalonia/HandyControlDemo_Avalonia/Properties/Langs/Lang.ca-ES.resx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -759,8 +759,8 @@
759759
<data name="Type" xml:space="preserve">
760760
<value>Tipus</value>
761761
</data>
762-
<data name="Morphing Animation" xml:space="preserve">
763-
<value>Morphing Animation</value>
762+
<data name="MorphingAnimation" xml:space="preserve">
763+
<value>MorphingAnimation</value>
764764
</data>
765765
<data name="TransitioningContentControl" xml:space="preserve">
766766
<value>TransitioningContentControl</value>

‎src/Avalonia/HandyControlDemo_Avalonia/Properties/Langs/Lang.cs.resx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -669,8 +669,8 @@
669669
<data name="HatchBrushGenerator" xml:space="preserve">
670670
<value>HatchBrushGenerator</value>
671671
</data>
672-
<data name="Morphing Animation" xml:space="preserve">
673-
<value>Morphing Animation</value>
672+
<data name="MorphingAnimation" xml:space="preserve">
673+
<value>MorphingAnimation</value>
674674
</data>
675675
<data name="Divider" xml:space="preserve">
676676
<value>Divider</value>

‎src/Avalonia/HandyControlDemo_Avalonia/Properties/Langs/Lang.en.resx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -672,8 +672,8 @@
672672
<data name="HatchBrushGenerator" xml:space="preserve">
673673
<value>HatchBrushGenerator</value>
674674
</data>
675-
<data name="Morphing Animation" xml:space="preserve">
676-
<value>Morphing Animation</value>
675+
<data name="MorphingAnimation" xml:space="preserve">
676+
<value>MorphingAnimation</value>
677677
</data>
678678
<data name="Divider" xml:space="preserve">
679679
<value>Divider</value>

‎src/Avalonia/HandyControlDemo_Avalonia/Properties/Langs/Lang.es.resx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -672,8 +672,8 @@
672672
<data name="HatchBrushGenerator" xml:space="preserve">
673673
<value>HatchBrushGenerator</value>
674674
</data>
675-
<data name="Morphing Animation" xml:space="preserve">
676-
<value>Morphing Animation</value>
675+
<data name="MorphingAnimation" xml:space="preserve">
676+
<value>MorphingAnimation</value>
677677
</data>
678678
<data name="Divider" xml:space="preserve">
679679
<value>Divider</value>

‎src/Avalonia/HandyControlDemo_Avalonia/Properties/Langs/Lang.fa.resx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -669,8 +669,8 @@
669669
<data name="HatchBrushGenerator" xml:space="preserve">
670670
<value>HatchBrushGenerator</value>
671671
</data>
672-
<data name="Morphing Animation" xml:space="preserve">
673-
<value>Morphing Animation</value>
672+
<data name="MorphingAnimation" xml:space="preserve">
673+
<value>MorphingAnimation</value>
674674
</data>
675675
<data name="Divider" xml:space="preserve">
676676
<value>Divider</value>

‎src/Avalonia/HandyControlDemo_Avalonia/Properties/Langs/Lang.fr.resx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -669,8 +669,8 @@
669669
<data name="HatchBrushGenerator" xml:space="preserve">
670670
<value>HatchBrushGenerator</value>
671671
</data>
672-
<data name="Morphing Animation" xml:space="preserve">
673-
<value>Morphing Animation</value>
672+
<data name="MorphingAnimation" xml:space="preserve">
673+
<value>MorphingAnimation</value>
674674
</data>
675675
<data name="Divider" xml:space="preserve">
676676
<value>Divider</value>

‎src/Avalonia/HandyControlDemo_Avalonia/Properties/Langs/Lang.ja.resx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -672,8 +672,8 @@
672672
<data name="HatchBrushGenerator" xml:space="preserve">
673673
<value>HatchBrushGenerator</value>
674674
</data>
675-
<data name="Morphing Animation" xml:space="preserve">
676-
<value>Morphing Animation</value>
675+
<data name="MorphingAnimation" xml:space="preserve">
676+
<value>MorphingAnimation</value>
677677
</data>
678678
<data name="Divider" xml:space="preserve">
679679
<value>Divider</value>

0 commit comments

Comments
 (0)