diff --git a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj
index 158c1a2d..9ff462f0 100644
--- a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj
+++ b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj
@@ -273,6 +273,9 @@
Resources\Img\LeftMainContent\GoToTop_16x.png
+
+ Resources\Img\LeftMainContent\GridLight_16x.png
+
Resources\Img\LeftMainContent\GroupBox_16x.png
diff --git a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
index d13eb321..9b670497 100644
--- a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
+++ b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
@@ -275,6 +275,9 @@
Resources\Img\LeftMainContent\GoToTop_16x.png
+
+ Resources\Img\LeftMainContent\GridLight_16x.png
+
Resources\Img\LeftMainContent\GroupBox_16x.png
diff --git a/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj b/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj
index 0e15006f..2c5b1120 100644
--- a/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj
+++ b/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj
@@ -260,6 +260,9 @@
UserControl\Controls\WaterfallPanelDemoCtl.xaml
+
+ UserControl\Controls\WatermarkDemoCtl.xaml
+
UserControl\Controls\WindowDemoCtl.xaml
@@ -702,6 +705,10 @@
UserControl\Controls\UniformSpacingPanelDemoCtl.xaml.cs
UniformSpacingPanelDemoCtl.xaml
+
+ UserControl\Controls\WatermarkDemoCtl.xaml.cs
+ WatermarkDemoCtl.xaml
+
UserControl\Controls\WaterfallPanelDemoCtl.xaml.cs
WaterfallPanelDemoCtl.xaml
diff --git a/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json b/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json
index 13ed6605..be1756b7 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json
+++ b/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json
@@ -56,7 +56,7 @@
[ "NumericUpDown", "NumericUpDownDemoCtl", "NumericListBox_16x", "", "DataEntry" ],
[ "TextBox", "TextBoxDemoCtl", "TextBox_16x", "", "DataEntry" ],
[ "ComboBox", "ComboBoxDemoCtl", "ComboBox_16x", "", "DataEntry" ],
- [ "CheckComboBox", "CheckComboBoxDemoCtl", "CheckBoxList_16x", "1", "DataEntry" ],
+ [ "CheckComboBox", "CheckComboBoxDemoCtl", "CheckBoxList_16x", "", "DataEntry" ],
[ "AutoCompleteTextBox", "AutoCompleteTextBoxDemoCtl", "AutoComplete_16x", "1", "DataEntry" ],
[ "PasswordBox", "PasswordBoxDemoCtl", "PasswordBox_16x", "", "DataEntry" ],
[ "PinBox", "PinBoxDemoCtl", "Ellipsis_16x", "", "DataEntry" ],
@@ -106,6 +106,7 @@
[ "Screenshot", "ScreenshotDemoCtl", "WindowScreenshot_16x", "", "" ],
[ "GotoTop", "GotoTopDemoCtl", "GoToTop_16x", "", "" ],
[ "ChatBubble", "ChatBubbleDemoCtl", "Bubble_16xLG", "", "" ],
+ [ "Watermark", "WatermarkDemoCtl", "GridLight_16x", "1", "" ],
[ "NotifyIcon", "NotifyIconDemoCtl", "NotificationHub_16x", "", "" ],
[ "ImageBrowser", "ImageBrowserDemoCtl", "ImageBrowser_16x", "", "" ],
[ "AnimationPath", "AnimationPathDemoCtl", "Path_16x", "", "" ],
diff --git a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
index 770a728b..893b8f35 100644
--- a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
+++ b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
@@ -265,6 +265,9 @@
UniformSpacingPanelDemoCtl.xaml
+
+ WatermarkDemoCtl.xaml
+
WaterfallPanelDemoCtl.xaml
@@ -816,6 +819,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs
index 9db8b90f..032e6c44 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs
@@ -20,7 +20,7 @@ namespace HandyControlDemo.Properties.Langs
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
public class Lang
@@ -2555,6 +2555,17 @@ namespace HandyControlDemo.Properties.Langs
}
}
+ ///
+ /// Looks up a localized string similar to 水印.
+ ///
+ public static string Watermark
+ {
+ get
+ {
+ return ResourceManager.GetString("Watermark", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to 网站.
///
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 3ad5692c..c292d9a5 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ca-ES.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ca-ES.resx
@@ -801,4 +801,7 @@
AutoCompleteTextBox
+
+ Watermark
+
\ 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 7002d977..325ecafc 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx
@@ -801,4 +801,7 @@
AutoCompleteTextBox
+
+ Watermark
+
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.es.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.es.resx
index 68a8d7ac..3cd24cb5 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.es.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.es.resx
@@ -801,4 +801,7 @@
AutoCompleteTextBox
+
+ Watermark
+
\ 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 46cf3986..6e662017 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx
@@ -801,4 +801,7 @@
AutoCompleteTextBox
+
+ Watermark
+
\ 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 3b8baefe..2ffe4df2 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx
@@ -801,4 +801,7 @@
AutoCompleteTextBox
+
+ Watermark
+
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ja.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ja.resx
index 740f985b..1126bb8a 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ja.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ja.resx
@@ -801,4 +801,7 @@
AutoCompleteTextBox
+
+ Watermark
+
\ 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 bc17ba33..9a4295fc 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx
@@ -801,4 +801,7 @@
AutoCompleteTextBox
+
+ Watermark
+
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.pl.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.pl.resx
index e8365371..48308cdf 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.pl.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.pl.resx
@@ -801,4 +801,7 @@
AutoCompleteTextBox
+
+ Watermark
+
\ 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 3238f146..5f078233 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.pt-BR.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.pt-BR.resx
@@ -801,4 +801,7 @@
AutoCompleteTextBox
+
+ Watermark
+
\ 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 f98e089a..ecd9fc91 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx
@@ -801,4 +801,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 5759095a..b0c4952f 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ru.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ru.resx
@@ -801,4 +801,7 @@
AutoCompleteTextBox
+
+ Watermark
+
\ 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 bd8bda39..064c1f0a 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.tr.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.tr.resx
@@ -801,4 +801,7 @@
AutoCompleteTextBox
+
+ Watermark
+
\ 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 ca04a1bf..7fa5742f 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/LangProvider.cs
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/LangProvider.cs
@@ -263,6 +263,7 @@ public class LangProvider : INotifyPropertyChanged
OnPropertyChanged(nameof(Vsix));
OnPropertyChanged(nameof(Warning));
OnPropertyChanged(nameof(WaterfallPanel));
+ OnPropertyChanged(nameof(Watermark));
OnPropertyChanged(nameof(Website));
OnPropertyChanged(nameof(Window));
}
@@ -1397,6 +1398,11 @@ public class LangProvider : INotifyPropertyChanged
///
public string WaterfallPanel => Lang.WaterfallPanel;
+ ///
+ /// 查找类似 水印 的本地化字符串。
+ ///
+ public string Watermark => Lang.Watermark;
+
///
/// 查找类似 网站 的本地化字符串。
///
@@ -2546,6 +2552,11 @@ public class LangKeys
///
public static string WaterfallPanel = nameof(WaterfallPanel);
+ ///
+ /// 查找类似 水印 的本地化字符串。
+ ///
+ public static string Watermark = nameof(Watermark);
+
///
/// 查找类似 网站 的本地化字符串。
///
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/GridLight_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/GridLight_16x.png
new file mode 100644
index 00000000..d9473a1a
Binary files /dev/null and b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/GridLight_16x.png differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml
index e6cf4862..bb27d155 100644
--- a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml
+++ b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml
@@ -45,38 +45,6 @@
-
-