From 9bc1208484509fc8d4be79a19ff8ebe58007ceee Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 27 Oct 2018 20:01:47 +0800
Subject: [PATCH] update to v1.4.0
---
HandyControl/Data/Enum/SkinType.cs | 8 ++
HandyControl/HandyControl.csproj | 23 ++++-
HandyControl/Properties/AssemblyInfo.cs | 2 +-
HandyControl/Themes/Basic/Basic.xaml | 1 -
HandyControl/Themes/Basic/Brushes.xaml | 8 ++
.../Themes/Basic/{ => Colors}/Colors.xaml | 9 +-
.../Themes/Basic/Colors/ColorsDark.xaml | 43 ++++++++++
HandyControl/Themes/SkinDark.xaml | 7 ++
HandyControl/Themes/SkinDefault.xaml | 7 ++
.../Themes/Styles/Base/BaseStyle.xaml | 6 +-
.../Styles/Base/ButtonBaseBaseStyle.xaml | 5 +-
.../Themes/Styles/Base/ButtonBaseStyle.xaml | 1 -
.../Themes/Styles/Base/CheckBoxBaseStyle.xaml | 2 +-
.../Themes/Styles/Base/ComboBoxBaseStyle.xaml | 58 ++++++-------
.../Styles/Base/ContextMenuBaseStyle.xaml | 17 ++--
.../Styles/Base/DatePickerBaseStyle.xaml | 8 +-
.../Themes/Styles/Base/ListBoxBaseStyle.xaml | 9 +-
.../Styles/Base/NumericUpDownBaseStyle.xaml | 10 +--
.../Styles/Base/PasswordBoxBaseStyle.xaml | 4 +-
.../Styles/Base/ProgressBarBaseStyle.xaml | 58 ++++++++-----
.../Styles/Base/RadioButtonBaseStyle.xaml | 4 +-
.../Styles/Base/TabControlBaseStyle.xaml | 5 +-
.../Styles/Base/TextBlockBaseStyle.xaml | 6 +-
.../Themes/Styles/Base/TextBoxBaseStyle.xaml | 7 +-
.../Styles/Base/TimePickerBaseStyle.xaml | 6 +-
.../Styles/Base/ToggleButtonBaseStyle.xaml | 8 +-
HandyControl/Themes/Styles/Button.xaml | 2 +-
HandyControl/Themes/Styles/Calendar.xaml | 24 ++++--
HandyControl/Themes/Styles/Clock.xaml | 10 +--
HandyControl/Themes/Styles/ColorPicker.xaml | 11 +--
HandyControl/Themes/Styles/ComboBox.xaml | 2 -
HandyControl/Themes/Styles/DataGrid.xaml | 8 +-
HandyControl/Themes/Styles/DatePicker.xaml | 8 +-
HandyControl/Themes/Styles/Expander.xaml | 5 +-
HandyControl/Themes/Styles/Growl.xaml | 5 +-
HandyControl/Themes/Styles/Image.xaml | 8 ++
HandyControl/Themes/Styles/NumericUpDown.xaml | 14 ++-
HandyControl/Themes/Styles/Pagination.xaml | 6 +-
HandyControl/Themes/Styles/PasswordBox.xaml | 4 +-
HandyControl/Themes/Styles/ProgressBar.xaml | 44 ++--------
HandyControl/Themes/Styles/Slider.xaml | 25 +++---
.../Styles/{Steps.xaml => StepBar.xaml} | 2 +-
HandyControl/Themes/Styles/Style.xaml | 3 +-
HandyControl/Themes/Styles/TabControl.xaml | 12 +--
HandyControl/Themes/Styles/TextBlock.xaml | 12 +--
HandyControl/Themes/Styles/TextBox.xaml | 9 +-
HandyControl/Themes/Styles/TimeBar.xaml | 5 +-
HandyControl/Themes/Styles/TimePicker.xaml | 9 +-
HandyControl/Themes/Styles/ToggleButton.xaml | 4 +-
HandyControl/Themes/Styles/TreeView.xaml | 11 ++-
HandyControl/Themes/Styles/Window.xaml | 28 +++---
.../Themes/{ThemesDefault.xaml => Theme.xaml} | 0
HandyControl/Tools/ResourceHelper.cs | 27 +++++-
HandyControlDemo/App.xaml | 14 ++-
HandyControlDemo/App.xaml.cs | 29 ++++++-
HandyControlDemo/Data/AppConfig.cs | 3 +
HandyControlDemo/Data/GlobalData.cs | 14 ++-
HandyControlDemo/Data/Model/DemoDataModel.cs | 2 +
HandyControlDemo/HandyControlDemo.csproj | 33 +++++++-
HandyControlDemo/MainWindow.xaml | 2 +-
HandyControlDemo/Properties/AssemblyInfo.cs | 2 +-
.../Properties/Langs/Lang.Designer.cs | 45 ++++++++++
.../Properties/Langs/Lang.en.resx | 15 ++++
HandyControlDemo/Properties/Langs/Lang.resx | 15 ++++
.../Resources/Img/Avatar/avatar1.png | Bin 0 -> 6396 bytes
.../Resources/Img/Avatar/avatar2.png | Bin 0 -> 31506 bytes
.../Resources/Img/Avatar/avatar3.png | Bin 0 -> 6882 bytes
.../Resources/Img/Avatar/avatar4.png | Bin 0 -> 7601 bytes
.../Resources/Img/Avatar/avatar5.png | Bin 0 -> 8025 bytes
.../Resources/Img/Avatar/avatar6.png | Bin 0 -> 6468 bytes
.../Resources/Themes/Basic/Basic.xaml | 9 ++
.../Resources/Themes/Basic/Brushes.xaml | 12 ++-
.../Themes/Basic/{ => Colors}/Colors.xaml | 2 +
.../Themes/Basic/Colors/ColorsDark.xaml | 8 ++
.../Resources/Themes/Basic/Geometries.xaml | 6 ++
.../Resources/Themes/SkinDark.xaml | 7 ++
.../Resources/Themes/SkinDefault.xaml | 7 ++
.../Resources/Themes/Styles/Style.xaml | 3 -
.../Resources/Themes/Styles/StyleDark.xaml | 12 +++
HandyControlDemo/Resources/Themes/Theme.xaml | 8 ++
HandyControlDemo/Service/DataService.cs | 4 +-
.../Controls/AnimationPathDemoCtl.xaml | 4 +-
.../UserControl/Controls/CarouselDemoCtl.xaml | 2 +-
.../Controls/CirclePanelDemoCtl.xaml | 2 +-
.../UserControl/Controls/ClockDemoCtl.xaml | 2 +-
.../Controls/ColorPickerDemoCtl.xaml | 1 -
.../Controls/CompareSliderDemoCtl.xaml | 2 +-
.../UserControl/Controls/GrowlDemoCtl.xaml | 2 +-
.../Controls/ImageBrowserDemoCtl.xaml | 2 +-
.../UserControl/Controls/LoadingDemoCtl.xaml | 2 +-
.../Controls/NumericUpDownDemoCtl.xaml | 2 +-
.../Controls/PaginationDemoCtl.xaml | 2 +-
.../Controls/ScrollViewerDemoCtl.xaml | 22 ++---
.../UserControl/Controls/StepBarDemoCtl.xaml | 2 +-
.../Controls/TabControlDemoCtl.xaml | 14 +--
.../UserControl/Controls/TimeBarDemoCtl.xaml | 4 +-
.../Controls/TimePickerDemoCtl.xaml | 2 +-
.../UserControl/Controls/WindowDemoCtl.xaml | 2 +-
.../UserControl/Main/LeftMainContent.xaml | 72 ++++++++--------
.../UserControl/Main/MainContent.xaml | 8 +-
.../UserControl/Main/NoUserContent.xaml | 80 ++++++++++++------
.../UserControl/Main/NoUserContent.xaml.cs | 31 +++++--
.../UserControl/Styles/BorderDemoCtl.xaml | 14 +--
.../UserControl/Styles/ButtonDemoCtl.xaml | 6 +-
.../UserControl/Styles/CalendarDemoCtl.xaml | 2 +-
.../UserControl/Styles/CheckBoxDemoCtl.xaml | 2 +-
.../UserControl/Styles/ComboBoxDemoCtl.xaml | 2 +-
.../UserControl/Styles/DataGridDemoCtl.xaml | 15 +++-
.../UserControl/Styles/DatePickerDemoCtl.xaml | 2 +-
.../UserControl/Styles/ExpanderDemoCtl.xaml | 20 ++---
.../UserControl/Styles/ListBoxDemoCtl.xaml | 2 +-
.../UserControl/Styles/MenuDemoCtl.xaml | 6 +-
.../Styles/NaiveScrollViewerDemoCtl.xaml | 22 ++---
.../Styles/NaiveTabControlDemoCtl.xaml | 2 +-
.../Styles/PasswordBoxDemoCtl.xaml | 2 +-
.../Styles/ProgressBarDemoCtl.xaml | 2 +-
.../Styles/RadioButtonDemoCtl.xaml | 2 +-
.../UserControl/Styles/TextBlockDemoCtl.xaml | 66 +++++++--------
.../UserControl/Styles/TextBoxDemoCtl.xaml | 2 +-
.../Styles/ToggleButtonDemoCtl.xaml | 18 ++--
.../UserControl/Styles/TreeViewDemoCtl.xaml | 2 +-
.../ViewModel/NoUserContentViewModel.cs | 22 +++++
.../ViewModel/ViewModelLocator.cs | 3 +
HandyControlDemo/Window/CommonWindow.xaml | 4 +-
.../Window/CustomNonClientAreaWindow.xaml | 24 +++---
125 files changed, 891 insertions(+), 483 deletions(-)
create mode 100644 HandyControl/Data/Enum/SkinType.cs
rename HandyControl/Themes/Basic/{ => Colors}/Colors.xaml (77%)
create mode 100644 HandyControl/Themes/Basic/Colors/ColorsDark.xaml
create mode 100644 HandyControl/Themes/SkinDark.xaml
create mode 100644 HandyControl/Themes/SkinDefault.xaml
create mode 100644 HandyControl/Themes/Styles/Image.xaml
rename HandyControl/Themes/Styles/{Steps.xaml => StepBar.xaml} (90%)
rename HandyControl/Themes/{ThemesDefault.xaml => Theme.xaml} (100%)
create mode 100644 HandyControlDemo/Resources/Img/Avatar/avatar1.png
create mode 100644 HandyControlDemo/Resources/Img/Avatar/avatar2.png
create mode 100644 HandyControlDemo/Resources/Img/Avatar/avatar3.png
create mode 100644 HandyControlDemo/Resources/Img/Avatar/avatar4.png
create mode 100644 HandyControlDemo/Resources/Img/Avatar/avatar5.png
create mode 100644 HandyControlDemo/Resources/Img/Avatar/avatar6.png
create mode 100644 HandyControlDemo/Resources/Themes/Basic/Basic.xaml
rename HandyControlDemo/Resources/Themes/Basic/{ => Colors}/Colors.xaml (65%)
create mode 100644 HandyControlDemo/Resources/Themes/Basic/Colors/ColorsDark.xaml
create mode 100644 HandyControlDemo/Resources/Themes/SkinDark.xaml
create mode 100644 HandyControlDemo/Resources/Themes/SkinDefault.xaml
create mode 100644 HandyControlDemo/Resources/Themes/Styles/StyleDark.xaml
create mode 100644 HandyControlDemo/Resources/Themes/Theme.xaml
create mode 100644 HandyControlDemo/ViewModel/NoUserContentViewModel.cs
diff --git a/HandyControl/Data/Enum/SkinType.cs b/HandyControl/Data/Enum/SkinType.cs
new file mode 100644
index 00000000..e329ecd4
--- /dev/null
+++ b/HandyControl/Data/Enum/SkinType.cs
@@ -0,0 +1,8 @@
+namespace HandyControl.Data.Enum
+{
+ public enum SkinType
+ {
+ Default = 0,
+ Dark
+ }
+}
\ No newline at end of file
diff --git a/HandyControl/HandyControl.csproj b/HandyControl/HandyControl.csproj
index 02602a74..1840a0a5 100644
--- a/HandyControl/HandyControl.csproj
+++ b/HandyControl/HandyControl.csproj
@@ -60,6 +60,7 @@
+
True
@@ -163,7 +164,7 @@
Designer
MSBuild:Compile
-
+
Designer
MSBuild:Compile
@@ -175,6 +176,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
@@ -331,6 +336,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
@@ -367,7 +376,7 @@
Designer
MSBuild:Compile
-
+
Designer
MSBuild:Compile
@@ -415,7 +424,15 @@
Designer
MSBuild:Compile
-
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
MSBuild:Compile
Designer
diff --git a/HandyControl/Properties/AssemblyInfo.cs b/HandyControl/Properties/AssemblyInfo.cs
index f0bf5245..b3838732 100644
--- a/HandyControl/Properties/AssemblyInfo.cs
+++ b/HandyControl/Properties/AssemblyInfo.cs
@@ -10,4 +10,4 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.3.4.*")]
+[assembly: AssemblyVersion("1.4.0.*")]
diff --git a/HandyControl/Themes/Basic/Basic.xaml b/HandyControl/Themes/Basic/Basic.xaml
index 5d113db2..38b5f704 100644
--- a/HandyControl/Themes/Basic/Basic.xaml
+++ b/HandyControl/Themes/Basic/Basic.xaml
@@ -2,7 +2,6 @@
-
diff --git a/HandyControl/Themes/Basic/Brushes.xaml b/HandyControl/Themes/Basic/Brushes.xaml
index de9e53ff..555392d9 100644
--- a/HandyControl/Themes/Basic/Brushes.xaml
+++ b/HandyControl/Themes/Basic/Brushes.xaml
@@ -10,11 +10,19 @@
+
+
+
+
+
+
+
+
diff --git a/HandyControl/Themes/Basic/Colors.xaml b/HandyControl/Themes/Basic/Colors/Colors.xaml
similarity index 77%
rename from HandyControl/Themes/Basic/Colors.xaml
rename to HandyControl/Themes/Basic/Colors/Colors.xaml
index 9693f28a..afa14852 100644
--- a/HandyControl/Themes/Basic/Colors.xaml
+++ b/HandyControl/Themes/Basic/Colors/Colors.xaml
@@ -19,11 +19,17 @@
#212121
#757575
#bdbdbd
+ #212121
White
#e0e0e0
+ #a0a0a0
#eeeeee
- White
+ #ffffff
+ #eeeeee
+ White
+ #73a5ff
+ #5477f5
White
#f4f4f4
@@ -33,4 +39,5 @@
#20000000
#40000000
+
\ No newline at end of file
diff --git a/HandyControl/Themes/Basic/Colors/ColorsDark.xaml b/HandyControl/Themes/Basic/Colors/ColorsDark.xaml
new file mode 100644
index 00000000..764efce2
--- /dev/null
+++ b/HandyControl/Themes/Basic/Colors/ColorsDark.xaml
@@ -0,0 +1,43 @@
+
+
+ #73a5ff
+ #5477f5
+
+ #ff8792
+ #ff4c9f
+
+ #ffd07a
+ #ff9133
+
+ #4dd0e1
+ #00bcd4
+
+ #A5D6A7
+ #4CAF50
+
+ White
+ #757575
+ #3f3f46
+ #212121
+ White
+
+ #3f3f46
+ #555555
+ #eeeeee
+ #1c1c1c
+ #2d2d30
+ #2d2d30
+ #3f3f46
+ #2d2d30
+
+ #686868
+ #686868
+
+ #ff5722
+ #d43f3a
+
+ #40000000
+ #40000000
+
+
\ No newline at end of file
diff --git a/HandyControl/Themes/SkinDark.xaml b/HandyControl/Themes/SkinDark.xaml
new file mode 100644
index 00000000..32b78055
--- /dev/null
+++ b/HandyControl/Themes/SkinDark.xaml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/HandyControl/Themes/SkinDefault.xaml b/HandyControl/Themes/SkinDefault.xaml
new file mode 100644
index 00000000..825e8dbd
--- /dev/null
+++ b/HandyControl/Themes/SkinDefault.xaml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/HandyControl/Themes/Styles/Base/BaseStyle.xaml b/HandyControl/Themes/Styles/Base/BaseStyle.xaml
index 0c182c66..428a2e1e 100644
--- a/HandyControl/Themes/Styles/Base/BaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/BaseStyle.xaml
@@ -1,9 +1,13 @@
+
+
+
+
\ No newline at end of file
diff --git a/HandyControl/Themes/Styles/Base/ButtonBaseBaseStyle.xaml b/HandyControl/Themes/Styles/Base/ButtonBaseBaseStyle.xaml
index 86903ef0..60c0150b 100644
--- a/HandyControl/Themes/Styles/Base/ButtonBaseBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/ButtonBaseBaseStyle.xaml
@@ -3,12 +3,13 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/HandyControl/Themes/Styles/NumericUpDown.xaml b/HandyControl/Themes/Styles/NumericUpDown.xaml
index 98090d0d..d562f20b 100644
--- a/HandyControl/Themes/Styles/NumericUpDown.xaml
+++ b/HandyControl/Themes/Styles/NumericUpDown.xaml
@@ -5,9 +5,7 @@
xmlns:system="clr-namespace:System;assembly=mscorlib">
-
-
@@ -19,7 +17,7 @@
-
+
@@ -28,7 +26,7 @@
-
+
@@ -39,7 +37,7 @@
-
+
@@ -54,7 +52,7 @@
-
+
@@ -63,7 +61,7 @@
-
+
@@ -74,7 +72,7 @@
-
+
diff --git a/HandyControl/Themes/Styles/Pagination.xaml b/HandyControl/Themes/Styles/Pagination.xaml
index 73503683..857b2511 100644
--- a/HandyControl/Themes/Styles/Pagination.xaml
+++ b/HandyControl/Themes/Styles/Pagination.xaml
@@ -20,7 +20,7 @@
-
+
@@ -70,7 +70,7 @@
@@ -90,7 +90,7 @@
diff --git a/HandyControl/Themes/Styles/PasswordBox.xaml b/HandyControl/Themes/Styles/PasswordBox.xaml
index f4409870..2039e0c2 100644
--- a/HandyControl/Themes/Styles/PasswordBox.xaml
+++ b/HandyControl/Themes/Styles/PasswordBox.xaml
@@ -33,7 +33,7 @@
-
+
@@ -63,7 +63,7 @@
-
+
diff --git a/HandyControl/Themes/Styles/ProgressBar.xaml b/HandyControl/Themes/Styles/ProgressBar.xaml
index 9c0f9594..223be237 100644
--- a/HandyControl/Themes/Styles/ProgressBar.xaml
+++ b/HandyControl/Themes/Styles/ProgressBar.xaml
@@ -25,7 +25,7 @@
-
-
-
-
-
diff --git a/HandyControl/Themes/Styles/TextBox.xaml b/HandyControl/Themes/Styles/TextBox.xaml
index 9dd31eb8..4e1ade6f 100644
--- a/HandyControl/Themes/Styles/TextBox.xaml
+++ b/HandyControl/Themes/Styles/TextBox.xaml
@@ -4,7 +4,6 @@
xmlns:system="clr-namespace:System;assembly=mscorlib">
-
@@ -20,7 +19,7 @@
-
+
@@ -32,7 +31,7 @@
-
+
@@ -47,7 +46,7 @@
-
+
@@ -59,7 +58,7 @@
-
+
diff --git a/HandyControl/Themes/Styles/TimeBar.xaml b/HandyControl/Themes/Styles/TimeBar.xaml
index 475ba5a8..2845bf2a 100644
--- a/HandyControl/Themes/Styles/TimeBar.xaml
+++ b/HandyControl/Themes/Styles/TimeBar.xaml
@@ -3,7 +3,6 @@
xmlns:controls="clr-namespace:HandyControl.Controls">
-
@@ -12,7 +11,7 @@
-
+
@@ -39,7 +38,7 @@
-
+
diff --git a/HandyControl/Themes/Styles/TimePicker.xaml b/HandyControl/Themes/Styles/TimePicker.xaml
index a91037a0..b7a7eefd 100644
--- a/HandyControl/Themes/Styles/TimePicker.xaml
+++ b/HandyControl/Themes/Styles/TimePicker.xaml
@@ -6,7 +6,6 @@
-
@@ -28,7 +27,7 @@
-
+
@@ -44,7 +43,7 @@
-
+
@@ -79,7 +78,7 @@
-
+
@@ -95,7 +94,7 @@
-
+
diff --git a/HandyControl/Themes/Styles/ToggleButton.xaml b/HandyControl/Themes/Styles/ToggleButton.xaml
index 58670e6f..ec6b6a7b 100644
--- a/HandyControl/Themes/Styles/ToggleButton.xaml
+++ b/HandyControl/Themes/Styles/ToggleButton.xaml
@@ -8,7 +8,7 @@