From 461a23614853397aa1adc8556c9ef479c75e8de7 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sun, 17 Jan 2021 22:29:12 +0800
Subject: [PATCH] add Empty
---
.../Themes/Styles/Base/TreeViewBaseStyle.xaml | 17 +-
.../Themes/Styles/DataGrid.xaml | 71 ++++----
.../HandyControl_Net_40/Themes/Theme.xaml | 131 ++++++++++-----
.../Properties/Langs/Lang.Designer.cs | 11 ++
.../Properties/Langs/Lang.ca-ES.resx | 3 +
.../Properties/Langs/Lang.en.resx | 3 +
.../Properties/Langs/Lang.fa.resx | 3 +
.../Properties/Langs/Lang.fr.resx | 3 +
.../Properties/Langs/Lang.ko-KR.resx | 3 +
.../Properties/Langs/Lang.pt-BR.resx | 3 +
.../Properties/Langs/Lang.resx | 3 +
.../Properties/Langs/Lang.ru.resx | 3 +
.../Properties/Langs/Lang.tr.resx | 3 +
.../Properties/Langs/LangProvider.cs | 11 ++
.../UserControl/Controls/DrawerDemoCtl.xaml | 34 ++--
.../Styles/NativeProgressBarDemoCtl.xaml | 4 +-
.../Controls/Other/Empty.cs | 26 +++
.../HandyControl_Shared.projitems | 7 +
.../Properties/Langs/Lang.Designer.cs | 13 +-
.../Properties/Langs/Lang.ca-ES.resx | 3 +
.../Properties/Langs/Lang.en.resx | 3 +
.../Properties/Langs/Lang.fa.resx | 3 +
.../Properties/Langs/Lang.fr.resx | 3 +
.../Properties/Langs/Lang.ko-KR.resx | 3 +
.../Properties/Langs/Lang.pt-BR.resx | 3 +
.../Properties/Langs/Lang.resx | 3 +
.../Properties/Langs/Lang.ru.resx | 3 +
.../Properties/Langs/Lang.tr.resx | 3 +
.../Properties/Langs/LangProvider.cs | 11 ++
.../Themes/Styles/Base/EmptyBaseStyle.xaml | 45 +++++
.../Themes/Styles/Base/ListBoxBaseStyle.xaml | 15 +-
.../Themes/Styles/Base/TreeViewBaseStyle.xaml | 17 +-
.../Themes/Styles/DataGrid.xaml | 71 ++++----
.../Themes/Styles/Empty.xaml | 11 ++
.../HandyControl_Shared/Themes/Theme.xaml | 157 ++++++++++++------
.../HandyControl_Shared/Themes/Theme_40.txt | 2 +
.../HandyControl_Shared/Themes/Theme_GE45.txt | 2 +
37 files changed, 523 insertions(+), 187 deletions(-)
create mode 100644 src/Shared/HandyControl_Shared/Controls/Other/Empty.cs
create mode 100644 src/Shared/HandyControl_Shared/Themes/Styles/Base/EmptyBaseStyle.xaml
create mode 100644 src/Shared/HandyControl_Shared/Themes/Styles/Empty.xaml
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/TreeViewBaseStyle.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/TreeViewBaseStyle.xaml
index ccb95675..f32999e6 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/TreeViewBaseStyle.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/TreeViewBaseStyle.xaml
@@ -106,10 +106,17 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -121,4 +128,4 @@
-
\ No newline at end of file
+
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 424e47fa..659adf27 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Styles/DataGrid.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/DataGrid.xaml
@@ -290,41 +290,48 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index 68decf1d..cbbcab06 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -8216,6 +8216,41 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -8762,9 +8797,16 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -11061,9 +11103,16 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -11618,37 +11667,44 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -11663,6 +11719,7 @@
+
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs
index 92afe96c..50444d69 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs
@@ -729,6 +729,17 @@ namespace HandyControlDemo.Properties.Langs
}
}
+ ///
+ /// 查找类似 空状态 的本地化字符串。
+ ///
+ public static string Empty
+ {
+ get
+ {
+ return ResourceManager.GetString("Empty", resourceCulture);
+ }
+ }
+
///
/// 查找类似 错误 的本地化字符串。
///
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ca-ES.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ca-ES.resx
index ab4fcc5b..f1f00611 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ca-ES.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ca-ES.resx
@@ -792,4 +792,7 @@
Feedback
+
+ Empty
+
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx
index c2ea44b9..83434bcd 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx
@@ -792,4 +792,7 @@
Feedback
+
+ Empty
+
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx
index a087fbb0..79896305 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx
@@ -792,4 +792,7 @@
Feedback
+
+ Empty
+
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx
index af4dc2f5..dc8c74ba 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx
@@ -792,4 +792,7 @@
Feedback
+
+ Empty
+
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx
index eeea3d08..045f36be 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx
@@ -792,4 +792,7 @@
Feedback
+
+ Empty
+
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.pt-BR.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.pt-BR.resx
index b84489cb..75e37f07 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.pt-BR.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.pt-BR.resx
@@ -792,4 +792,7 @@
Feedback
+
+ Empty
+
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx
index 987f4790..d0db53b2 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx
@@ -792,4 +792,7 @@
反馈
+
+ 空状态
+
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ru.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ru.resx
index 0df61c8b..d50b468e 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ru.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ru.resx
@@ -792,4 +792,7 @@
Feedback
+
+ Empty
+
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.tr.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.tr.resx
index 78bcd8dc..aa64d6a7 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.tr.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.tr.resx
@@ -792,4 +792,7 @@
Feedback
+
+ Empty
+
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/LangProvider.cs b/src/Shared/HandyControlDemo_Shared/Properties/Langs/LangProvider.cs
index 4f0a5a34..89ab8eb6 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/LangProvider.cs
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/LangProvider.cs
@@ -97,6 +97,7 @@ namespace HandyControlDemo.Properties.Langs
OnPropertyChanged(nameof(Drawer));
OnPropertyChanged(nameof(Effects));
OnPropertyChanged(nameof(Email));
+ OnPropertyChanged(nameof(Empty));
OnPropertyChanged(nameof(Error));
OnPropertyChanged(nameof(Exit));
OnPropertyChanged(nameof(Expander));
@@ -564,6 +565,11 @@ namespace HandyControlDemo.Properties.Langs
///
public string Email => Lang.Email;
+ ///
+ /// 查找类似 空状态 的本地化字符串。
+ ///
+ public string Empty => Lang.Empty;
+
///
/// 查找类似 错误 的本地化字符串。
///
@@ -1698,6 +1704,11 @@ namespace HandyControlDemo.Properties.Langs
///
public static string Email = nameof(Email);
+ ///
+ /// 查找类似 空状态 的本地化字符串。
+ ///
+ public static string Empty = nameof(Empty);
+
///
/// 查找类似 错误 的本地化字符串。
///
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DrawerDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DrawerDemoCtl.xaml
index 79aa5cd5..8fc96b49 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DrawerDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DrawerDemoCtl.xaml
@@ -5,22 +5,6 @@
Background="{DynamicResource RegionBrush}">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -69,6 +53,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeProgressBarDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeProgressBarDemoCtl.xaml
index aecf271e..890e3624 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeProgressBarDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeProgressBarDemoCtl.xaml
@@ -14,7 +14,7 @@
-
+
@@ -36,7 +36,7 @@
-
+
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Empty.cs b/src/Shared/HandyControl_Shared/Controls/Other/Empty.cs
new file mode 100644
index 00000000..4fb03460
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Empty.cs
@@ -0,0 +1,26 @@
+using System.Windows;
+using System.Windows.Controls;
+
+namespace HandyControl.Controls
+{
+ public class Empty : ContentControl
+ {
+ public static readonly DependencyProperty DescriptionProperty = DependencyProperty.Register(
+ "Description", typeof(object), typeof(Empty), new PropertyMetadata(default(object)));
+
+ public object Description
+ {
+ get => GetValue(DescriptionProperty);
+ set => SetValue(DescriptionProperty, value);
+ }
+
+ public static readonly DependencyProperty LogoProperty = DependencyProperty.Register(
+ "Logo", typeof(object), typeof(Empty), new PropertyMetadata(default(object)));
+
+ public object Logo
+ {
+ get => GetValue(LogoProperty);
+ set => SetValue(LogoProperty, value);
+ }
+ }
+}
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index d442837f..d603f191 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -39,6 +39,7 @@
+
@@ -917,6 +918,12 @@
Designer
+
+ Designer
+
+
+ Designer
+
Designer
MSBuild:Compile
diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.Designer.cs b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.Designer.cs
index 06b51481..e5704b57 100644
--- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.Designer.cs
+++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.Designer.cs
@@ -306,7 +306,18 @@ namespace HandyControl.Properties.Langs {
return ResourceManager.GetString("No", resourceCulture);
}
}
-
+
+ ///
+ /// 查找类似 暂无数据 的本地化字符串。
+ ///
+ public static string NoData
+ {
+ get
+ {
+ return ResourceManager.GetString("NoData", resourceCulture);
+ }
+ }
+
///
/// 查找类似 不在范围内 的本地化字符串。
///
diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ca-ES.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ca-ES.resx
index 7bfd9b4c..eac43b1b 100644
--- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ca-ES.resx
+++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ca-ES.resx
@@ -240,4 +240,7 @@
Tots
+
+ No Data
+
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.en.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.en.resx
index b12aa4f1..412e6a4d 100644
--- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.en.resx
+++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.en.resx
@@ -240,4 +240,7 @@
All
+
+ No Data
+
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fa.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fa.resx
index aa869a08..e468136c 100644
--- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fa.resx
+++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fa.resx
@@ -240,4 +240,7 @@
All
+
+ No Data
+
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fr.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fr.resx
index 14180e25..1358f21f 100644
--- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fr.resx
+++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fr.resx
@@ -240,4 +240,7 @@
All
+
+ No Data
+
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ko-KR.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ko-KR.resx
index 74be0fba..67ae01fe 100644
--- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ko-KR.resx
+++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ko-KR.resx
@@ -240,4 +240,7 @@
All
+
+ No Data
+
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.pt-BR.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.pt-BR.resx
index 724099b7..1d791361 100644
--- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.pt-BR.resx
+++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.pt-BR.resx
@@ -240,4 +240,7 @@
All
+
+ No Data
+
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.resx
index 5b9d9f8d..c684505a 100644
--- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.resx
+++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.resx
@@ -240,4 +240,7 @@
全部
+
+ 暂无数据
+
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ru.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ru.resx
index 35b6367a..c5dee7fc 100644
--- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ru.resx
+++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ru.resx
@@ -240,4 +240,7 @@
All
+
+ No Data
+
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.tr.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.tr.resx
index ea40fa6f..0a68273e 100644
--- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.tr.resx
+++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.tr.resx
@@ -240,4 +240,7 @@
All
+
+ No Data
+
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/LangProvider.cs b/src/Shared/HandyControl_Shared/Properties/Langs/LangProvider.cs
index 6a7cd365..834aa228 100644
--- a/src/Shared/HandyControl_Shared/Properties/Langs/LangProvider.cs
+++ b/src/Shared/HandyControl_Shared/Properties/Langs/LangProvider.cs
@@ -63,6 +63,7 @@ namespace HandyControl.Properties.Langs
OnPropertyChanged(nameof(LangComment));
OnPropertyChanged(nameof(NextPage));
OnPropertyChanged(nameof(No));
+ OnPropertyChanged(nameof(NoData));
OnPropertyChanged(nameof(OutOfRange));
OnPropertyChanged(nameof(PageMode));
OnPropertyChanged(nameof(Pm));
@@ -209,6 +210,11 @@ namespace HandyControl.Properties.Langs
///
public string No => Lang.No;
+ ///
+ /// 查找类似 暂无数据 的本地化字符串。
+ ///
+ public string NoData => Lang.NoData;
+
///
/// 查找类似 不在范围内 的本地化字符串。
///
@@ -418,6 +424,11 @@ namespace HandyControl.Properties.Langs
///
public static string No = nameof(No);
+ ///
+ /// 查找类似 暂无数据 的本地化字符串。
+ ///
+ public static string NoData = nameof(NoData);
+
///
/// 查找类似 不在范围内 的本地化字符串。
///
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/EmptyBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/EmptyBaseStyle.xaml
new file mode 100644
index 00000000..763cb47b
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/EmptyBaseStyle.xaml
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ListBoxBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ListBoxBaseStyle.xaml
index a796b0fa..3f7f29e8 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ListBoxBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ListBoxBaseStyle.xaml
@@ -80,13 +80,20 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TreeViewBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TreeViewBaseStyle.xaml
index 8c3f9c19..393bc5aa 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TreeViewBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TreeViewBaseStyle.xaml
@@ -107,10 +107,17 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -136,4 +143,4 @@
-
\ No newline at end of file
+
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/DataGrid.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/DataGrid.xaml
index d975fd3e..022bacd2 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/DataGrid.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/DataGrid.xaml
@@ -289,37 +289,44 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -335,4 +342,4 @@
-
\ No newline at end of file
+
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Empty.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Empty.xaml
new file mode 100644
index 00000000..419906fb
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Empty.xaml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index e764d8cf..f333bda3 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -8334,6 +8334,41 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -8880,9 +8915,16 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -11179,10 +11221,17 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -11750,37 +11799,44 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -11804,6 +11860,7 @@
+
@@ -12038,27 +12095,23 @@
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme_40.txt b/src/Shared/HandyControl_Shared/Themes/Theme_40.txt
index ef92aafb..d4772aff 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme_40.txt
+++ b/src/Shared/HandyControl_Shared/Themes/Theme_40.txt
@@ -82,6 +82,7 @@ Styles\Base\DateTimePickerBaseStyle.xaml
Styles\Base\DialogBaseStyle.xaml
Styles\Base\DividerBaseStyle.xaml
Styles\Base\DrawerBaseStyle.xaml
+Styles\Base\EmptyBaseStyle.xaml
Styles\Base\ExpanderBaseStyle.xaml
Styles\Base\FlowDocumentBaseStyle.xaml
Styles\Base\FrameBaseStyle.xaml
@@ -134,6 +135,7 @@ Styles\DateTimePicker.xaml
Styles\Dialog.xaml
Styles\Divider.xaml
Styles\Drawer.xaml
+Styles\Empty.xaml
Styles\Expander.xaml
Styles\FlipClock.xaml
Styles\FloatingBlock.xaml
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme_GE45.txt b/src/Shared/HandyControl_Shared/Themes/Theme_GE45.txt
index 2ed7671c..9e629efc 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme_GE45.txt
+++ b/src/Shared/HandyControl_Shared/Themes/Theme_GE45.txt
@@ -82,6 +82,7 @@ Styles\Base\DateTimePickerBaseStyle.xaml
Styles\Base\DialogBaseStyle.xaml
Styles\Base\DividerBaseStyle.xaml
Styles\Base\DrawerBaseStyle.xaml
+Styles\Base\EmptyBaseStyle.xaml
Styles\Base\ExpanderBaseStyle.xaml
Styles\Base\FlowDocumentBaseStyle.xaml
Styles\Base\FrameBaseStyle.xaml
@@ -134,6 +135,7 @@ Styles\DateTimePicker.xaml
Styles\Dialog.xaml
Styles\Divider.xaml
Styles\Drawer.xaml
+Styles\Empty.xaml
Styles\Expander.xaml
Styles\FlipClock.xaml
Styles\FloatingBlock.xaml