diff --git a/.gitignore b/.gitignore index ad4d0fec..fdab9690 100644 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,5 @@ src/Net_GE45/HandyControl_Net_GE45/bin src/Net_GE45/HandyControl_Net_GE45/obj src/Net_GE45/HandyControlDemo_Net_GE45/bin src/Net_GE45/HandyControlDemo_Net_GE45/obj -*.user \ No newline at end of file +*.user +*.xml \ No newline at end of file diff --git a/README.md b/README.md index 18acdfdb..a981b788 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,11 @@ Step 2:Add code in App.xaml as follows: ``` -Step 3:enjoy coding + +Step 3: Add NameSpace: +`xmlns:hc="https://handyorg.github.io/handycontrol"` + +Step 4:enjoy coding ## Overview diff --git a/doc/source/handycontrol/attach/images/Attach.png b/doc/source/handycontrol/attach/images/Attach.png new file mode 100644 index 00000000..efda668e Binary files /dev/null and b/doc/source/handycontrol/attach/images/Attach.png differ diff --git a/doc/source/handycontrol/attach/index.md b/doc/source/handycontrol/attach/index.md index ca12ad62..c8aa438a 100644 --- a/doc/source/handycontrol/attach/index.md +++ b/doc/source/handycontrol/attach/index.md @@ -1,5 +1,9 @@ --- -title: 建设中 +title: 附加属性 --- -建设中 \ No newline at end of file +附加属性源码在Controls / Attach文件夹中: + +![Attach](images/Attach.png) + +以`Element`结尾的类,可以为所有的控件设置一些共有的属性,以`Attach`结尾的类,只能为一种控件设置相关的属性。 \ No newline at end of file diff --git a/doc/source/handycontrol/basic_xaml/behaviors/index.md b/doc/source/handycontrol/basic_xaml/behaviors/index.md index d994b47f..8975830f 100644 --- a/doc/source/handycontrol/basic_xaml/behaviors/index.md +++ b/doc/source/handycontrol/basic_xaml/behaviors/index.md @@ -14,5 +14,5 @@ title: 行为 | BehaviorY400 | 流体移动行为,y轴运动,400毫秒结束动画 | {% note info no-icon %} -用例:`controls:PanelElement.FluidMoveBehavior="{StaticResource BehaviorXY200}"` +用例:`hc:PanelElement.FluidMoveBehavior="{StaticResource BehaviorXY200}"` {% endnote %} \ No newline at end of file diff --git a/doc/source/handycontrol/index.md b/doc/source/handycontrol/index.md index cf901cf9..407206a8 100644 --- a/doc/source/handycontrol/index.md +++ b/doc/source/handycontrol/index.md @@ -4,12 +4,15 @@ title: 欢迎使用HandyControl HandyControl是一套WPF控件库,它几乎重写了所有原生样式,同时包含50多款额外的控件(正逐步增加)。 -# 使用要求 +# 要求 - - .Net >= 4.0 - - OS >= win7 - - IDE >= vs2019 - - C# >= 7.3 +- 使用要求 +.Net >= 4.0 +OS >= win7 + +- 编译要求 +IDE >= vs2019 +C# >= 7.3 # 下载 diff --git a/doc/source/handycontrol/langs/images/Langs.png b/doc/source/handycontrol/langs/images/Langs.png new file mode 100644 index 00000000..cfec814b Binary files /dev/null and b/doc/source/handycontrol/langs/images/Langs.png differ diff --git a/doc/source/handycontrol/langs/index.md b/doc/source/handycontrol/langs/index.md index ca12ad62..567e3917 100644 --- a/doc/source/handycontrol/langs/index.md +++ b/doc/source/handycontrol/langs/index.md @@ -1,5 +1,30 @@ --- -title: 建设中 +title: 国际化 --- -建设中 \ No newline at end of file +# 使用方式 + +可通过`ConfigHelper.Instance.SetLang(string lang)`指定需要使用的语言包,默认使用zh-cn。 + +控件库自带的语言包一般为控件库内部使用,但用户也可以通过以下两种方式使用: + +- xaml +第一步,引入命名空间:`xmlns:hc="https://handyorg.github.io/handycontrol"` +第二步,使用语言包:`` + +- C# +`HandyControl.Properties.Langs.Lang.Cancel` + +{% note warning %} +控件库不支持动态语言包切换,未来也不会有支持。 +{% endnote %} + +# 扩展 + +控件库自带zh-cn和en两份语言包,默认为zh-cn: + +![Langs](images/Langs.png) + +如果需要可自行扩展,这里推荐使用开源插件:[ResXManager](https://marketplace.visualstudio.com/items?itemName=TomEnglert.ResXManager),来维护所有的语言包。 + +引用控件库后,会在运行目录生成语言包文件夹,其命名方式形如zh-cn、en等。 \ No newline at end of file diff --git a/doc/source/handycontrol/native_controls/comboBox/index.md b/doc/source/handycontrol/native_controls/comboBox/index.md index 6c05f375..588fe39d 100644 --- a/doc/source/handycontrol/native_controls/comboBox/index.md +++ b/doc/source/handycontrol/native_controls/comboBox/index.md @@ -4,16 +4,40 @@ title: ComboBox 组合框 # ComboBoxBaseStyle -原生组合框默认样式,不推荐直接使用,应该始终被其它样式以BasedOn的方式使用。 +原生组合框默认样式,不推荐直接使用,应该始终被其它样式以BasedOn的方式使用。原生组合框如果未设置任何样式,则默认使用该样式: + +- 默认样式 +`` +![ComboBoxBaseStyle](../images/ComboBoxBaseStyle.png) # ComboBoxExtendBaseStyle : ComboBoxBaseStyle 原生组合框扩展默认样式,不推荐直接使用,应该始终被其它样式以BasedOn的方式使用。 -# ComboBoxPlusBaseStyle : ComboBoxExtendBaseStyle - -扩展组合框默认样式,不推荐直接使用,应该始终被其它样式以BasedOn的方式使用。 - # ComboBoxExtend : ComboBoxExtendBaseStyle -相对于原生组合框默认样式,它借助于附加属性可以实现标题、水印的功能。 \ No newline at end of file +相对于原生组合框默认样式,它借助于附加属性可以实现标题、水印的功能。 + +- 标题在上 +`` +![ComboBoxExtend_1](../images/ComboBoxExtend_1.png) + +- 标题在左 +`` +![ComboBoxExtend_2](../images/ComboBoxExtend_2.png) + +{% note warning %} +标题在左时,为了多个输入框左侧对齐,需要设置标题宽度,标题宽度无需逐个设置,可在外部容器上统一设置。 +{% endnote %} + +- 标题在上,带有水印 +`` +![ComboBoxExtend_3](../images/ComboBoxExtend_3.png) + +- 标题在上,带有水印,且为必填 +`` +![ComboBoxExtend_4](../images/ComboBoxExtend_4.png) + +- 标题在上,带有水印,且为必填,同时自定义必填提示符 +`` +![ComboBoxExtend_5](../images/ComboBoxExtend_5.png) \ No newline at end of file diff --git a/doc/source/handycontrol/native_controls/contentControl/index.md b/doc/source/handycontrol/native_controls/contentControl/index.md index ca12ad62..22b4365c 100644 --- a/doc/source/handycontrol/native_controls/contentControl/index.md +++ b/doc/source/handycontrol/native_controls/contentControl/index.md @@ -1,5 +1,5 @@ --- -title: 建设中 +title: ContentControl 内容控件 --- -建设中 \ No newline at end of file +所有的`ContentControl`默认无法获得焦点 \ No newline at end of file diff --git a/doc/source/handycontrol/native_controls/contextMenu/index.md b/doc/source/handycontrol/native_controls/contextMenu/index.md index ca12ad62..fdcf837e 100644 --- a/doc/source/handycontrol/native_controls/contextMenu/index.md +++ b/doc/source/handycontrol/native_controls/contextMenu/index.md @@ -1,5 +1,22 @@ --- -title: 建设中 +title: ContextMenu 上下文菜单 --- -建设中 \ No newline at end of file +# ContextMenuBaseStyle + +上下文菜单默认样式,不推荐直接使用,应该始终被其它样式以BasedOn的方式使用。 + +{% note info no-icon %} +用例: + +{% code %} + + + + + + + +{% endcode %} +![ContextMenu](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/ContextMenu.png) +{% endnote %} \ No newline at end of file diff --git a/doc/source/handycontrol/native_controls/dataGrid/index.md b/doc/source/handycontrol/native_controls/dataGrid/index.md index ca12ad62..7ea36f18 100644 --- a/doc/source/handycontrol/native_controls/dataGrid/index.md +++ b/doc/source/handycontrol/native_controls/dataGrid/index.md @@ -1,5 +1,32 @@ --- -title: 建设中 +title: DataGrid 数据表格 --- -建设中 \ No newline at end of file +{% note info no-icon %} +用例: + +{% code %} + + + + + + + + + + + + + + + + + + + + + +{% endcode %} +![ContextMenu](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/DataGrid.png) +{% endnote %} \ No newline at end of file diff --git a/doc/source/handycontrol/native_controls/datePicker/index.md b/doc/source/handycontrol/native_controls/datePicker/index.md index ca12ad62..d4f5933e 100644 --- a/doc/source/handycontrol/native_controls/datePicker/index.md +++ b/doc/source/handycontrol/native_controls/datePicker/index.md @@ -1,5 +1,38 @@ --- -title: 建设中 +title: DatePicker 日期选择器 --- -建设中 \ No newline at end of file +# DatePickerBaseStyle + +原生日期选择器默认样式,不推荐直接使用,应该始终被其它样式以BasedOn的方式使用。原生日期选择器如果未设置任何样式,则默认使用该样式: + +- 默认样式 +`` +![ComboBoxBaseStyle](../images/DatePickerBaseStyle.png) + +# DatePickerExtendBaseStyle : DatePickerBaseStyle + +原生日期选择器扩展默认样式,不推荐直接使用,应该始终被其它样式以BasedOn的方式使用。 + +# DatePickerExtend : DatePickerExtendBaseStyle + +- 标题在上 +`` +![DatePickerExtend_1](../images/DatePickerExtend_1.png) + +- 标题在左 +`` +![DatePickerExtend_2](../images/DatePickerExtend_2.png) + +{% note warning %} +标题在左时,为了多个输入框左侧对齐,需要设置标题宽度,标题宽度无需逐个设置,可在外部容器上统一设置。 +{% endnote %} + +- 标题在上,带有水印 +[参见Combobox](../combobox) + +- 标题在上,带有水印,且为必填 +[参见Combobox](../combobox) + +- 标题在上,带有水印,且为必填,同时自定义必填提示符 +[参见Combobox](../combobox) \ No newline at end of file diff --git a/doc/source/handycontrol/native_controls/images/ComboBoxBaseStyle.png b/doc/source/handycontrol/native_controls/images/ComboBoxBaseStyle.png new file mode 100644 index 00000000..84e4da34 Binary files /dev/null and b/doc/source/handycontrol/native_controls/images/ComboBoxBaseStyle.png differ diff --git a/doc/source/handycontrol/native_controls/images/ComboBoxExtend_1.png b/doc/source/handycontrol/native_controls/images/ComboBoxExtend_1.png new file mode 100644 index 00000000..31195a92 Binary files /dev/null and b/doc/source/handycontrol/native_controls/images/ComboBoxExtend_1.png differ diff --git a/doc/source/handycontrol/native_controls/images/ComboBoxExtend_2.png b/doc/source/handycontrol/native_controls/images/ComboBoxExtend_2.png new file mode 100644 index 00000000..a2b8060c Binary files /dev/null and b/doc/source/handycontrol/native_controls/images/ComboBoxExtend_2.png differ diff --git a/doc/source/handycontrol/native_controls/images/ComboBoxExtend_3.png b/doc/source/handycontrol/native_controls/images/ComboBoxExtend_3.png new file mode 100644 index 00000000..56a4ef35 Binary files /dev/null and b/doc/source/handycontrol/native_controls/images/ComboBoxExtend_3.png differ diff --git a/doc/source/handycontrol/native_controls/images/ComboBoxExtend_4.png b/doc/source/handycontrol/native_controls/images/ComboBoxExtend_4.png new file mode 100644 index 00000000..9287b33d Binary files /dev/null and b/doc/source/handycontrol/native_controls/images/ComboBoxExtend_4.png differ diff --git a/doc/source/handycontrol/native_controls/images/ComboBoxExtend_5.png b/doc/source/handycontrol/native_controls/images/ComboBoxExtend_5.png new file mode 100644 index 00000000..761325f3 Binary files /dev/null and b/doc/source/handycontrol/native_controls/images/ComboBoxExtend_5.png differ diff --git a/doc/source/handycontrol/native_controls/images/DatePickerBaseStyle.png b/doc/source/handycontrol/native_controls/images/DatePickerBaseStyle.png new file mode 100644 index 00000000..ddc505b1 Binary files /dev/null and b/doc/source/handycontrol/native_controls/images/DatePickerBaseStyle.png differ diff --git a/doc/source/handycontrol/native_controls/images/DatePickerExtend_1.png b/doc/source/handycontrol/native_controls/images/DatePickerExtend_1.png new file mode 100644 index 00000000..489f613f Binary files /dev/null and b/doc/source/handycontrol/native_controls/images/DatePickerExtend_1.png differ diff --git a/doc/source/handycontrol/native_controls/images/DatePickerExtend_2.png b/doc/source/handycontrol/native_controls/images/DatePickerExtend_2.png new file mode 100644 index 00000000..2f350a68 Binary files /dev/null and b/doc/source/handycontrol/native_controls/images/DatePickerExtend_2.png differ diff --git a/doc/source/handycontrol/quick_start/index.md b/doc/source/handycontrol/quick_start/index.md new file mode 100644 index 00000000..9ec44b4c --- /dev/null +++ b/doc/source/handycontrol/quick_start/index.md @@ -0,0 +1,25 @@ +--- +title: 快速开始 +--- + +# 第一步 +下载源码或者以Nuget的方式引用控件库。 +源码链接:[HandyControl-Github](https://github.com/HandyOrg/HandyControl) +Nuget链接:[HandyControl-Nuget](https://www.nuget.org/packages/HandyControl/) + +# 第二步 +在App.xaml中添加以下代码: + +``` xml + + + + + + + + +``` + +# 第三步 +添加命名空间:`xmlns:hc="https://handyorg.github.io/handycontrol"` \ No newline at end of file diff --git a/doc/themes/next/_config.yml b/doc/themes/next/_config.yml index 23fc04f2..92a82f52 100644 --- a/doc/themes/next/_config.yml +++ b/doc/themes/next/_config.yml @@ -161,6 +161,7 @@ menu: HandyControl: default: /handycontrol/ || 鸣谢: /tnx/ || + 快速开始: /quick_start/ || # 总览: /overview/ || # 规范: /specifications/ || 基础xaml定义: diff --git a/src/HandyControl.sln b/src/HandyControl.sln index e6c455be..d4e18bab 100644 --- a/src/HandyControl.sln +++ b/src/HandyControl.sln @@ -61,7 +61,7 @@ Global {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net47|Any CPU.Build.0 = Debug-Net47|Any CPU {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net48|Any CPU.ActiveCfg = Debug-Net48|Any CPU {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net48|Any CPU.Build.0 = Debug-Net48|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Core30|Any CPU.ActiveCfg = Release-Net48|Any CPU + {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Core30|Any CPU.ActiveCfg = Release-Net45|Any CPU {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net40|Any CPU.ActiveCfg = Release-Net45|Any CPU {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net45|Any CPU.ActiveCfg = Release-Net45|Any CPU {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net45|Any CPU.Build.0 = Release-Net45|Any CPU @@ -71,24 +71,24 @@ Global {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net47|Any CPU.Build.0 = Release-Net47|Any CPU {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net48|Any CPU.ActiveCfg = Release-Net48|Any CPU {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net48|Any CPU.Build.0 = Release-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Core30|Any CPU.ActiveCfg = Debug-Net47|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net40|Any CPU.ActiveCfg = Debug-Net47|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net45|Any CPU.Build.0 = Debug-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net462|Any CPU.ActiveCfg = Debug-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net462|Any CPU.Build.0 = Debug-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net47|Any CPU.ActiveCfg = Debug-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net47|Any CPU.Build.0 = Debug-Net48|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Core30|Any CPU.ActiveCfg = Debug-Net45|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net40|Any CPU.ActiveCfg = Debug-Net45|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net45|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net45|Any CPU.Build.0 = Debug-Net45|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net462|Any CPU.ActiveCfg = Debug-Net462|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net462|Any CPU.Build.0 = Debug-Net462|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net47|Any CPU.ActiveCfg = Debug-Net47|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net47|Any CPU.Build.0 = Debug-Net47|Any CPU {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net48|Any CPU.ActiveCfg = Debug-Net48|Any CPU {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net48|Any CPU.Build.0 = Debug-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Core30|Any CPU.ActiveCfg = Release-Net48|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Core30|Any CPU.ActiveCfg = Release-Net45|Any CPU {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net40|Any CPU.ActiveCfg = Release-Net47|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net45|Any CPU.ActiveCfg = Release-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net45|Any CPU.Build.0 = Release-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net462|Any CPU.ActiveCfg = Release-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net462|Any CPU.Build.0 = Release-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net47|Any CPU.ActiveCfg = Release-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net47|Any CPU.Build.0 = Release-Net48|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net45|Any CPU.ActiveCfg = Release-Net45|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net45|Any CPU.Build.0 = Release-Net45|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net462|Any CPU.ActiveCfg = Release-Net462|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net462|Any CPU.Build.0 = Release-Net462|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net47|Any CPU.ActiveCfg = Release-Net47|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net47|Any CPU.Build.0 = Release-Net47|Any CPU {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net48|Any CPU.ActiveCfg = Release-Net48|Any CPU {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net48|Any CPU.Build.0 = Release-Net48|Any CPU {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Core30|Any CPU.ActiveCfg = Debug|Any CPU diff --git a/src/HandyControl_Net_GE45.sln b/src/HandyControl_Net_GE45.sln index b321309b..b2e1b9ae 100644 --- a/src/HandyControl_Net_GE45.sln +++ b/src/HandyControl_Net_GE45.sln @@ -49,8 +49,8 @@ Global {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net47|Any CPU.Build.0 = Release-Net47|Any CPU {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net48|Any CPU.ActiveCfg = Release-Net48|Any CPU {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net48|Any CPU.Build.0 = Release-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net45|Any CPU.Build.0 = Debug-Net48|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net47|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net45|Any CPU.Build.0 = Debug-Net47|Any CPU {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net462|Any CPU.ActiveCfg = Debug-Net48|Any CPU {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net462|Any CPU.Build.0 = Debug-Net48|Any CPU {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net47|Any CPU.ActiveCfg = Debug-Net48|Any CPU 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 d61b5420..e5a45bc4 100644 --- a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj +++ b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj @@ -15,6 +15,29 @@ + v4.5 + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + v4.5 + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + v4.6.2 AnyCPU @@ -38,6 +61,26 @@ 4 v4.8 + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + v4.5 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + v4.6.2 + AnyCPU pdbonly 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 c1f090f3..ee98de46 100644 --- a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj +++ b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj @@ -13,6 +13,7 @@ + v4.5 true diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeComboBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeComboBoxDemoCtl.xaml index 4503f163..0b3b45f4 100644 --- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeComboBoxDemoCtl.xaml +++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeComboBoxDemoCtl.xaml @@ -13,7 +13,7 @@ - + diff --git a/src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml b/src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml index 460eefcf..b0e301a8 100644 --- a/src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml +++ b/src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml @@ -1,22 +1,23 @@  + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:hc="https://handyorg.github.io/handycontrol" + mc:Ignorable="d" + xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs" + Title="{x:Static langs:Lang.About}" + ShowTitle="True" + BorderThickness="1" + BorderBrush="#262e2f" + Style="{StaticResource WindowWin10}" + ResizeMode="NoResize" + ShowInTaskbar="False" + WindowStartupLocation="CenterOwner" + Width="340" + Height="220"> +