From 80af1a29b06b95e81de2e8bd55a50544c9818f26 Mon Sep 17 00:00:00 2001 From: NaBian <836904362@qq.com> Date: Wed, 5 Feb 2020 20:13:23 +0800 Subject: [PATCH] merged pr 303 --- .../attach/globalShortcut/index.md | 3 - .../handycontrol/attach/linkElement/index.md | 3 - .../extend_controls/buttonGroup/index.md | 76 +++++++++++++++++- doc/source/handycontrol/index.md | 2 +- doc/source/handycontrol/langs/index.md | 11 ++- .../native_controls/radioButton/index.md | 78 +------------------ doc/themes/next/_config.yml | 50 ++++++------ 7 files changed, 110 insertions(+), 113 deletions(-) delete mode 100644 doc/source/handycontrol/attach/globalShortcut/index.md delete mode 100644 doc/source/handycontrol/attach/linkElement/index.md diff --git a/doc/source/handycontrol/attach/globalShortcut/index.md b/doc/source/handycontrol/attach/globalShortcut/index.md deleted file mode 100644 index c926da69..00000000 --- a/doc/source/handycontrol/attach/globalShortcut/index.md +++ /dev/null @@ -1,3 +0,0 @@ ---- -title: GlobalShortcut ---- diff --git a/doc/source/handycontrol/attach/linkElement/index.md b/doc/source/handycontrol/attach/linkElement/index.md deleted file mode 100644 index 68031d07..00000000 --- a/doc/source/handycontrol/attach/linkElement/index.md +++ /dev/null @@ -1,3 +0,0 @@ ---- -title: LinkElement ---- diff --git a/doc/source/handycontrol/extend_controls/buttonGroup/index.md b/doc/source/handycontrol/extend_controls/buttonGroup/index.md index 049e173b..32d31e77 100644 --- a/doc/source/handycontrol/extend_controls/buttonGroup/index.md +++ b/doc/source/handycontrol/extend_controls/buttonGroup/index.md @@ -1,3 +1,77 @@ --- -title: ButtonGroup +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/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 f5cc3916..48aa6242 100644 --- a/doc/source/handycontrol/langs/index.md +++ b/doc/source/handycontrol/langs/index.md @@ -21,9 +21,16 @@ title: 国际化 # 扩展 -控件库自带的语言包包括简体中文（zh-cn）、英文（en）、波斯语（fa）、法语（fr），韩国人 (ko-kr) , 默认为简体中文（zh-cn）： +控件库自带的语言包包括： -![Langs](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/langs/Langs.png) +* 简体中文（zh-cn） +* 英文（en） +* 英文（en） +* 波斯语（fa） +* 法语（fr） +* 韩文 （ko-kr） + +默认为简体中文（zh-cn）。 如果需要可自行扩展，这里推荐使用开源插件：[ResXManager](https://marketplace.visualstudio.com/items?itemName=TomEnglert.ResXManager)，来维护所有的语言包。 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/themes/next/_config.yml b/doc/themes/next/_config.yml index 8c006f62..133eb9d1 100644 --- a/doc/themes/next/_config.yml +++ b/doc/themes/next/_config.yml @@ -175,16 +175,13 @@ menu: 尺寸: /sizes/ || 附加属性: default: /attach/ || - TextBlockAttach : /textBlockAttach/ || BackgroundSwitchElement 可切换背景的元素: /backgroundSwitchElement/ || BorderElement 具有边框的元素: /borderElement/ || DataGridAttach DataGrid专用: /dataGridAttach/ || EdgeElement 具有边界内容的元素: /edgeElement/ || - GlobalShortcut : /globalShortcut/ || IconElement 具有图标的元素: /iconElement/ || IconSwitchElement 可切换图标的元素: /iconSwitchElement/ || InfoElement 信息元素: /infoElement/ || - LinkElement : /linkElement/ || PanelElement 面板元素: /panelElement/ || PasswordBoxAttach 密码框专用: /passwordBoxAttach/ || RectangleAttach Rectangle专用: /rectangleAttach/ || @@ -206,7 +203,7 @@ menu: DataGrid 数据表格: /dataGrid/ || DatePicker 日期选择器: /datePicker/ || Expander 展开框: /expander/ || - FlowDocumentScrollViewer: /flowDocumentScrollViewer/ || + FlowDocumentScrollViewer 流文档滚动视图: /flowDocumentScrollViewer/ || GroupBox 分组框: /groupBox/ || Image 图片: /image/ || Label 标签: /label/ || @@ -218,9 +215,9 @@ menu: RadioButton 单选按钮: /radioButton/ || RichTextBox 富文本框: /richTextBox/ || ScrollViewer 滚动视图: /scrollViewer/ || - Seperator: /seperator/ || + Seperator 分隔符: /seperator/ || Slider 滑块: /slider/ || - StatusBar: /statusBar/ || + StatusBar 状态栏: /statusBar/ || TabControl 选项卡控件: /tabControl/ || TextBlock 文本块: /textBlock/ || TextBox 文本框: /textBox/ || @@ -236,7 +233,7 @@ menu: ButtonGroup : /buttonGroup/ || BlurWindow 背景模糊窗口: /blurWindow/ || CalendarWithClock 带有时钟的日历: /calendarWithClock/ || - Card : /card/ || + Card 卡片: /card/ || Carousel 轮播: /carousel/ || ChatBubble 对话气泡: /chatBubble/ || CirclePanel 圆形布局: /circlePanel/ || @@ -250,47 +247,46 @@ menu: DatePicker 日期选择器: /datePicker/ || DateTimePicker 日期时间选择器: /dateTimePicker/ || Dialog 对话框: /dialog/ || - Divider : /divider/ || - Drawer : /drawer/ || + Divider 分割线: /divider/ || + Drawer 抽屉: /drawer/ || FlipClock 翻页时钟: /flipClock/ || - FloatingBlock : /floatingBlock/ || + FloatingBlock 漂浮块: /floatingBlock/ || GifImage Gif图片: /gifImage/ || GotoTop 回到顶部: /gotoTop/ || - GlowWindow: /glowWindow/ || Gravatar 头像: /gravatar/ || - Grid : /grid/ || + Grid 栅格: /grid/ || Growl 信息通知: /growl/ || - HoneycombPanel : /honeycombPanel/ || - ImageBlock : /imageBlock/ || + HoneycombPanel 蜂窝布局: /honeycombPanel/ || + ImageBlock 图片块: /imageBlock/ || ImageBrowser 图片浏览器: /imageBrowser/ || ImageViewer 图片视图: /imageViewer/ || Loading 加载条: /loading/ || - Magnifier : /magnifier/ || + Magnifier 放大镜: /magnifier/ || MessageBox 消息对话框: /messageBox/ || - Notification : /notification/ || + Notification 桌面通知: /notification/ || NotifyIcon 托盘图标: /notifyIcon/ || NumericUpDown 数值选择控件: /numericUpDown/ || OutlineText 轮廓文本: /outlineText/ || Pagination 页码条: /pagination/ || PasswordBox 密码框: /passwordBox/ || - PinBox: /pinBox/ || - PopTip : /popTip/ || + PinBox PIN码框: /pinBox/ || + PopTip 气泡提示: /popTip/ || PopupWindow 弹出窗口: /popupWindow/ || PreviewSlider 预览滑块: /previewSlider/ || ProgressButton 进度按钮: /progressButton/ || - RangeSlider : /rangeSlider/ || + RangeSlider 范围滑块: /rangeSlider/ || RadioGroup 单选按钮组: /radioGroup/ || Rate 评分: /rate/ || - RelativePanel : /relativePanel/ || - RunningBlock : /runningBlock/ || + RelativePanel 相对布局: /relativePanel/ || + RunningBlock 滚动块: /runningBlock/ || ScrollViewer 滚动视图: /scrollViewer/ || SearchBar 搜索栏: /searchBar/ || Shield 徽章: /shield/ || - SideMenu : /sideMenu/ || + SideMenu 侧边菜单: /sideMenu/ || SimpleItemsControl 简单项目控件: /simpleItemsControl/ || SimplePanel 简单面板: /simplePanel/ || - SplitButton : /splitButton/ || - Sprite : /sprite/ || + SplitButton 分割按钮: /splitButton/ || + Sprite 精灵: /sprite/ || StepBar 步骤条: /stepBar/ || TabControl 选项卡控件: /tabControl/ || Tag 标签: /tag/ || @@ -308,9 +304,9 @@ menu: InfoType: /InfoType/ || 工具和扩展: default: /tools/ || - HatchBrushGenerator : /hatchBrushGenerator/ || - Effect : /effect/ || - MorphingAnimation : /morphingAnimation/ || + Effect 效果: /effect/ || + HatchBrushGenerator 阴影画笔生成器: /hatchBrushGenerator/ || + MorphingAnimation 变形动画: /morphingAnimation/ || 国际化: default: /langs/ ||