From f835f25165ff09b10f47744d45952b6f3963c4df Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 1 Dec 2020 23:23:22 +0800
Subject: [PATCH] combine xaml
virtues:
1. 2 or 3 times layout speed
2. smaller dll
---
.../HandyControl_Net_40.csproj | 67 +-
.../Styles/Base/CheckComboBoxBaseStyle.xaml | 2 +-
.../Themes/Styles/Base/ComboBoxBaseStyle.xaml | 2 +-
.../Themes/Styles/DataGrid.xaml | 2 +-
.../Themes/Styles/MessageBox.xaml | 2 +-
.../HandyControl_Net_40/Themes/Theme.xaml | 13167 +++++++++++++++
.../HandyControl_Net_GE45.csproj | 3 +
src/Shared/HandyControlDemo_Shared/App.xaml | 2 +-
.../Controls/DatePickerDemoCtl.xaml | 2 +-
.../UserControl/Controls/DialogDemoCtl.xaml | 2 +-
.../UserControl/Controls/PoptipDemoCtl.xaml | 2 +-
.../Styles/GeometryDemoCtl.xaml.cs | 15 +-
.../Styles/NativeDatePickerDemoCtl.xaml | 2 +-
.../HandyControl_Shared.projitems | 831 +-
.../Themes/Basic/Basic.xaml | 17 -
.../Themes/Basic/Colors/Colors.xaml | 2 +-
.../Themes/Basic/Colors/ColorsDark.xaml | 2 +-
.../Themes/Basic/Colors/ColorsViolet.xaml | 2 +-
.../Themes/Basic/Fonts.xaml | 2 +-
.../Themes/Basic/Sizes.xaml | 2 +-
.../HandyControl_Shared/Themes/Lang.xaml | 7 +
.../Styles/Base/CheckComboBoxBaseStyle.xaml | 2 +-
.../Themes/Styles/Base/ComboBoxBaseStyle.xaml | 2 +-
.../Styles/Base/DatePickerBaseStyle.xaml | 2 +-
.../Styles/Base/DateTimePickerBaseStyle.xaml | 2 +-
.../Styles/Base/NumericUpDownBaseStyle.xaml | 2 +-
.../Styles/Base/PasswordBoxBaseStyle.xaml | 2 +-
.../Styles/Base/ProgressBarBaseStyle.xaml | 2 +-
.../Styles/Base/RadioButtonBaseStyle.xaml | 2 +-
.../Styles/Base/SearchBarBaseStyle.xaml | 2 +-
.../Styles/Base/TabControlBaseStyle.xaml | 2 +-
.../Themes/Styles/Base/TextBoxBaseStyle.xaml | 2 +-
.../Styles/Base/TimePickerBaseStyle.xaml | 2 +-
.../Styles/Base/ToggleButtonBaseStyle.xaml | 2 +-
.../Themes/Styles/DataGrid.xaml | 2 +-
.../Themes/Styles/MessageBox.xaml | 2 +-
.../Themes/Styles/Pagination.xaml | 2 +-
.../Themes/Styles/ProgressBar.xaml | 2 +-
.../Themes/Styles/PropertyGrid.xaml | 2 +-
.../Themes/Styles/Style.xaml | 96 -
.../HandyControl_Shared/Themes/Theme.xaml | 13329 +++++++++++++++-
.../HandyControl_Shared/Themes/Theme_40.txt | 166 +
.../HandyControl_Shared/Themes/Theme_GE45.txt | 166 +
.../Themes/XamlCombine.exe | Bin 0 -> 13312 bytes
44 files changed, 27232 insertions(+), 696 deletions(-)
create mode 100644 src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
delete mode 100644 src/Shared/HandyControl_Shared/Themes/Basic/Basic.xaml
create mode 100644 src/Shared/HandyControl_Shared/Themes/Lang.xaml
delete mode 100644 src/Shared/HandyControl_Shared/Themes/Styles/Style.xaml
create mode 100644 src/Shared/HandyControl_Shared/Themes/Theme_40.txt
create mode 100644 src/Shared/HandyControl_Shared/Themes/Theme_GE45.txt
create mode 100644 src/Shared/HandyControl_Shared/Themes/XamlCombine.exe
diff --git a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
index 1b529f4d..eeac001a 100644
--- a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
+++ b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
@@ -18,32 +18,6 @@
3.0.1
-
-
- Designer
- XamlIntelliSenseFileGenerator
-
-
- MSBuild:Compile
- Designer
-
-
- Designer
- XamlIntelliSenseFileGenerator
-
-
- Designer
- XamlIntelliSenseFileGenerator
-
-
- Designer
- XamlIntelliSenseFileGenerator
-
-
- Designer
- XamlIntelliSenseFileGenerator
-
-
Properties\Langs\Lang.Designer.cs
@@ -172,7 +146,7 @@
Resources\Images\GlowWindow\topright.png
-
+
@@ -180,5 +154,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ Designer
+ XamlIntelliSenseFileGenerator
+
+
+ MSBuild:Compile
+ Designer
+
+
+ Designer
+
+
+ Designer
+
+
+ Designer
+
+
+ Designer
+
+
+ Designer
+ MSBuild:Compile
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/CheckComboBoxBaseStyle.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/CheckComboBoxBaseStyle.xaml
index c2bea6d5..c4357c39 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/CheckComboBoxBaseStyle.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/CheckComboBoxBaseStyle.xaml
@@ -3,7 +3,7 @@
xmlns:hc="clr-namespace:HandyControl.Controls"
xmlns:ex="clr-namespace:HandyControl.Tools.Extension"
xmlns:themes="clr-namespace:HandyControl.Themes"
- xmlns:system="clr-namespace:System;assembly=System.Runtime"
+ xmlns:system="clr-namespace:System;assembly=mscorlib"
xmlns:interactivity="clr-namespace:HandyControl.Interactivity"
xmlns:langs="clr-namespace:HandyControl.Properties.Langs">
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/ComboBoxBaseStyle.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/ComboBoxBaseStyle.xaml
index c61184e5..9154c735 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/ComboBoxBaseStyle.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/ComboBoxBaseStyle.xaml
@@ -2,7 +2,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:hc="clr-namespace:HandyControl.Controls"
xmlns:interactivity="clr-namespace:HandyControl.Interactivity"
- xmlns:system="clr-namespace:System;assembly=System.Runtime"
+ xmlns:system="clr-namespace:System;assembly=mscorlib"
xmlns:themes="clr-namespace:HandyControl.Themes">
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/DataGrid.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/DataGrid.xaml
index 4ee0a6a2..424e47fa 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Styles/DataGrid.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/DataGrid.xaml
@@ -1,7 +1,7 @@
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/MessageBox.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/MessageBox.xaml
index c2d39033..35de3ab3 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Styles/MessageBox.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/MessageBox.xaml
@@ -9,7 +9,7 @@
-
+
+ 30
+ 10,6
+ 8,6
+ 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
index a9d4eeae..1616f2c9 100644
--- a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
+++ b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
@@ -141,4 +141,7 @@
Resources\Images\GlowWindow\topright.png
+
+
+
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/App.xaml b/src/Shared/HandyControlDemo_Shared/App.xaml
index da21212a..7bc380e6 100644
--- a/src/Shared/HandyControlDemo_Shared/App.xaml
+++ b/src/Shared/HandyControlDemo_Shared/App.xaml
@@ -14,7 +14,7 @@
-
+
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DatePickerDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DatePickerDemoCtl.xaml
index 7d8edee2..040ab4ad 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DatePickerDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DatePickerDemoCtl.xaml
@@ -2,7 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:hc="https://handyorg.github.io/handycontrol"
- xmlns:system="clr-namespace:System;assembly=System.Runtime"
+ xmlns:system="clr-namespace:System;assembly=mscorlib"
xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
Background="{DynamicResource RegionBrush}">
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DialogDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DialogDemoCtl.xaml
index db5749b2..0093e695 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DialogDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DialogDemoCtl.xaml
@@ -5,7 +5,7 @@
xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
xmlns:hc="https://handyorg.github.io/handycontrol"
xmlns:data="clr-namespace:HandyControlDemo.Data"
- xmlns:system="clr-namespace:System;assembly=System.Runtime"
+ xmlns:system="clr-namespace:System;assembly=mscorlib"
hc:Dialog.Token="{x:Static data:MessageToken.DialogContainer}"
Background="{DynamicResource RegionBrush}"
MinWidth="500"
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PoptipDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PoptipDemoCtl.xaml
index b07f4b87..754857e6 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PoptipDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PoptipDemoCtl.xaml
@@ -5,7 +5,7 @@
xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
xmlns:hc="https://handyorg.github.io/handycontrol"
- xmlns:system="clr-namespace:System;assembly=System.Runtime">
+ xmlns:system="clr-namespace:System;assembly=mscorlib">
+
+ 30
+ 10,6
+ 8,6
+ 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme_40.txt b/src/Shared/HandyControl_Shared/Themes/Theme_40.txt
new file mode 100644
index 00000000..b520ddf4
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Themes/Theme_40.txt
@@ -0,0 +1,166 @@
+Lang.xaml
+Basic\Colors\Colors.xaml
+Basic\Behaviors.xaml
+Basic\Brushes.xaml
+Basic\Converters.xaml
+Basic\Effects.xaml
+Basic\Fonts.xaml
+Basic\Geometries.xaml
+Basic\Paths.xaml
+Basic\Sizes.xaml
+Styles\Base\BadgeBaseStyle.xaml
+Styles\Base\BaseStyle.xaml
+Styles\Base\ButtonBaseBaseStyle.xaml
+Styles\Base\ButtonBaseStyle.xaml
+Styles\Base\ButtonGroupBaseStyle.xaml
+Styles\Base\CardBaseStyle.xaml
+Styles\Base\ChatBubbleBaseStyle.xaml
+Styles\Base\CheckBoxBaseStyle.xaml
+..\..\..\Net_40\HandyControl_Net_40\Themes\Styles\Base\CheckComboBoxBaseStyle.xaml
+Styles\Base\ColorPickerBaseStyle.xaml
+..\..\..\Net_40\HandyControl_Net_40\Themes\Styles\Base\ComboBoxBaseStyle.xaml
+Styles\Base\ContextMenuBaseStyle.xaml
+Styles\Base\CoverFlowBaseStyle.xaml
+Styles\Base\CoverViewBaseStyle.xaml
+Styles\Base\DatePickerBaseStyle.xaml
+Styles\Base\DateTimePickerBaseStyle.xaml
+Styles\Base\DialogBaseStyle.xaml
+Styles\Base\DividerBaseStyle.xaml
+Styles\Base\DrawerBaseStyle.xaml
+Styles\Base\ExpanderBaseStyle.xaml
+Styles\Base\FlowDocumentBaseStyle.xaml
+Styles\Base\FrameBaseStyle.xaml
+Styles\Base\GotoTopBaseStyle.xaml
+Styles\Base\GravatarBaseStyle.xaml
+Styles\Base\GroupBoxBaseStyle.xaml
+Styles\Base\ImageSelectorBaseStyle.xaml
+Styles\Base\LabelBaseStyle.xaml
+Styles\Base\ListBoxBaseStyle.xaml
+Styles\Base\LoadingBaseStyle.xaml
+Styles\Base\LoadingCircleBaseStyle.xaml
+Styles\Base\LoadingLineBaseStyle.xaml
+Styles\Base\MagnifierBaseStyle.xaml
+Styles\Base\MenuBaseStyle.xaml
+Styles\Base\NavigationWindowBaseStyle.xaml
+Styles\Base\NumericUpDownBaseStyle.xaml
+Styles\Base\PasswordBoxBaseStyle.xaml
+Styles\Base\PinBoxBaseStyle.xaml
+Styles\Base\PoptipBaseStyle.xaml
+Styles\Base\ProgressBarBaseStyle.xaml
+Styles\Base\ProgressButtonBaseStyle.xaml
+Styles\Base\PropertyGridBaseStyle.xaml
+Styles\Base\RadioButtonBaseStyle.xaml
+Styles\Base\RateBaseStyle.xaml
+Styles\Base\RepeatButtonBaseStyle.xaml
+Styles\Base\RunningBlockBaseStyle.xaml
+Styles\Base\ScrollViewerBaseStyle.xaml
+Styles\Base\SearchBarBaseStyle.xaml
+Styles\Base\SeparatorBaseStyle.xaml
+Styles\Base\ShieldBaseStyle.xaml
+Styles\Base\SideMenuBaseStyle.xaml
+Styles\Base\SliderBaseStyle.xaml
+Styles\Base\SplitButtonBaseStyle.xaml
+Styles\Base\StatusBarBaseStyle.xaml
+Styles\Base\StepBarBaseStyle.xaml
+Styles\Base\TabControlBaseStyle.xaml
+Styles\Base\TagBaseStyle.xaml
+Styles\Base\TextBlockBaseStyle.xaml
+Styles\Base\TextBoxBaseStyle.xaml
+Styles\Base\TimePickerBaseStyle.xaml
+Styles\Base\ToggleBlockBaseStyle.xaml
+Styles\Base\ToggleButtonBaseStyle.xaml
+Styles\Base\ToolBarBaseStyle.xaml
+Styles\Base\ToolTipBaseStyle.xaml
+Styles\Base\TransferBaseStyle.xaml
+..\..\..\Net_40\HandyControl_Net_40\Themes\Styles\Base\TreeViewBaseStyle.xaml
+Styles\Base\WatermarkBaseStyle.xaml
+Styles\Badge.xaml
+Styles\BlendEffectBox.xaml
+Styles\Border.xaml
+Styles\Button.xaml
+Styles\ButtonGroup.xaml
+Styles\Calendar.xaml
+Styles\CalendarWithClock.xaml
+Styles\Card.xaml
+Styles\Carousel.xaml
+Styles\ChatBubble.xaml
+Styles\CheckBox.xaml
+Styles\CheckComboBox.xaml
+Styles\Clock.xaml
+Styles\Col.xaml
+Styles\ColorPicker.xaml
+Styles\ComboBox.xaml
+Styles\ContentControl.xaml
+Styles\ContextMenu.xaml
+Styles\CoverFlow.xaml
+Styles\CoverView.xaml
+..\..\..\Net_40\HandyControl_Net_40\Themes\Styles\DataGrid.xaml
+Styles\DatePicker.xaml
+Styles\DateTimePicker.xaml
+Styles\Dialog.xaml
+Styles\Divider.xaml
+Styles\Drawer.xaml
+Styles\Expander.xaml
+Styles\FlipClock.xaml
+Styles\FloatingBlock.xaml
+Styles\FlowDocument.xaml
+Styles\Frame.xaml
+Styles\GotoTop.xaml
+Styles\Gravatar.xaml
+Styles\GridSplitter.xaml
+Styles\GroupBox.xaml
+Styles\Growl.xaml
+Styles\Image.xaml
+Styles\ImageSelector.xaml
+Styles\ImageViewer.xaml
+Styles\Label.xaml
+Styles\ListBox.xaml
+..\..\..\Net_40\HandyControl_Net_40\Themes\Styles\ListView.xaml
+Styles\Loading.xaml
+Styles\Magnifier.xaml
+Styles\Menu.xaml
+..\..\..\Net_40\HandyControl_Net_40\Themes\Styles\MessageBox.xaml
+Styles\NavigationWindow.xaml
+Styles\Notification.xaml
+Styles\NumericUpDown.xaml
+Styles\Pagination.xaml
+Styles\PasswordBox.xaml
+Styles\PinBox.xaml
+Styles\Poptip.xaml
+Styles\PopupWindow.xaml
+Styles\ProgressBar.xaml
+Styles\ProgressButton.xaml
+Styles\PropertyGrid.xaml
+Styles\RadioButton.xaml
+Styles\Rate.xaml
+Styles\Rectangle.xaml
+Styles\RepeatButton.xaml
+Styles\RichTextBox.xaml
+Styles\RunningBlock.xaml
+Styles\Screenshot.xaml
+Styles\ScrollViewer.xaml
+Styles\SearchBar.xaml
+Styles\Separator.xaml
+Styles\Shield.xaml
+Styles\SideMenu.xaml
+Styles\SimpleItemsControl.xaml
+Styles\Slider.xaml
+Styles\SplitButton.xaml
+Styles\Sprite.xaml
+Styles\StatusBar.xaml
+Styles\StepBar.xaml
+Styles\TabControl.xaml
+Styles\Tag.xaml
+Styles\TextBlock.xaml
+Styles\TextBox.xaml
+Styles\TimeBar.xaml
+Styles\TimePicker.xaml
+Styles\ToggleBlock.xaml
+Styles\ToggleButton.xaml
+Styles\ToolBar.xaml
+Styles\ToolTip.xaml
+Styles\Transfer.xaml
+Styles\TransitioningContentControl.xaml
+Styles\TreeView.xaml
+Styles\Watermark.xaml
+..\..\..\Net_40\HandyControl_Net_40\Themes\Styles\Window.xaml
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme_GE45.txt b/src/Shared/HandyControl_Shared/Themes/Theme_GE45.txt
new file mode 100644
index 00000000..2a040808
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Themes/Theme_GE45.txt
@@ -0,0 +1,166 @@
+Lang.xaml
+Basic\Colors\Colors.xaml
+Basic\Behaviors.xaml
+Basic\Brushes.xaml
+Basic\Converters.xaml
+Basic\Effects.xaml
+Basic\Fonts.xaml
+Basic\Geometries.xaml
+Basic\Paths.xaml
+Basic\Sizes.xaml
+Styles\Base\BadgeBaseStyle.xaml
+Styles\Base\BaseStyle.xaml
+Styles\Base\ButtonBaseBaseStyle.xaml
+Styles\Base\ButtonBaseStyle.xaml
+Styles\Base\ButtonGroupBaseStyle.xaml
+Styles\Base\CardBaseStyle.xaml
+Styles\Base\ChatBubbleBaseStyle.xaml
+Styles\Base\CheckBoxBaseStyle.xaml
+Styles\Base\CheckComboBoxBaseStyle.xaml
+Styles\Base\ColorPickerBaseStyle.xaml
+Styles\Base\ComboBoxBaseStyle.xaml
+Styles\Base\ContextMenuBaseStyle.xaml
+Styles\Base\CoverFlowBaseStyle.xaml
+Styles\Base\CoverViewBaseStyle.xaml
+Styles\Base\DatePickerBaseStyle.xaml
+Styles\Base\DateTimePickerBaseStyle.xaml
+Styles\Base\DialogBaseStyle.xaml
+Styles\Base\DividerBaseStyle.xaml
+Styles\Base\DrawerBaseStyle.xaml
+Styles\Base\ExpanderBaseStyle.xaml
+Styles\Base\FlowDocumentBaseStyle.xaml
+Styles\Base\FrameBaseStyle.xaml
+Styles\Base\GotoTopBaseStyle.xaml
+Styles\Base\GravatarBaseStyle.xaml
+Styles\Base\GroupBoxBaseStyle.xaml
+Styles\Base\ImageSelectorBaseStyle.xaml
+Styles\Base\LabelBaseStyle.xaml
+Styles\Base\ListBoxBaseStyle.xaml
+Styles\Base\LoadingBaseStyle.xaml
+Styles\Base\LoadingCircleBaseStyle.xaml
+Styles\Base\LoadingLineBaseStyle.xaml
+Styles\Base\MagnifierBaseStyle.xaml
+Styles\Base\MenuBaseStyle.xaml
+Styles\Base\NavigationWindowBaseStyle.xaml
+Styles\Base\NumericUpDownBaseStyle.xaml
+Styles\Base\PasswordBoxBaseStyle.xaml
+Styles\Base\PinBoxBaseStyle.xaml
+Styles\Base\PoptipBaseStyle.xaml
+Styles\Base\ProgressBarBaseStyle.xaml
+Styles\Base\ProgressButtonBaseStyle.xaml
+Styles\Base\PropertyGridBaseStyle.xaml
+Styles\Base\RadioButtonBaseStyle.xaml
+Styles\Base\RateBaseStyle.xaml
+Styles\Base\RepeatButtonBaseStyle.xaml
+Styles\Base\RunningBlockBaseStyle.xaml
+Styles\Base\ScrollViewerBaseStyle.xaml
+Styles\Base\SearchBarBaseStyle.xaml
+Styles\Base\SeparatorBaseStyle.xaml
+Styles\Base\ShieldBaseStyle.xaml
+Styles\Base\SideMenuBaseStyle.xaml
+Styles\Base\SliderBaseStyle.xaml
+Styles\Base\SplitButtonBaseStyle.xaml
+Styles\Base\StatusBarBaseStyle.xaml
+Styles\Base\StepBarBaseStyle.xaml
+Styles\Base\TabControlBaseStyle.xaml
+Styles\Base\TagBaseStyle.xaml
+Styles\Base\TextBlockBaseStyle.xaml
+Styles\Base\TextBoxBaseStyle.xaml
+Styles\Base\TimePickerBaseStyle.xaml
+Styles\Base\ToggleBlockBaseStyle.xaml
+Styles\Base\ToggleButtonBaseStyle.xaml
+Styles\Base\ToolBarBaseStyle.xaml
+Styles\Base\ToolTipBaseStyle.xaml
+Styles\Base\TransferBaseStyle.xaml
+Styles\Base\TreeViewBaseStyle.xaml
+Styles\Base\WatermarkBaseStyle.xaml
+Styles\Badge.xaml
+Styles\BlendEffectBox.xaml
+Styles\Border.xaml
+Styles\Button.xaml
+Styles\ButtonGroup.xaml
+Styles\Calendar.xaml
+Styles\CalendarWithClock.xaml
+Styles\Card.xaml
+Styles\Carousel.xaml
+Styles\ChatBubble.xaml
+Styles\CheckBox.xaml
+Styles\CheckComboBox.xaml
+Styles\Clock.xaml
+Styles\Col.xaml
+Styles\ColorPicker.xaml
+Styles\ComboBox.xaml
+Styles\ContentControl.xaml
+Styles\ContextMenu.xaml
+Styles\CoverFlow.xaml
+Styles\CoverView.xaml
+Styles\DataGrid.xaml
+Styles\DatePicker.xaml
+Styles\DateTimePicker.xaml
+Styles\Dialog.xaml
+Styles\Divider.xaml
+Styles\Drawer.xaml
+Styles\Expander.xaml
+Styles\FlipClock.xaml
+Styles\FloatingBlock.xaml
+Styles\FlowDocument.xaml
+Styles\Frame.xaml
+Styles\GotoTop.xaml
+Styles\Gravatar.xaml
+Styles\GridSplitter.xaml
+Styles\GroupBox.xaml
+Styles\Growl.xaml
+Styles\Image.xaml
+Styles\ImageSelector.xaml
+Styles\ImageViewer.xaml
+Styles\Label.xaml
+Styles\ListBox.xaml
+Styles\ListView.xaml
+Styles\Loading.xaml
+Styles\Magnifier.xaml
+Styles\Menu.xaml
+Styles\MessageBox.xaml
+Styles\NavigationWindow.xaml
+Styles\Notification.xaml
+Styles\NumericUpDown.xaml
+Styles\Pagination.xaml
+Styles\PasswordBox.xaml
+Styles\PinBox.xaml
+Styles\Poptip.xaml
+Styles\PopupWindow.xaml
+Styles\ProgressBar.xaml
+Styles\ProgressButton.xaml
+Styles\PropertyGrid.xaml
+Styles\RadioButton.xaml
+Styles\Rate.xaml
+Styles\Rectangle.xaml
+Styles\RepeatButton.xaml
+Styles\RichTextBox.xaml
+Styles\RunningBlock.xaml
+Styles\Screenshot.xaml
+Styles\ScrollViewer.xaml
+Styles\SearchBar.xaml
+Styles\Separator.xaml
+Styles\Shield.xaml
+Styles\SideMenu.xaml
+Styles\SimpleItemsControl.xaml
+Styles\Slider.xaml
+Styles\SplitButton.xaml
+Styles\Sprite.xaml
+Styles\StatusBar.xaml
+Styles\StepBar.xaml
+Styles\TabControl.xaml
+Styles\Tag.xaml
+Styles\TextBlock.xaml
+Styles\TextBox.xaml
+Styles\TimeBar.xaml
+Styles\TimePicker.xaml
+Styles\ToggleBlock.xaml
+Styles\ToggleButton.xaml
+Styles\ToolBar.xaml
+Styles\ToolTip.xaml
+Styles\Transfer.xaml
+Styles\TransitioningContentControl.xaml
+Styles\TreeView.xaml
+Styles\Watermark.xaml
+Styles\Window.xaml
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Themes/XamlCombine.exe b/src/Shared/HandyControl_Shared/Themes/XamlCombine.exe
new file mode 100644
index 0000000000000000000000000000000000000000..b8dcd5a831ef8dcb86e066a8764876910aedc519
GIT binary patch
literal 13312
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
NBOCvj{ZHKk{|AI4k