diff --git a/HandyControl/HandyControl.csproj b/HandyControl/HandyControl.csproj
index a01d6620..a5a8e24d 100644
--- a/HandyControl/HandyControl.csproj
+++ b/HandyControl/HandyControl.csproj
@@ -398,6 +398,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
@@ -450,6 +454,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
diff --git a/HandyControl/Themes/Styles/Base/DialogBaseStyle.xaml b/HandyControl/Themes/Styles/Base/DialogBaseStyle.xaml
new file mode 100644
index 00000000..4516fd43
--- /dev/null
+++ b/HandyControl/Themes/Styles/Base/DialogBaseStyle.xaml
@@ -0,0 +1,9 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/HandyControl/Themes/Styles/Dialog.xaml b/HandyControl/Themes/Styles/Dialog.xaml
new file mode 100644
index 00000000..d74f807e
--- /dev/null
+++ b/HandyControl/Themes/Styles/Dialog.xaml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/HandyControl/Themes/Styles/Style.xaml b/HandyControl/Themes/Styles/Style.xaml
index 41cf4b86..be50b99a 100644
--- a/HandyControl/Themes/Styles/Style.xaml
+++ b/HandyControl/Themes/Styles/Style.xaml
@@ -60,6 +60,7 @@
+
\ No newline at end of file
diff --git a/HandyControlDemo/Data/MessageToken.cs b/HandyControlDemo/Data/MessageToken.cs
index 44fa6c82..31d0e3ba 100644
--- a/HandyControlDemo/Data/MessageToken.cs
+++ b/HandyControlDemo/Data/MessageToken.cs
@@ -88,6 +88,8 @@
public static readonly string GravatarDemoCtl = nameof(GravatarDemoCtl);
+ public static readonly string DialogDemoCtl = nameof(DialogDemoCtl);
+
public static readonly string ButtonDemoCtl = nameof(ButtonDemoCtl);
public static readonly string ToggleButtonDemoCtl = nameof(ToggleButtonDemoCtl);
diff --git a/HandyControlDemo/Data/MessageToken.tt b/HandyControlDemo/Data/MessageToken.tt
index 549a85ed..c4801cee 100644
--- a/HandyControlDemo/Data/MessageToken.tt
+++ b/HandyControlDemo/Data/MessageToken.tt
@@ -46,7 +46,8 @@ var controlList = new List
"ChatBubbleDemoCtl",
"GotoTopDemoCtl",
"BadgeDemoCtl",
- "GravatarDemoCtl"
+ "GravatarDemoCtl",
+ "DialogDemoCtl"
};
var styleList = new List
{
diff --git a/HandyControlDemo/HandyControlDemo.csproj b/HandyControlDemo/HandyControlDemo.csproj
index 58544d2e..c9039d90 100644
--- a/HandyControlDemo/HandyControlDemo.csproj
+++ b/HandyControlDemo/HandyControlDemo.csproj
@@ -148,6 +148,9 @@
CirclePanelDemoCtl.xaml
+
+ DialogDemoCtl.xaml
+
ProgressBarDemoCtl.xaml
@@ -464,6 +467,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
@@ -774,6 +781,7 @@
TextTemplatingFileGenerator
MessageToken.cs
+
diff --git a/HandyControlDemo/Properties/Langs/Lang.Designer.cs b/HandyControlDemo/Properties/Langs/Lang.Designer.cs
index 073911db..33c85990 100644
--- a/HandyControlDemo/Properties/Langs/Lang.Designer.cs
+++ b/HandyControlDemo/Properties/Langs/Lang.Designer.cs
@@ -393,6 +393,15 @@ namespace HandyControlDemo.Properties.Langs {
}
}
+ ///
+ /// 查找类似 对话框 的本地化字符串。
+ ///
+ public static string Dialog {
+ get {
+ return ResourceManager.GetString("Dialog", resourceCulture);
+ }
+ }
+
///
/// 查找类似 在这里拖拽 的本地化字符串。
///
diff --git a/HandyControlDemo/Properties/Langs/Lang.en.resx b/HandyControlDemo/Properties/Langs/Lang.en.resx
index 031b4922..5147ebc0 100644
--- a/HandyControlDemo/Properties/Langs/Lang.en.resx
+++ b/HandyControlDemo/Properties/Langs/Lang.en.resx
@@ -513,4 +513,7 @@
Reply
+
+ Dialog
+
\ No newline at end of file
diff --git a/HandyControlDemo/Properties/Langs/Lang.resx b/HandyControlDemo/Properties/Langs/Lang.resx
index 4bfbd4a1..b3d34753 100644
--- a/HandyControlDemo/Properties/Langs/Lang.resx
+++ b/HandyControlDemo/Properties/Langs/Lang.resx
@@ -513,4 +513,7 @@
回复
+
+ 对话框
+
\ No newline at end of file
diff --git a/HandyControlDemo/Resources/Img/LeftMainContent/Dialog_16x.png b/HandyControlDemo/Resources/Img/LeftMainContent/Dialog_16x.png
new file mode 100644
index 00000000..9339fe6f
Binary files /dev/null and b/HandyControlDemo/Resources/Img/LeftMainContent/Dialog_16x.png differ
diff --git a/HandyControlDemo/UserControl/Controls/DialogDemoCtl.xaml b/HandyControlDemo/UserControl/Controls/DialogDemoCtl.xaml
new file mode 100644
index 00000000..67ae2df6
--- /dev/null
+++ b/HandyControlDemo/UserControl/Controls/DialogDemoCtl.xaml
@@ -0,0 +1,6 @@
+
+
+
diff --git a/HandyControlDemo/UserControl/Controls/DialogDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Controls/DialogDemoCtl.xaml.cs
new file mode 100644
index 00000000..a67e46c5
--- /dev/null
+++ b/HandyControlDemo/UserControl/Controls/DialogDemoCtl.xaml.cs
@@ -0,0 +1,10 @@
+namespace HandyControlDemo.UserControl
+{
+ public partial class DialogDemoCtl
+ {
+ public DialogDemoCtl()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/HandyControlDemo/UserControl/Main/LeftMainContent.xaml b/HandyControlDemo/UserControl/Main/LeftMainContent.xaml
index 2d7871ff..8b0a2bb3 100644
--- a/HandyControlDemo/UserControl/Main/LeftMainContent.xaml
+++ b/HandyControlDemo/UserControl/Main/LeftMainContent.xaml
@@ -208,7 +208,7 @@
-
+
@@ -388,6 +388,11 @@
+
+
+
+
+