Skip to content

Commit 8bc33da

Browse files
yanjinhuagoodyanjinhuagood
committed
Reapply "dev pull request master"
This reverts commit 2ee5e36.
1 parent c835294 commit 8bc33da

File tree

128 files changed

+5467
-1709
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

+5467
-1709
lines changed

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
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"
67
xmlns:shell="clr-namespace:Microsoft.Windows.Shell"
78
xmlns:wd="clr-namespace:WPFDevelopers.Net40">
89
<converts:ObjectNullToVisibilityConverter x:Key="ObjectNullToVisibilityConverter" />
@@ -74,7 +75,8 @@
7475
Padding="0"
7576
Command="{Binding Source={x:Static shell:SystemCommands.MinimizeWindowCommand}}"
7677
IsTabStop="False"
77-
Style="{DynamicResource WD.WindowButtonStyle}">
78+
Style="{DynamicResource WD.WindowButtonStyle}"
79+
ToolTip="{Binding [Minimize], Source={x:Static resx:LanguageManager.Instance}}">
7880
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
7981
<Rectangle
8082
x:Name="MinimizeGlyph"
@@ -90,7 +92,8 @@
9092
Padding="0"
9193
Command="{Binding Source={x:Static shell:SystemCommands.MaximizeWindowCommand}}"
9294
IsTabStop="False"
93-
Style="{DynamicResource WD.WindowButtonStyle}">
95+
Style="{DynamicResource WD.WindowButtonStyle}"
96+
ToolTip="{Binding [Maximize], Source={x:Static resx:LanguageManager.Instance}}">
9497
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
9598
<Path
9699
Width="10"
@@ -109,6 +112,7 @@
109112
Command="{Binding Source={x:Static shell:SystemCommands.RestoreWindowCommand}}"
110113
IsTabStop="False"
111114
Style="{DynamicResource WD.WindowButtonStyle}"
115+
ToolTip="{Binding [Restore], Source={x:Static resx:LanguageManager.Instance}}"
112116
Visibility="Collapsed">
113117
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
114118
<Path
@@ -128,7 +132,8 @@
128132
Name="PART_CloseButton"
129133
Command="{Binding Source={x:Static shell:SystemCommands.CloseWindowCommand}}"
130134
IsTabStop="False"
131-
Style="{DynamicResource WD.WindowButtonStyle}">
135+
Style="{DynamicResource WD.WindowButtonStyle}"
136+
ToolTip="{Binding [Close], Source={x:Static resx:LanguageManager.Instance}}">
132137
<Path
133138
Width="10"
134139
Height="10"

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

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

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
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>
57
</PropertyGroup>
68
<Import Project="..\WPFDevelopers.Shared\WPFDevelopers.Shared.projitems" Label="Shared" />
79
<Import Project="..\Microsoft.Windows.Shell\Microsoft.Windows.Shell.projitems" Label="Shared" />

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
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"
67
xmlns:wd="clr-namespace:WPFDevelopers.Net45x">
78
<converts:ObjectNullToVisibilityConverter x:Key="ObjectNullToVisibilityConverter" />
89
<Style
@@ -80,7 +81,8 @@
8081
Padding="0"
8182
Command="SystemCommands.MinimizeWindowCommand"
8283
IsTabStop="False"
83-
Style="{DynamicResource WD.WindowButtonStyle}">
84+
Style="{DynamicResource WD.WindowButtonStyle}"
85+
ToolTip="{Binding [Minimize], Source={x:Static resx:LanguageManager.Instance}}">
8486
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
8587
<Rectangle
8688
x:Name="MinimizeGlyph"
@@ -96,7 +98,8 @@
9698
Padding="0"
9799
Command="SystemCommands.MaximizeWindowCommand"
98100
IsTabStop="False"
99-
Style="{DynamicResource WD.WindowButtonStyle}">
101+
Style="{DynamicResource WD.WindowButtonStyle}"
102+
ToolTip="{Binding [Maximize], Source={x:Static resx:LanguageManager.Instance}}">
100103
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
101104
<Path
102105
Width="10"
@@ -115,6 +118,7 @@
115118
Command="SystemCommands.RestoreWindowCommand"
116119
IsTabStop="False"
117120
Style="{DynamicResource WD.WindowButtonStyle}"
121+
ToolTip="{Binding [Restore], Source={x:Static resx:LanguageManager.Instance}}"
118122
Visibility="Collapsed">
119123
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
120124
<Path
@@ -134,7 +138,8 @@
134138
Name="PART_CloseButton"
135139
Command="SystemCommands.CloseWindowCommand"
136140
IsTabStop="False"
137-
Style="{DynamicResource WD.WindowButtonStyle}">
141+
Style="{DynamicResource WD.WindowButtonStyle}"
142+
ToolTip="{Binding [Close], Source={x:Static resx:LanguageManager.Instance}}">
138143
<Path
139144
Width="10"
140145
Height="10"

0 commit comments

Comments
 (0)