diff --git a/Installers/VS2019/HandyControl_VS2019/License.txt b/Installers/VS2019/HandyControl_VS2019/License.txt index cfef606b..0c1c18de 100644 --- a/Installers/VS2019/HandyControl_VS2019/License.txt +++ b/Installers/VS2019/HandyControl_VS2019/License.txt @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2018-2019 HandyOrg +Copyright (c) 2018-2020 HandyOrg Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Installers/VS2019/HandyControl_VS2019/Properties/AssemblyInfo.cs b/Installers/VS2019/HandyControl_VS2019/Properties/AssemblyInfo.cs index b5f325ba..94d87828 100644 --- a/Installers/VS2019/HandyControl_VS2019/Properties/AssemblyInfo.cs +++ b/Installers/VS2019/HandyControl_VS2019/Properties/AssemblyInfo.cs @@ -6,7 +6,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("HandyControl_VS2019")] -[assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2019")] +[assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2020")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/Installers/VS2019/HandyControl_VS2019/source.extension.vsixmanifest b/Installers/VS2019/HandyControl_VS2019/source.extension.vsixmanifest index 6824b141..c25560c3 100644 --- a/Installers/VS2019/HandyControl_VS2019/source.extension.vsixmanifest +++ b/Installers/VS2019/HandyControl_VS2019/source.extension.vsixmanifest @@ -1,7 +1,7 @@  - + HandyControl for VS2019 This VSIX Project will help people initialize a HandyControl project. https://handyorg.github.io/handycontrol diff --git a/Installers/VS2019/WpfApp/ProjectTemplate.csproj b/Installers/VS2019/WpfApp/ProjectTemplate.csproj index d8a830db..cf36f37a 100644 --- a/Installers/VS2019/WpfApp/ProjectTemplate.csproj +++ b/Installers/VS2019/WpfApp/ProjectTemplate.csproj @@ -34,8 +34,8 @@ 4 - - ..\packages\HandyControl.2.3.0\lib\net47\HandyControl.dll + + ..\packages\HandyControl.2.4.0\lib\net47\HandyControl.dll diff --git a/Installers/VS2019/WpfApp/Properties/AssemblyInfo.cs b/Installers/VS2019/WpfApp/Properties/AssemblyInfo.cs index b45d8c50..59f278ed 100644 --- a/Installers/VS2019/WpfApp/Properties/AssemblyInfo.cs +++ b/Installers/VS2019/WpfApp/Properties/AssemblyInfo.cs @@ -6,9 +6,9 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("HandyControl_VS2019_WpfApp")] -[assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2019")] +[assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2020")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] -[assembly: AssemblyVersion("2.3.0")] -[assembly: AssemblyFileVersion("2.3.0")] \ No newline at end of file +[assembly: AssemblyVersion("2.4.0")] +[assembly: AssemblyFileVersion("2.4.0")] diff --git a/Installers/VS2019/WpfApp/packages.config b/Installers/VS2019/WpfApp/packages.config index 4889bb7d..a1fd738f 100644 --- a/Installers/VS2019/WpfApp/packages.config +++ b/Installers/VS2019/WpfApp/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Installers/VS2019/WpfCoreApp/ProjectTemplate.csproj b/Installers/VS2019/WpfCoreApp/ProjectTemplate.csproj index c453863b..18af215f 100644 --- a/Installers/VS2019/WpfCoreApp/ProjectTemplate.csproj +++ b/Installers/VS2019/WpfCoreApp/ProjectTemplate.csproj @@ -7,7 +7,7 @@ $safeprojectname$ 1.0.0.0 Debug;Release - Copyright © $username$ 2018-2019 + Copyright © $username$ 2018-2020 1.0.0.0 1.0.0.0 latest @@ -19,6 +19,6 @@ TRACE;Core - + \ No newline at end of file diff --git a/Installers/VS2019/WpfCoreApp/Properties/AssemblyInfo.cs b/Installers/VS2019/WpfCoreApp/Properties/AssemblyInfo.cs index afd74fb0..c0e4b299 100644 --- a/Installers/VS2019/WpfCoreApp/Properties/AssemblyInfo.cs +++ b/Installers/VS2019/WpfCoreApp/Properties/AssemblyInfo.cs @@ -6,9 +6,9 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("HandyControl_VS2019_WpfCoreApp")] -[assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2019")] +[assembly: AssemblyCopyright("Copyright © HandyOrg 2018-2020")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] -[assembly: AssemblyVersion("2.3.0")] -[assembly: AssemblyFileVersion("2.3.0")] \ No newline at end of file +[assembly: AssemblyVersion("2.4.0")] +[assembly: AssemblyFileVersion("2.4.0")] diff --git a/LICENSE b/LICENSE index f9f0dead..3d3d568c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2018-2019 HandyOrg +Copyright (c) 2018-2020 HandyOrg Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index b644e505..271efa13 100644 --- a/README.md +++ b/README.md @@ -98,6 +98,10 @@ Step 4：enjoy coding ## Latest examples +### GooeyEffect + +![GooeyEffect](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/GooeyEffect.gif) + ### GlowWindow ![GlowWindow](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/GlowWindow.png) diff --git a/build/build.cake b/build/build.cake index 7a5769ed..7538862b 100644 --- a/build/build.cake +++ b/build/build.cake @@ -47,16 +47,24 @@ Task("Build") var settingsCore30 = new DotNetCoreBuildSettings { Framework = "netcoreapp3.0", - Configuration = "Release", + Configuration = "Release-Core30", OutputDirectory = "lib/netcoreapp3.0" }; + var settingsCore31 = new DotNetCoreBuildSettings + { + Framework = "netcoreapp3.1", + Configuration = "Release-Core31", + OutputDirectory = "lib/netcoreapp3.1" + }; + MSBuild("../src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj", settingsNet40); MSBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet45); MSBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet462); MSBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet47); MSBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet48); - DotNetCoreBuild("../src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj", settingsCore30); + DotNetCoreBuild("../src/Core_GE30/HandyControl_Core_GE30/HandyControl_Core_GE30.csproj", settingsCore30); + DotNetCoreBuild("../src/Core_GE30/HandyControl_Core_GE30/HandyControl_Core_GE30.csproj", settingsCore31); }); RunTarget(target); \ No newline at end of file diff --git a/build/build.nuspec b/build/build.nuspec index d40e941a..f48902dc 100644 --- a/build/build.nuspec +++ b/build/build.nuspec @@ -2,7 +2,7 @@ HandyControl - 2.3.0 + 2.4.0 HandyOrg HandyOrg HandyOrg @@ -11,7 +11,7 @@ https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/icon.png Contains some commonly used simple WPF controls Changes are detailed at https://github.com/HandyOrg/HandyControl/releases - Copyright © HandyOrg 2018-2019 + Copyright © HandyOrg 2018-2020 WPF C# Control diff --git a/doc/source/handycontrol/langs/index.md b/doc/source/handycontrol/langs/index.md index 48aa6242..b3442cff 100644 --- a/doc/source/handycontrol/langs/index.md +++ b/doc/source/handycontrol/langs/index.md @@ -25,7 +25,6 @@ title: 国际化 * 简体中文（zh-cn） * 英文（en） -* 英文（en） * 波斯语（fa） * 法语（fr） * 韩文 （ko-kr） diff --git a/doc/source/handycontrol/native_controls/toggleButton/index.md b/doc/source/handycontrol/native_controls/toggleButton/index.md index c2e65ddc..94a04022 100644 --- a/doc/source/handycontrol/native_controls/toggleButton/index.md +++ b/doc/source/handycontrol/native_controls/toggleButton/index.md @@ -90,7 +90,7 @@ title: ToggleButton 切换按钮 ## 相关样式 | 名称 | 继承自 | -| - | - | - | +| - | - | | ToggleButtonSwitch | ToggleButtonSwitchBaseStyle | 案例： @@ -174,4 +174,4 @@ title: ToggleButton 切换按钮 效果： -![ToggleButtonCustom](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ToggleButtonCustom.png) \ No newline at end of file +![ToggleButtonCustom](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/native_controls/ToggleButtonCustom.png) diff --git a/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj b/src/Core_GE30/HandyControlDemo_Core_GE30/HandyControlDemo_Core_GE30.csproj similarity index 96% rename from src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj rename to src/Core_GE30/HandyControlDemo_Core_GE30/HandyControlDemo_Core_GE30.csproj index 7705c249..75007053 100644 --- a/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj +++ b/src/Core_GE30/HandyControlDemo_Core_GE30/HandyControlDemo_Core_GE30.csproj @@ -1,26 +1,36 @@  WinExe - netcoreapp3.0 true HandyControlDemo HandyControlDemo - 2.4.0 + 2.5.0 ..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico - Debug;Release + Debug-Core30;Debug-Core31;Release-Core30;Release-Core31 Copyright © HandyOrg 2018-2020 - 2.4.0.0 - 2.4.0.0 + 2.5.0 + 2.5.0 8.0 HandyOrg - + TRACE;Core + netcoreapp3.0 - + TRACE;Core + netcoreapp3.1 + + + TRACE;Core + netcoreapp3.0 + + + TRACE;Core + netcoreapp3.1 + @@ -46,7 +56,8 @@ - + + @@ -466,6 +477,9 @@ Resources\Img\LeftMainContent\frame_16xLG.png + + Resources\Img\cloud.png + diff --git a/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj b/src/Core_GE30/HandyControl_Core_GE30/HandyControl_Core_GE30.csproj similarity index 79% rename from src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj rename to src/Core_GE30/HandyControl_Core_GE30/HandyControl_Core_GE30.csproj index 4f61f64f..149c7f6b 100644 --- a/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj +++ b/src/Core_GE30/HandyControl_Core_GE30/HandyControl_Core_GE30.csproj @@ -1,25 +1,35 @@  - netcoreapp3.0 true HandyControl HandyControl - 2.4.0 - 2.4.0.0 + 2.5.0 + 2.5.0 false false Copyright © HandyOrg 2018-2020 Contains some commonly used simple WPF controls - Debug;Release + Debug-Core30;Debug-Core31;Release-Core30;Release-Core31 8.0 HandyOrg - + TRACE;Core + netcoreapp3.0 - + TRACE;Core - C:\Code\GitHub\HandyControl\src\Core_30\HandyControl_Core_30\HandyControl.xml + netcoreapp3.1 + + + TRACE;Core + netcoreapp3.0 + C:\Code\GitHub\HandyControl\src\Core_GE30\HandyControl_Core_GE30\HandyControl.xml + + + TRACE;Core + netcoreapp3.1 + C:\Code\GitHub\HandyControl\src\Core_GE30\HandyControl_Core_GE30\HandyControl.xml @@ -47,8 +57,8 @@ PublicResXFileCodeGenerator Lang.Designer.cs - - Properties\AssemblyInfo.cs + + Properties\CoreAssemblyInfo.cs @@ -61,9 +71,18 @@ + + Resources\Effects\BrightnessEffect.ps + Resources\Effects\ColorComplementEffect.ps + + Resources\Effects\ColorMatrixEffect.ps + + + Resources\Effects\ContrastEffect.ps + Resources\Effects\GrayScaleEffect.ps diff --git a/src/Core_30/HandyControl_Core_30/Themes/Styles/Base/ComboBoxBaseStyle.xaml b/src/Core_GE30/HandyControl_Core_GE30/Themes/Styles/Base/ComboBoxBaseStyle.xaml similarity index 100% rename from src/Core_30/HandyControl_Core_30/Themes/Styles/Base/ComboBoxBaseStyle.xaml rename to src/Core_GE30/HandyControl_Core_GE30/Themes/Styles/Base/ComboBoxBaseStyle.xaml diff --git a/src/Core_30/HandyControl_Core_30/Themes/Styles/Base/TreeViewBaseStyle.xaml b/src/Core_GE30/HandyControl_Core_GE30/Themes/Styles/Base/TreeViewBaseStyle.xaml similarity index 96% rename from src/Core_30/HandyControl_Core_30/Themes/Styles/Base/TreeViewBaseStyle.xaml rename to src/Core_GE30/HandyControl_Core_GE30/Themes/Styles/Base/TreeViewBaseStyle.xaml index b556d943..d50d832c 100644 --- a/src/Core_30/HandyControl_Core_30/Themes/Styles/Base/TreeViewBaseStyle.xaml +++ b/src/Core_GE30/HandyControl_Core_GE30/Themes/Styles/Base/TreeViewBaseStyle.xaml @@ -51,7 +51,7 @@ - + diff --git a/src/Core_30/HandyControl_Core_30/Themes/Styles/DataGrid.xaml b/src/Core_GE30/HandyControl_Core_GE30/Themes/Styles/DataGrid.xaml similarity index 100% rename from src/Core_30/HandyControl_Core_30/Themes/Styles/DataGrid.xaml rename to src/Core_GE30/HandyControl_Core_GE30/Themes/Styles/DataGrid.xaml diff --git a/src/Core_30/HandyControl_Core_30/Themes/Styles/ListView.xaml b/src/Core_GE30/HandyControl_Core_GE30/Themes/Styles/ListView.xaml similarity index 100% rename from src/Core_30/HandyControl_Core_30/Themes/Styles/ListView.xaml rename to src/Core_GE30/HandyControl_Core_GE30/Themes/Styles/ListView.xaml diff --git a/src/Core_30/HandyControl_Core_30/Themes/Styles/MessageBox.xaml b/src/Core_GE30/HandyControl_Core_GE30/Themes/Styles/MessageBox.xaml similarity index 100% rename from src/Core_30/HandyControl_Core_30/Themes/Styles/MessageBox.xaml rename to src/Core_GE30/HandyControl_Core_GE30/Themes/Styles/MessageBox.xaml diff --git a/src/Core_30/HandyControl_Core_30/Themes/Styles/Window.xaml b/src/Core_GE30/HandyControl_Core_GE30/Themes/Styles/Window.xaml similarity index 99% rename from src/Core_30/HandyControl_Core_30/Themes/Styles/Window.xaml rename to src/Core_GE30/HandyControl_Core_GE30/Themes/Styles/Window.xaml index 15e08920..c48c486c 100644 --- a/src/Core_30/HandyControl_Core_30/Themes/Styles/Window.xaml +++ b/src/Core_GE30/HandyControl_Core_GE30/Themes/Styles/Window.xaml @@ -117,7 +117,7 @@ - + diff --git a/src/HandyControl.sln b/src/HandyControl.sln index d4e18bab..1154962f 100644 --- a/src/HandyControl.sln +++ b/src/HandyControl.sln @@ -17,16 +17,18 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HandyControlDemo_Shared", " EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Net_40", "Net_40", "{35E3F9C0-8924-4536-BE09-F3761FDBF066}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core_30", "Core_30", "{B838C973-06F0-48A1-B259-A357AAF2D8D4}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core_GE30", "Core_GE30", "{B838C973-06F0-48A1-B259-A357AAF2D8D4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControl_Core_30", "Core_30\HandyControl_Core_30\HandyControl_Core_30.csproj", "{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControl_Core_GE30", "Core_GE30\HandyControl_Core_GE30\HandyControl_Core_GE30.csproj", "{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControlDemo_Core30", "Core_30\HandyControlDemo_Core_30\HandyControlDemo_Core30.csproj", "{D7107690-8592-4F9F-9379-9B82C1C15D2A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControlDemo_Core_GE30", "Core_GE30\HandyControlDemo_Core_GE30\HandyControlDemo_Core_GE30.csproj", "{D7107690-8592-4F9F-9379-9B82C1C15D2A}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControl_Net_40", "Net_40\HandyControl_Net_40\HandyControl_Net_40.csproj", "{32204503-2EF0-4681-AE13-AA1FEB6C658A}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo_Net_40", "Net_40\HandyControlDemo_Net_40\HandyControlDemo_Net_40.csproj", "{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo_Code", "Shared\HandyControlDemo_Code\HandyControlDemo_Code.csproj", "{D8A4748C-0500-4F63-BC47-3506658C68F7}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution Shared\HandyControl_Shared\HandyControl_Shared.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 4 @@ -38,12 +40,14 @@ Global EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug-Core30|Any CPU = Debug-Core30|Any CPU + Debug-Core31|Any CPU = Debug-Core31|Any CPU Debug-Net40|Any CPU = Debug-Net40|Any CPU Debug-Net45|Any CPU = Debug-Net45|Any CPU Debug-Net462|Any CPU = Debug-Net462|Any CPU Debug-Net47|Any CPU = Debug-Net47|Any CPU Debug-Net48|Any CPU = Debug-Net48|Any CPU Release-Core30|Any CPU = Release-Core30|Any CPU + Release-Core31|Any CPU = Release-Core31|Any CPU Release-Net40|Any CPU = Release-Net40|Any CPU Release-Net45|Any CPU = Release-Net45|Any CPU Release-Net462|Any CPU = Release-Net462|Any CPU @@ -52,6 +56,7 @@ Global EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Core30|Any CPU.ActiveCfg = Debug-Net45|Any CPU + {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Core31|Any CPU.ActiveCfg = Debug-Net45|Any CPU {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net40|Any CPU.ActiveCfg = Debug-Net45|Any CPU {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net45|Any CPU {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net45|Any CPU.Build.0 = Debug-Net45|Any CPU @@ -62,6 +67,7 @@ Global {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net48|Any CPU.ActiveCfg = Debug-Net48|Any CPU {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net48|Any CPU.Build.0 = Debug-Net48|Any CPU {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Core30|Any CPU.ActiveCfg = Release-Net45|Any CPU + {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Core31|Any CPU.ActiveCfg = Release-Net45|Any CPU {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net40|Any CPU.ActiveCfg = Release-Net45|Any CPU {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net45|Any CPU.ActiveCfg = Release-Net45|Any CPU {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net45|Any CPU.Build.0 = Release-Net45|Any CPU @@ -72,6 +78,7 @@ Global {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net48|Any CPU.ActiveCfg = Release-Net48|Any CPU {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net48|Any CPU.Build.0 = Release-Net48|Any CPU {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Core30|Any CPU.ActiveCfg = Debug-Net45|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Core31|Any CPU.ActiveCfg = Debug-Net45|Any CPU {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net40|Any CPU.ActiveCfg = Debug-Net45|Any CPU {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net45|Any CPU {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net45|Any CPU.Build.0 = Debug-Net45|Any CPU @@ -82,6 +89,7 @@ Global {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net48|Any CPU.ActiveCfg = Debug-Net48|Any CPU {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net48|Any CPU.Build.0 = Debug-Net48|Any CPU {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Core30|Any CPU.ActiveCfg = Release-Net45|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Core31|Any CPU.ActiveCfg = Release-Net45|Any CPU {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net40|Any CPU.ActiveCfg = Release-Net47|Any CPU {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net45|Any CPU.ActiveCfg = Release-Net45|Any CPU {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net45|Any CPU.Build.0 = Release-Net45|Any CPU @@ -91,43 +99,64 @@ Global {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net47|Any CPU.Build.0 = Release-Net47|Any CPU {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net48|Any CPU.ActiveCfg = Release-Net48|Any CPU {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net48|Any CPU.Build.0 = Release-Net48|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Core30|Any CPU.ActiveCfg = Debug|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Core30|Any CPU.Build.0 = Debug|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net40|Any CPU.ActiveCfg = Debug|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net45|Any CPU.ActiveCfg = Debug|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net462|Any CPU.ActiveCfg = Debug|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net47|Any CPU.ActiveCfg = Debug|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net48|Any CPU.ActiveCfg = Debug|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Core30|Any CPU.ActiveCfg = Release|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Core30|Any CPU.Build.0 = Release|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net40|Any CPU.ActiveCfg = Release|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net45|Any CPU.ActiveCfg = Release|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net45|Any CPU.Build.0 = Release|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net462|Any CPU.ActiveCfg = Release|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net462|Any CPU.Build.0 = Release|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net47|Any CPU.ActiveCfg = Release|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net47|Any CPU.Build.0 = Release|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net48|Any CPU.ActiveCfg = Release|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net48|Any CPU.Build.0 = Release|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Core30|Any CPU.ActiveCfg = Debug|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Core30|Any CPU.Build.0 = Debug|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net40|Any CPU.ActiveCfg = Debug|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net45|Any CPU.ActiveCfg = Debug|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net462|Any CPU.ActiveCfg = Debug|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net47|Any CPU.ActiveCfg = Debug|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net48|Any CPU.ActiveCfg = Debug|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Core30|Any CPU.ActiveCfg = Release|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Core30|Any CPU.Build.0 = Release|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net40|Any CPU.ActiveCfg = Release|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net45|Any CPU.ActiveCfg = Release|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net45|Any CPU.Build.0 = Release|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net462|Any CPU.ActiveCfg = Release|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net462|Any CPU.Build.0 = Release|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net47|Any CPU.ActiveCfg = Release|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net47|Any CPU.Build.0 = Release|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net48|Any CPU.ActiveCfg = Release|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net48|Any CPU.Build.0 = Release|Any CPU + {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Core30|Any CPU.ActiveCfg = Debug-Core30|Any CPU + {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Core30|Any CPU.Build.0 = Debug-Core30|Any CPU + {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Core31|Any CPU.ActiveCfg = Debug-Core31|Any CPU + {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Core31|Any CPU.Build.0 = Debug-Core31|Any CPU + {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net40|Any CPU.ActiveCfg = Debug-Core31|Any CPU + {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net40|Any CPU.Build.0 = Debug-Core31|Any CPU + {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net45|Any CPU.ActiveCfg = Debug-Core31|Any CPU + {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net45|Any CPU.Build.0 = Debug-Core31|Any CPU + {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net462|Any CPU.ActiveCfg = Debug-Core31|Any CPU + {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net462|Any CPU.Build.0 = Debug-Core31|Any CPU + {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net47|Any CPU.ActiveCfg = Debug-Core31|Any CPU + {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net47|Any CPU.Build.0 = Debug-Core31|Any CPU + {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net48|Any CPU.ActiveCfg = Debug-Core31|Any CPU + {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net48|Any CPU.Build.0 = Debug-Core31|Any CPU + {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Core30|Any CPU.ActiveCfg = Release-Core30|Any CPU + {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Core30|Any CPU.Build.0 = Release-Core30|Any CPU + {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Core31|Any CPU.ActiveCfg = Release-Core31|Any CPU + {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Core31|Any CPU.Build.0 = Release-Core31|Any CPU + {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net40|Any CPU.ActiveCfg = Release-Core31|Any CPU + {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net40|Any CPU.Build.0 = Release-Core31|Any CPU + {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net45|Any CPU.ActiveCfg = Release-Core31|Any CPU + {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net45|Any CPU.Build.0 = Release-Core31|Any CPU + {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net462|Any CPU.ActiveCfg = Release-Core31|Any CPU + {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net462|Any CPU.Build.0 = Release-Core31|Any CPU + {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net47|Any CPU.ActiveCfg = Release-Core31|Any CPU + {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net47|Any CPU.Build.0 = Release-Core31|Any CPU + {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net48|Any CPU.ActiveCfg = Release-Core31|Any CPU + {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net48|Any CPU.Build.0 = Release-Core31|Any CPU + {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Core30|Any CPU.ActiveCfg = Debug-Core30|Any CPU + {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Core30|Any CPU.Build.0 = Debug-Core30|Any CPU + {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Core31|Any CPU.ActiveCfg = Debug-Core31|Any CPU + {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Core31|Any CPU.Build.0 = Debug-Core31|Any CPU + {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net40|Any CPU.ActiveCfg = Debug-Core31|Any CPU + {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net40|Any CPU.Build.0 = Debug-Core31|Any CPU + {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net45|Any CPU.ActiveCfg = Debug-Core31|Any CPU + {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net45|Any CPU.Build.0 = Debug-Core31|Any CPU + {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net462|Any CPU.ActiveCfg = Debug-Core31|Any CPU + {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net462|Any CPU.Build.0 = Debug-Core31|Any CPU + {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net47|Any CPU.ActiveCfg = Debug-Core31|Any CPU + {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net47|Any CPU.Build.0 = Debug-Core31|Any CPU + {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net48|Any CPU.ActiveCfg = Debug-Core31|Any CPU + {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net48|Any CPU.Build.0 = Debug-Core31|Any CPU + {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Core30|Any CPU.ActiveCfg = Release-Core30|Any CPU + {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Core30|Any CPU.Build.0 = Release-Core30|Any CPU + {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Core31|Any CPU.ActiveCfg = Release-Core31|Any CPU + {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Core31|Any CPU.Build.0 = Release-Core31|Any CPU + {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net40|Any CPU.ActiveCfg = Release-Core31|Any CPU + {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net40|Any CPU.Build.0 = Release-Core31|Any CPU + {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net45|Any CPU.ActiveCfg = Release-Core31|Any CPU + {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net45|Any CPU.Build.0 = Release-Core31|Any CPU + {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net462|Any CPU.ActiveCfg = Release-Core31|Any CPU + {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net462|Any CPU.Build.0 = Release-Core31|Any CPU + {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net47|Any CPU.ActiveCfg = Release-Core31|Any CPU + {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net47|Any CPU.Build.0 = Release-Core31|Any CPU + {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net48|Any CPU.ActiveCfg = Release-Core31|Any CPU + {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net48|Any CPU.Build.0 = Release-Core31|Any CPU {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug-Core30|Any CPU.ActiveCfg = Debug|Any CPU + {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug-Core31|Any CPU.ActiveCfg = Debug|Any CPU {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug-Net40|Any CPU.ActiveCfg = Debug|Any CPU {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug-Net40|Any CPU.Build.0 = Debug|Any CPU {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug-Net45|Any CPU.ActiveCfg = Debug|Any CPU @@ -135,17 +164,15 @@ Global {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug-Net47|Any CPU.ActiveCfg = Debug|Any CPU {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug-Net48|Any CPU.ActiveCfg = Debug|Any CPU {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Core30|Any CPU.ActiveCfg = Release|Any CPU + {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Core31|Any CPU.ActiveCfg = Release|Any CPU {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Net40|Any CPU.ActiveCfg = Release|Any CPU {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Net40|Any CPU.Build.0 = Release|Any CPU {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Net45|Any CPU.ActiveCfg = Release|Any CPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Net45|Any CPU.Build.0 = Release|Any CPU {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Net462|Any CPU.ActiveCfg = Release|Any CPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Net462|Any CPU.Build.0 = Release|Any CPU {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Net47|Any CPU.ActiveCfg = Release|Any CPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Net47|Any CPU.Build.0 = Release|Any CPU {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Net48|Any CPU.ActiveCfg = Release|Any CPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Net48|Any CPU.Build.0 = Release|Any CPU {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug-Core30|Any CPU.ActiveCfg = Debug|Any CPU + {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug-Core31|Any CPU.ActiveCfg = Debug|Any CPU {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug-Net40|Any CPU.ActiveCfg = Debug|Any CPU {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug-Net40|Any CPU.Build.0 = Debug|Any CPU {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug-Net45|Any CPU.ActiveCfg = Debug|Any CPU @@ -153,16 +180,41 @@ Global {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug-Net47|Any CPU.ActiveCfg = Debug|Any CPU {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug-Net48|Any CPU.ActiveCfg = Debug|Any CPU {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Core30|Any CPU.ActiveCfg = Release|Any CPU + {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Core31|Any CPU.ActiveCfg = Release|Any CPU {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Net40|Any CPU.ActiveCfg = Release|Any CPU {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Net40|Any CPU.Build.0 = Release|Any CPU {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Net45|Any CPU.ActiveCfg = Release|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Net45|Any CPU.Build.0 = Release|Any CPU {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Net462|Any CPU.ActiveCfg = Release|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Net462|Any CPU.Build.0 = Release|Any CPU {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Net47|Any CPU.ActiveCfg = Release|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Net47|Any CPU.Build.0 = Release|Any CPU {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Net48|Any CPU.ActiveCfg = Release|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Net48|Any CPU.Build.0 = Release|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Core30|Any CPU.ActiveCfg = Debug-Net48|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Core30|Any CPU.Build.0 = Debug-Net48|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Core31|Any CPU.ActiveCfg = Debug-Net48|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Core31|Any CPU.Build.0 = Debug-Net48|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net40|Any CPU.ActiveCfg = Debug-Net40|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net40|Any CPU.Build.0 = Debug-Net40|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net45|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net45|Any CPU.Build.0 = Debug-Net45|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net462|Any CPU.ActiveCfg = Debug-Net462|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net462|Any CPU.Build.0 = Debug-Net462|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net47|Any CPU.ActiveCfg = Debug-Net47|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net47|Any CPU.Build.0 = Debug-Net47|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net48|Any CPU.ActiveCfg = Debug-Net48|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net48|Any CPU.Build.0 = Debug-Net48|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Core30|Any CPU.ActiveCfg = Release-Net48|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Core30|Any CPU.Build.0 = Release-Net48|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Core31|Any CPU.ActiveCfg = Release-Net48|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Core31|Any CPU.Build.0 = Release-Net48|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net40|Any CPU.ActiveCfg = Release-Net40|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net40|Any CPU.Build.0 = Release-Net40|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net45|Any CPU.ActiveCfg = Release-Net45|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net45|Any CPU.Build.0 = Release-Net45|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net462|Any CPU.ActiveCfg = Release-Net462|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net462|Any CPU.Build.0 = Release-Net462|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net47|Any CPU.ActiveCfg = Release-Net47|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net47|Any CPU.Build.0 = Release-Net47|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net48|Any CPU.ActiveCfg = Release-Net48|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net48|Any CPU.Build.0 = Release-Net48|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -176,6 +228,7 @@ Global {D7107690-8592-4F9F-9379-9B82C1C15D2A} = {B838C973-06F0-48A1-B259-A357AAF2D8D4} {32204503-2EF0-4681-AE13-AA1FEB6C658A} = {35E3F9C0-8924-4536-BE09-F3761FDBF066} {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231} = {35E3F9C0-8924-4536-BE09-F3761FDBF066} + {D8A4748C-0500-4F63-BC47-3506658C68F7} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D4636382-1A18-4079-A3E7-054DD970F179} diff --git a/src/HandyControl_Core_30.sln b/src/HandyControl_Core_GE30.sln similarity index 72% rename from src/HandyControl_Core_30.sln rename to src/HandyControl_Core_GE30.sln index d41e6f27..5d0f3b84 100644 --- a/src/HandyControl_Core_30.sln +++ b/src/HandyControl_Core_GE30.sln @@ -9,11 +9,13 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HandyControl_Shared", "Shar EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HandyControlDemo_Shared", "Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.shproj", "{C4694269-C9B8-45D5-87F8-D0088C532510}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core_30", "Core_30", "{7BB7D82E-48B1-4673-91B6-37D563A0A624}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core_GE30", "Core_GE30", "{7BB7D82E-48B1-4673-91B6-37D563A0A624}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControl_Core_30", "Core_30\HandyControl_Core_30\HandyControl_Core_30.csproj", "{A85722CF-CDF4-4164-94E4-EB71E543361A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControl_Core_GE30", "Core_GE30\HandyControl_Core_GE30\HandyControl_Core_GE30.csproj", "{A85722CF-CDF4-4164-94E4-EB71E543361A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControlDemo_Core30", "Core_30\HandyControlDemo_Core_30\HandyControlDemo_Core30.csproj", "{BF712555-531A-4C8D-9AB5-3109DC178A8E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControlDemo_Core_GE30", "Core_GE30\HandyControlDemo_Core_GE30\HandyControlDemo_Core_GE30.csproj", "{BF712555-531A-4C8D-9AB5-3109DC178A8E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo_Code", "Shared\HandyControlDemo_Code\HandyControlDemo_Code.csproj", "{D8A4748C-0500-4F63-BC47-3506658C68F7}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution @@ -33,6 +35,10 @@ Global {BF712555-531A-4C8D-9AB5-3109DC178A8E}.Debug|Any CPU.Build.0 = Debug|Any CPU {BF712555-531A-4C8D-9AB5-3109DC178A8E}.Release|Any CPU.ActiveCfg = Release|Any CPU {BF712555-531A-4C8D-9AB5-3109DC178A8E}.Release|Any CPU.Build.0 = Release|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug|Any CPU.ActiveCfg = Debug-Net48|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug|Any CPU.Build.0 = Debug-Net48|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release|Any CPU.ActiveCfg = Release-Net48|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release|Any CPU.Build.0 = Release-Net48|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -42,6 +48,7 @@ Global {C4694269-C9B8-45D5-87F8-D0088C532510} = {60DCDCCA-3902-49EB-BC24-488143BE832E} {A85722CF-CDF4-4164-94E4-EB71E543361A} = {7BB7D82E-48B1-4673-91B6-37D563A0A624} {BF712555-531A-4C8D-9AB5-3109DC178A8E} = {7BB7D82E-48B1-4673-91B6-37D563A0A624} + {D8A4748C-0500-4F63-BC47-3506658C68F7} = {60DCDCCA-3902-49EB-BC24-488143BE832E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6C8B9B9F-B396-4C31-BA28-11BCB1ED94C5} diff --git a/src/HandyControl_Net_40.sln b/src/HandyControl_Net_40.sln index 60bcd427..e33e7cc8 100644 --- a/src/HandyControl_Net_40.sln +++ b/src/HandyControl_Net_40.sln @@ -15,6 +15,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControl_Net_40", "Net_ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo_Net_40", "Net_40\HandyControlDemo_Net_40\HandyControlDemo_Net_40.csproj", "{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo_Code", "Shared\HandyControlDemo_Code\HandyControlDemo_Code.csproj", "{D8A4748C-0500-4F63-BC47-3506658C68F7}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution Shared\HandyControl_Shared\HandyControl_Shared.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 4 @@ -35,6 +37,10 @@ Global {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug|Any CPU.Build.0 = Debug|Any CPU {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release|Any CPU.ActiveCfg = Release|Any CPU {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release|Any CPU.Build.0 = Release|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug|Any CPU.ActiveCfg = Debug-Net40|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug|Any CPU.Build.0 = Debug-Net40|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release|Any CPU.ActiveCfg = Release-Net40|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release|Any CPU.Build.0 = Release-Net40|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -44,6 +50,7 @@ Global {C4694269-C9B8-45D5-87F8-D0088C532510} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} {32204503-2EF0-4681-AE13-AA1FEB6C658A} = {763DABFC-950A-4965-97CB-15C59A928401} {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231} = {763DABFC-950A-4965-97CB-15C59A928401} + {D8A4748C-0500-4F63-BC47-3506658C68F7} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D4636382-1A18-4079-A3E7-054DD970F179} diff --git a/src/HandyControl_Net_GE45.sln b/src/HandyControl_Net_GE45.sln index b2e1b9ae..34b9d63d 100644 --- a/src/HandyControl_Net_GE45.sln +++ b/src/HandyControl_Net_GE45.sln @@ -15,6 +15,8 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HandyControl_Shared", "Shar EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HandyControlDemo_Shared", "Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.shproj", "{C4694269-C9B8-45D5-87F8-D0088C532510}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo_Code", "Shared\HandyControlDemo_Code\HandyControlDemo_Code.csproj", "{D8A4748C-0500-4F63-BC47-3506658C68F7}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{9a7b52e6-94bb-4e7e-bb6a-7cf6761b79a7}*SharedItemsImports = 4 @@ -49,22 +51,38 @@ Global {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net47|Any CPU.Build.0 = Release-Net47|Any CPU {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net48|Any CPU.ActiveCfg = Release-Net48|Any CPU {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net48|Any CPU.Build.0 = Release-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net47|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net45|Any CPU.Build.0 = Debug-Net47|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net462|Any CPU.ActiveCfg = Debug-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net462|Any CPU.Build.0 = Debug-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net47|Any CPU.ActiveCfg = Debug-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net47|Any CPU.Build.0 = Debug-Net48|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net45|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net45|Any CPU.Build.0 = Debug-Net45|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net462|Any CPU.ActiveCfg = Debug-Net462|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net462|Any CPU.Build.0 = Debug-Net462|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net47|Any CPU.ActiveCfg = Debug-Net47|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net47|Any CPU.Build.0 = Debug-Net47|Any CPU {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net48|Any CPU.ActiveCfg = Debug-Net48|Any CPU {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net48|Any CPU.Build.0 = Debug-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net45|Any CPU.ActiveCfg = Release-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net45|Any CPU.Build.0 = Release-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net462|Any CPU.ActiveCfg = Release-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net462|Any CPU.Build.0 = Release-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net47|Any CPU.ActiveCfg = Release-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net47|Any CPU.Build.0 = Release-Net48|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net45|Any CPU.ActiveCfg = Debug-Net45|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net45|Any CPU.Build.0 = Debug-Net45|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net462|Any CPU.ActiveCfg = Debug-Net462|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net462|Any CPU.Build.0 = Debug-Net462|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net47|Any CPU.ActiveCfg = Release-Net47|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net47|Any CPU.Build.0 = Release-Net47|Any CPU {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net48|Any CPU.ActiveCfg = Release-Net48|Any CPU {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net48|Any CPU.Build.0 = Release-Net48|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net45|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net45|Any CPU.Build.0 = Debug-Net45|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net462|Any CPU.ActiveCfg = Debug-Net462|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net462|Any CPU.Build.0 = Debug-Net462|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net47|Any CPU.ActiveCfg = Debug-Net47|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net47|Any CPU.Build.0 = Debug-Net47|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net48|Any CPU.ActiveCfg = Debug-Net48|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net48|Any CPU.Build.0 = Debug-Net48|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net45|Any CPU.ActiveCfg = Release-Net45|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net45|Any CPU.Build.0 = Release-Net45|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net462|Any CPU.ActiveCfg = Release-Net462|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net462|Any CPU.Build.0 = Release-Net462|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net47|Any CPU.ActiveCfg = Release-Net47|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net47|Any CPU.Build.0 = Release-Net47|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net48|Any CPU.ActiveCfg = Release-Net48|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net48|Any CPU.Build.0 = Release-Net48|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -74,6 +92,7 @@ Global {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7} = {2F551C62-77F7-4FA5-8AD7-FCF53E92AE08} {AAC11083-FACA-405D-9197-5C1212D65656} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} {C4694269-C9B8-45D5-87F8-D0088C532510} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} + {D8A4748C-0500-4F63-BC47-3506658C68F7} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D4636382-1A18-4079-A3E7-054DD970F179} 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 3da0dae4..50bbc0a2 100644 --- a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj +++ b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj @@ -57,6 +57,9 @@ + + 6.0.1 + 5.4.1.1 @@ -395,6 +398,10 @@ + + {d8a4748c-0500-4f63-bc47-3506658c68f7} + HandyControlDemo_Code + {32204503-2ef0-4681-ae13-aa1feb6c658a} HandyControl_Net_40 @@ -537,6 +544,9 @@ Resources\Img\LeftMainContent\frame_16xLG.png + + Resources\Img\cloud.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 092bb8a0..992a379c 100644 --- a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj +++ b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj @@ -37,8 +37,8 @@ 8.0 - - Properties\AssemblyInfo.cs + + Properties\NetAssemblyInfo.cs Properties\Langs\Lang.Designer.cs @@ -113,9 +113,18 @@ + + Resources\Effects\BrightnessEffect.ps + Resources\Effects\ColorComplementEffect.ps + + Resources\Effects\ColorMatrixEffect.ps + + + Resources\Effects\ContrastEffect.ps + Resources\Effects\GrayScaleEffect.ps diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/TreeViewBaseStyle.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/TreeViewBaseStyle.xaml index 6c9f43c3..deea89ce 100644 --- a/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/TreeViewBaseStyle.xaml +++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/TreeViewBaseStyle.xaml @@ -51,7 +51,7 @@ - + diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/Window.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/Window.xaml index b0203625..a9e520ac 100644 --- a/src/Net_40/HandyControl_Net_40/Themes/Styles/Window.xaml +++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/Window.xaml @@ -118,7 +118,7 @@ - + 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 6b365cd1..abe74897 100644 --- a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj +++ b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj @@ -127,12 +127,19 @@ + + {d8a4748c-0500-4f63-bc47-3506658c68f7} + HandyControlDemo_Code + {dc966e3d-bcff-4652-98cf-070e5494749a} HandyControl_Net_GE45 + + 6.0.1 + 5.4.1.1 @@ -600,6 +607,9 @@ Resources\Img\LeftMainContent\frame_16xLG.png + + Resources\Img\cloud.png + 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 15efdefe..676b9be5 100644 --- a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj +++ b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj @@ -112,8 +112,8 @@ 8.0 - - Properties\AssemblyInfo.cs + + Properties\NetAssemblyInfo.cs Properties\Langs\Lang.Designer.cs @@ -184,9 +184,18 @@ + + Resources\Effects\BrightnessEffect.ps + Resources\Effects\ColorComplementEffect.ps + + Resources\Effects\ColorMatrixEffect.ps + + + Resources\Effects\ContrastEffect.ps + Resources\Effects\GrayScaleEffect.ps diff --git a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Base/TreeViewBaseStyle.xaml b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Base/TreeViewBaseStyle.xaml index fd88df4e..16a204a8 100644 --- a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Base/TreeViewBaseStyle.xaml +++ b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Base/TreeViewBaseStyle.xaml @@ -52,7 +52,7 @@ - + diff --git a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Window.xaml b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Window.xaml index 84b09e51..82e8e68b 100644 --- a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Window.xaml +++ b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Window.xaml @@ -117,7 +117,7 @@ - + diff --git a/src/Shared/HandyControlDemo_Code/DemoHelper.cs b/src/Shared/HandyControlDemo_Code/DemoHelper.cs new file mode 100644 index 00000000..b45e370e --- /dev/null +++ b/src/Shared/HandyControlDemo_Code/DemoHelper.cs @@ -0,0 +1,25 @@ +using System; +using System.IO; +using System.Windows; + +public class DemoHelper +{ + public static void Main() + { + + } + + public static string GetCode(string demoName) + { + var uri = new Uri($"/HandyControlDemoCode;component/{demoName}", UriKind.Relative); + var resourceStream = Application.GetResourceStream(uri); + if (resourceStream != null) + { + using var reader = new StreamReader(resourceStream.Stream); + var code = reader.ReadToEnd(); + return code; + } + + return ""; + } +} \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj b/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj new file mode 100644 index 00000000..db149ee9 --- /dev/null +++ b/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj @@ -0,0 +1,990 @@ + + + + + Debug + AnyCPU + {D8A4748C-0500-4F63-BC47-3506658C68F7} + Library + HandyControlDemoCode + HandyControlDemoCode + v4.0 + 512 + true + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE;netle45;netle40 + prompt + 4 + v4.0 + 8.0 + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + v4.5 + 8.0 + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + v4.6.2 + 8.0 + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + v4.7 + 8.0 + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + v4.8 + 8.0 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE;netle45;netle40 + prompt + 4 + v4.0 + 8.0 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + v4.5 + 8.0 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + v4.6.2 + 8.0 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + v4.7 + 8.0 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + v4.8 + 8.0 + + + + + + + + + + Window\AboutWindow.xaml + + + Window\BlurWindow.xaml + + + Window\CommonWindow.xaml + + + Window\CustomNonClientAreaWindow.xaml + + + Window\DialogDemoWindow.xaml + + + Window\GlowWindow.xaml + + + Window\GrowlDemoWindow.xaml + + + Window\NativeCommonWindow.xaml + + + Window\NavigationWindow.xaml + + + Window\NoNonClientAreaDragableWindow.xaml + + + UserControl\Basic\Avatar.xaml + + + UserControl\Basic\ChatBox.xaml + + + UserControl\Basic\InteractiveDialog.xaml + + + UserControl\Basic\TextDialog.xaml + + + UserControl\Basic\TextDialogWithTimer.xaml + + + UserControl\Controls\AnimationPathDemoCtl.xaml + + + UserControl\Controls\BadgeDemoCtl.xaml + + + UserControl\Controls\ButtonGroupDemoCtl.xaml + + + UserControl\Controls\CalendarWithClockDemoCtl.xaml + + + UserControl\Controls\CardDemoCtl.xaml + + + UserControl\Controls\CarouselDemoCtl.xaml + + + UserControl\Controls\ChatBubbleDemoCtl.xaml + + + UserControl\Controls\CirclePanelDemoCtl.xaml + + + UserControl\Controls\ClockDemoCtl.xaml + + + UserControl\Controls\ColorPickerDemoCtl.xaml + + + UserControl\Controls\ComboBoxDemoCtl.xaml + + + UserControl\Controls\CompareSliderDemoCtl.xaml + + + UserControl\Controls\CoverFlowDemoCtl.xaml + + + UserControl\Controls\CoverViewDemoCtl.xaml + + + UserControl\Controls\DatePickerDemoCtl.xaml + + + UserControl\Controls\DateTimePickerDemoCtl.xaml + + + UserControl\Controls\DialogDemoCtl.xaml + + + UserControl\Controls\DividerDemoCtl.xaml + + + UserControl\Controls\DrawerDemoCtl.xaml + + + UserControl\Controls\FlipClockDemoCtl.xaml + + + UserControl\Controls\FloatingBlockDemoCtl.xaml + + + UserControl\Controls\GifImageDemoCtl.xaml + + + UserControl\Controls\GotoTopDemoCtl.xaml + + + UserControl\Controls\GravatarDemoCtl.xaml + + + UserControl\Controls\GridDemoCtl.xaml + + + UserControl\Controls\GrowlDemoCtl.xaml + + + UserControl\Controls\HoneycombPanelDemoCtl.xaml + + + UserControl\Controls\ImageBlockDemoCtl.xaml + + + UserControl\Controls\ImageBrowserDemoCtl.xaml + + + UserControl\Controls\LoadingDemoCtl.xaml + + + UserControl\Controls\MagnifierDemoCtl.xaml + + + UserControl\Controls\NotificationDemoCtl.xaml + + + UserControl\Controls\NotifyIconDemoCtl.xaml + + + UserControl\Controls\NumericUpDownDemoCtl.xaml + + + UserControl\Controls\OutlineTextDemoCtl.xaml + + + UserControl\Controls\PaginationDemoCtl.xaml + + + UserControl\Controls\PasswordBoxDemoCtl.xaml + + + UserControl\Controls\PinBoxDemoCtl.xaml + + + UserControl\Controls\PoptipDemoCtl.xaml + + + UserControl\Controls\PreviewSliderDemoCtl.xaml + + + UserControl\Controls\ProgressBarDemoCtl.xaml + + + UserControl\Controls\ProgressButtonDemoCtl.xaml + + + UserControl\Controls\RangeSliderDemoCtl.xaml + + + UserControl\Controls\RateDemoCtl.xaml + + + UserControl\Controls\RelativePanelDemoCtl.xaml + + + UserControl\Controls\RunningBlockDemoCtl.xaml + + + UserControl\Controls\ScrollViewerDemoCtl.xaml + + + UserControl\Controls\SearchBarDemoCtl.xaml + + + UserControl\Controls\ShieldDemoCtl.xaml + + + UserControl\Controls\SideMenuDemoCtl.xaml + + + UserControl\Controls\SplitButtonDemoCtl.xaml + + + UserControl\Controls\SpriteDemoCtl.xaml + + + UserControl\Controls\StepBarDemoCtl.xaml + + + UserControl\Controls\TabControlDemoCtl.xaml + + + UserControl\Controls\TagDemoCtl.xaml + + + UserControl\Controls\TextBoxDemoCtl.xaml + + + UserControl\Controls\TimeBarDemoCtl.xaml + + + UserControl\Controls\TimePickerDemoCtl.xaml + + + UserControl\Controls\TransferDemoCtl.xaml + + + UserControl\Controls\TransitioningContentControlDemoCtl.xaml + + + UserControl\Controls\WaterfallPanelDemoCtl.xaml + + + UserControl\Controls\WindowDemoCtl.xaml + + + UserControl\Styles\BorderDemoCtl.xaml + + + UserControl\Styles\BrushDemoCtl.xaml + + + UserControl\Styles\ButtonDemoCtl.xaml + + + UserControl\Styles\CalendarDemoCtl.xaml + + + UserControl\Styles\CheckBoxDemoCtl.xaml + + + UserControl\Styles\DataGridDemoCtl.xaml + + + UserControl\Styles\ExpanderDemoCtl.xaml + + + UserControl\Styles\FlowDocumentDemoCtl.xaml + + + UserControl\Styles\FrameDemoCtl.xaml + + + UserControl\Styles\GroupBoxDemoCtl.xaml + + + UserControl\Styles\LabelDemoCtl.xaml + + + UserControl\Styles\ListBoxDemoCtl.xaml + + + UserControl\Styles\ListViewDemoCtl.xaml + + + UserControl\Styles\MenuDemoCtl.xaml + + + UserControl\Styles\NativeComboBoxDemoCtl.xaml + + + UserControl\Styles\NativeDatePickerDemoCtl.xaml + + + UserControl\Styles\NativePasswordBoxDemoCtl.xaml + + + UserControl\Styles\NativeProgressBarDemoCtl.xaml + + + UserControl\Styles\NativeScrollViewerDemoCtl.xaml + + + UserControl\Styles\NativeTabControlDemoCtl.xaml + + + UserControl\Styles\NativeTextBoxDemoCtl.xaml + + + UserControl\Styles\NativeWindowDemoCtl.xaml + + + UserControl\Styles\RadioButtonDemoCtl.xaml + + + UserControl\Styles\RepeatButtonDemoCtl.xaml + + + UserControl\Styles\RichTextBoxDemoCtl.xaml + + + UserControl\Styles\SliderDemoCtl.xaml + + + UserControl\Styles\TextBlockDemoCtl.xaml + + + UserControl\Styles\ToggleButtonDemoCtl.xaml + + + UserControl\Styles\ToolBarDemoCtl.xaml + + + UserControl\Styles\TreeViewDemoCtl.xaml + + + UserControl\Tools\EffectsDemoCtl.xaml + + + UserControl\Tools\GeometryAnimationDemoCtl.xaml + + + UserControl\Tools\HatchBrushGeneratorDemoCtl.xaml + + + + + Window\AboutWindow.xaml.cs + AboutWindow.xaml + + + Window\BlurWindow.xaml.cs + BlurWindow.xaml + + + Window\CommonWindow.xaml.cs + CommonWindow.xaml + + + Window\CustomNonClientAreaWindow.xaml.cs + CustomNonClientAreaWindow.xaml + + + Window\DialogDemoWindow.xaml.cs + DialogDemoWindow.xaml + + + Window\GlowWindow.xaml.cs + GlowWindow.xaml + + + Window\GrowlDemoWindow.xaml.cs + GrowlDemoWindow.xaml + + + Window\NativeCommonWindow.xaml.cs + NativeCommonWindow.xaml + + + Window\NavigationWindow.xaml.cs + NavigationWindow.xaml + + + Window\NoNonClientAreaDragableWindow.xaml.cs + NoNonClientAreaDragableWindow.xaml + + + UserControl\Basic\Avatar.xaml.cs + Avatar.xaml + + + UserControl\Basic\ChatBox.xaml.cs + ChatBox.xaml + + + UserControl\Basic\IFull.cs + + + UserControl\Basic\InteractiveDialog.xaml.cs + InteractiveDialog.xaml + + + UserControl\Basic\TextDialog.xaml.cs + TextDialog.xaml + + + UserControl\Basic\TextDialogWithTimer.xaml.cs + TextDialogWithTimer.xaml + + + UserControl\Controls\AnimationPathDemoCtl.xaml.cs + AnimationPathDemoCtl.xaml + + + UserControl\Controls\BadgeDemoCtl.xaml.cs + BadgeDemoCtl.xaml + + + UserControl\Controls\ButtonGroupDemoCtl.xaml.cs + ButtonGroupDemoCtl.xaml + + + UserControl\Controls\CalendarWithClockDemoCtl.xaml.cs + CalendarWithClockDemoCtl.xaml + + + UserControl\Controls\CardDemoCtl.xaml.cs + CardDemoCtl.xaml + + + UserControl\Controls\CarouselDemoCtl.xaml.cs + CarouselDemoCtl.xaml + + + UserControl\Controls\ChatBubbleDemoCtl.xaml.cs + ChatBubbleDemoCtl.xaml + + + UserControl\Controls\CirclePanelDemoCtl.xaml.cs + CirclePanelDemoCtl.xaml + + + UserControl\Controls\ClockDemoCtl.xaml.cs + ClockDemoCtl.xaml + + + UserControl\Controls\ColorPickerDemoCtl.xaml.cs + ColorPickerDemoCtl.xaml + + + UserControl\Controls\ComboBoxDemoCtl.xaml.cs + ComboBoxDemoCtl.xaml + + + UserControl\Controls\CompareSliderDemoCtl.xaml.cs + CompareSliderDemoCtl.xaml + + + UserControl\Controls\CoverFlowDemoCtl.xaml.cs + CoverFlowDemoCtl.xaml + + + UserControl\Controls\CoverViewDemoCtl.xaml.cs + CoverViewDemoCtl.xaml + + + UserControl\Controls\DatePickerDemoCtl.xaml.cs + DatePickerDemoCtl.xaml + + + UserControl\Controls\DateTimePickerDemoCtl.xaml.cs + DateTimePickerDemoCtl.xaml + + + UserControl\Controls\DialogDemoCtl.xaml.cs + DialogDemoCtl.xaml + + + UserControl\Controls\DividerDemoCtl.xaml.cs + DividerDemoCtl.xaml + + + UserControl\Controls\DrawerDemoCtl.xaml.cs + DrawerDemoCtl.xaml + + + UserControl\Controls\FlipClockDemoCtl.xaml.cs + FlipClockDemoCtl.xaml + + + UserControl\Controls\FloatingBlockDemoCtl.xaml.cs + FloatingBlockDemoCtl.xaml + + + UserControl\Controls\GifImageDemoCtl.xaml.cs + GifImageDemoCtl.xaml + + + UserControl\Controls\GotoTopDemoCtl.xaml.cs + GotoTopDemoCtl.xaml + + + UserControl\Controls\GravatarDemoCtl.xaml.cs + GravatarDemoCtl.xaml + + + UserControl\Controls\GridDemoCtl.xaml.cs + GridDemoCtl.xaml + + + UserControl\Controls\GrowlDemoCtl.xaml.cs + GrowlDemoCtl.xaml + + + UserControl\Controls\HoneycombPanelDemoCtl.xaml.cs + HoneycombPanelDemoCtl.xaml + + + UserControl\Controls\ImageBlockDemoCtl.xaml.cs + ImageBlockDemoCtl.xaml + + + UserControl\Controls\ImageBrowserDemoCtl.xaml.cs + ImageBrowserDemoCtl.xaml + + + UserControl\Controls\LoadingDemoCtl.xaml.cs + LoadingDemoCtl.xaml + + + UserControl\Controls\MagnifierDemoCtl.xaml.cs + MagnifierDemoCtl.xaml + + + UserControl\Controls\NotificationDemoCtl.xaml.cs + NotificationDemoCtl.xaml + + + UserControl\Controls\NotifyIconDemoCtl.xaml.cs + NotifyIconDemoCtl.xaml + + + UserControl\Controls\NumericUpDownDemoCtl.xaml.cs + NumericUpDownDemoCtl.xaml + + + UserControl\Controls\OutlineTextDemoCtl.xaml.cs + OutlineTextDemoCtl.xaml + + + UserControl\Controls\PaginationDemoCtl.xaml.cs + PaginationDemoCtl.xaml + + + UserControl\Controls\PasswordBoxDemoCtl.xaml.cs + PasswordBoxDemoCtl.xaml + + + UserControl\Controls\PinBoxDemoCtl.xaml.cs + PinBoxDemoCtl.xaml + + + UserControl\Controls\PoptipDemoCtl.xaml.cs + PoptipDemoCtl.xaml + + + UserControl\Controls\PreviewSliderDemoCtl.xaml.cs + PreviewSliderDemoCtl.xaml + + + UserControl\Controls\ProgressBarDemoCtl.xaml.cs + ProgressBarDemoCtl.xaml + + + UserControl\Controls\ProgressButtonDemoCtl.xaml.cs + ProgressButtonDemoCtl.xaml + + + UserControl\Controls\RangeSliderDemoCtl.xaml.cs + RangeSliderDemoCtl.xaml + + + UserControl\Controls\RateDemoCtl.xaml.cs + RateDemoCtl.xaml + + + UserControl\Controls\RelativePanelDemoCtl.xaml.cs + RelativePanelDemoCtl.xaml + + + UserControl\Controls\RunningBlockDemoCtl.xaml.cs + RunningBlockDemoCtl.xaml + + + UserControl\Controls\ScrollViewerDemoCtl.xaml.cs + ScrollViewerDemoCtl.xaml + + + UserControl\Controls\SearchBarDemoCtl.xaml.cs + SearchBarDemoCtl.xaml + + + UserControl\Controls\ShieldDemoCtl.xaml.cs + ShieldDemoCtl.xaml + + + UserControl\Controls\SideMenuDemoCtl.xaml.cs + SideMenuDemoCtl.xaml + + + UserControl\Controls\SplitButtonDemoCtl.xaml.cs + SplitButtonDemoCtl.xaml + + + UserControl\Controls\SpriteDemoCtl.xaml.cs + SpriteDemoCtl.xaml + + + UserControl\Controls\StepBarDemoCtl.xaml.cs + StepBarDemoCtl.xaml + + + UserControl\Controls\TabControlDemoCtl.xaml.cs + TabControlDemoCtl.xaml + + + UserControl\Controls\TagDemoCtl.xaml.cs + TagDemoCtl.xaml + + + UserControl\Controls\TextBoxDemoCtl.xaml.cs + TextBoxDemoCtl.xaml + + + UserControl\Controls\TimeBarDemoCtl.xaml.cs + TimeBarDemoCtl.xaml + + + UserControl\Controls\TimePickerDemoCtl.xaml.cs + TimePickerDemoCtl.xaml + + + UserControl\Controls\TransferDemoCtl.xaml.cs + TransferDemoCtl.xaml + + + UserControl\Controls\TransitioningContentControlDemoCtl.xaml.cs + TransitioningContentControlDemoCtl.xaml + + + UserControl\Controls\WaterfallPanelDemoCtl.xaml.cs + WaterfallPanelDemoCtl.xaml + + + UserControl\Controls\WindowDemoCtl.xaml.cs + WindowDemoCtl.xaml + + + UserControl\Styles\BorderDemoCtl.xaml.cs + BorderDemoCtl.xaml + + + UserControl\Styles\BrushDemoCtl.xaml.cs + BrushDemoCtl.xaml + + + UserControl\Styles\ButtonDemoCtl.xaml.cs + ButtonDemoCtl.xaml + + + UserControl\Styles\CalendarDemoCtl.xaml.cs + CalendarDemoCtl.xaml + + + UserControl\Styles\CheckBoxDemoCtl.xaml.cs + CheckBoxDemoCtl.xaml + + + UserControl\Styles\DataGridDemoCtl.xaml.cs + DataGridDemoCtl.xaml + + + UserControl\Styles\ExpanderDemoCtl.xaml.cs + ExpanderDemoCtl.xaml + + + UserControl\Styles\FlowDocumentDemoCtl.xaml.cs + FlowDocumentDemoCtl.xaml + + + UserControl\Styles\FrameDemoCtl.xaml.cs + FrameDemoCtl.xaml + + + UserControl\Styles\GroupBoxDemoCtl.xaml.cs + GroupBoxDemoCtl.xaml + + + UserControl\Styles\LabelDemoCtl.xaml.cs + LabelDemoCtl.xaml + + + UserControl\Styles\ListBoxDemoCtl.xaml.cs + ListBoxDemoCtl.xaml + + + UserControl\Styles\ListViewDemoCtl.xaml.cs + ListViewDemoCtl.xaml + + + UserControl\Styles\MenuDemoCtl.xaml.cs + MenuDemoCtl.xaml + + + UserControl\Styles\NativeComboBoxDemoCtl.xaml.cs + NativeComboBoxDemoCtl.xaml + + + UserControl\Styles\NativeDatePickerDemoCtl.xaml.cs + NativeDatePickerDemoCtl.xaml + + + UserControl\Styles\NativePasswordBoxDemoCtl.xaml.cs + NativePasswordBoxDemoCtl.xaml + + + UserControl\Styles\NativeProgressBarDemoCtl.xaml.cs + NativeProgressBarDemoCtl.xaml + + + UserControl\Styles\NativeScrollViewerDemoCtl.xaml.cs + NativeScrollViewerDemoCtl.xaml + + + UserControl\Styles\NativeTabControlDemoCtl.xaml.cs + NativeTabControlDemoCtl.xaml + + + UserControl\Styles\NativeTextBoxDemoCtl.xaml.cs + NativeTextBoxDemoCtl.xaml + + + UserControl\Styles\NativeWindowDemoCtl.xaml.cs + NativeWindowDemoCtl.xaml + + + UserControl\Styles\RadioButtonDemoCtl.xaml.cs + RadioButtonDemoCtl.xaml + + + UserControl\Styles\RepeatButtonDemoCtl.xaml.cs + RepeatButtonDemoCtl.xaml + + + UserControl\Styles\RichTextBoxDemoCtl.xaml.cs + RichTextBoxDemoCtl.xaml + + + UserControl\Styles\SliderDemoCtl.xaml.cs + SliderDemoCtl.xaml + + + UserControl\Styles\TextBlockDemoCtl.xaml.cs + TextBlockDemoCtl.xaml + + + UserControl\Styles\ToggleButtonDemoCtl.xaml.cs + ToggleButtonDemoCtl.xaml + + + UserControl\Styles\ToolBarDemoCtl.xaml.cs + ToolBarDemoCtl.xaml + + + UserControl\Styles\TreeViewDemoCtl.xaml.cs + TreeViewDemoCtl.xaml + + + UserControl\Tools\EffectsDemoCtl.xaml.cs + EffectsDemoCtl.xaml + + + UserControl\Tools\GeometryAnimationDemoCtl.xaml.cs + GeometryAnimationDemoCtl.xaml + + + UserControl\Tools\HatchBrushGeneratorDemoCtl.xaml.cs + HatchBrushGeneratorDemoCtl.xaml + + + + + ViewModel\ChatBoxViewModel.cs + + + ViewModel\InteractiveDialogViewModel.cs + + + ViewModel\ComboBoxDemoViewModel.cs + + + ViewModel\BadgeDemoViewModel.cs + + + ViewModel\CardDemoViewModel.cs + + + ViewModel\CoverViewModel.cs + + + ViewModel\DialogDemoViewModel.cs + + + ViewModel\GrowlDemoViewModel.cs + + + ViewModel\ImageBrowserDemoViewModel.cs + + + ViewModel\NotificationDemoViewModel.cs + + + ViewModel\NotifyIconDemoViewModel.cs + + + ViewModel\PaginationDemoViewModel.cs + + + ViewModel\SearchBarDemoViewModel.cs + + + ViewModel\SideMenuDemoViewModel.cs + + + ViewModel\SplitButtonDemoViewModel.cs + + + ViewModel\SpriteDemoViewModel.cs + + + ViewModel\StepBarDemoViewModel.cs + + + ViewModel\TabControlDemoViewModel.cs + + + ViewModel\WindowDemoViewModel.cs + + + ViewModel\DemoViewModelBase!1.cs + + + ViewModel\ItemsDisplayViewModel.cs + + + ViewModel\MainViewModel.cs + + + ViewModel\NoUserViewModel.cs + + + + + + + + + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/App.xaml.cs b/src/Shared/HandyControlDemo_Shared/App.xaml.cs index 62d43bb1..6cc43843 100644 --- a/src/Shared/HandyControlDemo_Shared/App.xaml.cs +++ b/src/Shared/HandyControlDemo_Shared/App.xaml.cs @@ -71,8 +71,6 @@ namespace HandyControlDemo UpdateSkin(GlobalData.Config.Skin); } - ConfigHelper.Instance.SetWindowDefaultStyle(); - ConfigHelper.Instance.SetNavigationWindowDefaultStyle(); ConfigHelper.Instance.SetSystemVersionInfo(CommonHelper.GetSystemVersionInfo()); ServicePointManager.SecurityProtocol = (SecurityProtocolType)(SslProtocols)0x00000C00; diff --git a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs index 63e14bd3..bcc0bcbd 100644 --- a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs +++ b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs @@ -18,7 +18,7 @@ public static readonly string MainWindow = nameof(MainWindow); - public static readonly string OverView = nameof(OverView); + public static readonly string PracticalDemo = nameof(PracticalDemo); public static readonly string ProjectsView = nameof(ProjectsView); diff --git a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt index 9455d621..76cbb2b3 100644 --- a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt +++ b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt @@ -12,7 +12,7 @@ var messageList = new List "GrowlDemoPanel", "DialogDemoWindow", "MainWindow", - "OverView", + "PracticalDemo", "ProjectsView", "BlogsView", "WebsitesView", diff --git a/src/Shared/HandyControlDemo_Shared/Data/Model/DemoInfoModel.cs b/src/Shared/HandyControlDemo_Shared/Data/Model/DemoInfoModel.cs index 30149de4..a9d82b6b 100644 --- a/src/Shared/HandyControlDemo_Shared/Data/Model/DemoInfoModel.cs +++ b/src/Shared/HandyControlDemo_Shared/Data/Model/DemoInfoModel.cs @@ -5,6 +5,8 @@ namespace HandyControlDemo.Data { public class DemoInfoModel : ViewModelBase { + public string Key { get; set; } + private string _title; public string Title @@ -17,7 +19,7 @@ namespace HandyControlDemo.Data #endif } - private int _selectedIndex = -1; + private int _selectedIndex; public int SelectedIndex { diff --git a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems index ff7903f6..ef1f20e3 100644 --- a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems +++ b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems @@ -35,7 +35,6 @@ - Avatar.xaml @@ -251,8 +250,8 @@ ProjectsView.xaml - - OverView.xaml + + PracticalDemo.xaml ContributorsView.xaml @@ -272,6 +271,9 @@ WebsitesView.xaml + + Login.xaml + BorderDemoCtl.xaml @@ -762,7 +764,7 @@ Designer MSBuild:Compile - + Designer MSBuild:Compile @@ -790,6 +792,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile diff --git a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml index cf373d52..0e779e8a 100644 --- a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml +++ b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml @@ -1,4 +1,4 @@ - - + - + - - + + - + diff --git a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml.cs index b317b980..68635d9a 100644 --- a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml.cs +++ b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml.cs @@ -19,7 +19,7 @@ namespace HandyControlDemo base.OnInitialized(e); Messenger.Default.Send(true, MessageToken.FullSwitch); - Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{MessageToken.OverView}"), MessageToken.LoadShowContent); + Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{MessageToken.PracticalDemo}"), MessageToken.LoadShowContent); } protected override void OnClosing(CancelEventArgs e) diff --git a/src/Shared/HandyControlDemo_Shared/Properties/AssemblyInfo.cs b/src/Shared/HandyControlDemo_Shared/Properties/AssemblyInfo.cs index 7c03ec55..e5052785 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("2.4.0")] +[assembly: AssemblyVersion("2.5.0")] #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 2354a8cc..bd30d1fd 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs @@ -1275,6 +1275,15 @@ namespace HandyControlDemo.Properties.Langs { } } + /// + /// 查找类似 实用例子 的本地化字符串。 + /// + public static string PracticalDemos { + get { + return ResourceManager.GetString("PracticalDemos", resourceCulture); + } + } + /// /// 查找类似 上一步 的本地化字符串。 /// diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx index bd530288..24edac67 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx @@ -576,9 +576,6 @@ SideMenu - - Overview - Grid @@ -738,4 +735,7 @@ Frame + + Practical demos + \ 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 1fbed098..73fd70c6 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx @@ -576,9 +576,6 @@ SideMenu - - دید کلی - Grid @@ -738,4 +735,7 @@ Frame + + Practical demos + \ 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 bdec38d6..c8051c46 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx @@ -576,9 +576,6 @@ SideMenu - - Vue d'ensemble - Grid @@ -738,4 +735,7 @@ Frame + + Practical demos + \ 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 42566978..9715066f 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx @@ -465,9 +465,6 @@ OutlineText - - Overview - Pagination @@ -738,4 +735,7 @@ Frame + + Practical demos + \ 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 0474931a..a64229fb 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx @@ -579,9 +579,6 @@ 侧边菜单 - - 概览 - 栅格 @@ -738,4 +735,7 @@ 导航框架 + + 实用例子 + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/cloud.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/cloud.png new file mode 100644 index 00000000..82a215ef Binary files /dev/null and b/src/Shared/HandyControlDemo_Shared/Resources/Img/cloud.png differ diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Brushes.xaml b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Brushes.xaml index 95654be8..721c9126 100644 --- a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Brushes.xaml +++ b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Brushes.xaml @@ -5,6 +5,14 @@ + + + + + + + + diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml index 44a46462..3123a4db 100644 --- a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml +++ b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml @@ -39,6 +39,7 @@ diff --git a/src/Shared/HandyControlDemo_Shared/Service/Data/DataService.cs b/src/Shared/HandyControlDemo_Shared/Service/Data/DataService.cs index c4389402..c3517b70 100644 --- a/src/Shared/HandyControlDemo_Shared/Service/Data/DataService.cs +++ b/src/Shared/HandyControlDemo_Shared/Service/Data/DataService.cs @@ -373,10 +373,12 @@ namespace HandyControlDemo.Service var jsonObj = JsonConvert.DeserializeObject(jsonStr); foreach (var item in jsonObj) { - var title = Properties.Langs.Lang.ResourceManager.GetString((string)item.title); + var titleKey = (string) item.title; + var title = Properties.Langs.Lang.ResourceManager.GetString(titleKey); var list = Convert2DemoItemList(item.demoItemList); infoList.Add(new DemoInfoModel { + Key = titleKey, Title = title, DemoItemList = list }); diff --git a/src/Shared/HandyControlDemo_Shared/Tools/Helper/ExternDllHelper.cs b/src/Shared/HandyControlDemo_Shared/Tools/Helper/ExternDllHelper.cs deleted file mode 100644 index a5d0e53d..00000000 --- a/src/Shared/HandyControlDemo_Shared/Tools/Helper/ExternDllHelper.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Runtime.InteropServices; - -namespace HandyControlDemo.Tools -{ - internal class ExternDllHelper - { - private const string Winmm = "winmm.dll"; - - [DllImport(Winmm, EntryPoint = "mciSendString", CharSet = CharSet.Auto)] - public static extern int MciSendString(string lpstrCommand, string lpstrReturnString, int uReturnLength, int hwndCallback); - } -} \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Tools/Helper/Win32Helper.cs b/src/Shared/HandyControlDemo_Shared/Tools/Helper/Win32Helper.cs index 0f8aeb4b..c8929ae9 100644 --- a/src/Shared/HandyControlDemo_Shared/Tools/Helper/Win32Helper.cs +++ b/src/Shared/HandyControlDemo_Shared/Tools/Helper/Win32Helper.cs @@ -7,5 +7,8 @@ namespace HandyControlDemo.Tools { [DllImport("user32.dll", ExactSpelling = true, CharSet = CharSet.Auto)] public static extern bool SetForegroundWindow(IntPtr hWnd); + + [DllImport("winmm.dll", EntryPoint = "mciSendString", CharSet = CharSet.Auto)] + public static extern int MciSendString(string lpstrCommand, string lpstrReturnString, int uReturnLength, int hwndCallback); } } diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml index 7c3dc3d6..909f10d9 100644 --- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml +++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml @@ -3,10 +3,13 @@ xmlns:command="http://www.galasoft.ch/mvvmlight" x:Class="HandyControlDemo.UserControl.LeftMainContent" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - Background="{Binding Background,RelativeSource={RelativeSource AncestorType=Window}}" + Background="{DynamicResource RegionBrush}" xmlns:hc="https://handyorg.github.io/handycontrol" xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs" - xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"> + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + Margin="16" + CornerRadius="10" + Effect="{StaticResource EffectShadow4}"> -