diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 150c58a4..00000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,32 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -title: '' -labels: '' -assignees: '' - ---- - -**Describe the bug** -A clear and concise description of what the bug is. - -**To Reproduce** -Steps to reproduce the behavior: -1. Go to '...' -2. Click on '....' -3. Scroll down to '....' -4. See error - -**Expected behavior** -A clear and concise description of what you expected to happen. - -**Screenshots** -If applicable, add screenshots to help explain your problem. - -**Environment (please complete the following information):** - - .net: [e.g. 4.6.2] - - IDE [e.g. vs2017] - - Version [e.g. 1.0.0] - -**Additional context** -Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml new file mode 100644 index 00000000..f03073b1 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -0,0 +1,96 @@ +name: Bug report +description: File a bug report +title: "Bug title" +labels: [] +body: + - type: textarea + validations: + required: true + attributes: + label: Describe the bug + description: Please enter a short, clear description of the bug. + - type: textarea + validations: + required: true + attributes: + label: Steps to reproduce the bug + description: Please provide any required setup and steps to reproduce the behavior. + placeholder: | + 1. Go to '...' + 2. Click on '....' + - type: textarea + attributes: + label: Expected behavior + description: Please provide a description of what you expected to happen + - type: textarea + attributes: + label: Screenshots + description: If applicable, add screenshots here to help explain your problem + - type: dropdown + attributes: + label: NuGet package version + options: + - "HandyControl 3.4.0" + - "HandyControl 3.3.0" + - "HandyControl 3.2.0" + - "HandyControl 3.1.0" + - "HandyControl 3.0.0" + - "HandyControls (Custom version) 3.4.0" + - "HandyControls (Custom version) 3.3.11" + - "HandyControls (Custom version) 3.3.10" + - "HandyControls (Custom version) 3.3.9" + - "HandyControls (Custom version) 3.3.8.1" + - "HandyControls (Custom version) 3.3.8" + - "HandyControls (Custom version) 3.3.7" + - type: dropdown + attributes: + label: IDE + description: Which Visual Studio versions did you see the issue on? + multiple: true + options: + - "Visual Studio 2022-preview" + - "Visual Studio 2022" + - "Visual Studio 2019" + - "Visual Studio 2017" + - type: dropdown + attributes: + label: Framework type + description: please specify for which framework type you have encountered the issue. + multiple: true + options: + - ".Net 6.0" + - ".Net 5.0" + - ".Net Core 3.1" + - ".Net Core 3.0" + - ".Net Framework 4.8" + - ".Net Framework 4.7.2" + - ".Net Framework 4.7.1" + - ".Net Framework 4.7.0" + - ".Net Framework 4.6.2" + - ".Net Framework 4.6.1" + - ".Net Framework 4.6.0" + - ".Net Framework 4.5.2" + - ".Net Framework 4.5.1" + - ".Net Framework 4.5.0" + - ".Net Framework 4.0.0" + - type: dropdown + attributes: + label: Windows version + description: Which Windows versions did you see the issue on? + multiple: true + options: + - "Insider Build (xxxxx)" + - "Windows 11 (22000)" + - "May 2021 Update (19043)" + - "October 2020 Update (19042)" + - "May 2020 Update (19041)" + - "November 2019 Update (18363)" + - "May 2019 Update (18362)" + - "October 2018 Update (17763)" + - "April 2018 Update (17134)" + - "Fall Creators Update (16299)" + - "Creators Update (15063)" + - type: textarea + attributes: + label: Additional context + description: Enter any other applicable info here diff --git a/README-cn.md b/README-cn.md index c3371000..0e901601 100644 --- a/README-cn.md +++ b/README-cn.md @@ -143,7 +143,7 @@ HandyControl 项目已加入 [dotNET China](https://gitee.com/dotnetchina) 组 quicker phpenv -AutumnBox +AutumnBox 如果你的项目没有被列出，请告知我们! 😀 diff --git a/README.md b/README.md index 7f102047..4226d573 100644 --- a/README.md +++ b/README.md @@ -137,7 +137,7 @@ quicker phpenv -AutumnBox +AutumnBox if your project is not listed here, let us know! 😀 diff --git a/build/build.Lang.es.nuspec b/build/build.Lang.es.nuspec new file mode 100644 index 00000000..5c1bd8c8 --- /dev/null +++ b/build/build.Lang.es.nuspec @@ -0,0 +1,55 @@ + + + + HandyControl.Lang.es + 3.3.0 + HandyOrg + HandyOrg + HandyOrg + true + LICENSE + icon.png + https://github.com/HandyOrg/HandyControl + Contains some simple and commonly used WPF controls + Changes are detailed at https://github.com/HandyOrg/HandyControl/releases + Copyright © HandyOrg 2018-2021 + WPF C# Control + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/HandyControl.sln b/src/HandyControl.sln index 1459e713..bdeea6fc 100644 --- a/src/HandyControl.sln +++ b/src/HandyControl.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.28729.10 +# Visual Studio Version 17 +VisualStudioVersion = 17.1.32228.430 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControl_Net_GE45", "Net_GE45\HandyControl_Net_GE45\HandyControl_Net_GE45.csproj", "{DC966E3D-BCFF-4652-98CF-070E5494749A}" EndProject @@ -30,16 +30,31 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Directory.Build.Props = Directory.Build.Props EndProjectSection EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.Expression.Drawing", "Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.shproj", "{E5DC7C25-6293-4660-B5FB-186496386B90}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "System.Windows.Interactivity", "Shared\System.Windows.Interactivity\System.Windows.Interactivity.shproj", "{6F0C9CFF-2269-46A7-9664-478354C582A4}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.Expression.Interactions", "Shared\Microsoft.Expression.Interactions\Microsoft.Expression.Interactions.shproj", "{3531857C-28FC-4E0F-82D9-BFBB70740E04}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution Shared\HandyControl_Shared\HandyControl_Shared.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 5 + Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 5 + Shared\Microsoft.Expression.Interactions\Microsoft.Expression.Interactions.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 5 Shared\Microsoft.Windows.Shell\Microsoft.Windows.Shell.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 5 + Shared\System.Windows.Interactivity\System.Windows.Interactivity.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 5 + Shared\Microsoft.Expression.Interactions\Microsoft.Expression.Interactions.projitems*{3531857c-28fc-4e0f-82d9-bfbb70740e04}*SharedItemsImports = 13 + Shared\System.Windows.Interactivity\System.Windows.Interactivity.projitems*{6f0c9cff-2269-46a7-9664-478354c582a4}*SharedItemsImports = 13 Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{9a7b52e6-94bb-4e7e-bb6a-7cf6761b79a7}*SharedItemsImports = 5 Shared\HandyControl_Shared\HandyControl_Shared.projitems*{aac11083-faca-405d-9197-5c1212d65656}*SharedItemsImports = 13 Shared\Microsoft.Windows.Shell\Microsoft.Windows.Shell.projitems*{bbe51380-8b21-49ff-9cfc-b29447a40999}*SharedItemsImports = 13 Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{c4694269-c9b8-45d5-87f8-d0088c532510}*SharedItemsImports = 13 Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{d8ae88f8-c36b-4d10-a7f9-22ffcfba5231}*SharedItemsImports = 5 Shared\HandyControl_Shared\HandyControl_Shared.projitems*{dc966e3d-bcff-4652-98cf-070e5494749a}*SharedItemsImports = 5 + Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.projitems*{dc966e3d-bcff-4652-98cf-070e5494749a}*SharedItemsImports = 5 + Shared\Microsoft.Expression.Interactions\Microsoft.Expression.Interactions.projitems*{dc966e3d-bcff-4652-98cf-070e5494749a}*SharedItemsImports = 5 + Shared\System.Windows.Interactivity\System.Windows.Interactivity.projitems*{dc966e3d-bcff-4652-98cf-070e5494749a}*SharedItemsImports = 5 + Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.projitems*{e5dc7c25-6293-4660-b5fb-186496386b90}*SharedItemsImports = 13 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -93,6 +108,9 @@ Global {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231} = {35E3F9C0-8924-4536-BE09-F3761FDBF066} {D8A4748C-0500-4F63-BC47-3506658C68F7} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} {BBE51380-8B21-49FF-9CFC-B29447A40999} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} + {E5DC7C25-6293-4660-B5FB-186496386B90} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} + {6F0C9CFF-2269-46A7-9664-478354C582A4} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} + {3531857C-28FC-4E0F-82D9-BFBB70740E04} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D4636382-1A18-4079-A3E7-054DD970F179} 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 8e3cccc3..21f318b8 100644 --- a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj +++ b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj @@ -83,6 +83,9 @@ + + + Resources\dropper.cur 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 101d1183..34cd38b2 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 @@ -99,10 +99,10 @@ - + - + diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml index 43d0dd10..e6e99ae8 100644 --- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml +++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml @@ -462,6 +462,7 @@ - - - - - - - - - - - - - - - @@ -1168,6 +1175,37 @@ + + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + - - - - - - - - - - -