From de5c2e7a6ec0f312ae2da91fcf27873fd11f346f Mon Sep 17 00:00:00 2001 From: NaBian <836904362@qq.com> Date: Fri, 17 Jan 2020 23:34:00 +0800 Subject: [PATCH 1/6] init branch --- .../HandyControlDemo_Core30.csproj | 3 ++ .../HandyControlDemo_Net_40.csproj | 3 ++ .../HandyControlDemo_Net_GE45.csproj | 3 ++ .../Data/DemoInfo.json | 4 +-- .../Data/MessageToken.cs | 2 ++ .../Data/MessageToken.tt | 3 +- .../HandyControlDemo_Shared.projitems | 7 +++++ .../Properties/Langs/Lang.Designer.cs | 9 ++++++ .../Properties/Langs/Lang.en.resx | 3 ++ .../Properties/Langs/Lang.fa.resx | 3 ++ .../Properties/Langs/Lang.fr.resx | 3 ++ .../Properties/Langs/Lang.ko-KR.resx | 3 ++ .../Properties/Langs/Lang.resx | 3 ++ .../OutlinedRectangleTool_16x.png | Bin 0 -> 133 bytes .../UserControl/Controls/WindowDemoCtl.xaml | 3 ++ .../Window/BlurWindow.xaml | 26 +++++++++--------- .../Window/GlowWindow.xaml | 17 ++++++++++++ .../Window/GlowWindow.xaml.cs | 10 +++++++ .../Controls/Window/GlowWindow.cs | 7 +++++ .../HandyControl_Shared.projitems | 1 + 20 files changed, 97 insertions(+), 16 deletions(-) create mode 100644 src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/OutlinedRectangleTool_16x.png create mode 100644 src/Shared/HandyControlDemo_Shared/Window/GlowWindow.xaml create mode 100644 src/Shared/HandyControlDemo_Shared/Window/GlowWindow.xaml.cs create mode 100644 src/Shared/HandyControl_Shared/Controls/Window/GlowWindow.cs diff --git a/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj b/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj index f91f3b1d..80a476b3 100644 --- a/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj +++ b/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj @@ -460,6 +460,9 @@ Resources\Img\LeftMainContent\WPFFlowDocument_16x.png + + Resources\Img\LeftMainContent\OutlinedRectangleTool_16x.png + 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 bba16269..98fcf4f6 100644 --- a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj +++ b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj @@ -526,6 +526,9 @@ Resources\Img\LeftMainContent\WPFFlowDocument_16x.png + + Resources\Img\LeftMainContent\OutlinedRectangleTool_16x.png + 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 94a32b27..2fd623be 100644 --- a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj +++ b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj @@ -589,6 +589,9 @@ Resources\Img\LeftMainContent\WPFFlowDocument_16x.png + + Resources\Img\LeftMainContent\OutlinedRectangleTool_16x.png + diff --git a/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json b/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json index 09201d74..89503cad 100644 --- a/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json +++ b/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json @@ -45,7 +45,7 @@ [ "ButtonGroup", "ButtonGroupDemoCtl", "ButtonGroup_16x", "" ], [ "ProgressButton", "ProgressButtonDemoCtl", "ProgressButton_16x", "" ], [ "ChatBubble", "ChatBubbleDemoCtl", "Bubble_16xLG", "" ], - [ "Poptip", "PoptipDemoCtl", "PopupCursor_16x", "1" ], + [ "Poptip", "PoptipDemoCtl", "PopupCursor_16x", "" ], [ "NotifyIcon", "NotifyIconDemoCtl", "NotificationHub_16x", "" ], [ "NumericUpDown", "NumericUpDownDemoCtl", "NumericListBox_16x", "" ], [ "TextBox", "TextBoxDemoCtl", "TextBox_16x", "" ], @@ -96,7 +96,7 @@ [ "Sprite", "SpriteDemoCtl", "HandyControl", "" ], [ "Notification", "NotificationDemoCtl", "Procedure_16x", "" ], [ "Dialog", "DialogDemoCtl", "Dialog_16x", "" ], - [ "Window", "WindowDemoCtl", "WindowsForm_16x", "" ] + [ "Window", "WindowDemoCtl", "WindowsForm_16x", "1" ] ] }, { diff --git a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs index 5d039b04..e18b5fb7 100644 --- a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs +++ b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs @@ -40,5 +40,7 @@ public static readonly string QQGroupView = nameof(QQGroupView); + public static readonly string GlowWindow = nameof(GlowWindow); + } } \ 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 885626a9..db0696aa 100644 --- a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt +++ b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt @@ -22,7 +22,8 @@ var messageList = new List "BlurWindow", "CustomNonClientAreaWindow", "NoNonClientAreaDragableWindow", - "QQGroupView" + "QQGroupView", + "GlowWindow" }; #> namespace HandyControlDemo.Data diff --git a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems index 17fed60e..45a6fcf3 100644 --- a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems +++ b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems @@ -407,6 +407,9 @@ DialogDemoWindow.xaml + + GlowWindow.xaml + GrowlDemoWindow.xaml @@ -923,6 +926,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 0a7a2898..21e62118 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs @@ -1050,6 +1050,15 @@ namespace HandyControlDemo.Properties.Langs { } } + /// + /// 查找类似 点击打开辉光窗口 的本地化字符串。 + /// + public static string OpenGlowWindow { + get { + return ResourceManager.GetString("OpenGlowWindow", resourceCulture); + } + } + /// /// 查找类似 点击打开图片浏览器 的本地化字符串。 /// diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx index eec92d63..dbc55e2a 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx @@ -717,4 +717,7 @@ FlowDocumentScrollViewer + + Open glowWindow + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx index 17f72064..6f5aec9c 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx @@ -717,4 +717,7 @@ FlowDocumentScrollViewer + + Open glowWindow + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx index 2a9f70e6..51edab20 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx @@ -717,4 +717,7 @@ FlowDocumentScrollViewer + + Open glowWindow + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx index b16ff604..67447dbd 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx @@ -717,4 +717,7 @@ FlowDocumentScrollViewer + + Open glowWindow + \ 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 45a4e46c..a6a4fc1d 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx @@ -717,4 +717,7 @@ 流文档滚动视图 + + 点击打开辉光窗口 + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/OutlinedRectangleTool_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/OutlinedRectangleTool_16x.png new file mode 100644 index 0000000000000000000000000000000000000000..cb6eb86b80a39faf8e9d18423d1e162b80397f4a GIT binary patch literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F5he4R}c>anMprE;@ zi(^Pd+}lfrTnq|4&KKwCe&6r?dQ#{?;f|##nGe?IbN!jTMLV|Pi9fHyv8t7<5(oY_ cdu@2n5L$2jd|oN5BG3p1Pgg&ebxsLQ08m{j=l}o! literal 0 HcmV?d00001 diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WindowDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WindowDemoCtl.xaml index 7417064e..aeb6f37f 100644 --- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WindowDemoCtl.xaml +++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WindowDemoCtl.xaml @@ -16,6 +16,9 @@