Skip to content

Commit 520e6b6

Browse files
yanjinhuagoodyanjinhuagood
committed
2 parents 3496e6f + c815085 commit 520e6b6

File tree

128 files changed

+1709
-5467
lines changed

Some content is hidden

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

128 files changed

+1709
-5467
lines changed

‎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"

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

Lines changed: 244 additions & 225 deletions
Large diffs are not rendered by default.

‎src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
2-
<Import Project="../Package.props" />
2+
<Import Project="../Package.props"/>
33
<PropertyGroup>
44
<TargetFramework>net40</TargetFramework>
5-
<SignAssembly>True</SignAssembly>
6-
<AssemblyOriginatorKeyFile>E:\Code\git\WPFDevelopers\WPFDevelopersMultiple\WPFDevelopers.snk</AssemblyOriginatorKeyFile>
75
</PropertyGroup>
86
<Import Project="..\WPFDevelopers.Shared\WPFDevelopers.Shared.projitems" Label="Shared" />
97
<Import Project="..\Microsoft.Windows.Shell\Microsoft.Windows.Shell.projitems" Label="Shared" />

‎src/WPFDevelopers.Net45x/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:wd="clr-namespace:WPFDevelopers.Net45x">
87
<converts:ObjectNullToVisibilityConverter x:Key="ObjectNullToVisibilityConverter" />
98
<Style
@@ -81,8 +80,7 @@
8180
Padding="0"
8281
Command="SystemCommands.MinimizeWindowCommand"
8382
IsTabStop="False"
84-
Style="{DynamicResource WD.WindowButtonStyle}"
85-
ToolTip="{Binding [Minimize], Source={x:Static resx:LanguageManager.Instance}}">
83+
Style="{DynamicResource WD.WindowButtonStyle}">
8684
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
8785
<Rectangle
8886
x:Name="MinimizeGlyph"
@@ -98,8 +96,7 @@
9896
Padding="0"
9997
Command="SystemCommands.MaximizeWindowCommand"
10098
IsTabStop="False"
101-
Style="{DynamicResource WD.WindowButtonStyle}"
102-
ToolTip="{Binding [Maximize], Source={x:Static resx:LanguageManager.Instance}}">
99+
Style="{DynamicResource WD.WindowButtonStyle}">
103100
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
104101
<Path
105102
Width="10"
@@ -118,7 +115,6 @@
118115
Command="SystemCommands.RestoreWindowCommand"
119116
IsTabStop="False"
120117
Style="{DynamicResource WD.WindowButtonStyle}"
121-
ToolTip="{Binding [Restore], Source={x:Static resx:LanguageManager.Instance}}"
122118
Visibility="Collapsed">
123119
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
124120
<Path
@@ -138,8 +134,7 @@
138134
Name="PART_CloseButton"
139135
Command="SystemCommands.CloseWindowCommand"
140136
IsTabStop="False"
141-
Style="{DynamicResource WD.WindowButtonStyle}"
142-
ToolTip="{Binding [Close], Source={x:Static resx:LanguageManager.Instance}}">
137+
Style="{DynamicResource WD.WindowButtonStyle}">
143138
<Path
144139
Width="10"
145140
Height="10"

0 commit comments

Comments
 (0)