diff --git a/README.md b/README.md index 5a05eb07..7c5f1c52 100644 --- a/README.md +++ b/README.md @@ -46,8 +46,18 @@ Step 2：Add code in App.xaml as follows: ``` Step 3：enjoy coding +## Overview + +![Overview](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Overview.png) + +![Overview-dark](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Overview-dark.png) + ## Latest examples +### SideMenu + +![SideMenu](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/SideMenu.png) + ### NotifyIcon ![NotifyIcon](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/NotifyIcon.png) @@ -64,12 +74,12 @@ Step 3：enjoy coding ![Badge](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Badge.png) +## History publication + ### Gravatar ![Gravatar](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Gravatar.gif) -## History publication - ### GoToTop ![GoToTop](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/GoToTop.gif) diff --git a/Resources/Overview-dark.png b/Resources/Overview-dark.png new file mode 100644 index 00000000..ded33060 Binary files /dev/null and b/Resources/Overview-dark.png differ diff --git a/Resources/Overview.png b/Resources/Overview.png new file mode 100644 index 00000000..d0211362 Binary files /dev/null and b/Resources/Overview.png differ diff --git a/Resources/SideMenu.png b/Resources/SideMenu.png new file mode 100644 index 00000000..fc0a655a Binary files /dev/null and b/Resources/SideMenu.png differ diff --git a/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj b/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj index 62a7d384..fdbd815d 100644 --- a/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj +++ b/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj @@ -5,7 +5,7 @@ true HandyControlDemo HandyControlDemo - 1.5.4 + 1.5.5 ..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico @@ -321,6 +321,30 @@ Resources\Img\under_construction.gif + + Resources\Img\DevOps\DevOps-Boards.png + + + Resources\Img\DevOps\DevOps-Overview.png + + + Resources\Img\DevOps\DevOps-Pipelines.png + + + Resources\Img\DevOps\DevOps-Repos.png + + + Resources\Img\DevOps\DevOps-TestPlans.png + + + Resources\Img\LeftMainContent\MainMenuControl_16x.png + + + Resources\fabric-icons.ttf + + + Resources\Img\LeftMainContent\MainMenuControl_16x.png + diff --git a/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj b/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj index 0dcfc447..2ac1874c 100644 --- a/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj +++ b/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj @@ -4,8 +4,8 @@ true HandyControl HandyControl - 1.5.4 - 1.5.4.0 + 1.5.5 + 1.5.5.0 false false diff --git a/src/HandyControl_Net_GE45.sln.DotSettings b/src/HandyControl_Net_GE45.sln.DotSettings new file mode 100644 index 00000000..df567fc2 --- /dev/null +++ b/src/HandyControl_Net_GE45.sln.DotSettings @@ -0,0 +1,2 @@ + + True \ No newline at end of file diff --git a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj index bd927660..4e282a0d 100644 --- a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj +++ b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj @@ -69,6 +69,9 @@ True MessageToken.tt + + Properties\AssemblyInfo.cs + NoUserContent.xaml @@ -381,13 +384,35 @@ Lang.Designer.cs - + + + Resources\fabric-icons.ttf + + Data\MessageToken.tt TextTemplatingFileGenerator MessageToken.cs + + Resources\Img\LeftMainContent\MainMenuControl_16x.png + + + Resources\Img\DevOps\DevOps-Boards.png + + + Resources\Img\DevOps\DevOps-Overview.png + + + Resources\Img\DevOps\DevOps-Pipelines.png + + + Resources\Img\DevOps\DevOps-Repos.png + + + Resources\Img\DevOps\DevOps-TestPlans.png + Resources\Img\LeftMainContent\RepeatButton_16x.png diff --git a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj index ffb31c73..71a3f961 100644 --- a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj +++ b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj @@ -35,6 +35,9 @@ v4.0 + + Properties\AssemblyInfo.cs + Properties\Langs\Lang.Designer.cs True 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..37f8abfd 100644 --- a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj +++ b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj @@ -96,6 +96,9 @@ True MessageToken.tt + + Properties\AssemblyInfo.cs + Properties\Langs\Lang.Designer.cs True @@ -411,6 +414,32 @@ TextTemplatingFileGenerator MessageToken.cs + + Resources\Img\LeftMainContent\GridPane_16x.png + + + Resources\Img\DevOps\DevOps-Boards.png + + + Resources\Img\DevOps\DevOps-Overview.png + + + Resources\Img\DevOps\DevOps-Pipelines.png + + + Resources\Img\DevOps\DevOps-Repos.png + + + Resources\Img\DevOps\DevOps-TestPlans.png + + + Resources\Img\LeftMainContent\MainMenuControl_16x.png + + + + + Resources\fabric-icons.ttf + diff --git a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj index 30d6ea16..c989b1c4 100644 --- a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj +++ b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj @@ -81,6 +81,9 @@ netgt40 + + Properties\AssemblyInfo.cs + Properties\Langs\Lang.Designer.cs True diff --git a/src/Shared/HandyControlDemo_Shared/App.xaml.cs b/src/Shared/HandyControlDemo_Shared/App.xaml.cs index 493daf1e..b597e60c 100644 --- a/src/Shared/HandyControlDemo_Shared/App.xaml.cs +++ b/src/Shared/HandyControlDemo_Shared/App.xaml.cs @@ -20,7 +20,7 @@ namespace HandyControlDemo base.OnStartup(e); GlobalData.Init(); - Thread.CurrentThread.CurrentUICulture = new CultureInfo(GlobalData.Config.Lang); + ConfigHelper.Instance.SetLang(GlobalData.Config.Lang); if (GlobalData.Config.Skin != SkinType.Default) { @@ -28,7 +28,7 @@ namespace HandyControlDemo } #if !Core - BlurWindow.SystemVersionInfo = CommonHelper.GetSystemVersionInfo(); + ConfigHelper.Instance.SetSystemVersionInfo(CommonHelper.GetSystemVersionInfo()); #endif } diff --git a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs index e6f29fbc..d5fce6b2 100644 --- a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs +++ b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs @@ -92,6 +92,10 @@ public static readonly string DialogDemoCtl = nameof(DialogDemoCtl); + public static readonly string SideMenuDemoCtl = nameof(SideMenuDemoCtl); + + public static readonly string GridDemoCtl = nameof(GridDemoCtl); + public static readonly string ButtonDemoCtl = nameof(ButtonDemoCtl); public static readonly string RepeatButtonDemoCtl = nameof(RepeatButtonDemoCtl); @@ -168,5 +172,7 @@ public static readonly string MainWindow = nameof(MainWindow); + public static readonly string OverView = nameof(OverView); + } } \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt index e9e4d4b7..5117bc00 100644 --- a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt +++ b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt @@ -48,7 +48,9 @@ var controlList = new List "NotifyIconDemoCtl", "BadgeDemoCtl", "GravatarDemoCtl", - "DialogDemoCtl" + "DialogDemoCtl", + "SideMenuDemoCtl", + "GridDemoCtl" }; var styleList = new List { @@ -95,7 +97,8 @@ var messageList = new List "SendChatMessage", "GrowlDemoPanel", "DialogDemoWindow", - "MainWindow" + "MainWindow", + "OverView" }; #> namespace HandyControlDemo.Data diff --git a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems index bcdb7a3a..7a9d0ef9 100644 --- a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems +++ b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems @@ -38,6 +38,7 @@ ChatBox.xaml + InteractiveDialog.xaml @@ -74,6 +75,9 @@ CompareSliderDemoCtl.xaml + + GridDemoCtl.xaml + CoverFlowDemoCtl.xaml @@ -146,6 +150,9 @@ ShieldDemoCtl.xaml + + SideMenuDemoCtl.xaml + StepBarDemoCtl.xaml @@ -173,6 +180,9 @@ WindowDemoCtl.xaml + + OverView.xaml + ContributorsView.xaml @@ -280,6 +290,7 @@ + @@ -333,6 +344,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -409,6 +424,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -505,6 +524,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -541,6 +564,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile diff --git a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml.cs index bb90030a..ec24646f 100644 --- a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml.cs +++ b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml.cs @@ -1,6 +1,9 @@ -using System.ComponentModel; +using System; +using System.ComponentModel; +using GalaSoft.MvvmLight.Messaging; using HandyControl.Controls; using HandyControlDemo.Data; +using HandyControlDemo.Tools; namespace HandyControlDemo { @@ -11,6 +14,15 @@ namespace HandyControlDemo InitializeComponent(); } + protected override void OnInitialized(EventArgs e) + { + base.OnInitialized(e); + + Messenger.Default.Send(null, MessageToken.ClearLeftSelected); + Messenger.Default.Send(true, MessageToken.FullSwitch); + Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{MessageToken.OverView}"), MessageToken.LoadShowContent); + } + protected override void OnClosing(CancelEventArgs e) { if (GlobalData.NotifyIconIsShow) diff --git a/src/Shared/HandyControlDemo_Shared/Properties/AssemblyInfo.cs b/src/Shared/HandyControlDemo_Shared/Properties/AssemblyInfo.cs index 9c72998a..2cbdb17c 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/AssemblyInfo.cs +++ b/src/Shared/HandyControlDemo_Shared/Properties/AssemblyInfo.cs @@ -13,5 +13,5 @@ using System.Windows; [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] [assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)] -[assembly: AssemblyVersion("1.5.4")] +[assembly: AssemblyVersion("1.5.5")] #endif \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs index 41ef454d..9d91fd32 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs @@ -47,7 +47,7 @@ namespace HandyControlDemo.Properties.Langs { } /// - /// 使用此强类型资源类，为所有资源查找 + /// 重写当前线程的 CurrentUICulture 属性 /// 重写当前线程的 CurrentUICulture 属性。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] @@ -528,6 +528,15 @@ namespace HandyControlDemo.Properties.Langs { } } + /// + /// 查找类似 栅格 的本地化字符串。 + /// + public static string Grid { + get { + return ResourceManager.GetString("Grid", resourceCulture); + } + } + /// /// 查找类似 分组框 的本地化字符串。 /// @@ -879,6 +888,15 @@ namespace HandyControlDemo.Properties.Langs { } } + /// + /// 查找类似 概览 的本地化字符串。 + /// + public static string Overview { + get { + return ResourceManager.GetString("Overview", resourceCulture); + } + } + /// /// 查找类似 页码条 的本地化字符串。 /// @@ -1158,6 +1176,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..9807ecb7 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx @@ -576,4 +576,13 @@ Show in the main window + + SideMenu + + + Overview + + + Grid + \ 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..0f5ce9d5 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx @@ -576,4 +576,13 @@ 在主窗口显示 + + 侧边菜单 + + + 概览 + + + 栅格 + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/DevOps/DevOps-Boards.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/DevOps/DevOps-Boards.png new file mode 100644 index 00000000..5d14a4a8 Binary files /dev/null and b/src/Shared/HandyControlDemo_Shared/Resources/Img/DevOps/DevOps-Boards.png differ diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/DevOps/DevOps-Overview.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/DevOps/DevOps-Overview.png new file mode 100644 index 00000000..e9e3d7e4 Binary files /dev/null and b/src/Shared/HandyControlDemo_Shared/Resources/Img/DevOps/DevOps-Overview.png differ diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/DevOps/DevOps-Pipelines.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/DevOps/DevOps-Pipelines.png new file mode 100644 index 00000000..ad1da5b8 Binary files /dev/null and b/src/Shared/HandyControlDemo_Shared/Resources/Img/DevOps/DevOps-Pipelines.png differ diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/DevOps/DevOps-Repos.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/DevOps/DevOps-Repos.png new file mode 100644 index 00000000..379d17eb Binary files /dev/null and b/src/Shared/HandyControlDemo_Shared/Resources/Img/DevOps/DevOps-Repos.png differ diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/DevOps/DevOps-TestPlans.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/DevOps/DevOps-TestPlans.png new file mode 100644 index 00000000..686d0730 Binary files /dev/null and b/src/Shared/HandyControlDemo_Shared/Resources/Img/DevOps/DevOps-TestPlans.png differ diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/GridPane_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/GridPane_16x.png new file mode 100644 index 00000000..51285602 Binary files /dev/null and b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/GridPane_16x.png differ 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 00000000..16d105af Binary files /dev/null and b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/MainMenuControl_16x.png differ diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Basic.xaml b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Basic.xaml index 6b2fbe74..927f257f 100644 --- a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Basic.xaml +++ b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Basic.xaml @@ -4,6 +4,7 @@ + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Fonts.xaml b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Fonts.xaml new file mode 100644 index 00000000..700d0689 --- /dev/null +++ b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Fonts.xaml @@ -0,0 +1,6 @@ + + + pack://application:,,,/HandyControlDemo;component/Resources/fabric-icons.ttf#Fabric MDL2 Assets + + diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml index d8cd940a..49831368 100644 --- a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml +++ b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml @@ -5,6 +5,7 @@ + + + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Resources/fabric-icons.ttf b/src/Shared/HandyControlDemo_Shared/Resources/fabric-icons.ttf new file mode 100644 index 00000000..9964e1a0 Binary files /dev/null and b/src/Shared/HandyControlDemo_Shared/Resources/fabric-icons.ttf differ diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/IFull.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/IFull.cs new file mode 100644 index 00000000..dede1433 --- /dev/null +++ b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/IFull.cs @@ -0,0 +1,7 @@ +namespace HandyControlDemo.UserControl +{ + internal interface IFull + { + + } +} \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GridDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GridDemoCtl.xaml new file mode 100644 index 00000000..5c0b25d0 --- /dev/null +++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GridDemoCtl.xaml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GridDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GridDemoCtl.xaml.cs new file mode 100644 index 00000000..2054b682 --- /dev/null +++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GridDemoCtl.xaml.cs @@ -0,0 +1,10 @@ +namespace HandyControlDemo.UserControl +{ + public partial class GridDemoCtl : IFull + { + public GridDemoCtl() + { + InitializeComponent(); + } + } +} \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScrollViewerDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScrollViewerDemoCtl.xaml index 12abfc01..aad157d0 100644 --- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScrollViewerDemoCtl.xaml +++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScrollViewerDemoCtl.xaml @@ -15,27 +15,27 @@ - + - + - + - + - + @@ -46,27 +46,27 @@ - + - + - + - + - + diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SideMenuDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SideMenuDemoCtl.xaml new file mode 100644 index 00000000..b056b8ce --- /dev/null +++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SideMenuDemoCtl.xaml @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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..a949e809 100644 --- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml +++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml @@ -8,408 +8,421 @@ xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl" xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +