diff --git a/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj b/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj index efb97896..bd47b261 100644 --- a/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj +++ b/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj @@ -402,6 +402,9 @@ Resources\Img\LeftMainContent\HandyControl.png + + Resources\Img\LeftMainContent\Procedure_16x.png + Resources\Img\Dance.png diff --git a/src/Core_30/HandyControl_Core_30/Themes/Styles/Base/ComboBoxBaseStyle.xaml b/src/Core_30/HandyControl_Core_30/Themes/Styles/Base/ComboBoxBaseStyle.xaml index d8f26026..ec88f225 100644 --- a/src/Core_30/HandyControl_Core_30/Themes/Styles/Base/ComboBoxBaseStyle.xaml +++ b/src/Core_30/HandyControl_Core_30/Themes/Styles/Base/ComboBoxBaseStyle.xaml @@ -22,7 +22,7 @@ - + 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 530c4e9d..061ee976 100644 --- a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj +++ b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj @@ -417,6 +417,9 @@ TextTemplatingFileGenerator MessageToken.cs + + Resources\Img\LeftMainContent\Procedure_16x.png + Resources\Img\LeftMainContent\HandyControl.png diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/ComboBoxBaseStyle.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/ComboBoxBaseStyle.xaml index afbb2390..96d3122e 100644 --- a/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/ComboBoxBaseStyle.xaml +++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/ComboBoxBaseStyle.xaml @@ -5,7 +5,6 @@ xmlns:interactivity="clr-namespace:HandyControl.Interactivity"> - @@ -21,9 +20,9 @@ - - - + + + @@ -54,9 +53,9 @@ - - - + + + @@ -83,12 +82,12 @@ - - + + - - + + @@ -139,12 +138,12 @@ - - + + - - + + @@ -186,19 +185,19 @@ - + - - + + - - + + @@ -261,17 +260,17 @@ - - + + - - + + - + @@ -320,12 +319,12 @@ - - + + - - + + @@ -370,19 +369,19 @@ - + - - + + - - + + @@ -470,11 +469,11 @@ - + - + @@ -520,10 +519,10 @@ - + - + @@ -542,16 +541,16 @@ - - + + - - + + - + @@ -617,10 +616,10 @@ - + - + @@ -629,23 +628,23 @@ - + - - + + - - + + - + @@ -711,10 +710,10 @@ - + - + @@ -733,16 +732,16 @@ - - + + - - + + - + @@ -963,10 +962,10 @@ - + - + @@ -975,23 +974,23 @@ - + - - + + - - + + - + 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 a2e724d7..960af279 100644 --- a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj +++ b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj @@ -480,6 +480,9 @@ TextTemplatingFileGenerator MessageToken.cs + + Resources\Img\LeftMainContent\Procedure_16x.png + Resources\Img\LeftMainContent\HandyControl.png diff --git a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Base/ComboBoxBaseStyle.xaml b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Base/ComboBoxBaseStyle.xaml index d8f26026..ec88f225 100644 --- a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Base/ComboBoxBaseStyle.xaml +++ b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Base/ComboBoxBaseStyle.xaml @@ -22,7 +22,7 @@ - + diff --git a/src/Shared/HandyControlDemo_Shared/App.xaml b/src/Shared/HandyControlDemo_Shared/App.xaml index cdd77978..a9f0c1ee 100644 --- a/src/Shared/HandyControlDemo_Shared/App.xaml +++ b/src/Shared/HandyControlDemo_Shared/App.xaml @@ -6,6 +6,7 @@ xmlns:d1P1="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:data="clr-namespace:HandyControlDemo.Data" + xmlns:hc="https://handyorg.github.io/handycontrol" d1P1:Ignorable="d" StartupUri="MainWindow.xaml"> @@ -35,6 +36,12 @@ + + + + + + diff --git a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs index 1e09db7a..982af49c 100644 --- a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs +++ b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs @@ -112,6 +112,8 @@ public static readonly string SpriteDemoCtl = nameof(SpriteDemoCtl); + public static readonly string NotificationDemoCtl = nameof(NotificationDemoCtl); + 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 5562e803..c3f93c36 100644 --- a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt +++ b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt @@ -58,7 +58,8 @@ var controlList = new List "ImageBlockDemoCtl", "RunningBlockDemoCtl", "HoneycombPanelDemoCtl", - "SpriteDemoCtl" + "SpriteDemoCtl", + "NotificationDemoCtl" }; var styleList = new List { diff --git a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems index 984abb9a..8f0d5303 100644 --- a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems +++ b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems @@ -63,6 +63,9 @@ MagnifierDemoCtl.xaml + + NotificationDemoCtl.xaml + RangeSliderDemoCtl.xaml @@ -207,6 +210,9 @@ WindowDemoCtl.xaml + + AppNotification.xaml + BlogsView.xaml @@ -324,6 +330,7 @@ + @@ -451,6 +458,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -643,6 +654,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 43270cfc..65dbbbaa 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs @@ -852,6 +852,15 @@ namespace HandyControlDemo.Properties.Langs { } } + /// + /// 查找类似 桌面通知 的本地化字符串。 + /// + public static string Notification { + get { + return ResourceManager.GetString("Notification", resourceCulture); + } + } + /// /// 查找类似 托盘图标 的本地化字符串。 /// @@ -1320,6 +1329,15 @@ namespace HandyControlDemo.Properties.Langs { } } + /// + /// 查找类似 发送通知 的本地化字符串。 + /// + public static string SendNotification { + get { + return ResourceManager.GetString("SendNotification", resourceCulture); + } + } + /// /// 查找类似 徽章 的本地化字符串。 /// @@ -1383,6 +1401,15 @@ namespace HandyControlDemo.Properties.Langs { } } + /// + /// 查找类似 保持打开 的本地化字符串。 + /// + public static string StaysOpen { + get { + return ResourceManager.GetString("StaysOpen", resourceCulture); + } + } + /// /// 查找类似 步骤 的本地化字符串。 /// diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx index 3efb365c..7c939565 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx @@ -651,4 +651,13 @@ Open sprite + + Notification + + + Send notification + + + Stays open + \ 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 6b168ea6..5c46a76d 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx @@ -651,4 +651,13 @@ 打开精灵 + + 桌面通知 + + + 发送通知 + + + 保持打开 + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Procedure_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Procedure_16x.png new file mode 100644 index 00000000..70f60143 Binary files /dev/null and b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Procedure_16x.png differ diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NotificationDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NotificationDemoCtl.xaml new file mode 100644 index 00000000..0f0cdf27 --- /dev/null +++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NotificationDemoCtl.xaml @@ -0,0 +1,18 @@ + + + + + + +