Skip to content

Commit c815085

Browse files
yanjinhuagoodyanjinhuagood
authored
Merge pull request #97 from WPFDevelopersOrg/master
master pull request dev
2 parents a25e2f0 + c835294 commit c815085

File tree

130 files changed

+1754
-5468
lines changed

Some content is hidden

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

130 files changed

+1754
-5468
lines changed

‎README-zh.md‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
### [ Wiki→ 正在进行快速更新](https://gitee.com/WPFDevelopersOrg/WPFDevelopers/wikis/pages)
2727

28-
### 此项目包含了 微信公众号 《 WPF开发者》 日常开发分享，欢迎<kbd>Star</kbd>。
28+
### 此项目包含了 微信公众号 《 WPF开发者》 日常开发分享，欢迎<kbd>Star🌟</kbd>。
2929

3030
### 运行环境 Visual Studio 2022
3131

@@ -40,6 +40,8 @@
4040
| netcoreapp3.0 | ✅ |
4141
| net5.0-windows | ✅ |
4242
| net6.0-windows | ✅ |
43+
| net7.0-windows | ✅ |
44+
| net8.0-windows | ✅ |
4345

4446
### 欢迎关注微信公众号
4547

@@ -89,6 +91,26 @@ xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
8991
`xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"`
9092

9193
***
94+
### IPEditBox
95+
96+
<img src="hhttps://gitee.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/IPEditBox.gif"/>
97+
98+
----------
99+
### TransformLayout
100+
101+
<img src="https://gitee.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/TransformLayout.gif"/>
102+
103+
----------
104+
### ScreenCaptureExt
105+
106+
<img src="https://gitee.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/ScreenCutNew.gif"/>
107+
108+
----------
109+
### TimePicker
110+
111+
<img src="https://gitee.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/TimePicker.gif"/>
112+
113+
----------
92114
### ColorPicker
93115

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

‎README.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
| netcoreapp3.0 | ✅ |
3535
| net5.0-windows | ✅ |
3636
| net6.0-windows | ✅ |
37+
| net7.0-windows | ✅ |
38+
| net8.0-windows | ✅ |
3739

3840
### Donate
3941
If you think our open source software is helpful to you, please scan the QR code below and give us a cup of coffee.
@@ -79,6 +81,26 @@ xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
7981

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

84+
----------
85+
### IPEditBox
86+
87+
<img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/IPEditBox.gif"/>
88+
89+
----------
90+
### TransformLayout
91+
92+
<img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/TransformLayout.gif"/>
93+
94+
----------
95+
### ScreenCaptureExt
96+
97+
<img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/ScreenCutNew.gif"/>
98+
99+
----------
100+
### TimePicker
101+
102+
<img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/TimePicker.gif"/>
103+
82104
----------
83105
### ColorPicker
84106

‎src/WPFDevelopers.Net40/Themes/Generic.xaml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:control="clr-namespace:WPFDevelopers.Controls"
55
xmlns:converts="clr-namespace:WPFDevelopers.Converts"
6-
xmlns:resx="clr-namespace:WPFDevelopers"
76
xmlns:shell="clr-namespace:Microsoft.Windows.Shell"
87
xmlns:wd="clr-namespace:WPFDevelopers.Net40">
98
<converts:ObjectNullToVisibilityConverter x:Key="ObjectNullToVisibilityConverter" />
@@ -75,8 +74,7 @@
7574
Padding="0"
7675
Command="{Binding Source={x:Static shell:SystemCommands.MinimizeWindowCommand}}"
7776
IsTabStop="False"
78-
Style="{DynamicResource WD.WindowButtonStyle}"
79-
ToolTip="{Binding [Minimize], Source={x:Static resx:LanguageManager.Instance}}">
77+
Style="{DynamicResource WD.WindowButtonStyle}">
8078
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
8179
<Rectangle
8280
x:Name="MinimizeGlyph"
@@ -92,8 +90,7 @@
9290
Padding="0"
9391
Command="{Binding Source={x:Static shell:SystemCommands.MaximizeWindowCommand}}"
9492
IsTabStop="False"
95-
Style="{DynamicResource WD.WindowButtonStyle}"
96-
ToolTip="{Binding [Maximize], Source={x:Static resx:LanguageManager.Instance}}">
93+
Style="{DynamicResource WD.WindowButtonStyle}">
9794
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
9895
<Path
9996
Width="10"
@@ -112,7 +109,6 @@
112109
Command="{Binding Source={x:Static shell:SystemCommands.RestoreWindowCommand}}"
113110
IsTabStop="False"
114111
Style="{DynamicResource WD.WindowButtonStyle}"
115-
ToolTip="{Binding [Restore], Source={x:Static resx:LanguageManager.Instance}}"
116112
Visibility="Collapsed">
117113
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
118114
<Path
@@ -132,8 +128,7 @@
132128
Name="PART_CloseButton"
133129
Command="{Binding Source={x:Static shell:SystemCommands.CloseWindowCommand}}"
134130
IsTabStop="False"
135-
Style="{DynamicResource WD.WindowButtonStyle}"
136-
ToolTip="{Binding [Close], Source={x:Static resx:LanguageManager.Instance}}">
131+
Style="{DynamicResource WD.WindowButtonStyle}">
137132
<Path
138133
Width="10"
139134
Height="10"

0 commit comments

Comments
 (0)