From e6719725df98cc8ef03a5dc1cdb37df813abaead Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Mon, 11 Mar 2019 22:17:15 +0800
Subject: [PATCH] init pr

---
 HandyControl/HandyControl.csproj                  |   8 ++++++++
 .../Themes/Styles/Base/DialogBaseStyle.xaml       |   9 +++++++++
 HandyControl/Themes/Styles/Dialog.xaml            |  10 ++++++++++
 HandyControl/Themes/Styles/Style.xaml             |   1 +
 HandyControlDemo/Data/MessageToken.cs             |   2 ++
 HandyControlDemo/Data/MessageToken.tt             |   3 ++-
 HandyControlDemo/HandyControlDemo.csproj          |   8 ++++++++
 .../Properties/Langs/Lang.Designer.cs             |   9 +++++++++
 HandyControlDemo/Properties/Langs/Lang.en.resx    |   3 +++
 HandyControlDemo/Properties/Langs/Lang.resx       |   3 +++
 .../Resources/Img/LeftMainContent/Dialog_16x.png  | Bin 0 -> 183 bytes
 .../UserControl/Controls/DialogDemoCtl.xaml       |   6 ++++++
 .../UserControl/Controls/DialogDemoCtl.xaml.cs    |  10 ++++++++++
 .../UserControl/Main/LeftMainContent.xaml         |   7 ++++++-
 14 files changed, 77 insertions(+), 2 deletions(-)
 create mode 100644 HandyControl/Themes/Styles/Base/DialogBaseStyle.xaml
 create mode 100644 HandyControl/Themes/Styles/Dialog.xaml
 create mode 100644 HandyControlDemo/Resources/Img/LeftMainContent/Dialog_16x.png
 create mode 100644 HandyControlDemo/UserControl/Controls/DialogDemoCtl.xaml
 create mode 100644 HandyControlDemo/UserControl/Controls/DialogDemoCtl.xaml.cs

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 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Themes\Styles\Base\DialogBaseStyle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Themes\Styles\Base\GotoTopBaseStyle.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -450,6 +454,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Themes\Styles\Dialog.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Themes\Styles\FlipClock.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
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 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:HandyControl.Controls">
+
+    <Style x:Key="DialogBaseStyle" TargetType="controls:Dialog">
+        
+    </Style>
+
+</ResourceDictionary>
\ 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 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:controls="clr-namespace:HandyControl.Controls">
+    
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Base/DialogBaseStyle.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style BasedOn="{StaticResource DialogBaseStyle}" TargetType="controls:Dialog"/>
+
+</ResourceDictionary>
\ 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 @@
         <ResourceDictionary Source="GotoTop.xaml"/>
         <ResourceDictionary Source="Gravatar.xaml"/>
         <ResourceDictionary Source="Badge.xaml"/>
+        <ResourceDictionary Source="Dialog.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
 </ResourceDictionary>
\ 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<string>
 	"ChatBubbleDemoCtl",
 	"GotoTopDemoCtl",
 	"BadgeDemoCtl",
-	"GravatarDemoCtl"
+	"GravatarDemoCtl",
+	"DialogDemoCtl"
 };
 var styleList = new List<string>
 {
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 @@
     <Compile Include="UserControl\Controls\CirclePanelDemoCtl.xaml.cs">
       <DependentUpon>CirclePanelDemoCtl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="UserControl\Controls\DialogDemoCtl.xaml.cs">
+      <DependentUpon>DialogDemoCtl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="UserControl\Controls\ProgressBarDemoCtl.xaml.cs">
       <DependentUpon>ProgressBarDemoCtl.xaml</DependentUpon>
     </Compile>
@@ -464,6 +467,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="UserControl\Controls\DialogDemoCtl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="UserControl\Controls\ProgressBarDemoCtl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -774,6 +781,7 @@
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>MessageToken.cs</LastGenOutput>
     </Content>
+    <Resource Include="Resources\Img\LeftMainContent\Dialog_16x.png" />
     <Resource Include="Resources\Img\under_construction.gif" />
     <Resource Include="Resources\Img\LeftMainContent\User_16x.png" />
     <Resource Include="Resources\Img\LeftMainContent\DotLarge_16x.png" />
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 {
             }
         }
         
+        /// <summary>
+        ///   查找类似 对话框 的本地化字符串。
+        /// </summary>
+        public static string Dialog {
+            get {
+                return ResourceManager.GetString("Dialog", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 在这里拖拽 的本地化字符串。
         /// </summary>
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 @@
   <data name="Reply" xml:space="preserve">
     <value>Reply</value>
   </data>
+  <data name="Dialog" xml:space="preserve">
+    <value>Dialog</value>
+  </data>
 </root>
\ 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 @@
   <data name="Reply" xml:space="preserve">
     <value>回复</value>
   </data>
+  <data name="Dialog" xml:space="preserve">
+    <value>对话框</value>
+  </data>
 </root>
\ 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 0000000000000000000000000000000000000000..9339fe6f851dbe284e48ce2dee11893b59337a9e
GIT binary patch
literal 183
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F5M?jcysy3fAP%zWe
z#WAEJZtrAAt_A}hmgJkypDx-Ly!T1&PAyxOBYUr~$ZF_l`pj}rFSlRHP!$k*G9m5K
z61Ug}j^AY`q^FhgF^cD3a_^nps3)W>(0s|>?SU1i;f{~*%Pz3(`tEG`x#@%sM>X4#
c^{0v$eL{6j1=cJAx`2Vf)78&qol`;+0Np-3`~Uy|

literal 0
HcmV?d00001

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 @@
+<UserControl x:Class="HandyControlDemo.UserControl.DialogDemoCtl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:userControl="clr-namespace:HandyControlDemo.UserControl">
+    <userControl:UnderConstruction/>
+</UserControl>
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 @@
                             <Image Source="../../Resources/Img/LeftMainContent/ProgressButton_16x.png"/>
                         </controls:EdgeElement.LeftContent>
                     </ListBoxItem>
-                    <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.ChatBubbleDemoCtl}" Content="{x:Static langs:Lang.ChatBubble}">
+                    <ListBoxItem Tag="{x:Static data:MessageToken.ChatBubbleDemoCtl}" Content="{x:Static langs:Lang.ChatBubble}">
                         <controls:EdgeElement.LeftContent>
                             <Image Source="../../Resources/Img/LeftMainContent/Bubble_16xLG.png"/>
                         </controls:EdgeElement.LeftContent>
@@ -388,6 +388,11 @@
                             <Image Source="../../Resources/Img/LeftMainContent/ScrollBox_16x.png"/>
                         </controls:EdgeElement.LeftContent>
                     </ListBoxItem>
+                    <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.DialogDemoCtl}" Content="{x:Static langs:Lang.Dialog}">
+                        <controls:EdgeElement.LeftContent>
+                            <Image Source="../../Resources/Img/LeftMainContent/Dialog_16x.png"/>
+                        </controls:EdgeElement.LeftContent>
+                    </ListBoxItem>
                     <ListBoxItem Tag="{x:Static data:MessageToken.WindowDemoCtl}" Content="{x:Static langs:Lang.Window}">
                         <controls:EdgeElement.LeftContent>
                             <Image Source="../../Resources/Img/LeftMainContent/WindowsForm_16x.png"/>