From 4df7e838fd170cdde0fb3bcdff26d5ce467f4289 Mon Sep 17 00:00:00 2001 From: NaBian <836904362@qq.com> Date: Sun, 5 Jul 2020 18:15:19 +0800 Subject: [PATCH] add CheckComboBox --- README-cn.md | 8 +- README.md | 8 +- .../Controls/CheckComboBoxDemoCtl.xaml | 31 +- .../UserControl/Controls/WindowDemoCtl.xaml | 4 +- .../Input/CheckComboBox/CheckComboBox.cs | 111 +++- .../HandyControl_Shared.projitems | 1 + .../Properties/Langs/Lang.Designer.cs | 13 +- .../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 | 13 +- .../Themes/Basic/Converters.xaml | 1 + .../Styles/Base/CheckComboBoxBaseStyle.xaml | 501 +++++++++++++++++- .../Themes/Styles/CheckComboBox.xaml | 5 + .../Converter/Object2VisibilityReConverter.cs | 20 + 20 files changed, 702 insertions(+), 38 deletions(-) create mode 100644 src/Shared/HandyControl_Shared/Tools/Converter/Object2VisibilityReConverter.cs diff --git a/README-cn.md b/README-cn.md index f857f2eb..f6f1fe21 100644 --- a/README-cn.md +++ b/README-cn.md @@ -119,6 +119,10 @@ Step 4: Enjoy coding ## Latest examples +### CheckComboBox + +![CheckComboBox](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/CheckComboBox.png) + ### ImageSelector ![ImageSelector](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/ImageSelector.png) @@ -135,12 +139,12 @@ Step 4: Enjoy coding ![GooeyEffect](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/GooeyEffect.gif) +## History publication + ### GlowWindow ![GlowWindow](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/GlowWindow.png) -## History publication - ### FlowDocumentScrollViewerStyle ![FlowDocumentScrollViewerStyle](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/FlowDocumentScrollViewer.png) diff --git a/README.md b/README.md index 8625625f..c5bb1625 100644 --- a/README.md +++ b/README.md @@ -119,6 +119,10 @@ Step 4: Enjoy coding ## Latest examples +### CheckComboBox + +![CheckComboBox](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/CheckComboBox.png) + ### ImageSelector ![ImageSelector](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/ImageSelector.png) @@ -135,12 +139,12 @@ Step 4: Enjoy coding ![GooeyEffect](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/GooeyEffect.gif) +## History publication + ### GlowWindow ![GlowWindow](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/GlowWindow.png) -## History publication - ### FlowDocumentScrollViewerStyle ![FlowDocumentScrollViewerStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/FlowDocumentScrollViewer.png) diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CheckComboBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CheckComboBoxDemoCtl.xaml index 6487bf79..4a10a841 100644 --- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CheckComboBoxDemoCtl.xaml +++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CheckComboBoxDemoCtl.xaml @@ -1,14 +1,33 @@  - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WindowDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WindowDemoCtl.xaml index 66837b23..cbbe9643 100644 --- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WindowDemoCtl.xaml +++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WindowDemoCtl.xaml @@ -17,9 +17,7 @@