diff --git a/HandyControl/HandyControl.csproj b/HandyControl/HandyControl.csproj
index 8ec96797..7a4202b1 100644
--- a/HandyControl/HandyControl.csproj
+++ b/HandyControl/HandyControl.csproj
@@ -186,6 +186,7 @@
+
diff --git a/HandyControlDemo/HandyControlDemo.csproj b/HandyControlDemo/HandyControlDemo.csproj
index cbbb9f37..9bfba767 100644
--- a/HandyControlDemo/HandyControlDemo.csproj
+++ b/HandyControlDemo/HandyControlDemo.csproj
@@ -130,6 +130,9 @@
ChatBox.xaml
+
+ InteractiveDialog.xaml
+
TextDialog.xaml
@@ -359,6 +362,7 @@
TreeViewDemoCtl.xaml
+
@@ -455,6 +459,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
diff --git a/HandyControlDemo/Properties/Langs/Lang.Designer.cs b/HandyControlDemo/Properties/Langs/Lang.Designer.cs
index 57bd671d..b51659bc 100644
--- a/HandyControlDemo/Properties/Langs/Lang.Designer.cs
+++ b/HandyControlDemo/Properties/Langs/Lang.Designer.cs
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
//
-// 此代码由工具生成。
-// 运行时版本:4.0.30319.42000
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.42000
//
-// 对此文件的更改可能会导致不正确的行为,并且如果
-// 重新生成代码,这些更改将会丢失。
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
//
//------------------------------------------------------------------------------
@@ -13,12 +13,12 @@ namespace HandyControlDemo.Properties.Langs {
///
- /// 一个强类型的资源类,用于查找本地化的字符串等。
+ /// A strongly-typed resource class, for looking up localized strings, etc.
///
- // 此类是由 StronglyTypedResourceBuilder
- // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
- // 若要添加或移除成员,请编辑 .ResX 文件,然后重新运行 ResGen
- // (以 /str 作为命令选项),或重新生成 VS 项目。
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
@@ -33,7 +33,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 返回此类使用的缓存的 ResourceManager 实例。
+ /// Returns the cached ResourceManager instance used by this class.
///
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
public static global::System.Resources.ResourceManager ResourceManager {
@@ -47,8 +47,8 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 使用此强类型资源类,为所有资源查找
- /// 重写当前线程的 CurrentUICulture 属性。
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
///
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
public static global::System.Globalization.CultureInfo Culture {
@@ -61,7 +61,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 关于 的本地化字符串。
+ /// Looks up a localized string similar to 关于.
///
public static string About {
get {
@@ -70,7 +70,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 动画路径 的本地化字符串。
+ /// Looks up a localized string similar to 动画路径.
///
public static string AnimationPath {
get {
@@ -79,7 +79,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 托盘图标已打开,将隐藏窗口而不是关闭程序 的本地化字符串。
+ /// Looks up a localized string similar to 托盘图标已打开,将隐藏窗口而不是关闭程序.
///
public static string AppClosingTip {
get {
@@ -88,7 +88,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 询问 的本地化字符串。
+ /// Looks up a localized string similar to 询问.
///
public static string Ask {
get {
@@ -97,7 +97,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 标记 的本地化字符串。
+ /// Looks up a localized string similar to 标记.
///
public static string Badge {
get {
@@ -106,7 +106,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 填写基本信息 的本地化字符串。
+ /// Looks up a localized string similar to 填写基本信息.
///
public static string BasicInfo {
get {
@@ -115,7 +115,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 闪烁 的本地化字符串。
+ /// Looks up a localized string similar to 闪烁.
///
public static string Blink {
get {
@@ -124,7 +124,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 博客 的本地化字符串。
+ /// Looks up a localized string similar to 博客.
///
public static string Blog {
get {
@@ -133,7 +133,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 边框 的本地化字符串。
+ /// Looks up a localized string similar to 边框.
///
public static string Border1 {
get {
@@ -142,7 +142,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 画刷 的本地化字符串。
+ /// Looks up a localized string similar to 画刷.
///
public static string Brush {
get {
@@ -151,7 +151,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 按钮 的本地化字符串。
+ /// Looks up a localized string similar to 按钮.
///
public static string Button {
get {
@@ -160,7 +160,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 透明按钮 的本地化字符串。
+ /// Looks up a localized string similar to 透明按钮.
///
public static string ButtonOpacity {
get {
@@ -169,7 +169,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 日历 的本地化字符串。
+ /// Looks up a localized string similar to 日历.
///
public static string Calendar {
get {
@@ -178,7 +178,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 带时钟的日历 的本地化字符串。
+ /// Looks up a localized string similar to 带时钟的日历.
///
public static string CalendarWithClock {
get {
@@ -187,7 +187,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 轮播 的本地化字符串。
+ /// Looks up a localized string similar to 轮播.
///
public static string Carousel {
get {
@@ -196,7 +196,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 是否重启以更改语言? 的本地化字符串。
+ /// Looks up a localized string similar to 是否重启以更改语言?.
///
public static string ChangeLangAsk {
get {
@@ -205,7 +205,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 对话气泡 的本地化字符串。
+ /// Looks up a localized string similar to 对话气泡.
///
public static string ChatBubble {
get {
@@ -214,7 +214,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 讨论室 的本地化字符串。
+ /// Looks up a localized string similar to 讨论室.
///
public static string Chatroom {
get {
@@ -223,7 +223,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 复选框 的本地化字符串。
+ /// Looks up a localized string similar to 复选框.
///
public static string CheckBox {
get {
@@ -232,7 +232,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 圆形布局 的本地化字符串。
+ /// Looks up a localized string similar to 圆形布局.
///
public static string CirclePanel {
get {
@@ -241,7 +241,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 清空 的本地化字符串。
+ /// Looks up a localized string similar to 清空.
///
public static string Clear {
get {
@@ -250,7 +250,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 时钟 的本地化字符串。
+ /// Looks up a localized string similar to 时钟.
///
public static string Clock {
get {
@@ -259,7 +259,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 颜色拾取器 的本地化字符串。
+ /// Looks up a localized string similar to 颜色拾取器.
///
public static string ColorPicker {
get {
@@ -268,7 +268,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 组合框 的本地化字符串。
+ /// Looks up a localized string similar to 组合框.
///
public static string ComboBox {
get {
@@ -277,7 +277,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 敬请期待 的本地化字符串。
+ /// Looks up a localized string similar to 敬请期待.
///
public static string ComingSoon {
get {
@@ -286,7 +286,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 评论 的本地化字符串。
+ /// Looks up a localized string similar to 评论.
///
public static string Comment {
get {
@@ -295,7 +295,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 一般 的本地化字符串。
+ /// Looks up a localized string similar to 一般.
///
public static string Common {
get {
@@ -304,7 +304,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 对比滑块 的本地化字符串。
+ /// Looks up a localized string similar to 对比滑块.
///
public static string CompareSlider {
get {
@@ -313,7 +313,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 完成 的本地化字符串。
+ /// Looks up a localized string similar to 完成.
///
public static string Complete {
get {
@@ -322,7 +322,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 这是内容 的本地化字符串。
+ /// Looks up a localized string similar to 这是内容.
///
public static string ContentDemoStr {
get {
@@ -331,7 +331,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 贡献者 的本地化字符串。
+ /// Looks up a localized string similar to 贡献者.
///
public static string Contributors {
get {
@@ -340,7 +340,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 控件 的本地化字符串。
+ /// Looks up a localized string similar to 控件.
///
public static string Controls {
get {
@@ -349,7 +349,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 封面流 的本地化字符串。
+ /// Looks up a localized string similar to 封面流.
///
public static string CoverFlow {
get {
@@ -358,7 +358,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 封面视图 的本地化字符串。
+ /// Looks up a localized string similar to 封面视图.
///
public static string CoverView {
get {
@@ -367,7 +367,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 危险 的本地化字符串。
+ /// Looks up a localized string similar to 危险.
///
public static string Danger {
get {
@@ -376,7 +376,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 数据表格 的本地化字符串。
+ /// Looks up a localized string similar to 数据表格.
///
public static string DataGrid {
get {
@@ -385,7 +385,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 日期选择器 的本地化字符串。
+ /// Looks up a localized string similar to 日期选择器.
///
public static string DatePicker {
get {
@@ -394,7 +394,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 日期时间选择器 的本地化字符串。
+ /// Looks up a localized string similar to 日期时间选择器.
///
public static string DateTimePicker {
get {
@@ -403,7 +403,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 默认 的本地化字符串。
+ /// Looks up a localized string similar to 默认.
///
public static string Default {
get {
@@ -412,7 +412,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 对话框 的本地化字符串。
+ /// Looks up a localized string similar to 对话框.
///
public static string Dialog {
get {
@@ -421,7 +421,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 在这里拖拽 的本地化字符串。
+ /// Looks up a localized string similar to 在这里拖拽.
///
public static string DragHere {
get {
@@ -430,7 +430,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 邮箱 的本地化字符串。
+ /// Looks up a localized string similar to 邮箱.
///
public static string Email {
get {
@@ -439,7 +439,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 错误 的本地化字符串。
+ /// Looks up a localized string similar to 错误.
///
public static string Error {
get {
@@ -448,7 +448,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 退出 的本地化字符串。
+ /// Looks up a localized string similar to 退出.
///
public static string Exit {
get {
@@ -457,7 +457,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 展开框 的本地化字符串。
+ /// Looks up a localized string similar to 展开框.
///
public static string Expander {
get {
@@ -466,7 +466,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 严重 的本地化字符串。
+ /// Looks up a localized string similar to 严重.
///
public static string Fatal {
get {
@@ -475,7 +475,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 翻页时钟 的本地化字符串。
+ /// Looks up a localized string similar to 翻页时钟.
///
public static string FlipClock {
get {
@@ -484,7 +484,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 Gif图片 的本地化字符串。
+ /// Looks up a localized string similar to Gif图片.
///
public static string GifImage {
get {
@@ -493,7 +493,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 回到顶部 的本地化字符串。
+ /// Looks up a localized string similar to 回到顶部.
///
public static string GotoTop {
get {
@@ -502,7 +502,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 头像 的本地化字符串。
+ /// Looks up a localized string similar to 头像.
///
public static string Gravatar {
get {
@@ -511,7 +511,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 分组框 的本地化字符串。
+ /// Looks up a localized string similar to 分组框.
///
public static string GroupBox {
get {
@@ -520,7 +520,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 组数 的本地化字符串。
+ /// Looks up a localized string similar to 组数.
///
public static string Groups {
get {
@@ -529,7 +529,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 信息通知 的本地化字符串。
+ /// Looks up a localized string similar to 信息通知.
///
public static string Growl {
get {
@@ -538,7 +538,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 检测到有新版本!是否更新? 的本地化字符串。
+ /// Looks up a localized string similar to 检测到有新版本!是否更新?.
///
public static string GrowlAsk {
get {
@@ -547,7 +547,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 消息通知示例 的本地化字符串。
+ /// Looks up a localized string similar to 消息通知示例.
///
public static string GrowlDemo {
get {
@@ -556,7 +556,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 连接失败,请检查网络! 的本地化字符串。
+ /// Looks up a localized string similar to 连接失败,请检查网络!.
///
public static string GrowlError {
get {
@@ -565,7 +565,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 程序已崩溃~~~ 的本地化字符串。
+ /// Looks up a localized string similar to 程序已崩溃~~~.
///
public static string GrowlFatal {
get {
@@ -574,7 +574,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 今天的天气不错~~~ 的本地化字符串。
+ /// Looks up a localized string similar to 今天的天气不错~~~.
///
public static string GrowlInfo {
get {
@@ -583,7 +583,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 文件保存成功! 的本地化字符串。
+ /// Looks up a localized string similar to 文件保存成功!.
///
public static string GrowlSuccess {
get {
@@ -592,7 +592,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 磁盘空间快要满了! 的本地化字符串。
+ /// Looks up a localized string similar to 磁盘空间快要满了!.
///
public static string GrowlWarning {
get {
@@ -601,7 +601,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 忽略 的本地化字符串。
+ /// Looks up a localized string similar to 忽略.
///
public static string Ignore {
get {
@@ -610,7 +610,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 图片浏览器 的本地化字符串。
+ /// Looks up a localized string similar to 图片浏览器.
///
public static string ImageBrowser {
get {
@@ -619,7 +619,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 索引 的本地化字符串。
+ /// Looks up a localized string similar to 索引.
///
public static string Index {
get {
@@ -628,7 +628,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 信息 的本地化字符串。
+ /// Looks up a localized string similar to 信息.
///
public static string Info {
get {
@@ -637,7 +637,16 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 不是手机号码 的本地化字符串。
+ /// Looks up a localized string similar to 可交互对话框.
+ ///
+ public static string InteractiveDialog {
+ get {
+ return ResourceManager.GetString("InteractiveDialog", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to 不是手机号码.
///
public static string IsNotPhone {
get {
@@ -646,7 +655,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 标签 的本地化字符串。
+ /// Looks up a localized string similar to 标签.
///
public static string Label {
get {
@@ -655,7 +664,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 列表框 的本地化字符串。
+ /// Looks up a localized string similar to 列表框.
///
public static string ListBox {
get {
@@ -664,7 +673,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 列表视图 的本地化字符串。
+ /// Looks up a localized string similar to 列表视图.
///
public static string ListView {
get {
@@ -673,7 +682,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 加载条 的本地化字符串。
+ /// Looks up a localized string similar to 加载条.
///
public static string Loading {
get {
@@ -682,7 +691,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 菜单 的本地化字符串。
+ /// Looks up a localized string similar to 菜单.
///
public static string Menu {
get {
@@ -691,7 +700,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 消息框 的本地化字符串。
+ /// Looks up a localized string similar to 消息框.
///
public static string MessageBox {
get {
@@ -700,7 +709,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 名称 的本地化字符串。
+ /// Looks up a localized string similar to 名称.
///
public static string Name {
get {
@@ -709,7 +718,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 新建窗口 的本地化字符串。
+ /// Looks up a localized string similar to 新建窗口.
///
public static string NewWindow {
get {
@@ -718,7 +727,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 下一步 的本地化字符串。
+ /// Looks up a localized string similar to 下一步.
///
public static string Next {
get {
@@ -727,7 +736,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 托盘图标 的本地化字符串。
+ /// Looks up a localized string similar to 托盘图标.
///
public static string NotifyIcon {
get {
@@ -736,7 +745,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 数值选择控件 的本地化字符串。
+ /// Looks up a localized string similar to 数值选择控件.
///
public static string NumericUpDown {
get {
@@ -745,7 +754,16 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 点击打开背景模糊窗口 的本地化字符串。
+ /// Looks up a localized string similar to 确定.
+ ///
+ public static string Ok {
+ get {
+ return ResourceManager.GetString("Ok", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to 点击打开背景模糊窗口.
///
public static string OpenBlurWindow {
get {
@@ -754,7 +772,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 点击打开常规窗口 的本地化字符串。
+ /// Looks up a localized string similar to 点击打开常规窗口.
///
public static string OpenCommonWindow {
get {
@@ -763,7 +781,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 点击打开自定义内容窗口 的本地化字符串。
+ /// Looks up a localized string similar to 点击打开自定义内容窗口.
///
public static string OpenCustomContentWindow {
get {
@@ -772,7 +790,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 点击打开自定义消息窗口 的本地化字符串。
+ /// Looks up a localized string similar to 点击打开自定义消息窗口.
///
public static string OpenCustomMessageWindow {
get {
@@ -781,7 +799,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 点击打开自定义非客户端区域窗口 的本地化字符串。
+ /// Looks up a localized string similar to 点击打开自定义非客户端区域窗口.
///
public static string OpenCustomNonClientAreaWindow {
get {
@@ -790,7 +808,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 点击打开图片浏览器 的本地化字符串。
+ /// Looks up a localized string similar to 点击打开图片浏览器.
///
public static string OpenImageBrowser {
get {
@@ -799,7 +817,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 点击打开消息窗口 的本地化字符串。
+ /// Looks up a localized string similar to 点击打开消息窗口.
///
public static string OpenMessageWindow {
get {
@@ -808,7 +826,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 点击打开鼠标跟随窗口 的本地化字符串。
+ /// Looks up a localized string similar to 点击打开鼠标跟随窗口.
///
public static string OpenMouseFollowWindow {
get {
@@ -817,7 +835,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 打开无非客户端区域可拖拽窗口 的本地化字符串。
+ /// Looks up a localized string similar to 打开无非客户端区域可拖拽窗口.
///
public static string OpenNoNonClientAreaDragableWindow {
get {
@@ -826,7 +844,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 打开面板 的本地化字符串。
+ /// Looks up a localized string similar to 打开面板.
///
public static string OpenPanel {
get {
@@ -835,7 +853,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 轮廓文本 的本地化字符串。
+ /// Looks up a localized string similar to 轮廓文本.
///
public static string OutlineText {
get {
@@ -844,7 +862,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 页码条 的本地化字符串。
+ /// Looks up a localized string similar to 页码条.
///
public static string Pagination {
get {
@@ -853,7 +871,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 密码框 的本地化字符串。
+ /// Looks up a localized string similar to 密码框.
///
public static string PasswordBox {
get {
@@ -862,7 +880,16 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 请稍后... 的本地化字符串。
+ /// Looks up a localized string similar to 请输入....
+ ///
+ public static string PleaseInput {
+ get {
+ return ResourceManager.GetString("PleaseInput", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to 请稍后....
///
public static string PleaseWait {
get {
@@ -871,7 +898,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 请输入内容 的本地化字符串。
+ /// Looks up a localized string similar to 请输入内容.
///
public static string PlsEnterContent {
get {
@@ -880,7 +907,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 请输入邮箱 的本地化字符串。
+ /// Looks up a localized string similar to 请输入邮箱.
///
public static string PlsEnterEmail {
get {
@@ -889,7 +916,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 请输入关键字 的本地化字符串。
+ /// Looks up a localized string similar to 请输入关键字.
///
public static string PlsEnterKey {
get {
@@ -898,7 +925,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 上一步 的本地化字符串。
+ /// Looks up a localized string similar to 上一步.
///
public static string Prev {
get {
@@ -907,7 +934,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 预览滑块 的本地化字符串。
+ /// Looks up a localized string similar to 预览滑块.
///
public static string PreviewSlider {
get {
@@ -916,7 +943,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 主要 的本地化字符串。
+ /// Looks up a localized string similar to 主要.
///
public static string Primary {
get {
@@ -925,7 +952,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 进度条 的本地化字符串。
+ /// Looks up a localized string similar to 进度条.
///
public static string ProgressBar {
get {
@@ -934,7 +961,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 进度按钮 的本地化字符串。
+ /// Looks up a localized string similar to 进度按钮.
///
public static string ProgressButton {
get {
@@ -943,7 +970,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 按住说话 的本地化字符串。
+ /// Looks up a localized string similar to 按住说话.
///
public static string PushToTalk {
get {
@@ -952,7 +979,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 QQ群 的本地化字符串。
+ /// Looks up a localized string similar to QQ群.
///
public static string QQGroup {
get {
@@ -961,7 +988,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 单选按钮 的本地化字符串。
+ /// Looks up a localized string similar to 单选按钮.
///
public static string RadioButton {
get {
@@ -970,7 +997,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 评分 的本地化字符串。
+ /// Looks up a localized string similar to 评分.
///
public static string Rate {
get {
@@ -979,7 +1006,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 注册 的本地化字符串。
+ /// Looks up a localized string similar to 注册.
///
public static string Register {
get {
@@ -988,7 +1015,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 备注 的本地化字符串。
+ /// Looks up a localized string similar to 备注.
///
public static string Remark {
get {
@@ -997,7 +1024,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 回复 的本地化字符串。
+ /// Looks up a localized string similar to 回复.
///
public static string Reply {
get {
@@ -1006,7 +1033,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 代码仓库 的本地化字符串。
+ /// Looks up a localized string similar to 代码仓库.
///
public static string Repository {
get {
@@ -1015,7 +1042,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 富文本框 的本地化字符串。
+ /// Looks up a localized string similar to 富文本框.
///
public static string RichTextBox {
get {
@@ -1024,7 +1051,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 在这里右击 的本地化字符串。
+ /// Looks up a localized string similar to 在这里右击.
///
public static string RightClickHere {
get {
@@ -1033,7 +1060,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 滚动视图 的本地化字符串。
+ /// Looks up a localized string similar to 滚动视图.
///
public static string ScrollViewer {
get {
@@ -1042,7 +1069,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 搜索栏 的本地化字符串。
+ /// Looks up a localized string similar to 搜索栏.
///
public static string SearchBar {
get {
@@ -1051,7 +1078,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 秒 的本地化字符串。
+ /// Looks up a localized string similar to 秒.
///
public static string Second {
get {
@@ -1060,7 +1087,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 选中 的本地化字符串。
+ /// Looks up a localized string similar to 选中.
///
public static string Selected {
get {
@@ -1069,7 +1096,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 徽章 的本地化字符串。
+ /// Looks up a localized string similar to 徽章.
///
public static string Shield {
get {
@@ -1078,7 +1105,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 显示行号 的本地化字符串。
+ /// Looks up a localized string similar to 显示行号.
///
public static string ShowRowNumber {
get {
@@ -1087,7 +1114,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 滑块 的本地化字符串。
+ /// Looks up a localized string similar to 滑块.
///
public static string Slider {
get {
@@ -1096,7 +1123,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 步骤 的本地化字符串。
+ /// Looks up a localized string similar to 步骤.
///
public static string Step {
get {
@@ -1105,7 +1132,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 步骤条 的本地化字符串。
+ /// Looks up a localized string similar to 步骤条.
///
public static string StepBar {
get {
@@ -1114,7 +1141,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 样式模板 的本地化字符串。
+ /// Looks up a localized string similar to 样式模板.
///
public static string Styles {
get {
@@ -1123,7 +1150,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 子标题 的本地化字符串。
+ /// Looks up a localized string similar to 子标题.
///
public static string SubTitle {
get {
@@ -1132,7 +1159,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 成功 的本地化字符串。
+ /// Looks up a localized string similar to 成功.
///
public static string Success {
get {
@@ -1141,7 +1168,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 选项卡控件 的本地化字符串。
+ /// Looks up a localized string similar to 选项卡控件.
///
public static string TabControl {
get {
@@ -1150,7 +1177,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 标签 的本地化字符串。
+ /// Looks up a localized string similar to 标签.
///
public static string Tag {
get {
@@ -1159,7 +1186,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 正文 的本地化字符串。
+ /// Looks up a localized string similar to 正文.
///
public static string Text {
get {
@@ -1168,7 +1195,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 文本块 的本地化字符串。
+ /// Looks up a localized string similar to 文本块.
///
public static string TextBlock {
get {
@@ -1177,7 +1204,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 文本框 的本地化字符串。
+ /// Looks up a localized string similar to 文本框.
///
public static string TextBox {
get {
@@ -1186,7 +1213,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 文本对话框 的本地化字符串。
+ /// Looks up a localized string similar to 文本对话框.
///
public static string TextDialog {
get {
@@ -1195,7 +1222,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 时间条 的本地化字符串。
+ /// Looks up a localized string similar to 时间条.
///
public static string TimeBar {
get {
@@ -1204,7 +1231,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 时间选择器 的本地化字符串。
+ /// Looks up a localized string similar to 时间选择器.
///
public static string TimePicker {
get {
@@ -1213,7 +1240,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 提示 的本地化字符串。
+ /// Looks up a localized string similar to 提示.
///
public static string Tip {
get {
@@ -1222,7 +1249,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 标题 的本地化字符串。
+ /// Looks up a localized string similar to 标题.
///
public static string Title {
get {
@@ -1231,7 +1258,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 这是标题 的本地化字符串。
+ /// Looks up a localized string similar to 这是标题.
///
public static string TitleDemoStr1 {
get {
@@ -1240,7 +1267,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 此项必填 的本地化字符串。
+ /// Looks up a localized string similar to 此项必填.
///
public static string TitleDemoStr2 {
get {
@@ -1249,7 +1276,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 标题在左侧 的本地化字符串。
+ /// Looks up a localized string similar to 标题在左侧.
///
public static string TitleDemoStr3 {
get {
@@ -1258,7 +1285,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 切换按钮 的本地化字符串。
+ /// Looks up a localized string similar to 切换按钮.
///
public static string ToggleButton {
get {
@@ -1267,7 +1294,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 工具条 的本地化字符串。
+ /// Looks up a localized string similar to 工具条.
///
public static string ToolBar {
get {
@@ -1276,7 +1303,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 穿梭框 的本地化字符串。
+ /// Looks up a localized string similar to 穿梭框.
///
public static string Transfer {
get {
@@ -1285,7 +1312,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 树视图 的本地化字符串。
+ /// Looks up a localized string similar to 树视图.
///
public static string TreeView {
get {
@@ -1294,7 +1321,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 试试关闭程序吧? 的本地化字符串。
+ /// Looks up a localized string similar to 试试关闭程序吧?.
///
public static string Try2CloseApp {
get {
@@ -1303,7 +1330,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 类型 的本地化字符串。
+ /// Looks up a localized string similar to 类型.
///
public static string Type {
get {
@@ -1312,7 +1339,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 上传文件 的本地化字符串。
+ /// Looks up a localized string similar to 上传文件.
///
public static string UploadFile {
get {
@@ -1321,7 +1348,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 上传;上传中 的本地化字符串。
+ /// Looks up a localized string similar to 上传;上传中.
///
public static string UploadStr {
get {
@@ -1330,7 +1357,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 可见性 的本地化字符串。
+ /// Looks up a localized string similar to 可见性.
///
public static string Visibility {
get {
@@ -1339,7 +1366,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 警告 的本地化字符串。
+ /// Looks up a localized string similar to 警告.
///
public static string Warning {
get {
@@ -1348,7 +1375,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 瀑布流 的本地化字符串。
+ /// Looks up a localized string similar to 瀑布流.
///
public static string WaterfallPanel {
get {
@@ -1357,7 +1384,7 @@ namespace HandyControlDemo.Properties.Langs {
}
///
- /// 查找类似 窗口 的本地化字符串。
+ /// Looks up a localized string similar to 窗口.
///
public static string Window {
get {
diff --git a/HandyControlDemo/Properties/Langs/Lang.en.resx b/HandyControlDemo/Properties/Langs/Lang.en.resx
index ea35ef98..bfa5f15c 100644
--- a/HandyControlDemo/Properties/Langs/Lang.en.resx
+++ b/HandyControlDemo/Properties/Langs/Lang.en.resx
@@ -552,4 +552,13 @@
Try to close app?
+
+ Interactive Dialog
+
+
+ Ok
+
+
+ Please input...
+
\ No newline at end of file
diff --git a/HandyControlDemo/Properties/Langs/Lang.resx b/HandyControlDemo/Properties/Langs/Lang.resx
index f6cf4a2e..0b765b5f 100644
--- a/HandyControlDemo/Properties/Langs/Lang.resx
+++ b/HandyControlDemo/Properties/Langs/Lang.resx
@@ -552,4 +552,13 @@
试试关闭程序吧?
+
+ 可交互对话框
+
+
+ 确定
+
+
+ 请输入...
+
\ No newline at end of file
diff --git a/HandyControlDemo/UserControl/Basic/InteractiveDialog.xaml b/HandyControlDemo/UserControl/Basic/InteractiveDialog.xaml
new file mode 100644
index 00000000..c2e488c7
--- /dev/null
+++ b/HandyControlDemo/UserControl/Basic/InteractiveDialog.xaml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
diff --git a/HandyControlDemo/UserControl/Basic/InteractiveDialog.xaml.cs b/HandyControlDemo/UserControl/Basic/InteractiveDialog.xaml.cs
new file mode 100644
index 00000000..00718cbf
--- /dev/null
+++ b/HandyControlDemo/UserControl/Basic/InteractiveDialog.xaml.cs
@@ -0,0 +1,13 @@
+namespace HandyControlDemo.UserControl.Basic
+{
+ ///
+ /// Interaction logic for InteractiveDialog.xaml
+ ///
+ public partial class InteractiveDialog
+ {
+ public InteractiveDialog()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/HandyControlDemo/UserControl/Controls/DialogDemoCtl.xaml b/HandyControlDemo/UserControl/Controls/DialogDemoCtl.xaml
index b5de0cf5..09d40c3e 100644
--- a/HandyControlDemo/UserControl/Controls/DialogDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Controls/DialogDemoCtl.xaml
@@ -3,6 +3,19 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
Background="{DynamicResource RegionBrush}"
- DataContext="{Binding DialogDemo,Source={StaticResource Locator}}">
-
+ DataContext="{Binding DialogDemo,Source={StaticResource Locator}}"
+ Width="300">
+
+
+
+
+
diff --git a/HandyControlDemo/ViewModel/Basic/InteractiveDialogViewModel.cs b/HandyControlDemo/ViewModel/Basic/InteractiveDialogViewModel.cs
new file mode 100644
index 00000000..c447fcef
--- /dev/null
+++ b/HandyControlDemo/ViewModel/Basic/InteractiveDialogViewModel.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Windows.Input;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.CommandWpf;
+using HandyControl.Tools.Extension;
+
+namespace HandyControlDemo.ViewModel.Basic
+{
+ public class InteractiveDialogViewModel : ViewModelBase, IDialogResultable
+ {
+ private string _message;
+
+
+ public object Result { get; set; }
+
+ public Action ClosureToken { get; set; }
+
+ public ICommand CloseCommand { get; }
+
+ public string Message
+ {
+ get => _message;
+ set => Set(ref _message, value);
+ }
+
+
+ public InteractiveDialogViewModel()
+ {
+ CloseCommand = new RelayCommand(result =>
+ {
+ Result = result;
+ ClosureToken();
+ });
+ }
+ }
+}
diff --git a/HandyControlDemo/ViewModel/Controls/DialogDemoViewModel.cs b/HandyControlDemo/ViewModel/Controls/DialogDemoViewModel.cs
index 5aeee60c..7f79b718 100644
--- a/HandyControlDemo/ViewModel/Controls/DialogDemoViewModel.cs
+++ b/HandyControlDemo/ViewModel/Controls/DialogDemoViewModel.cs
@@ -1,16 +1,43 @@
using System;
+using System.Windows.Input;
using GalaSoft.MvvmLight;
using GalaSoft.MvvmLight.CommandWpf;
using HandyControl.Controls;
+using HandyControl.Tools.Extension;
+using HandyControlDemo.Properties.Langs;
using HandyControlDemo.UserControl;
+using HandyControlDemo.UserControl.Basic;
+using HandyControlDemo.ViewModel.Basic;
namespace HandyControlDemo.ViewModel
{
public class DialogDemoViewModel : ViewModelBase
{
+ private string _dialogResult;
+
public RelayCommand ShowTextCmd => new Lazy(() =>
new RelayCommand(ShowText)).Value;
+ public string DialogResult
+ {
+ get => _dialogResult;
+ set => Set(ref _dialogResult, value);
+ }
+
+ public ICommand ShowInteractiveDialogCmd { get; }
+
+ public DialogDemoViewModel()
+ {
+ DialogResult = Lang.PleaseInput;
+
+ ShowInteractiveDialogCmd = new RelayCommand(async message =>
+ {
+ DialogResult = await Dialog.Show()
+ .Initialize(vm => vm.Message = message)
+ .GetResultAsync();
+ });
+ }
+
private void ShowText()
{
Dialog.Show(new TextDialog());
diff --git a/HandyControlDemo/ViewModel/ViewModelLocator.cs b/HandyControlDemo/ViewModel/ViewModelLocator.cs
index c6089cd3..940975cc 100644
--- a/HandyControlDemo/ViewModel/ViewModelLocator.cs
+++ b/HandyControlDemo/ViewModel/ViewModelLocator.cs
@@ -5,6 +5,7 @@ using CommonServiceLocator;
using GalaSoft.MvvmLight.Ioc;
using HandyControlDemo.Data;
using HandyControlDemo.Service;
+using HandyControlDemo.ViewModel.Basic;
namespace HandyControlDemo.ViewModel
{
@@ -30,6 +31,7 @@ namespace HandyControlDemo.ViewModel
SimpleIoc.Default.Register();
SimpleIoc.Default.Register();
SimpleIoc.Default.Register();
+ SimpleIoc.Default.Register();
}
public static ViewModelLocator Instance => new Lazy(() =>
@@ -65,6 +67,7 @@ namespace HandyControlDemo.ViewModel
public NotifyIconDemoViewModel NotifyIconDemo => ServiceLocator.Current.GetInstance();
+ public InteractiveDialogViewModel InteractiveDialog => ServiceLocator.Current.GetInstance();
#endregion
}
}
\ No newline at end of file