diff --git a/README.md b/README.md index 271efa13..ff539909 100644 --- a/README.md +++ b/README.md @@ -27,32 +27,33 @@ ## Contributors - - - - - - - - - - + + + + + + + + + + ## Backers - - - - - - - - - - - - - + + + + + + + + + + + + + + ## Special thanks to @@ -98,6 +99,10 @@ Step 4：enjoy coding ## Latest examples +### Screenshot + +![Screenshot](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/Screenshot.png) + ### GooeyEffect ![GooeyEffect](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/GooeyEffect.gif) @@ -114,6 +119,8 @@ Step 4：enjoy coding ![PinBox](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/PinBox.png) +## History publication + ### Effects ![Effects](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/Effects.png) @@ -122,8 +129,6 @@ Step 4：enjoy coding ![RelativePanel](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/RelativePanel.png) -## History publication - ### Drawer ![Drawer](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/Drawer.gif) diff --git a/src/Core_GE30/HandyControlDemo_Core_GE30/HandyControlDemo_Core_GE30.csproj b/src/Core_GE30/HandyControlDemo_Core_GE30/HandyControlDemo_Core_GE30.csproj index 75007053..a599d3eb 100644 --- a/src/Core_GE30/HandyControlDemo_Core_GE30/HandyControlDemo_Core_GE30.csproj +++ b/src/Core_GE30/HandyControlDemo_Core_GE30/HandyControlDemo_Core_GE30.csproj @@ -480,6 +480,9 @@ Resources\Img\cloud.png + + Resources\Img\LeftMainContent\WindowScreenshot_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 50bbc0a2..0efba4ca 100644 --- a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj +++ b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj @@ -547,6 +547,9 @@ Resources\Img\cloud.png + + Resources\Img\LeftMainContent\WindowScreenshot_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 abe74897..0dae1c8d 100644 --- a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj +++ b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj @@ -610,6 +610,9 @@ Resources\Img\cloud.png + + Resources\Img\LeftMainContent\WindowScreenshot_16x.png + diff --git a/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj b/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj index db149ee9..d307144e 100644 --- a/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj +++ b/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj @@ -317,6 +317,9 @@ UserControl\Controls\RunningBlockDemoCtl.xaml + + UserControl\Controls\ScreenshotDemoCtl.xaml + UserControl\Controls\ScrollViewerDemoCtl.xaml @@ -713,6 +716,10 @@ UserControl\Controls\RunningBlockDemoCtl.xaml.cs RunningBlockDemoCtl.xaml + + UserControl\Controls\ScreenshotDemoCtl.xaml.cs + ScreenshotDemoCtl.xaml + UserControl\Controls\ScrollViewerDemoCtl.xaml.cs ScrollViewerDemoCtl.xaml diff --git a/src/Shared/HandyControlDemo_Shared/App.xaml.cs b/src/Shared/HandyControlDemo_Shared/App.xaml.cs index 6cc43843..05d65336 100644 --- a/src/Shared/HandyControlDemo_Shared/App.xaml.cs +++ b/src/Shared/HandyControlDemo_Shared/App.xaml.cs @@ -7,7 +7,6 @@ using System.Runtime; using System.Security.Authentication; using System.Threading; using System.Windows; -using System.Windows.Media.Animation; using HandyControl.Data; using HandyControl.Tools; using HandyControlDemo.Data; diff --git a/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json b/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json index c849557e..69a6b1da 100644 --- a/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json +++ b/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json @@ -98,6 +98,7 @@ [ "Sprite", "SpriteDemoCtl", "HandyControl", "" ], [ "Notification", "NotificationDemoCtl", "Procedure_16x", "" ], [ "Dialog", "DialogDemoCtl", "Dialog_16x", "" ], + [ "Screenshot", "ScreenshotDemoCtl", "WindowScreenshot_16x", "1" ], [ "Window", "WindowDemoCtl", "WindowsForm_16x", "1" ] ] }, @@ -106,7 +107,7 @@ "demoItemList": [ [ "HatchBrushGenerator", "HatchBrushGeneratorDemoCtl", "DataGenerator_16x", "" ], [ "Morphing Animation", "GeometryAnimationDemoCtl", "Animation_16x", "" ], - [ "Effects", "EffectsDemoCtl", "Effects_16x", "1" ] + [ "Effects", "EffectsDemoCtl", "Effects_16x", "" ] ] } ] \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems index ef1f20e3..9bb9f927 100644 --- a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems +++ b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems @@ -190,6 +190,9 @@ RunningBlockDemoCtl.xaml + + ScreenshotDemoCtl.xaml + ScrollViewerDemoCtl.xaml @@ -684,6 +687,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 bd30d1fd..e3078682 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs @@ -1176,15 +1176,6 @@ namespace HandyControlDemo.Properties.Langs { } } - /// - /// 查找类似 概览 的本地化字符串。 - /// - public static string Overview { - get { - return ResourceManager.GetString("Overview", resourceCulture); - } - } - /// /// 查找类似 页码条 的本地化字符串。 /// @@ -1491,6 +1482,15 @@ namespace HandyControlDemo.Properties.Langs { } } + /// + /// 查找类似 截图 的本地化字符串。 + /// + public static string Screenshot { + get { + return ResourceManager.GetString("Screenshot", resourceCulture); + } + } + /// /// 查找类似 滚动视图 的本地化字符串。 /// @@ -1608,6 +1608,15 @@ namespace HandyControlDemo.Properties.Langs { } } + /// + /// 查找类似 开始截图 的本地化字符串。 + /// + public static string StartScreenshot { + get { + return ResourceManager.GetString("StartScreenshot", resourceCulture); + } + } + /// /// 查找类似 保持打开 的本地化字符串。 /// diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx index 24edac67..97bad55c 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx @@ -738,4 +738,10 @@ Practical demos + + Start screenshot + + + Screenshot + \ 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 73fd70c6..b1d3c4fe 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx @@ -738,4 +738,10 @@ Practical demos + + Start screenshot + + + Screenshot + \ 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 c8051c46..3c22a942 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx @@ -738,4 +738,10 @@ Practical demos + + Start screenshot + + + Screenshot + \ 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 9715066f..88562ce8 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx @@ -738,4 +738,10 @@ Practical demos + + Start screenshot + + + Screenshot + \ 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 a64229fb..f4e63998 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx @@ -738,4 +738,10 @@ 实用例子 + + 开始截图 + + + 截图 + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/WindowScreenshot_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/WindowScreenshot_16x.png new file mode 100644 index 00000000..45e78d9f Binary files /dev/null and b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/WindowScreenshot_16x.png differ diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NotifyIconDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NotifyIconDemoCtl.xaml index 173073e2..36c6aeac 100644 --- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NotifyIconDemoCtl.xaml +++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NotifyIconDemoCtl.xaml @@ -3,8 +3,6 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs" xmlns:hc="https://handyorg.github.io/handycontrol" - xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity" - xmlns:command="http://www.galasoft.ch/mvvmlight" xmlns:data="clr-namespace:HandyControlDemo.Data" DataContext="{Binding NotifyIconDemo,Source={StaticResource Locator}}" Background="{DynamicResource RegionBrush}"> @@ -47,14 +45,14 @@ - - - - - - - - + + + + + + + + @@ -68,14 +66,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PoptipDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PoptipDemoCtl.xaml index 43d45e3e..30891034 100644 --- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PoptipDemoCtl.xaml +++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PoptipDemoCtl.xaml @@ -36,12 +36,12 @@