diff --git a/Installers/VS2019/HandyControl_VS2019/HandyControl_VS2019.csproj b/Installers/VS2019/HandyControl_VS2019/HandyControl_VS2019.csproj index 621606c8..a652ad34 100644 --- a/Installers/VS2019/HandyControl_VS2019/HandyControl_VS2019.csproj +++ b/Installers/VS2019/HandyControl_VS2019/HandyControl_VS2019.csproj @@ -53,7 +53,11 @@ Always true - + + Always + true + + Always true diff --git a/Installers/VS2019/HandyControl_VS2019/Packages/handycontrol.1.5.5.nupkg b/Installers/VS2019/HandyControl_VS2019/Packages/handycontrol.1.5.5.nupkg deleted file mode 100644 index 9f36d145..00000000 Binary files a/Installers/VS2019/HandyControl_VS2019/Packages/handycontrol.1.5.5.nupkg and /dev/null differ diff --git a/Installers/VS2019/HandyControl_VS2019/Packages/handycontrol.2.0.0.nupkg b/Installers/VS2019/HandyControl_VS2019/Packages/handycontrol.2.0.0.nupkg new file mode 100644 index 00000000..b442d002 Binary files /dev/null and b/Installers/VS2019/HandyControl_VS2019/Packages/handycontrol.2.0.0.nupkg differ diff --git a/Installers/VS2019/HandyControl_VS2019/ProjectTemplates/WpfApp.zip b/Installers/VS2019/HandyControl_VS2019/ProjectTemplates/WpfApp.zip index ee36df8a..4d7cadf9 100644 Binary files a/Installers/VS2019/HandyControl_VS2019/ProjectTemplates/WpfApp.zip and b/Installers/VS2019/HandyControl_VS2019/ProjectTemplates/WpfApp.zip differ diff --git a/Installers/VS2019/HandyControl_VS2019/ProjectTemplates/WpfCoreApp.zip b/Installers/VS2019/HandyControl_VS2019/ProjectTemplates/WpfCoreApp.zip new file mode 100644 index 00000000..073b19ef Binary files /dev/null and b/Installers/VS2019/HandyControl_VS2019/ProjectTemplates/WpfCoreApp.zip differ diff --git a/Installers/VS2019/HandyControl_VS2019/Properties/AssemblyInfo.cs b/Installers/VS2019/HandyControl_VS2019/Properties/AssemblyInfo.cs index d4aae7d0..5ecbbb92 100644 --- a/Installers/VS2019/HandyControl_VS2019/Properties/AssemblyInfo.cs +++ b/Installers/VS2019/HandyControl_VS2019/Properties/AssemblyInfo.cs @@ -10,5 +10,5 @@ using System.Runtime.InteropServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] -[assembly: AssemblyVersion("1.5.5")] -[assembly: AssemblyFileVersion("1.5.5")] \ No newline at end of file +[assembly: AssemblyVersion("2.0.0")] +[assembly: AssemblyFileVersion("2.0.0")] \ No newline at end of file diff --git a/Installers/VS2019/HandyControl_VS2019/source.extension.vsixmanifest b/Installers/VS2019/HandyControl_VS2019/source.extension.vsixmanifest index 4701c027..4f081ca5 100644 --- a/Installers/VS2019/HandyControl_VS2019/source.extension.vsixmanifest +++ b/Installers/VS2019/HandyControl_VS2019/source.extension.vsixmanifest @@ -1,7 +1,7 @@  - + HandyControl for VS2019 This VSIX Project will help people initialize a HandyControl project. https://handyorg.github.io/handycontrol @@ -26,5 +26,6 @@ + diff --git a/README.md b/README.md index 687eaa26..13d7245e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![logo](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/icon.png) -![dotnet-version](https://img.shields.io/badge/.net-%3E%3D4.0-blue.svg) ![csharp-version](https://img.shields.io/badge/C%23-7.0-blue.svg) ![IDE-version](https://img.shields.io/badge/IDE-vs2017-blue.svg) [![nuget-version](https://img.shields.io/nuget/v/HandyControl.svg)](https://www.nuget.org/packages/HandyControl) [![build-status](https://ci.appveyor.com/api/projects/status/github/handyorg/handycontrol?svg=true)](https://ci.appveyor.com/project/handyorg/handycontrol) [![Join the chat at https://gitter.im/HandyControl/Lobby](https://badges.gitter.im/HandyControl/Lobby.svg)](https://gitter.im/HandyControl/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![qq-group](https://img.shields.io/badge/qq-714704041-red.svg)](//shang.qq.com/wpa/qunwpa?idkey=a571e5553c9d41e49c4f22f3a8b2865451497a795ff281fedf3285def247efc1) +![dotnet-version](https://img.shields.io/badge/.net-%3E%3D4.0-blue.svg) ![csharp-version](https://img.shields.io/badge/C%23-7.3-blue.svg) ![IDE-version](https://img.shields.io/badge/IDE-vs2019-blue.svg) [![nuget-version](https://img.shields.io/nuget/v/HandyControl.svg)](https://www.nuget.org/packages/HandyControl) [![build-status](https://ci.appveyor.com/api/projects/status/github/handyorg/handycontrol?svg=true)](https://ci.appveyor.com/project/handyorg/handycontrol) [![Join the chat at https://gitter.im/HandyControl/Lobby](https://badges.gitter.im/HandyControl/Lobby.svg)](https://gitter.im/HandyControl/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![qq-group](https://img.shields.io/badge/qq-714704041-red.svg)](//shang.qq.com/wpa/qunwpa?idkey=a571e5553c9d41e49c4f22f3a8b2865451497a795ff281fedf3285def247efc1) [![wiki](https://img.shields.io/badge/wiki-Complete-brightgreen.svg)](https://github.com/ghost1372/HandyControl/wiki) # Welcome to HandyControl @@ -63,6 +63,10 @@ Step 4：enjoy coding ## Latest examples +### ButtonGroup + +![ButtonGroup](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/ButtonGroup.png) + ### Grid ![Grid](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Grid.gif) @@ -79,12 +83,12 @@ Step 4：enjoy coding ![Dialog](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Dialog.png) +## History publication + ### WaveProgressBar ![WaveProgressBar](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/WaveProgressBar.gif) -## History publication - ### Badge ![Badge](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Badge.png) diff --git a/Resources/ButtonGroup.png b/Resources/ButtonGroup.png new file mode 100644 index 00000000..25041947 Binary files /dev/null and b/Resources/ButtonGroup.png differ diff --git a/Resources/RadioButton.png b/Resources/RadioButton.png index 4641a6f8..4f1308e5 100644 Binary files a/Resources/RadioButton.png and b/Resources/RadioButton.png differ diff --git a/doc/source/_posts/home.md b/doc/source/_posts/home.md index 34ebe0d8..cec7679d 100644 --- a/doc/source/_posts/home.md +++ b/doc/source/_posts/home.md @@ -4,8 +4,6 @@ title: 欢迎来到HandyOrg HandyOrg的宗旨是为用户提供最简单的API。 -目前组织成员只有一人。 - 我们一直期待着有更多的同学加入。 我们的入坑要求： diff --git a/doc/source/handycontrol/attach/backgroundSwitchElement/index.md b/doc/source/handycontrol/attach/backgroundSwitchElement/index.md index ca12ad62..2fa310da 100644 --- a/doc/source/handycontrol/attach/backgroundSwitchElement/index.md +++ b/doc/source/handycontrol/attach/backgroundSwitchElement/index.md @@ -1,5 +1,42 @@ --- -title: 建设中 +title: BackgroundSwitchElement 可切换背景的元素 --- -建设中 \ No newline at end of file +# 准备工作 +添加`HandyControl`命名空间 +{% code %} +xmlns:hc="https://handyorg.github.io/handycontrol" +{% endcode %} + +## MouseHoverBackground `鼠标悬浮背景色` + +该附加属性常用于设置控件在鼠标悬浮时的背景色，在控件的样式或者模板中我们添加如下的触发器代码： + +{% code %} + + + +{% endcode %} + +随后我们就可以使用该属性了： + +{% code %} +<目标控件 controls:BackgroundSwitchElement.MouseHoverBackground ="Blue"/> +{% endcode %} + +## MouseDownBackground `鼠标按下背景色` + +该附加属性常用于设置控件在鼠标按下时的背景色，在控件的样式或者模板中我们添加如下的触发器代码： + +{% code %} + + + +{% endcode %} + +随后我们就可以使用该属性了： + +{% code %} +<目标控件 controls:BackgroundSwitchElement.MouseDownBackground ="Yellow"/> +{% endcode %} \ No newline at end of file diff --git a/doc/source/handycontrol/tnx/index.md b/doc/source/handycontrol/tnx/index.md index 671466f7..129c2af4 100644 --- a/doc/source/handycontrol/tnx/index.md +++ b/doc/source/handycontrol/tnx/index.md @@ -4,7 +4,7 @@ title: 鸣谢 # 感谢以下Coder提供代码贡献 -

ghost1372Dingping ZhangM0n7y5guanguanchuangyuguanguanchuangyu

+

ghost1372Dingping ZhangM0n7y5guanguanchuangyuyanchao891012noctwolf

# 感谢以下User提供使用建议 diff --git a/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj b/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj index b87ba43d..d384531c 100644 --- a/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj +++ b/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj @@ -5,10 +5,12 @@ true HandyControlDemo HandyControlDemo - 1.5.5 + 2.0.0 ..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico Debug;Release Copyright © HandyOrg 2018-2019 + 2.0.0.0 + 2.0.0.0 TRACE;Core @@ -350,6 +352,9 @@ Resources\Img\LeftMainContent\brackets_Square_16xLG.png + + Resources\Img\LeftMainContent\ButtonGroup_16x.png + diff --git a/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj b/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj index 9d2421a4..f5711c96 100644 --- a/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj +++ b/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj @@ -4,8 +4,8 @@ true HandyControl HandyControl - 1.5.5 - 1.5.5.0 + 2.0.0 + 2.0.0.0 false false Copyright © HandyOrg 2018-2019 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 61536a9e..82e5ee46 100644 --- a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj +++ b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj @@ -395,6 +395,9 @@ TextTemplatingFileGenerator MessageToken.cs + + Resources\Img\LeftMainContent\ButtonGroup_16x.png + Resources\Img\LeftMainContent\brackets_Square_16xLG.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 57947a1f..36a1fec2 100644 --- a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj +++ b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj @@ -457,6 +457,9 @@ TextTemplatingFileGenerator MessageToken.cs + + Resources\Img\LeftMainContent\ButtonGroup_16x.png + Resources\Img\LeftMainContent\brackets_Square_16xLG.png 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 96b1b1bc..a9df5f10 100644 --- a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj +++ b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj @@ -62,7 +62,7 @@ pdbonly true - bin\Release\ + bin\Release\Net45\ TRACE;netle45 prompt 4 @@ -73,7 +73,7 @@ pdbonly true - bin\Release\ + bin\Release\Net462\ TRACE prompt 4 @@ -84,7 +84,7 @@ pdbonly true - bin\Release\ + bin\Release\Net47\ TRACE prompt 4 @@ -95,7 +95,7 @@ pdbonly true - bin\Release\ + bin\Release\Net48\ TRACE prompt 4 diff --git a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs index 10cb3212..72b30cf2 100644 --- a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs +++ b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs @@ -98,6 +98,8 @@ public static readonly string RangeSliderDemoCtl = nameof(RangeSliderDemoCtl); + public static readonly string ButtonGroupDemoCtl = nameof(ButtonGroupDemoCtl); + public static readonly string ButtonDemoCtl = nameof(ButtonDemoCtl); public static readonly string RepeatButtonDemoCtl = nameof(RepeatButtonDemoCtl); diff --git a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt index 23421817..56b9b0f5 100644 --- a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt +++ b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt @@ -51,7 +51,8 @@ var controlList = new List "DialogDemoCtl", "SideMenuDemoCtl", "GridDemoCtl", - "RangeSliderDemoCtl" + "RangeSliderDemoCtl", + "ButtonGroupDemoCtl" }; var styleList = new List { diff --git a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems index 86a11012..8f0e0adb 100644 --- a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems +++ b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems @@ -56,6 +56,9 @@ BadgeDemoCtl.xaml + + ButtonGroupDemoCtl.xaml + CalendarWithClockDemoCtl.xaml @@ -413,6 +416,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile diff --git a/src/Shared/HandyControlDemo_Shared/Properties/AssemblyInfo.cs b/src/Shared/HandyControlDemo_Shared/Properties/AssemblyInfo.cs index 2cbdb17c..e13e70bb 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/AssemblyInfo.cs +++ b/src/Shared/HandyControlDemo_Shared/Properties/AssemblyInfo.cs @@ -13,5 +13,5 @@ using System.Windows; [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] [assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)] -[assembly: AssemblyVersion("1.5.5")] +[assembly: AssemblyVersion("2.0.0")] #endif \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs index d4b6a070..14840212 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs @@ -177,6 +177,15 @@ namespace HandyControlDemo.Properties.Langs { } } + /// + /// 查找类似 按钮组 的本地化字符串。 + /// + public static string ButtonGroup { + get { + return ResourceManager.GetString("ButtonGroup", resourceCulture); + } + } + /// /// 查找类似 日历 的本地化字符串。 /// diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx index 68dc57fe..c16cb5c0 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx @@ -618,4 +618,7 @@ Off + + ButtonGroup + \ 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 84a43c24..3e44c0b1 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx @@ -618,4 +618,7 @@ 关 + + 按钮组 + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ButtonGroup_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ButtonGroup_16x.png new file mode 100644 index 00000000..e1e3b904 Binary files /dev/null and b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ButtonGroup_16x.png differ diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ButtonGroupDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ButtonGroupDemoCtl.xaml new file mode 100644 index 00000000..dd6faccd --- /dev/null +++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ButtonGroupDemoCtl.xaml @@ -0,0 +1,71 @@ + + + + + + + + + + + + +