Skip to content

dev pull request master #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 103 commits into from
May 27, 2024
Merged

dev pull request master #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
9f181c5
update in AnimationNavigationBar3D
yanjinhuagood Mar 10, 2024
0fbe2c9
Update AnimationNavigationBar3DExample.xaml
yanjinhuagood Mar 10, 2024
520c689
Update AnimationNavigationBar3D.xaml
yanjinhuagood Mar 10, 2024
98ee880
Update PaginationExample.xaml
yanjinhuagood Mar 24, 2024
9628609
Update ScreenCaptureExt.cs
yanjinhuagood Mar 24, 2024
9215273
Fix issue (#81 )
yanjinhuagood Mar 24, 2024
4dbf9c3
Update MainWindow.xaml
yanjinhuagood Mar 24, 2024
04597f3
Update BasicControlsExample.xaml
yanjinhuagood Mar 24, 2024
eb46895
Add basic controls to support rounded corners
yanjinhuagood Mar 24, 2024
fa5bce8
Update Styles.DataGrid.xaml
yanjinhuagood Mar 24, 2024
04f1abd
Update Styles.Expander.xaml
yanjinhuagood Mar 24, 2024
3b3f6cb
Update Styles.ListBox.xaml
yanjinhuagood Mar 24, 2024
70cd1df
Update Styles.GroupBox.xaml
yanjinhuagood Mar 24, 2024
6968bbb
Update Styles.ListView.xaml
yanjinhuagood Mar 24, 2024
736ab66
Update Styles.ProgressBar.xaml
yanjinhuagood Mar 24, 2024
cb06233
Update Styles.Slider.xaml
yanjinhuagood Mar 24, 2024
2c4526a
Update Styles.TabControl.xaml
yanjinhuagood Mar 24, 2024
7401926
Update Styles.TreeView.xaml
yanjinhuagood Mar 24, 2024
0249ac3
Update ControlBasic.xaml
yanjinhuagood Mar 24, 2024
57d1b5f
Update DrawerMenu.xaml
yanjinhuagood Mar 24, 2024
e2ca592
Update NavigateMenu.xaml
yanjinhuagood Mar 24, 2024
f36953b
add in .snk
yanjinhuagood Mar 24, 2024
09e3c40
Update Theme.xaml
yanjinhuagood Mar 24, 2024
a9478b2
Update Theme.xaml
yanjinhuagood Mar 24, 2024
857e827
Fix issue（#93 ）
yanjinhuagood Apr 11, 2024
fc70045
Update CropImage.cs
yanjinhuagood Apr 11, 2024
aeb0941
Update CropImage.xaml
yanjinhuagood Apr 11, 2024
ba7f1a2
Modify all namespace names
yanjinhuagood Apr 13, 2024
ba8ee67
Delete BasicBarChartExample.xaml.cs
yanjinhuagood Apr 14, 2024
ceeacf1
Delete BasicBarChartExample.xaml
yanjinhuagood Apr 14, 2024
3d5139a
update in ChartBar
yanjinhuagood Apr 14, 2024
142c246
Delete BasicBarChart.cs
yanjinhuagood Apr 14, 2024
479e84a
Delete RadarChart.cs
yanjinhuagood Apr 14, 2024
854d6e3
Delete RadarModel.cs
yanjinhuagood Apr 14, 2024
bd7f587
Update Dark.Color.xaml
yanjinhuagood Apr 14, 2024
ed0202a
Update Light.Color.xaml
yanjinhuagood Apr 14, 2024
6b2aa41
Create RadarChart.cs
yanjinhuagood Apr 14, 2024
48e061b
Create RadarModel.cs
yanjinhuagood Apr 14, 2024
fb06f43
Create ChartLine.cs
yanjinhuagood Apr 14, 2024
e99f925
Create ChartLineExample
yanjinhuagood Apr 14, 2024
3e9c19a
Update MenuEnum.cs
yanjinhuagood Apr 14, 2024
27ba59e
Update MainVM.cs
yanjinhuagood Apr 14, 2024
9a7e53c
Update Theme.xaml
yanjinhuagood Apr 14, 2024
47d123d
Update Theme.xaml
yanjinhuagood Apr 14, 2024
afbd38f
Update WPFDevelopers.Samples.Shared.projitems
yanjinhuagood Apr 14, 2024
aafab75
Update WPFDevelopers.Samples40.csproj
yanjinhuagood Apr 14, 2024
6d8ebb6
Update WPFDevelopers.Samples45x.csproj
yanjinhuagood Apr 14, 2024
4bcf0db
Update WPFDevelopers.SamplesCode.csproj
yanjinhuagood Apr 14, 2024
d3a72fa
Update WPFDevelopers.Shared.projitems
yanjinhuagood Apr 14, 2024
a8a0c0e
add in DrapView
yanjinhuagood Apr 24, 2024
9b82573
delete RadarChartExample
yanjinhuagood May 18, 2024
f9db1fd
delete NavigateMenu
yanjinhuagood May 18, 2024
b52115e
Delete WPFMessageBox.cs
yanjinhuagood May 18, 2024
7f85221
Create WDBorder.cs
yanjinhuagood May 18, 2024
da12246
Update Styles.ProgressBar.xaml
yanjinhuagood May 18, 2024
0fd1780
Update Styles.TreeView.xaml
yanjinhuagood May 18, 2024
03c75ef
Update Styles.DataGrid.xaml
yanjinhuagood May 18, 2024
b8c5a7e
Update Styles.ListBox.xaml
yanjinhuagood May 18, 2024
58f0341
Update Styles.TabControl.xaml
yanjinhuagood May 18, 2024
0784d29
Update ThumbAngle.cs
yanjinhuagood May 18, 2024
a695c1c
Update TransformThumb.cs
yanjinhuagood May 18, 2024
2d52fce
Migrate NavigateMenu from WD Control Library to Samples
yanjinhuagood May 18, 2024
c81d577
Create GeometryHelper.cs
yanjinhuagood May 18, 2024
b61f7ef
Update ChartBase.cs
yanjinhuagood May 18, 2024
d4a8872
Update ChartBar.cs
yanjinhuagood May 18, 2024
fa9cdc3
Update ChartLine.cs
yanjinhuagood May 18, 2024
b1eba74
Update NavigateMenuModel.cs
yanjinhuagood May 18, 2024
db57dea
Update BreatheLightExample.xaml
yanjinhuagood May 18, 2024
53a2fbe
add in Languages
yanjinhuagood May 18, 2024
c33c1bc
Update Styles.Menu.xaml
yanjinhuagood May 18, 2024
333cc0e
Update WPFDevelopers.Shared.projitems
yanjinhuagood May 18, 2024
a067302
Create ChartRadar.cs
yanjinhuagood May 18, 2024
bbb52da
Create ChartRadarExample
yanjinhuagood May 18, 2024
ab1ea23
Update Language.resx
yanjinhuagood May 27, 2024
aa4dd7c
Update Language.ko-KR.resx
yanjinhuagood May 27, 2024
3103f46
Update Language.en-US.resx
yanjinhuagood May 27, 2024
8eae72b
Update ChartBase.cs
yanjinhuagood May 27, 2024
b8363a8
Update ChartBar.cs
yanjinhuagood May 27, 2024
3d2b69b
Update ChartLine.cs
yanjinhuagood May 27, 2024
cae8562
Update ChartRadar.cs
yanjinhuagood May 27, 2024
14b753e
Create ChartRect.cs
yanjinhuagood May 27, 2024
e94eff3
Create ChartRound.cs
yanjinhuagood May 27, 2024
692b061
Translate according to language
yanjinhuagood May 27, 2024
3dcdd28
Adding a clear button to textbox and PasswordBox
yanjinhuagood May 27, 2024
a2acbdb
Update Message.xaml
yanjinhuagood May 27, 2024
575fb04
Update ScreenCut.xaml
yanjinhuagood May 27, 2024
0464eff
Update Pagination.xaml
yanjinhuagood May 27, 2024
fd8fde4
Update CropAvatar.xaml
yanjinhuagood May 27, 2024
18d2c85
Update BasicControlsExample.xaml
yanjinhuagood May 27, 2024
71311fc
Update Styles.DatePicker.xaml
yanjinhuagood May 27, 2024
99f7304
add a search box to the homepage
yanjinhuagood May 27, 2024
372d679
Update MenuEnum.cs
yanjinhuagood May 27, 2024
27ab552
Update Generic.xaml
yanjinhuagood May 27, 2024
235b618
Update Theme.xaml
yanjinhuagood May 27, 2024
7f8da32
Update Theme40.txt
yanjinhuagood May 27, 2024
f384f13
Update Theme45x.txt
yanjinhuagood May 27, 2024
4be803f
Update Theme.xaml
yanjinhuagood May 27, 2024
d7f00e8
Update Generic.xaml
yanjinhuagood May 27, 2024
9ca3bf4
Update WPFDevelopers.Shared.projitems
yanjinhuagood May 27, 2024
0979946
Update WPFDevelopers.SamplesCode.csproj
yanjinhuagood May 27, 2024
419631c
Update WPFDevelopers.Samples.Shared.projitems
yanjinhuagood May 27, 2024
be2b47b
Update WPFDevelopers.Samples45x.csproj
yanjinhuagood May 27, 2024
a25e2f0
Update WPFDevelopers.sln
yanjinhuagood May 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/WPFDevelopers.Net40/Themes/Generic.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:control="clr-namespace:WPFDevelopers.Controls"
xmlns:converts="clr-namespace:WPFDevelopers.Converts"
xmlns:resx="clr-namespace:WPFDevelopers"
xmlns:shell="clr-namespace:Microsoft.Windows.Shell"
xmlns:wd="clr-namespace:WPFDevelopers.Net40">
<converts:ObjectNullToVisibilityConverter x:Key="ObjectNullToVisibilityConverter" />
Expand Down Expand Up @@ -74,7 +75,8 @@
Padding="0"
Command="{Binding Source={x:Static shell:SystemCommands.MinimizeWindowCommand}}"
IsTabStop="False"
Style="{DynamicResource WD.WindowButtonStyle}">
Style="{DynamicResource WD.WindowButtonStyle}"
ToolTip="{Binding [Minimize], Source={x:Static resx:LanguageManager.Instance}}">
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
<Rectangle
x:Name="MinimizeGlyph"
Expand All @@ -90,7 +92,8 @@
Padding="0"
Command="{Binding Source={x:Static shell:SystemCommands.MaximizeWindowCommand}}"
IsTabStop="False"
Style="{DynamicResource WD.WindowButtonStyle}">
Style="{DynamicResource WD.WindowButtonStyle}"
ToolTip="{Binding [Maximize], Source={x:Static resx:LanguageManager.Instance}}">
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
<Path
Width="10"
Expand All @@ -109,6 +112,7 @@
Command="{Binding Source={x:Static shell:SystemCommands.RestoreWindowCommand}}"
IsTabStop="False"
Style="{DynamicResource WD.WindowButtonStyle}"
ToolTip="{Binding [Restore], Source={x:Static resx:LanguageManager.Instance}}"
Visibility="Collapsed">
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
<Path
Expand All @@ -128,7 +132,8 @@
Name="PART_CloseButton"
Command="{Binding Source={x:Static shell:SystemCommands.CloseWindowCommand}}"
IsTabStop="False"
Style="{DynamicResource WD.WindowButtonStyle}">
Style="{DynamicResource WD.WindowButtonStyle}"
ToolTip="{Binding [Close], Source={x:Static resx:LanguageManager.Instance}}">
<Path
Width="10"
Height="10"
Expand Down
469 changes: 225 additions & 244 deletions src/WPFDevelopers.Net40/Themes/Theme.xaml
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Import Project="../Package.props"/>
<Import Project="../Package.props" />
<PropertyGroup>
<TargetFramework>net40</TargetFramework>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>E:\Code\git\WPFDevelopers\WPFDevelopersMultiple\WPFDevelopers.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<Import Project="..\WPFDevelopers.Shared\WPFDevelopers.Shared.projitems" Label="Shared" />
<Import Project="..\Microsoft.Windows.Shell\Microsoft.Windows.Shell.projitems" Label="Shared" />
Expand Down
11 changes: 8 additions & 3 deletions src/WPFDevelopers.Net45x/Themes/Generic.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:control="clr-namespace:WPFDevelopers.Controls"
xmlns:converts="clr-namespace:WPFDevelopers.Converts"
xmlns:resx="clr-namespace:WPFDevelopers"
xmlns:wd="clr-namespace:WPFDevelopers.Net45x">
<converts:ObjectNullToVisibilityConverter x:Key="ObjectNullToVisibilityConverter" />
<Style
Expand Down Expand Up @@ -80,7 +81,8 @@
Padding="0"
Command="SystemCommands.MinimizeWindowCommand"
IsTabStop="False"
Style="{DynamicResource WD.WindowButtonStyle}">
Style="{DynamicResource WD.WindowButtonStyle}"
ToolTip="{Binding [Minimize], Source={x:Static resx:LanguageManager.Instance}}">
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
<Rectangle
x:Name="MinimizeGlyph"
Expand All @@ -96,7 +98,8 @@
Padding="0"
Command="SystemCommands.MaximizeWindowCommand"
IsTabStop="False"
Style="{DynamicResource WD.WindowButtonStyle}">
Style="{DynamicResource WD.WindowButtonStyle}"
ToolTip="{Binding [Maximize], Source={x:Static resx:LanguageManager.Instance}}">
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
<Path
Width="10"
Expand All @@ -115,6 +118,7 @@
Command="SystemCommands.RestoreWindowCommand"
IsTabStop="False"
Style="{DynamicResource WD.WindowButtonStyle}"
ToolTip="{Binding [Restore], Source={x:Static resx:LanguageManager.Instance}}"
Visibility="Collapsed">
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
<Path
Expand All @@ -134,7 +138,8 @@
Name="PART_CloseButton"
Command="SystemCommands.CloseWindowCommand"
IsTabStop="False"
Style="{DynamicResource WD.WindowButtonStyle}">
Style="{DynamicResource WD.WindowButtonStyle}"
ToolTip="{Binding [Close], Source={x:Static resx:LanguageManager.Instance}}">
<Path
Width="10"
Height="10"
Expand Down
Loading