diff --git a/doc/source/handycontrol/attach/linkElement/index.md b/doc/source/handycontrol/attach/passwordBoxAttach/index.md similarity index 100% rename from doc/source/handycontrol/attach/linkElement/index.md rename to doc/source/handycontrol/attach/passwordBoxAttach/index.md diff --git a/doc/source/handycontrol/attach/passwordBoxMonitor/index.md b/doc/source/handycontrol/attach/passwordBoxMonitor/index.md deleted file mode 100644 index ca12ad62..00000000 --- a/doc/source/handycontrol/attach/passwordBoxMonitor/index.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: 建设中 ---- - -建设中 \ 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 3af87443..8b936e70 100644 --- a/doc/source/handycontrol/basic_xaml/converters/index.md +++ b/doc/source/handycontrol/basic_xaml/converters/index.md @@ -50,6 +50,10 @@ title: 转换器 如果该转换器获取到的值为`null`则返回`false`，否则返回`true`。 +# Object2VisibilityConverter + +如果该转换器获取到的值为`null`则返回`Collapsed`，否则返回`Visible`。 + # String2VisibilityConverter 该转换器接受一个字符串，如果该字符串为空或者为null，则返回`Collapse`，否则返回`Visible`。 diff --git a/doc/source/handycontrol/images/Build_Config.png b/doc/source/handycontrol/images/Build_Config.png index 1c030a11..8568462f 100644 Binary files a/doc/source/handycontrol/images/Build_Config.png and b/doc/source/handycontrol/images/Build_Config.png differ diff --git a/doc/source/handycontrol/images/Project_Structure.png b/doc/source/handycontrol/images/Project_Structure.png index 79dc7658..e7a9f4ed 100644 Binary files a/doc/source/handycontrol/images/Project_Structure.png and b/doc/source/handycontrol/images/Project_Structure.png differ diff --git a/doc/source/handycontrol/index.md b/doc/source/handycontrol/index.md index 1be36394..cf901cf9 100644 --- a/doc/source/handycontrol/index.md +++ b/doc/source/handycontrol/index.md @@ -8,8 +8,8 @@ HandyControl是一套WPF控件库，它几乎重写了所有原生样式，同 - .Net >= 4.0 - OS >= win7 - - IDE >= vs2017 - - C# >= 7.0 + - IDE >= vs2019 + - C# >= 7.3 # 下载 @@ -28,7 +28,7 @@ Github上一般每天都有更新，相对而言不适合用于生产。 {% endnote %} {% note warning %} -文档的更新速度必然跟不上最新的Github源码，有出入的地方一切以本文档为准，因为文档是相对稳定的。 +文档的更新速度必然跟不上最新的Github源码，有出入的地方一切以Github上Demo示例为准。 {% endnote %} # 项目结构介绍 @@ -38,7 +38,7 @@ Github上一般每天都有更新，相对而言不适合用于生产。 从Github上克隆好源码后，进入src文件夹，该文件夹结构如下： ![Project_Structure](images/Project_Structure.png) -这里一共有三个解决方案sln文件，需要注意的是HandyControl_Core30.sln需要用VS2019打开，其它两个用VS2017即可。 +这里一共有4个解决方案sln文件。 `Net_GE45`的意思是.Net版本大于等于4.5 @@ -83,6 +83,6 @@ Controls中的每个控件一般都能在Themes中找到对应的xaml定义。 {% endnote %} {% note info %} -HandyControl_Net_GE45.sln解决方案中包含了3个项目类型，分别是.Net 4.5、.Net 4.6.2和.Net 4.7，请在解决方案配置下拉框中进行选择： +打开HandyControl.sln，在解决方案配置下拉框中选择指定的环境进行编译： ![Build_Config](images/Build_Config.png) {% endnote %} \ No newline at end of file diff --git a/doc/source/handycontrol/tnx/index.md b/doc/source/handycontrol/tnx/index.md index 56d2b7a1..671466f7 100644 --- a/doc/source/handycontrol/tnx/index.md +++ b/doc/source/handycontrol/tnx/index.md @@ -16,5 +16,4 @@ title: 鸣谢 # 感谢以下捐赠者 -

bigorange1900bigorange1900

-QQ：1942142462 \ No newline at end of file +

bigorange1900bigorange1900bigorange1900bigorange1900

\ No newline at end of file diff --git a/doc/themes/next/_config.yml b/doc/themes/next/_config.yml index 49b310a1..23fc04f2 100644 --- a/doc/themes/next/_config.yml +++ b/doc/themes/next/_config.yml @@ -161,8 +161,8 @@ menu: HandyControl: default: /handycontrol/ || 鸣谢: /tnx/ || - 总览: /overview/ || - 规范: /specifications/ || + # 总览: /overview/ || + # 规范: /specifications/ || 基础xaml定义: default: /basic_xaml/ || 行为: /behaviors/ || @@ -176,21 +176,20 @@ menu: 尺寸: /sizes/ || 附加属性: default: /attach/ || - BackgroundSwitchElement: /backgroundSwitchElement/ || - BorderElement: /borderElement/ || - DataGridAttach: /dataGridAttach/ || + BackgroundSwitchElement 可切换背景的元素: /backgroundSwitchElement/ || + BorderElement 具有边框的元素: /borderElement/ || + DataGridAttach DataGrid专用: /dataGridAttach/ || EdgeElement: /edgeElement/ || - IconElement: /iconElement/ || - IconSwitchElement: /iconSwitchElement/ || - InfoElement: /infoElement/ || - LinkElement: /linkElement/ || - PanelElement: /panelElement/ || - PasswordBoxMonitor: /passwordBoxMonitor/ || - StatusSwitchElement: /statusSwitchElement/ || - TipElement: /tipElement/ || - TitleElement: /titleElement/ || - VisualElement: /visualElement/ || - WindowAttach: /windowAttach/ || + IconElement 具有图标的元素: /iconElement/ || + IconSwitchElement 可切换图标的元素: /iconSwitchElement/ || + InfoElement 信息元素: /infoElement/ || + PanelElement 面板元素: /panelElement/ || + PasswordBoxAttach 密码框专用: /passwordBoxAttach/ || + StatusSwitchElement 可切换状态的元素: /statusSwitchElement/ || + TipElement 提示元素: /tipElement/ || + TitleElement 标题元素: /titleElement/ || + VisualElement 可视化元素: /visualElement/ || + WindowAttach 窗体专用: /windowAttach/ || 原生控件: default: /native_controls/ || Border 边框: /border/ || diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/PasswordBoxMonitor.cs b/src/Shared/HandyControl_Shared/Controls/Attach/PasswordBoxAttach.cs similarity index 84% rename from src/Shared/HandyControl_Shared/Controls/Attach/PasswordBoxMonitor.cs rename to src/Shared/HandyControl_Shared/Controls/Attach/PasswordBoxAttach.cs index 23792d37..754533ce 100644 --- a/src/Shared/HandyControl_Shared/Controls/Attach/PasswordBoxMonitor.cs +++ b/src/Shared/HandyControl_Shared/Controls/Attach/PasswordBoxAttach.cs @@ -3,13 +3,13 @@ using HandyControl.Data; namespace HandyControl.Controls { - public class PasswordBoxMonitor + public class PasswordBoxAttach { /// /// 密码长度 /// public static readonly DependencyProperty PasswordLengthProperty = DependencyProperty.RegisterAttached( - "PasswordLength", typeof(int), typeof(PasswordBoxMonitor), new PropertyMetadata(ValueBoxes.Int0Box)); + "PasswordLength", typeof(int), typeof(PasswordBoxAttach), new PropertyMetadata(ValueBoxes.Int0Box)); public static void SetPasswordLength(DependencyObject element, int value) => element.SetValue(PasswordLengthProperty, value); @@ -19,7 +19,7 @@ namespace HandyControl.Controls /// 是否监测 /// public static readonly DependencyProperty IsMonitoringProperty = DependencyProperty.RegisterAttached( - "IsMonitoring", typeof(bool), typeof(PasswordBoxMonitor), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.Inherits, OnIsMonitoringChanged)); + "IsMonitoring", typeof(bool), typeof(PasswordBoxAttach), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.Inherits, OnIsMonitoringChanged)); private static void OnIsMonitoringChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) { diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems index 9fdd777a..780c94e0 100644 --- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems +++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems @@ -17,7 +17,7 @@ - + diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/PasswordBoxBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/PasswordBoxBaseStyle.xaml index f9073bbc..d79a4f45 100644 --- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/PasswordBoxBaseStyle.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/PasswordBoxBaseStyle.xaml @@ -65,7 +65,7 @@ - + @@ -97,7 +97,7 @@ - + @@ -119,7 +119,7 @@ - + @@ -146,7 +146,7 @@ - + @@ -296,7 +296,7 @@ - +