diff --git a/Installers/VS2019/HandyControl_VS2019/License.txt b/Installers/VS2019/HandyControl_VS2019/License.txt index cfef606b..0c1c18de 100644 --- a/Installers/VS2019/HandyControl_VS2019/License.txt +++ b/Installers/VS2019/HandyControl_VS2019/License.txt @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2018-2019 HandyOrg +Copyright (c) 2018-2020 HandyOrg Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Installers/VS2019/HandyControl_VS2019/Properties/AssemblyInfo.cs b/Installers/VS2019/HandyControl_VS2019/Properties/AssemblyInfo.cs index b5f325ba..94d87828 100644 --- a/Installers/VS2019/HandyControl_VS2019/Properties/AssemblyInfo.cs +++ b/Installers/VS2019/HandyControl_VS2019/Properties/AssemblyInfo.cs @@ -6,7 +6,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("HandyControl_VS2019")] -[assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2019")] +[assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2020")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/Installers/VS2019/HandyControl_VS2019/source.extension.vsixmanifest b/Installers/VS2019/HandyControl_VS2019/source.extension.vsixmanifest index 6824b141..c25560c3 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 diff --git a/Installers/VS2019/WpfApp/ProjectTemplate.csproj b/Installers/VS2019/WpfApp/ProjectTemplate.csproj index d8a830db..cf36f37a 100644 --- a/Installers/VS2019/WpfApp/ProjectTemplate.csproj +++ b/Installers/VS2019/WpfApp/ProjectTemplate.csproj @@ -34,8 +34,8 @@ 4 - - ..\packages\HandyControl.2.3.0\lib\net47\HandyControl.dll + + ..\packages\HandyControl.2.4.0\lib\net47\HandyControl.dll diff --git a/Installers/VS2019/WpfApp/Properties/AssemblyInfo.cs b/Installers/VS2019/WpfApp/Properties/AssemblyInfo.cs index b45d8c50..59f278ed 100644 --- a/Installers/VS2019/WpfApp/Properties/AssemblyInfo.cs +++ b/Installers/VS2019/WpfApp/Properties/AssemblyInfo.cs @@ -6,9 +6,9 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("HandyControl_VS2019_WpfApp")] -[assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2019")] +[assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2020")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] -[assembly: AssemblyVersion("2.3.0")] -[assembly: AssemblyFileVersion("2.3.0")] \ No newline at end of file +[assembly: AssemblyVersion("2.4.0")] +[assembly: AssemblyFileVersion("2.4.0")] diff --git a/Installers/VS2019/WpfApp/packages.config b/Installers/VS2019/WpfApp/packages.config index 4889bb7d..a1fd738f 100644 --- a/Installers/VS2019/WpfApp/packages.config +++ b/Installers/VS2019/WpfApp/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Installers/VS2019/WpfCoreApp/ProjectTemplate.csproj b/Installers/VS2019/WpfCoreApp/ProjectTemplate.csproj index c453863b..18af215f 100644 --- a/Installers/VS2019/WpfCoreApp/ProjectTemplate.csproj +++ b/Installers/VS2019/WpfCoreApp/ProjectTemplate.csproj @@ -7,7 +7,7 @@ $safeprojectname$ 1.0.0.0 Debug;Release - Copyright © $username$ 2018-2019 + Copyright © $username$ 2018-2020 1.0.0.0 1.0.0.0 latest @@ -19,6 +19,6 @@ TRACE;Core - + \ No newline at end of file diff --git a/Installers/VS2019/WpfCoreApp/Properties/AssemblyInfo.cs b/Installers/VS2019/WpfCoreApp/Properties/AssemblyInfo.cs index afd74fb0..c0e4b299 100644 --- a/Installers/VS2019/WpfCoreApp/Properties/AssemblyInfo.cs +++ b/Installers/VS2019/WpfCoreApp/Properties/AssemblyInfo.cs @@ -6,9 +6,9 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("HandyControl_VS2019_WpfCoreApp")] -[assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2019")] +[assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2020")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] -[assembly: AssemblyVersion("2.3.0")] -[assembly: AssemblyFileVersion("2.3.0")] \ No newline at end of file +[assembly: AssemblyVersion("2.4.0")] +[assembly: AssemblyFileVersion("2.4.0")] diff --git a/LICENSE b/LICENSE index f9f0dead..3d3d568c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2018-2019 HandyOrg +Copyright (c) 2018-2020 HandyOrg Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index b644e505..2faaf251 100644 --- a/README.md +++ b/README.md @@ -98,6 +98,14 @@ Step 4：enjoy coding ## Latest examples +### Screenshot + +![Screenshot](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/Screenshot.png) + +### GooeyEffect + +![GooeyEffect](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/GooeyEffect.gif) + ### GlowWindow ![GlowWindow](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/GlowWindow.png) @@ -110,6 +118,8 @@ Step 4：enjoy coding ![PinBox](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/PinBox.png) +## History publication + ### Effects ![Effects](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/Effects.png) @@ -118,8 +128,6 @@ Step 4：enjoy coding ![RelativePanel](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/RelativePanel.png) -## History publication - ### Drawer ![Drawer](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/Drawer.gif) diff --git a/build/build.cake b/build/build.cake index 7a5769ed..7538862b 100644 --- a/build/build.cake +++ b/build/build.cake @@ -47,16 +47,24 @@ Task("Build") var settingsCore30 = new DotNetCoreBuildSettings { Framework = "netcoreapp3.0", - Configuration = "Release", + Configuration = "Release-Core30", OutputDirectory = "lib/netcoreapp3.0" }; + var settingsCore31 = new DotNetCoreBuildSettings + { + Framework = "netcoreapp3.1", + Configuration = "Release-Core31", + OutputDirectory = "lib/netcoreapp3.1" + }; + MSBuild("../src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj", settingsNet40); MSBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet45); MSBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet462); MSBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet47); MSBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet48); - DotNetCoreBuild("../src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj", settingsCore30); + DotNetCoreBuild("../src/Core_GE30/HandyControl_Core_GE30/HandyControl_Core_GE30.csproj", settingsCore30); + DotNetCoreBuild("../src/Core_GE30/HandyControl_Core_GE30/HandyControl_Core_GE30.csproj", settingsCore31); }); RunTarget(target); \ No newline at end of file diff --git a/build/build.nuspec b/build/build.nuspec index d40e941a..f48902dc 100644 --- a/build/build.nuspec +++ b/build/build.nuspec @@ -2,7 +2,7 @@ HandyControl - 2.3.0 + 2.4.0 HandyOrg HandyOrg HandyOrg @@ -11,7 +11,7 @@ https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/icon.png Contains some commonly used simple WPF controls Changes are detailed at https://github.com/HandyOrg/HandyControl/releases - Copyright © HandyOrg 2018-2019 + Copyright © HandyOrg 2018-2020 WPF C# Control diff --git a/doc/source/handycontrol/attach/panelElement/index.md b/doc/source/handycontrol/attach/panelElement/index.md index ca12ad62..9267ff42 100644 --- a/doc/source/handycontrol/attach/panelElement/index.md +++ b/doc/source/handycontrol/attach/panelElement/index.md @@ -1,5 +1,19 @@ --- -title: 建设中 +title: PanelElement 面板元素 --- -建设中 \ No newline at end of file +# 属性 + +| 名称 | 用途 | +|-|-| +| FluidMoveBehavior | 设置面板的流体移动方式 | + +# 使用案例 + +## FluidMoveBehavior 设置面板的流体移动方式 + +```xml + +``` + +当向面板容器中添加或移除元素时，就可以看到流体移动的动画效果。 \ No newline at end of file diff --git a/doc/source/handycontrol/attach/rectangleAttach/index.md b/doc/source/handycontrol/attach/rectangleAttach/index.md new file mode 100644 index 00000000..4999a04b --- /dev/null +++ b/doc/source/handycontrol/attach/rectangleAttach/index.md @@ -0,0 +1,19 @@ +--- +title: RectangleAttach Rectangle专用 +--- + +# 属性 + +| 名称 | 用途 | +|-|-| +| CornerRadius | 设置Rectangle圆角值 | + +# 使用案例 + +## CornerRadius 设置Rectangle圆角值 + +```xml + +``` + +![RectangleAttach.CornerRadius](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/attach/RectangleAttach.CornerRadius.png) \ No newline at end of file diff --git a/doc/source/handycontrol/attach/textBlockAttach/index.md b/doc/source/handycontrol/attach/textBlockAttach/index.md new file mode 100644 index 00000000..bf355d3f --- /dev/null +++ b/doc/source/handycontrol/attach/textBlockAttach/index.md @@ -0,0 +1,21 @@ +--- +title: TextBlockAttach 文本块专用 +--- + +# 属性 + +| 名称 | 用途 | +|-|-| +| AutoTooltip | 设置是否自动显示工具提示 | + +# 使用案例 + +## AutoTooltip 设置是否自动显示工具提示 + +```xml + + + +``` + +![TextBlockAttach.AutoTooltip](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/attach/TextBlockAttach.AutoTooltip.png) \ No newline at end of file diff --git a/doc/source/handycontrol/basic_xaml/converters/index.md b/doc/source/handycontrol/basic_xaml/converters/index.md index 33f62bde..6d256584 100644 --- a/doc/source/handycontrol/basic_xaml/converters/index.md +++ b/doc/source/handycontrol/basic_xaml/converters/index.md @@ -50,6 +50,14 @@ title: 转换器 该转换器需要提供一个字符串作为参数，该字符串的一般形式为：`[0/1],[0/1],[0/1],[0/1]`，4个以逗号分隔的值分别对应`CornerRadius`的`Left`、`Top`，`Right`，`Bottom`属性，当值为1则返回对应属性的值，否则返回0。 +# Double2GridLengthConverter + +该转换器会将`double`值转换为`GridLength`。 + +# DoubleMinConverter（内部使用） + +可以向该转换器提供一个字符串作为最小值（如果不提供，则最小值默认为0），当传入的值小于最小值时，返回最小值，否则返回传入的值。 + # Int2StrConverter 该转换器需要提供一个字符串作为参数，该字符串的一般形式为：`[字符串0];[字符串1];...[字符串n]`，转换器会将一个整型的值作为索引，来获取指定位置的字符串并返回。 diff --git a/doc/source/handycontrol/basic_xaml/geometries/index.md b/doc/source/handycontrol/basic_xaml/geometries/index.md index 7304c03f..3d01060e 100644 --- a/doc/source/handycontrol/basic_xaml/geometries/index.md +++ b/doc/source/handycontrol/basic_xaml/geometries/index.md @@ -16,6 +16,7 @@ HandyControl中自带了一些几何形状定义，但要应用于生产中显 | LeftGeometry | 左 | | RightGeometry | 右 | | RotateLeftGeometry | 向左旋转 | +| RotateRightGeometry | 向左旋转 | | EnlargeGeometry | 放大 | | ReduceGeometry | 缩小 | | DownloadGeometry | 下载 | @@ -28,6 +29,12 @@ HandyControl中自带了一些几何形状定义，但要应用于生产中显 | WindowMinGeometry | 窗口最小化 | | WindowRestoreGeometry | 窗口还原 | | WindowMaxGeometry | 窗口最大化 | +| CheckedGeometry | 选中 | +| PageModeGeometry | 单页模式 | +| TwoPageModeGeometry | 双页模式 | +| ScrollModeGeometry | 滚动模式 | +| EyeOpenGeometry | 睁眼 | +| EyeCloseGeometry | 闭眼 | | AudioGeometry | 声音 | | BubbleTailGeometry | 气泡的尾巴 | | StarGeometry | 爱心 | diff --git a/doc/source/handycontrol/basic_xaml/sizes/index.md b/doc/source/handycontrol/basic_xaml/sizes/index.md index e8b38ee2..2fbb6e0f 100644 --- a/doc/source/handycontrol/basic_xaml/sizes/index.md +++ b/doc/source/handycontrol/basic_xaml/sizes/index.md @@ -5,7 +5,7 @@ title: 尺寸 | 名称 | 类型 | 值 | 描述 | |-|-| | DefaultControlHeight | System.Double | 30 | 默认控件高度 | -| DefaultControlPadding | System.Windows.Thickness | 12,6 | 默认控件内边距 | +| DefaultControlPadding | System.Windows.Thickness | 10,6 | 默认控件内边距 | | DefaultInputPadding | System.Windows.Thickness | 8,6 |默认输入控件内边距 | | DefaultCornerRadius | System.Windows.CornerRadius | 4 | 默认圆角 | diff --git a/doc/source/handycontrol/extend_controls/buttonGroup/index.md b/doc/source/handycontrol/extend_controls/buttonGroup/index.md new file mode 100644 index 00000000..32d31e77 --- /dev/null +++ b/doc/source/handycontrol/extend_controls/buttonGroup/index.md @@ -0,0 +1,77 @@ +--- +title: ButtonGroup 按钮组 +--- + +# RadioGroupItemBaseStyle + +`ButtonGroup`控件中的子集`RadioButton`样式基类，不建议直接使用，常作为`ButtonGroup`中`Item`样式基类,同时与`ButtonGroup`控件配套使用 + +案例： + +```xml + + + + + + + + + + + + + +``` + +效果： + +![RadioButton.RadioButtonItemDefaultStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/RadioButton.RadioButtonItemDefaultStyle.png) + +# RadioGroup关联样式 + +| 样式Key | 用途 | 基类样式 | +| ----------------------------- | ------------------------------------ | ----------------------- | +| RadioGroupItemDefault | RadioGroupItem默认样式 | RadioGroupItemBaseStyle | +| RadioGroupItemHorizontalFirst | RadioGroupItem水平头样式（从左至右） | RadioGroupItemBaseStyle | +| RadioGroupItemHorizontalLast | RadioGroupItem水平尾样式（从左至右） | RadioGroupItemBaseStyle | +| RadioGroupItemSingle | RadioGroupItem单项样式 | RadioGroupItemBaseStyle | +| RadioGroupItemVerticalFirst | RadioGroupItem垂直头样式（从上至下） | RadioGroupItemBaseStyle | +| RadioGroupItemVerticalLast | RadioGroupItem垂直尾样式（从上至下） | RadioGroupItemBaseStyle | + +案例： + +单个`RadioButton`样式： + +```xml + +``` + +效果： + +![RadioButton.RadioButtonItemSingleStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/RadioButton.RadioButtonItemSingleStyle.png) + +多个`RadioButton`垂直样式： + +```xml + + + + + + + + + + + + + + +``` + +效果： + +![RadioButton.RadioButtonItemVerticalStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/RadioButton.RadioButtonItemVerticalStyle.png) \ No newline at end of file diff --git a/doc/source/handycontrol/extend_controls/card/index.md b/doc/source/handycontrol/extend_controls/card/index.md new file mode 100644 index 00000000..877d2fd6 --- /dev/null +++ b/doc/source/handycontrol/extend_controls/card/index.md @@ -0,0 +1,3 @@ +--- +title: Card +--- diff --git a/doc/source/handycontrol/extend_controls/divider/index.md b/doc/source/handycontrol/extend_controls/divider/index.md new file mode 100644 index 00000000..c0af413b --- /dev/null +++ b/doc/source/handycontrol/extend_controls/divider/index.md @@ -0,0 +1,3 @@ +--- +title: Divider +--- diff --git a/doc/source/handycontrol/extend_controls/drawer/index.md b/doc/source/handycontrol/extend_controls/drawer/index.md new file mode 100644 index 00000000..03c8a6ac --- /dev/null +++ b/doc/source/handycontrol/extend_controls/drawer/index.md @@ -0,0 +1,3 @@ +--- +title: Drawer +--- diff --git a/doc/source/handycontrol/extend_controls/floatingBlock/index.md b/doc/source/handycontrol/extend_controls/floatingBlock/index.md new file mode 100644 index 00000000..7eb12950 --- /dev/null +++ b/doc/source/handycontrol/extend_controls/floatingBlock/index.md @@ -0,0 +1,3 @@ +--- +title: FloatingBlock +--- diff --git a/doc/source/handycontrol/extend_controls/glowWindow/index.md b/doc/source/handycontrol/extend_controls/glowWindow/index.md new file mode 100644 index 00000000..bf0d4873 --- /dev/null +++ b/doc/source/handycontrol/extend_controls/glowWindow/index.md @@ -0,0 +1,3 @@ +--- +title: GlowWindow +--- diff --git a/doc/source/handycontrol/extend_controls/grid/index.md b/doc/source/handycontrol/extend_controls/grid/index.md new file mode 100644 index 00000000..d52f1876 --- /dev/null +++ b/doc/source/handycontrol/extend_controls/grid/index.md @@ -0,0 +1,3 @@ +--- +title: Grid +--- diff --git a/doc/source/handycontrol/extend_controls/honeycombPanel/index.md b/doc/source/handycontrol/extend_controls/honeycombPanel/index.md new file mode 100644 index 00000000..9189a4e7 --- /dev/null +++ b/doc/source/handycontrol/extend_controls/honeycombPanel/index.md @@ -0,0 +1,3 @@ +--- +title: HoneycombPanel +--- diff --git a/doc/source/handycontrol/extend_controls/imageBlock/index.md b/doc/source/handycontrol/extend_controls/imageBlock/index.md new file mode 100644 index 00000000..004fee45 --- /dev/null +++ b/doc/source/handycontrol/extend_controls/imageBlock/index.md @@ -0,0 +1,3 @@ +--- +title: ImageBlock +--- diff --git a/doc/source/handycontrol/extend_controls/magnifier/index.md b/doc/source/handycontrol/extend_controls/magnifier/index.md new file mode 100644 index 00000000..e9cd70d1 --- /dev/null +++ b/doc/source/handycontrol/extend_controls/magnifier/index.md @@ -0,0 +1,3 @@ +--- +title: Magnifier +--- diff --git a/doc/source/handycontrol/extend_controls/notification/index.md b/doc/source/handycontrol/extend_controls/notification/index.md new file mode 100644 index 00000000..92b4119e --- /dev/null +++ b/doc/source/handycontrol/extend_controls/notification/index.md @@ -0,0 +1,3 @@ +--- +title: Notification +--- diff --git a/doc/source/handycontrol/extend_controls/pinBox/index.md b/doc/source/handycontrol/extend_controls/pinBox/index.md new file mode 100644 index 00000000..2f0ef4cf --- /dev/null +++ b/doc/source/handycontrol/extend_controls/pinBox/index.md @@ -0,0 +1,3 @@ +--- +title: PinBox +--- diff --git a/doc/source/handycontrol/extend_controls/popTip/index.md b/doc/source/handycontrol/extend_controls/popTip/index.md new file mode 100644 index 00000000..e28dfc77 --- /dev/null +++ b/doc/source/handycontrol/extend_controls/popTip/index.md @@ -0,0 +1,3 @@ +--- +title: PopTip +--- diff --git a/doc/source/handycontrol/extend_controls/rangeSlider/index.md b/doc/source/handycontrol/extend_controls/rangeSlider/index.md new file mode 100644 index 00000000..d8671ff6 --- /dev/null +++ b/doc/source/handycontrol/extend_controls/rangeSlider/index.md @@ -0,0 +1,3 @@ +--- +title: RangeSlider +--- diff --git a/doc/source/handycontrol/extend_controls/relativePanel/index.md b/doc/source/handycontrol/extend_controls/relativePanel/index.md new file mode 100644 index 00000000..81349147 --- /dev/null +++ b/doc/source/handycontrol/extend_controls/relativePanel/index.md @@ -0,0 +1,3 @@ +--- +title: RelativePanel +--- diff --git a/doc/source/handycontrol/extend_controls/runningBlock/index.md b/doc/source/handycontrol/extend_controls/runningBlock/index.md new file mode 100644 index 00000000..474bc528 --- /dev/null +++ b/doc/source/handycontrol/extend_controls/runningBlock/index.md @@ -0,0 +1,3 @@ +--- +title: RunningBlock +--- diff --git a/doc/source/handycontrol/extend_controls/sideMenu/index.md b/doc/source/handycontrol/extend_controls/sideMenu/index.md new file mode 100644 index 00000000..c7cc2051 --- /dev/null +++ b/doc/source/handycontrol/extend_controls/sideMenu/index.md @@ -0,0 +1,3 @@ +--- +title: SideMenu +--- diff --git a/doc/source/handycontrol/extend_controls/splitButton/index.md b/doc/source/handycontrol/extend_controls/splitButton/index.md new file mode 100644 index 00000000..532fd314 --- /dev/null +++ b/doc/source/handycontrol/extend_controls/splitButton/index.md @@ -0,0 +1,3 @@ +--- +title: SplitButton +--- diff --git a/doc/source/handycontrol/extend_controls/sprite/index.md b/doc/source/handycontrol/extend_controls/sprite/index.md new file mode 100644 index 00000000..59360979 --- /dev/null +++ b/doc/source/handycontrol/extend_controls/sprite/index.md @@ -0,0 +1,3 @@ +--- +title: Sprite +--- diff --git a/doc/source/handycontrol/index.md b/doc/source/handycontrol/index.md index 8c17cc52..a4da7377 100644 --- a/doc/source/handycontrol/index.md +++ b/doc/source/handycontrol/index.md @@ -2,7 +2,7 @@ title: 欢迎使用HandyControl --- -HandyControl是一套WPF控件库，它几乎重写了所有原生样式，同时包含60余款自定义控件（正逐步增加）。 +HandyControl是一套WPF控件库，它几乎重写了所有原生样式，同时包含70余款自定义控件（正逐步增加）。 # 要求 diff --git a/doc/source/handycontrol/langs/index.md b/doc/source/handycontrol/langs/index.md index e33f0268..b3442cff 100644 --- a/doc/source/handycontrol/langs/index.md +++ b/doc/source/handycontrol/langs/index.md @@ -21,9 +21,15 @@ title: 国际化 # 扩展 -控件库自带的语言包包括简体中文（zh-cn）、英文（en）、波斯语（fa）、法语（fr），默认为简体中文（zh-cn）： +控件库自带的语言包包括： -![Langs](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/langs/Langs.png) +* 简体中文（zh-cn） +* 英文（en） +* 波斯语（fa） +* 法语（fr） +* 韩文 （ko-kr） + +默认为简体中文（zh-cn）。 如果需要可自行扩展，这里推荐使用开源插件：[ResXManager](https://marketplace.visualstudio.com/items?itemName=TomEnglert.ResXManager)，来维护所有的语言包。 diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentScrollViewerDemoCtl.xaml b/doc/source/handycontrol/native_controls/flowDocument/index.md similarity index 89% rename from src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentScrollViewerDemoCtl.xaml rename to doc/source/handycontrol/native_controls/flowDocument/index.md index f6c8c9c3..24ea90d6 100644 --- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentScrollViewerDemoCtl.xaml +++ b/doc/source/handycontrol/native_controls/flowDocument/index.md @@ -1,10 +1,15 @@ - - - +--- +title: FlowDocument 流文档 +--- + +# FlowDocumentScrollViewerBaseStyle + +流文档滚动视图默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。 + +案例： + +``` xml +
@@ -97,5 +102,16 @@
- - +``` + +效果： + +![FlowDocumentScrollViewer](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/FlowDocumentScrollViewer.png) + +# FlowDocumentPageViewerBaseStyle + +流文档单页视图默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。 + +# FlowDocumentReaderBaseStyle + +流文档查看器默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。 \ No newline at end of file diff --git a/doc/source/handycontrol/native_controls/frame/index.md b/doc/source/handycontrol/native_controls/frame/index.md new file mode 100644 index 00000000..b78c4faa --- /dev/null +++ b/doc/source/handycontrol/native_controls/frame/index.md @@ -0,0 +1,17 @@ +--- +title: Frame 导航框架 +--- + +# FrameBaseStyle + +导航框架默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。 + +案例： + +``` xml + +``` + +效果： + +![FrameBaseStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/FrameBaseStyle.png) \ No newline at end of file diff --git a/doc/source/handycontrol/native_controls/radioButton/index.md b/doc/source/handycontrol/native_controls/radioButton/index.md index 0773732f..9e95e83d 100644 --- a/doc/source/handycontrol/native_controls/radioButton/index.md +++ b/doc/source/handycontrol/native_controls/radioButton/index.md @@ -21,7 +21,7 @@ title: RadioButton 单选按钮 ![RadioButton.DefaultStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/RadioButton.DefaultStyle.png) -# RadioButtonIcon:RadioButtonBaseStyle +# RadioButtonIcon : RadioButtonBaseStyle 带图标样式，可只显示图标也可图文显示 @@ -38,78 +38,4 @@ title: RadioButton 单选按钮 效果： -![RadioButton.IconStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/RadioButton.IconStyle.png) - -# RadioGroupItemBaseStyle - -`ButtonGroup`控件中的子集`RadioButton`样式基类，不建议直接使用，常作为`ButtonGroup`中`Item`样式基类,同时与`ButtonGroup`控件配套使用 - -案例： - -```xml - - - - - - - - - - - - - -``` - -效果： - -![RadioButton.RadioButtonItemDefaultStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/RadioButton.RadioButtonItemDefaultStyle.png) - -# RadioGroup关联样式 - -| 样式Key | 用途 | 基类样式 | -| ----------------------------- | ------------------------------------ | ----------------------- | -| RadioGroupItemDefault | RadioGroupItem默认样式 | RadioGroupItemBaseStyle | -| RadioGroupItemHorizontalFirst | RadioGroupItem水平头样式（从左至右） | RadioGroupItemBaseStyle | -| RadioGroupItemHorizontalLast | RadioGroupItem水平尾样式（从左至右） | RadioGroupItemBaseStyle | -| RadioGroupItemSingle | RadioGroupItem单项样式 | RadioGroupItemBaseStyle | -| RadioGroupItemVerticalFirst | RadioGroupItem垂直头样式（从上至下） | RadioGroupItemBaseStyle | -| RadioGroupItemVerticalLast | RadioGroupItem垂直尾样式（从上至下） | RadioGroupItemBaseStyle | - -案例： - -单个`RadioButton`样式： - -```xml - -``` - -效果： - -![RadioButton.RadioButtonItemSingleStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/RadioButton.RadioButtonItemSingleStyle.png) - -多个`RadioButton`垂直样式： - -```xml - - - - - - - - - - - - - - -``` - -效果： - -![RadioButton.RadioButtonItemVerticalStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/RadioButton.RadioButtonItemVerticalStyle.png) \ No newline at end of file +![RadioButton.IconStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/RadioButton.IconStyle.png) \ No newline at end of file diff --git a/doc/source/handycontrol/native_controls/richTextBox/index.md b/doc/source/handycontrol/native_controls/richTextBox/index.md index ca12ad62..3e33e5e1 100644 --- a/doc/source/handycontrol/native_controls/richTextBox/index.md +++ b/doc/source/handycontrol/native_controls/richTextBox/index.md @@ -1,5 +1,21 @@ --- -title: 建设中 +title: RichTextBox 富文本框 --- -建设中 \ No newline at end of file +# TextBoxBaseBaseStyle + +基础文本控件默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。 + +# RichTextBoxBaseStyle : TextBoxBaseBaseStyle + +富文本框默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。 + +案例： + +```xml + +``` + +效果： + +![RichTextbox.DefaultStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/RichTextbox.DefaultStyle.png) \ No newline at end of file diff --git a/doc/source/handycontrol/native_controls/scrollViewer/index.md b/doc/source/handycontrol/native_controls/scrollViewer/index.md index ca12ad62..8d39838d 100644 --- a/doc/source/handycontrol/native_controls/scrollViewer/index.md +++ b/doc/source/handycontrol/native_controls/scrollViewer/index.md @@ -1,5 +1,42 @@ --- -title: 建设中 +title: ScrollViewer 滚动视图 --- -建设中 \ No newline at end of file +# ScrollViewerNativeBaseStyle + +原生滚动视图默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。 + +案例： + +```xml + + + + + +``` + +效果： + +![ScrollViewer.DefaultStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ScrollViewer.DefaultStyle.png) + +# ScrollViewerUpDown + +显示上下按钮的滚动视图样式 + +案例： + +```xml + + + + + + + + +``` + +效果： + +![ScrollViewer.UpDownStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ScrollViewer.UpDownStyle.png) \ No newline at end of file diff --git a/doc/source/handycontrol/native_controls/seperator/index.md b/doc/source/handycontrol/native_controls/seperator/index.md new file mode 100644 index 00000000..9b06017b --- /dev/null +++ b/doc/source/handycontrol/native_controls/seperator/index.md @@ -0,0 +1,7 @@ +--- +title: Seperator 分隔符 +--- + +# SeparatorBaseStyle + +分隔符默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。 \ No newline at end of file diff --git a/doc/source/handycontrol/native_controls/slider/index.md b/doc/source/handycontrol/native_controls/slider/index.md index ca12ad62..3ffd997e 100644 --- a/doc/source/handycontrol/native_controls/slider/index.md +++ b/doc/source/handycontrol/native_controls/slider/index.md @@ -1,5 +1,17 @@ --- -title: 建设中 +title: Slider 滑块 --- -建设中 \ No newline at end of file +# SliderBaseStyle + +滑块默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。 + +案例： + +```xml + +``` + +效果： + +![Slider.DefaultStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/Slider.DefaultStyle.png) \ No newline at end of file diff --git a/doc/source/handycontrol/native_controls/statusBar/index.md b/doc/source/handycontrol/native_controls/statusBar/index.md new file mode 100644 index 00000000..6fe4aa99 --- /dev/null +++ b/doc/source/handycontrol/native_controls/statusBar/index.md @@ -0,0 +1,7 @@ +--- +title: StatusBar 状态栏 +--- + +# StatusBarBaseStyle + +状态栏默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。 \ No newline at end of file diff --git a/doc/source/handycontrol/native_controls/tabControl/index.md b/doc/source/handycontrol/native_controls/tabControl/index.md index ca12ad62..1c2ac558 100644 --- a/doc/source/handycontrol/native_controls/tabControl/index.md +++ b/doc/source/handycontrol/native_controls/tabControl/index.md @@ -1,5 +1,93 @@ --- -title: 建设中 +title: TabControl 选项卡控件 --- -建设中 \ No newline at end of file +# TabControlBaseStyle + +选项卡控件默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。 + +案例： + + ```xml + + + + + + + + + ``` + +效果： + +![TabControl.DefaultStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/TabControl.DefaultStyle.png) + +# TabControlInLine : TabControlBaseStyle + +单行填充选项卡样式 + +案例： + +```xml + + + + + + + + +``` + +效果： + +![TabControl.InLineStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/TabControl.InLineStyle.png) + +# TabControlCapsule + +胶囊状选项卡样式 + +案例： + +```xml + + + + + + + + +``` + +效果： + +![TabControl.CapsuleStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/TabControl.CapsuleStyle.png) + +# TabControlCapsuleSolid : TabControlCapsule + +胶囊状（实心）选项卡样式 + +案例： + +```xml + + + + + + + + +``` + +效果： + +![TabControl.CapsuleSolidStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/TabControl.CapsuleSolidStyle.png) + +# 温馨提示 + +可以使用属性`TabStripPlacement`设定头部标题的位置，效果如下： + +![TabControl.TabStripPlacement](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/TabControl.TabStripPlacement.png) \ No newline at end of file diff --git a/doc/source/handycontrol/native_controls/textBlock/index.md b/doc/source/handycontrol/native_controls/textBlock/index.md index ca12ad62..b1baf500 100644 --- a/doc/source/handycontrol/native_controls/textBlock/index.md +++ b/doc/source/handycontrol/native_controls/textBlock/index.md @@ -1,5 +1,37 @@ --- -title: 建设中 +title: TextBlock 文本块 --- -建设中 \ No newline at end of file +# TextBlockBaseStyle + +文本块默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。 + +# TextBlockBoldBaseStyle + +文本块粗体默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。 + +# 案例 + +```xml + + + + + + + + + + + + + + + + + + + +``` + +![TextBlockStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/TextBlock.jpg) \ No newline at end of file diff --git a/doc/source/handycontrol/native_controls/textBox/index.md b/doc/source/handycontrol/native_controls/textBox/index.md index ca12ad62..b9a3dcc8 100644 --- a/doc/source/handycontrol/native_controls/textBox/index.md +++ b/doc/source/handycontrol/native_controls/textBox/index.md @@ -1,5 +1,40 @@ --- -title: 建设中 +title: TextBox 文本框 --- -建设中 \ No newline at end of file +# TextBoxBaseStyle + +原生文本框默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。 + +- 默认样式 +`` +![TextBoxBaseStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/TextBoxBaseStyle.png) + +# TextBoxExtendBaseStyle : TextBoxBaseStyle + +原生文本框扩展默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。 + +# TextBoxExtend : TextBoxExtendBaseStyle + +相对于原生文本框默认样式，它借助于附加属性可以实现标题、水印的功能。 + +- 标题在上 +`` +![TextBoxExtend_1](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/TextBoxExtend_1.png) + +- 标题在左 +`` +![TextBoxExtend_2](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/TextBoxExtend_2.png) + +{% note warning %} +标题在左时，为了多个输入框左侧对齐，需要设置标题宽度，标题宽度无需逐个设置，可在外部容器上统一设置。 +{% endnote %} + +- 标题在上，带有水印 +[参见Combobox](https://handyorg.github.io/handycontrol/native_controls/comboBox/) + +- 标题在上，带有水印，且为必填 +[参见Combobox](https://handyorg.github.io/handycontrol/native_controls/comboBox/) + +- 标题在上，带有水印，且为必填，同时自定义必填提示符 +[参见Combobox](https://handyorg.github.io/handycontrol/native_controls/comboBox/) \ No newline at end of file diff --git a/doc/source/handycontrol/native_controls/toggleButton/index.md b/doc/source/handycontrol/native_controls/toggleButton/index.md index ca12ad62..94a04022 100644 --- a/doc/source/handycontrol/native_controls/toggleButton/index.md +++ b/doc/source/handycontrol/native_controls/toggleButton/index.md @@ -1,5 +1,177 @@ --- -title: 建设中 +title: ToggleButton 切换按钮 --- -建设中 \ No newline at end of file +# ToggleButtonBaseStyle : ButtonBaseBaseStyle + +切换按钮默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。 + +{% note info %} +所有继承此样式的按钮都可以使用`IconElement`中定义的附加属性来控制按钮中几何图形的属性。 +{% endnote %} + +{% note info %} +所有继承此样式的按钮都可以使用`BorderElement.CornerRadius`附加属性来控制按钮的圆角大小。 +{% endnote %} + +## 相关样式 + +| 名称 | 继承自 | 用途描述 | +| - | - | - | +| ToggleButtonPrimary | ToggleButtonBaseStyle | 主要 | +| ToggleButtonSuccess | ToggleButtonBaseStyle | 成功 | +| ToggleButtonInfo | ToggleButtonBaseStyle | 信息 | +| ToggleButtonWarning | ToggleButtonBaseStyle | 警告 | +| ToggleButtonDanger | ToggleButtonBaseStyle | 危险 | + +案例： + +```xml + + + + + + + + +``` + +效果： + +![ToggleButtonBaseStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ToggleButtonBaseStyle.png) + +# ToggleButtonIconBaseStyle : BaseStyle + +只显示图标的切换按钮，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。 + +{% note info %} +所有继承此样式的按钮都可以使用`IconElement`中定义的附加属性来控制按钮中几何图形的属性。 +{% endnote %} + +{% note info %} +所有继承此样式的按钮都可以使用`BorderElement.CornerRadius`附加属性来控制按钮的圆角大小。 +{% endnote %} + +## 相关样式 + +| 名称 | 继承自 | 用途描述 | +| - | - | - | +| ToggleButtonIcon | ToggleButtonIconBaseStyle | 默认 | +| ToggleButtonIconPrimary | ToggleButtonIconBaseStyle | 主要 | +| ToggleButtonIconSuccess | ToggleButtonIconBaseStyle | 成功 | +| ToggleButtonIconInfo | ToggleButtonIconBaseStyle | 信息 | +| ToggleButtonIconWarning | ToggleButtonIconBaseStyle | 警告 | +| ToggleButtonIconDanger | ToggleButtonIconBaseStyle | 危险 | +| ToggleButtonIconTransparent | ToggleButtonIconBaseStyle | 透明 | + +案例： + +```xml + + + + + + + + + +``` + +效果： + +![ToggleButtonIconBaseStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ToggleButtonIconBaseStyle.png) + +# ToggleButtonSwitchBaseStyle : BaseStyle + +开关式切换按钮，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。 + +## 相关样式 + +| 名称 | 继承自 | +| - | - | +| ToggleButtonSwitch | ToggleButtonSwitchBaseStyle | + +案例： + +```xml + + + + +``` + +效果： + +![ToggleButtonSwitchBaseStyle](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ToggleButtonSwitchBaseStyle.png) + +# ToggleButtonFlip : BaseStyle + +翻转式切换按钮。 + +案例： + +```xml + + + + + + + + + + + + + + + + + + + + + + +``` + +效果： + +![ToggleButtonFlip](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ToggleButtonFlip.png) + +# ToggleButtonCustom : BaseStyle + +如果想完全自定义按钮的内容，则推荐使用此样式。`ToggleButtonCustom`中的内容完全由你自己决定。 + +案例： + +```xml + + + + + + + + + + + + + + + + + + + + + + +``` + +效果： + +![ToggleButtonCustom](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ToggleButtonCustom.png) diff --git a/doc/source/handycontrol/native_controls/toolBar/index.md b/doc/source/handycontrol/native_controls/toolBar/index.md index ca12ad62..17b6d024 100644 --- a/doc/source/handycontrol/native_controls/toolBar/index.md +++ b/doc/source/handycontrol/native_controls/toolBar/index.md @@ -1,5 +1,21 @@ --- -title: 建设中 +title: ToolBar 工具条 --- -建设中 \ No newline at end of file +# ToolBarBaseStyle + +工具条默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。 + +案例： + +```xml + +