From 76248707c670c0b5f347f165ad083b0ac168e29f Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 27 Apr 2019 23:32:15 +0800
Subject: [PATCH] init demo
---
.../HandyControlDemo_Net_GE45.csproj | 3 +++
.../HandyControlDemo_Shared/Data/MessageToken.cs | 2 ++
.../HandyControlDemo_Shared/Data/MessageToken.tt | 3 ++-
.../HandyControlDemo_Shared.projitems | 7 +++++++
.../Properties/Langs/Lang.Designer.cs | 9 +++++++++
.../Properties/Langs/Lang.en.resx | 3 +++
.../Properties/Langs/Lang.resx | 3 +++
.../Img/LeftMainContent/MainMenuControl_16x.png | Bin 0 -> 155 bytes
.../UserControl/Controls/SideMenuDemoCtl.xaml | 11 +++++++++++
.../UserControl/Controls/SideMenuDemoCtl.xaml.cs | 10 ++++++++++
.../UserControl/Main/LeftMainContent.xaml | 7 ++++++-
.../Controls/SideMenu/SideMenu.cs | 9 +++++++++
.../HandyControl_Shared.projitems | 9 +++++++++
.../Themes/Styles/Base/SideMenuBaseStyle.xaml | 9 +++++++++
.../Themes/Styles/SideMenu.xaml | 12 ++++++++++++
.../HandyControl_Shared/Themes/Styles/Style.xaml | 1 +
16 files changed, 96 insertions(+), 2 deletions(-)
create mode 100644 src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/MainMenuControl_16x.png
create mode 100644 src/Shared/HandyControlDemo_Shared/UserControl/Controls/SideMenuDemoCtl.xaml
create mode 100644 src/Shared/HandyControlDemo_Shared/UserControl/Controls/SideMenuDemoCtl.xaml.cs
create mode 100644 src/Shared/HandyControl_Shared/Controls/SideMenu/SideMenu.cs
create mode 100644 src/Shared/HandyControl_Shared/Themes/Styles/Base/SideMenuBaseStyle.xaml
create mode 100644 src/Shared/HandyControl_Shared/Themes/Styles/SideMenu.xaml
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 4d5aaea8..57e96763 100644
--- a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
+++ b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
@@ -411,6 +411,9 @@
TextTemplatingFileGenerator
MessageToken.cs
+
+ Resources\Img\LeftMainContent\MainMenuControl_16x.png
+
diff --git a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs
index e6f29fbc..9567de5c 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs
@@ -92,6 +92,8 @@
public static readonly string DialogDemoCtl = nameof(DialogDemoCtl);
+ public static readonly string SideMenuDemoCtl = nameof(SideMenuDemoCtl);
+
public static readonly string ButtonDemoCtl = nameof(ButtonDemoCtl);
public static readonly string RepeatButtonDemoCtl = nameof(RepeatButtonDemoCtl);
diff --git a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt
index e9e4d4b7..13e61674 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt
+++ b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt
@@ -48,7 +48,8 @@ var controlList = new List
"NotifyIconDemoCtl",
"BadgeDemoCtl",
"GravatarDemoCtl",
- "DialogDemoCtl"
+ "DialogDemoCtl",
+ "SideMenuDemoCtl"
};
var styleList = new List
{
diff --git a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
index bcdb7a3a..472ed3f4 100644
--- a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
+++ b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
@@ -146,6 +146,9 @@
ShieldDemoCtl.xaml
+
+ SideMenuDemoCtl.xaml
+
StepBarDemoCtl.xaml
@@ -505,6 +508,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs
index 41ef454d..c4a75fbe 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs
@@ -1158,6 +1158,15 @@ namespace HandyControlDemo.Properties.Langs {
}
}
+ ///
+ /// 查找类似 侧边菜单 的本地化字符串。
+ ///
+ public static string SideMenu {
+ get {
+ return ResourceManager.GetString("SideMenu", resourceCulture);
+ }
+ }
+
///
/// 查找类似 滑块 的本地化字符串。
///
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx
index 0cbadb2c..5cad6050 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx
@@ -576,4 +576,7 @@
Show in the main window
+
+ SideMenu
+
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx
index 64783b77..72ded0fb 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx
@@ -576,4 +576,7 @@
在主窗口显示
+
+ 侧边菜单
+
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/MainMenuControl_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/MainMenuControl_16x.png
new file mode 100644
index 0000000000000000000000000000000000000000..16d105afeb666332ddece3244da29351657ba7d0
GIT binary patch
literal 155
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F5he4R}c>anMprEg(
zi(^Pd+|fynTnq{vEVZ}){nx*GH2b2jmWg0?qMqEe#ECO@RxdF9%<+J2?}BN|m=rE5
zG$kfTpX9ZX;ZE5dIxBa>=kpKFvVFAgaJb0x&3fDO
+
+
+
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SideMenuDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SideMenuDemoCtl.xaml.cs
new file mode 100644
index 00000000..021ff249
--- /dev/null
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SideMenuDemoCtl.xaml.cs
@@ -0,0 +1,10 @@
+namespace HandyControlDemo.UserControl
+{
+ public partial class SideMenuDemoCtl
+ {
+ public SideMenuDemoCtl()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml
index a6d448a2..d3b4c74d 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml
@@ -193,7 +193,7 @@
-
+
@@ -393,6 +393,11 @@
+
+
+
+
+
diff --git a/src/Shared/HandyControl_Shared/Controls/SideMenu/SideMenu.cs b/src/Shared/HandyControl_Shared/Controls/SideMenu/SideMenu.cs
new file mode 100644
index 00000000..0ca00085
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Controls/SideMenu/SideMenu.cs
@@ -0,0 +1,9 @@
+using System.Windows.Controls;
+
+namespace HandyControl.Controls
+{
+ public class SideMenu : Control
+ {
+
+ }
+}
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index d3e3f040..be5d95ac 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -77,6 +77,7 @@
+
@@ -439,6 +440,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
@@ -639,6 +644,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/SideMenuBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/SideMenuBaseStyle.xaml
new file mode 100644
index 00000000..a86b5d6c
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/SideMenuBaseStyle.xaml
@@ -0,0 +1,9 @@
+
+
+
+
+
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/SideMenu.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/SideMenu.xaml
new file mode 100644
index 00000000..97399e7d
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/SideMenu.xaml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Style.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Style.xaml
index 6f0df42e..5a971e9d 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Style.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Style.xaml
@@ -62,6 +62,7 @@
+
\ No newline at end of file