Making the initial stuff working, getting an installer, when running from VS.

CommonProject.properties

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <NoWarn>1685</NoWarn>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
-    <FileAlignment>4096</FileAlignment>
-    <DebugType>Full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <NoWarn>1685</NoWarn>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
-    <FileAlignment>4096</FileAlignment>
-    <DebugType>Full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
-    <NoWarn>1685</NoWarn>
-    <OutputPath>bin\Release\</OutputPath>
-    <Optimize>true</Optimize>
-    <FileAlignment>4096</FileAlignment>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-</Project>

Directory.Build.props

@@ -0,0 +1,77 @@
+<Project>
+  <PropertyGroup>
+    <Copyright>Copyright © Greenshot 2004-2020</Copyright>
+    <Authors>Greenshot</Authors>
+    <PackageIconUrl>https://getgreenshot.org/favicon.ico</PackageIconUrl>
+    <RepositoryUrl>https://github.com/greenshot/greenshot</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageProjectUrl>https://github.com/greenshot/greenshot</PackageProjectUrl>
+    <PackageLicenseUrl>https://www.gnu.org/licenses/gpl.html</PackageLicenseUrl>
+    <PackageLicenseExpression>GPL</PackageLicenseExpression>
+    <LangVersion>latest</LangVersion>
+    <UseWPF>true</UseWPF>
+    <UseWindowsForms>true</UseWindowsForms>
+    <RuntimeIdentifiers>win10-x64;win10-x86;win-x64;win-x86</RuntimeIdentifiers>
+    <!-- Optional: Publish the repository URL in the built .nupkg (in the NuSpec <Repository> element) -->
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <!-- Optional: Embed source files that are not tracked by the source control manager in the PDB -->
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+	<TargetFramework>net471</TargetFramework>
+  </PropertyGroup>
+  
+  <!-- ILLinker and single file settings -->
+  <ItemGroup Condition="$(MSBuildProjectName) == 'Greenshot'">
+    <TrimmerRootAssembly Include="netstandard" />
+  </ItemGroup>
+
+  <PropertyGroup Condition="$(MSBuildProjectName) == 'Greenshot'">
+	<IncludeSymbolsInSingleFile>false</IncludeSymbolsInSingleFile>
+	<ShowLinkerSizeComparison>true</ShowLinkerSizeComparison>
+  </PropertyGroup>
+	  
+  <PropertyGroup Condition="'$(Configuration)' != 'Debug' And !$(MSBuildProjectName.Contains('Test')) And !$(MSBuildProjectName.Contains('Demo'))">
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
+    <IsPackable>true</IsPackable>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="$(MSBuildProjectName.Contains('Tests')) Or $(MSBuildProjectName.Contains('Demo'))">
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>  
+
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugSymbols>True</DebugSymbols>
+    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+    <DebugType>embedded</DebugType>
+    <Optimize>false</Optimize>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+    <Optimize>true</Optimize>
+    <DebugType>embedded</DebugType>
+    <DebugSymbols>True</DebugSymbols>
+  </PropertyGroup>
+
+  <ItemGroup Condition="!$(MSBuildProjectName.Contains('Tests')) And $(MSBuildProjectName.StartsWith('Greenshot'))">
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.0.50">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
+  </ItemGroup>
+
+  <Target Name="PostBuild" BeforeTargets="PostBuildEvent" Condition="'$(BuildingInsideVisualStudio)' == 'true' And $(MSBuildProjectName.Contains('Plugin')) And !$(MSBuildProjectName.Contains('Test')) And !$(MSBuildProjectName.Contains('Demo'))">
+    <Exec Command="
+    xcopy /q /y /d &quot;$(TargetDir)$(TargetName).*&quot; &quot;$(SolutionDir)$(SolutionName)\$(OutDir)&quot;&#xD;&#xA;
+    xcopy /q /y /d &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)$(SolutionName)\$(OutDir)&quot;&#xD;&#xA;
+    xcopy /q /y /d &quot;$(TargetDir)*.xml&quot; &quot;$(SolutionDir)$(SolutionName)\$(OutDir)&quot;&#xD;&#xA;&#xD;&#xA;
+    IF EXIST &quot;$(TargetDir)Languages&quot; (&#xD;&#xA;
+        IF NOT EXIST &quot;$(SolutionDir)$(SolutionName)\$(OutDir)Languages&quot; (&#xD;&#xA;
+            mkdir &quot;$(SolutionDir)$(SolutionName)\$(OutDir)Languages&quot;&#xD;&#xA;
+        )&#xD;&#xA;
+        xcopy /q /y /d &quot;$(TargetDir)Languages\*.xml&quot; &quot;$(SolutionDir)$(SolutionName)\$(OutDir)Languages&quot;&#xD;&#xA;
+	)" />
+  </Target>
+</Project>

Greenshot.sln

@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29728.190
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot", "Greenshot\Greenshot.csproj", "{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot", "Greenshot\Greenshot.csproj", "{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GreenshotPlugin", "GreenshotPlugin\GreenshotPlugin.csproj", "{5B924697-4DCD-4F98-85F1-105CB84B7341}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GreenshotPlugin", "GreenshotPlugin\GreenshotPlugin.csproj", "{5B924697-4DCD-4F98-85F1-105CB84B7341}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GreenshotExternalCommandPlugin", "GreenshotExternalCommandPlugin\GreenshotExternalCommandPlugin.csproj", "{47F23C86-604E-4CC3-8767-B3D4088F30BB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GreenshotConfluencePlugin", "GreenshotConfluencePlugin\GreenshotConfluencePlugin.csproj", "{C3052651-598A-44E2-AAB3-2E41311D50F9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GreenshotConfluencePlugin", "GreenshotConfluencePlugin\GreenshotConfluencePlugin.csproj", "{C3052651-598A-44E2-AAB3-2E41311D50F9}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GreenshotImgurPlugin", "GreenshotImgurPlugin\GreenshotImgurPlugin.csproj", "{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}"
 EndProject
@@ -22,7 +22,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GreenshotOCRCommand", "Gree
 		{C6988EE8-2FEE-4349-9F09-F9628A0D8965} = {C6988EE8-2FEE-4349-9F09-F9628A0D8965}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GreenshotBoxPlugin", "GreenshotBoxPlugin\GreenshotBoxPlugin.csproj", "{697CF066-9077-4F22-99D9-D989CCE7282B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GreenshotBoxPlugin", "GreenshotBoxPlugin\GreenshotBoxPlugin.csproj", "{697CF066-9077-4F22-99D9-D989CCE7282B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GreenshotDropboxPlugin", "GreenshotDropboxPlugin\GreenshotDropboxPlugin.csproj", "{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}"
 EndProject
@@ -30,11 +30,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GreenshotFlickrPlugin", "Gr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GreenshotPicasaPlugin", "GreenshotPicasaPlugin\GreenshotPicasaPlugin.csproj", "{1893A2E4-A78A-4713-A8E7-E70058DABEE0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GreenshotOfficePlugin", "GreenshotOfficePlugin\GreenshotOfficePlugin.csproj", "{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GreenshotOfficePlugin", "GreenshotOfficePlugin\GreenshotOfficePlugin.csproj", "{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GreenshotPhotobucketPlugin", "GreenshotPhotobucketPlugin\GreenshotPhotobucketPlugin.csproj", "{9C0ECC4C-7807-4111-916A-4F57BB29788A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GreenshotPhotobucketPlugin", "GreenshotPhotobucketPlugin\GreenshotPhotobucketPlugin.csproj", "{9C0ECC4C-7807-4111-916A-4F57BB29788A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GreenshotWin10Plugin", "GreenshotWin10Plugin\GreenshotWin10Plugin.csproj", "{9801F62C-540F-4BFE-9211-6405DEDE563B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GreenshotWin10Plugin", "GreenshotWin10Plugin\GreenshotWin10Plugin.csproj", "{9801F62C-540F-4BFE-9211-6405DEDE563B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -49,136 +49,152 @@ Global
 		{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Debug|x86.ActiveCfg = Debug|x86
+		{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Debug|x86.Build.0 = Debug|x86
+		{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Debug|x86.Build.0 = Debug|Any CPU
 		{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Release|x86.ActiveCfg = Release|x86
+		{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Release|x86.ActiveCfg = Release|Any CPU
+		{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Release|x86.Build.0 = Release|Any CPU
 		{5B924697-4DCD-4F98-85F1-105CB84B7341}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5B924697-4DCD-4F98-85F1-105CB84B7341}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5B924697-4DCD-4F98-85F1-105CB84B7341}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5B924697-4DCD-4F98-85F1-105CB84B7341}.Debug|x86.ActiveCfg = Debug|x86
+		{5B924697-4DCD-4F98-85F1-105CB84B7341}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5B924697-4DCD-4F98-85F1-105CB84B7341}.Debug|x86.Build.0 = Debug|x86
+		{5B924697-4DCD-4F98-85F1-105CB84B7341}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5B924697-4DCD-4F98-85F1-105CB84B7341}.Debug|x86.Build.0 = Debug|Any CPU
 		{5B924697-4DCD-4F98-85F1-105CB84B7341}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5B924697-4DCD-4F98-85F1-105CB84B7341}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5B924697-4DCD-4F98-85F1-105CB84B7341}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{5B924697-4DCD-4F98-85F1-105CB84B7341}.Release|x86.ActiveCfg = Release|x86
+		{5B924697-4DCD-4F98-85F1-105CB84B7341}.Release|x86.ActiveCfg = Release|Any CPU
+		{5B924697-4DCD-4F98-85F1-105CB84B7341}.Release|x86.Build.0 = Release|Any CPU
 		{47F23C86-604E-4CC3-8767-B3D4088F30BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{47F23C86-604E-4CC3-8767-B3D4088F30BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{47F23C86-604E-4CC3-8767-B3D4088F30BB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{47F23C86-604E-4CC3-8767-B3D4088F30BB}.Debug|x86.ActiveCfg = Debug|x86
+		{47F23C86-604E-4CC3-8767-B3D4088F30BB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{47F23C86-604E-4CC3-8767-B3D4088F30BB}.Debug|x86.Build.0 = Debug|x86
+		{47F23C86-604E-4CC3-8767-B3D4088F30BB}.Debug|x86.Build.0 = Debug|Any CPU
 		{47F23C86-604E-4CC3-8767-B3D4088F30BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{47F23C86-604E-4CC3-8767-B3D4088F30BB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{47F23C86-604E-4CC3-8767-B3D4088F30BB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{47F23C86-604E-4CC3-8767-B3D4088F30BB}.Release|x86.ActiveCfg = Release|x86
+		{47F23C86-604E-4CC3-8767-B3D4088F30BB}.Release|x86.ActiveCfg = Release|Any CPU
+		{47F23C86-604E-4CC3-8767-B3D4088F30BB}.Release|x86.Build.0 = Release|Any CPU
 		{C3052651-598A-44E2-AAB3-2E41311D50F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C3052651-598A-44E2-AAB3-2E41311D50F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C3052651-598A-44E2-AAB3-2E41311D50F9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C3052651-598A-44E2-AAB3-2E41311D50F9}.Debug|x86.ActiveCfg = Debug|x86
+		{C3052651-598A-44E2-AAB3-2E41311D50F9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C3052651-598A-44E2-AAB3-2E41311D50F9}.Debug|x86.Build.0 = Debug|x86
+		{C3052651-598A-44E2-AAB3-2E41311D50F9}.Debug|x86.Build.0 = Debug|Any CPU
 		{C3052651-598A-44E2-AAB3-2E41311D50F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C3052651-598A-44E2-AAB3-2E41311D50F9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C3052651-598A-44E2-AAB3-2E41311D50F9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{C3052651-598A-44E2-AAB3-2E41311D50F9}.Release|x86.ActiveCfg = Release|x86
+		{C3052651-598A-44E2-AAB3-2E41311D50F9}.Release|x86.ActiveCfg = Release|Any CPU
+		{C3052651-598A-44E2-AAB3-2E41311D50F9}.Release|x86.Build.0 = Release|Any CPU
 		{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Debug|x86.ActiveCfg = Debug|x86
+		{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Debug|x86.Build.0 = Debug|x86
+		{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Debug|x86.Build.0 = Debug|Any CPU
 		{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Release|Any CPU.Build.0 = Release|Any CPU
 		{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Release|x86.ActiveCfg = Release|x86
+		{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Release|x86.ActiveCfg = Release|Any CPU
+		{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Release|x86.Build.0 = Release|Any CPU
 		{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Debug|x86.ActiveCfg = Debug|x86
+		{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Debug|x86.Build.0 = Debug|x86
+		{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Debug|x86.Build.0 = Debug|Any CPU
 		{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Release|x86.ActiveCfg = Release|x86
+		{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Release|x86.ActiveCfg = Release|Any CPU
+		{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Release|x86.Build.0 = Release|Any CPU
 		{C6988EE8-2FEE-4349-9F09-F9628A0D8965}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C6988EE8-2FEE-4349-9F09-F9628A0D8965}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C6988EE8-2FEE-4349-9F09-F9628A0D8965}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C6988EE8-2FEE-4349-9F09-F9628A0D8965}.Debug|x86.ActiveCfg = Debug|x86
+		{C6988EE8-2FEE-4349-9F09-F9628A0D8965}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C6988EE8-2FEE-4349-9F09-F9628A0D8965}.Debug|x86.Build.0 = Debug|x86
+		{C6988EE8-2FEE-4349-9F09-F9628A0D8965}.Debug|x86.Build.0 = Debug|Any CPU
 		{C6988EE8-2FEE-4349-9F09-F9628A0D8965}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C6988EE8-2FEE-4349-9F09-F9628A0D8965}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C6988EE8-2FEE-4349-9F09-F9628A0D8965}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{C6988EE8-2FEE-4349-9F09-F9628A0D8965}.Release|x86.ActiveCfg = Release|x86
+		{C6988EE8-2FEE-4349-9F09-F9628A0D8965}.Release|x86.ActiveCfg = Release|Any CPU
-		{D61E6ECE-E0B6-4467-B492-F08A06BA8F02}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{C6988EE8-2FEE-4349-9F09-F9628A0D8965}.Release|x86.Build.0 = Release|Any CPU
-		{D61E6ECE-E0B6-4467-B492-F08A06BA8F02}.Debug|Any CPU.Build.0 = Debug|x86
+		{D61E6ECE-E0B6-4467-B492-F08A06BA8F02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D61E6ECE-E0B6-4467-B492-F08A06BA8F02}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{D61E6ECE-E0B6-4467-B492-F08A06BA8F02}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D61E6ECE-E0B6-4467-B492-F08A06BA8F02}.Debug|x86.ActiveCfg = Debug|x86
+		{D61E6ECE-E0B6-4467-B492-F08A06BA8F02}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D61E6ECE-E0B6-4467-B492-F08A06BA8F02}.Debug|x86.Build.0 = Debug|x86
+		{D61E6ECE-E0B6-4467-B492-F08A06BA8F02}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D61E6ECE-E0B6-4467-B492-F08A06BA8F02}.Release|Any CPU.ActiveCfg = Release|x86
+		{D61E6ECE-E0B6-4467-B492-F08A06BA8F02}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D61E6ECE-E0B6-4467-B492-F08A06BA8F02}.Release|Any CPU.Build.0 = Release|x86
+		{D61E6ECE-E0B6-4467-B492-F08A06BA8F02}.Debug|x86.Build.0 = Debug|Any CPU
-		{D61E6ECE-E0B6-4467-B492-F08A06BA8F02}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{D61E6ECE-E0B6-4467-B492-F08A06BA8F02}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D61E6ECE-E0B6-4467-B492-F08A06BA8F02}.Release|x86.ActiveCfg = Release|x86
+		{D61E6ECE-E0B6-4467-B492-F08A06BA8F02}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D61E6ECE-E0B6-4467-B492-F08A06BA8F02}.Release|x86.Build.0 = Release|x86
+		{D61E6ECE-E0B6-4467-B492-F08A06BA8F02}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{D61E6ECE-E0B6-4467-B492-F08A06BA8F02}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{D61E6ECE-E0B6-4467-B492-F08A06BA8F02}.Release|x86.ActiveCfg = Release|Any CPU
+		{D61E6ECE-E0B6-4467-B492-F08A06BA8F02}.Release|x86.Build.0 = Release|Any CPU
 		{697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|x86.ActiveCfg = Debug|x86
+		{697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|x86.Build.0 = Debug|x86
+		{697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|x86.Build.0 = Debug|Any CPU
 		{697CF066-9077-4F22-99D9-D989CCE7282B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{697CF066-9077-4F22-99D9-D989CCE7282B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{697CF066-9077-4F22-99D9-D989CCE7282B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{697CF066-9077-4F22-99D9-D989CCE7282B}.Release|x86.ActiveCfg = Release|x86
+		{697CF066-9077-4F22-99D9-D989CCE7282B}.Release|x86.ActiveCfg = Release|Any CPU
+		{697CF066-9077-4F22-99D9-D989CCE7282B}.Release|x86.Build.0 = Release|Any CPU
 		{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Debug|x86.ActiveCfg = Debug|x86
+		{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Debug|x86.Build.0 = Debug|x86
+		{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Debug|x86.Build.0 = Debug|Any CPU
 		{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Release|x86.ActiveCfg = Release|x86
+		{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Release|x86.ActiveCfg = Release|Any CPU
+		{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Release|x86.Build.0 = Release|Any CPU
 		{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Debug|x86.ActiveCfg = Debug|x86
+		{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Debug|x86.Build.0 = Debug|x86
+		{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Debug|x86.Build.0 = Debug|Any CPU
 		{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Release|x86.ActiveCfg = Release|x86
+		{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Release|x86.ActiveCfg = Release|Any CPU
+		{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Release|x86.Build.0 = Release|Any CPU
 		{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Debug|x86.ActiveCfg = Debug|x86
+		{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Debug|x86.Build.0 = Debug|x86
+		{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Debug|x86.Build.0 = Debug|Any CPU
 		{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Release|x86.ActiveCfg = Release|x86
+		{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Release|x86.ActiveCfg = Release|Any CPU
+		{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Release|x86.Build.0 = Release|Any CPU
 		{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Debug|x86.ActiveCfg = Debug|x86
+		{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Debug|x86.Build.0 = Debug|x86
+		{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Debug|x86.Build.0 = Debug|Any CPU
 		{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Release|x86.ActiveCfg = Release|x86
+		{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Release|x86.ActiveCfg = Release|Any CPU
-		{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Release|x86.Build.0 = Release|x86
+		{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Release|x86.Build.0 = Release|Any CPU
 		{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Debug|x86.ActiveCfg = Debug|x86
+		{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Debug|x86.Build.0 = Debug|x86
+		{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Debug|x86.Build.0 = Debug|Any CPU
 		{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|x86.ActiveCfg = Release|x86
+		{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|x86.ActiveCfg = Release|Any CPU
-		{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|x86.Build.0 = Release|x86
+		{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|x86.Build.0 = Release|Any CPU
 		{9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU

Greenshot/App.config

@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-	<startup useLegacyV2RuntimeActivationPolicy="true">
+	<!--<system.windows.forms jitDebugging="true" />-->
-    <supportedRuntime version="v4.0"/>
+	<startup>
-    <supportedRuntime version="v2.0.50727"/>
+		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
 	</startup>
 	<runtime>    
 		<loadFromRemoteSources enabled="true" />
+		<relativeBindForResources enabled="true" />
 		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<probing privatePath="Addons" />
 			<probing privatePath="App\Greenshot" />
 		</assemblyBinding>
 	</runtime>

Greenshot/AssemblyInfo.cs

@@ -1,44 +0,0 @@
-/*
- * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
- * 
- * For more information see: http://getgreenshot.org/
- * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 1 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Greenshot")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Greenshot")]
-[assembly: AssemblyProduct("Greenshot")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// This sets the default COM visibility of types in the assembly to invisible.
-// If you need to expose a type to COM, use [ComVisible(true)] on that type.
-[assembly: ComVisible(false)]
-
-// The assembly version, replaced by build scripts
-[assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyInformationalVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]

Greenshot/Configuration/EditorConfiguration.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Configuration/LanguageKeys.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Controls/BindableToolStripButton.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Controls/BindableToolStripComboBox.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Controls/BindableToolStripDropDownButton.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Controls/ColorButton.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
@@ -55,11 +55,11 @@ namespace Greenshot.Controls {
 					brush = new HatchBrush(HatchStyle.Percent50, Color.White, Color.Gray);
 				}
 
-				if (Image != null) {
+				if (Image != null)
-					using (Graphics graphics = Graphics.FromImage(Image)) {
+                {
+                    using Graphics graphics = Graphics.FromImage(Image);
                     graphics.FillRectangle(brush, new Rectangle(4,17,16,3));
                 }
-				}
 
 				// cleanup GDI Object
 				brush.Dispose();

Greenshot/Controls/ContextMenuToolStripProfessionalRenderer.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016  Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020  Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Controls/CustomToolStripProfessionalRenderer.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016  Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020  Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Controls/FontFamilyComboBox.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
@@ -98,24 +98,23 @@ namespace Greenshot.Controls {
 		/// <param name="fontStyle"></param>
 		/// <param name="bounds"></param>
 		/// <param name="text"></param>
-		private void DrawText(Graphics graphics, FontFamily fontFamily, FontStyle fontStyle, Rectangle bounds, string text) {
+		private void DrawText(Graphics graphics, FontFamily fontFamily, FontStyle fontStyle, Rectangle bounds, string text)
-			using (Font font = new Font(fontFamily, Font.Size + 5, fontStyle, GraphicsUnit.Pixel)) {
+        {
+            using Font font = new Font(fontFamily, Font.Size + 5, fontStyle, GraphicsUnit.Pixel);
 			// Make sure the text is visible by centering it in the line
-				using (StringFormat stringFormat = new StringFormat()) {
+			using StringFormat stringFormat = new StringFormat
-					stringFormat.LineAlignment = StringAlignment.Center;
+			{
+				LineAlignment = StringAlignment.Center
+			};
 			graphics.DrawString(text, font, Brushes.Black, bounds, stringFormat);
         }
-			}
-		}
 
 		private void BindableToolStripComboBox_SelectedIndexChanged(object sender, EventArgs e) {
-			if (PropertyChanged != null) {
+            if (PropertyChanged == null) return;
             PropertyChanged(this, new PropertyChangedEventArgs("Text"));
             PropertyChanged(this, new PropertyChangedEventArgs("FontFamily"));
             PropertyChanged(this, new PropertyChangedEventArgs("SelectedIndex"));
             PropertyChanged(this, new PropertyChangedEventArgs("SelectedItem"));
-
-			}
         }
 	}
 }

Greenshot/Controls/MenuStripEx.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Controls/NonJumpingPanel.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Controls/Pipette.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
@@ -56,17 +56,16 @@ namespace Greenshot.Controls {
 		/// <param name="hotspotX">Hotspot X coordinate</param>
 		/// <param name="hotspotY">Hotspot Y coordinate</param>
 		/// <returns>Cursor</returns>
-		private static Cursor CreateCursor(Bitmap bitmap, int hotspotX, int hotspotY) {
+		private static Cursor CreateCursor(Bitmap bitmap, int hotspotX, int hotspotY)
-			using (SafeIconHandle iconHandle = new SafeIconHandle( bitmap.GetHicon())) {
+        {
-				IconInfo iconInfo;
+            using SafeIconHandle iconHandle = new SafeIconHandle( bitmap.GetHicon());
-				User32.GetIconInfo(iconHandle, out iconInfo);
+            User32.GetIconInfo(iconHandle, out var iconInfo);
             iconInfo.xHotspot = hotspotX;
             iconInfo.yHotspot = hotspotY;
             iconInfo.fIcon = false;
             var icon = User32.CreateIconIndirect(ref iconInfo);
             return new Cursor(icon);
         }
-		}
 
 		/// <summary>
 		/// The bulk of the clean-up code is implemented in Dispose(bool)
@@ -151,8 +150,6 @@ namespace Greenshot.Controls {
 			base.OnMouseCaptureChanged(e);
 		}
 
-		#region IMessageFilter Members
-
         public bool PreFilterMessage(ref Message m) {
 			if (_dragging) {
 				if (m.Msg == (int)WindowsMessages.WM_CHAR) {
@@ -163,8 +160,6 @@ namespace Greenshot.Controls {
 			}
 			return false;
 		}
-
-		#endregion
     }
 
 	public class PipetteUsedArgs : EventArgs {

Greenshot/Controls/ToolStripColorButton.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
@@ -53,11 +53,11 @@ namespace Greenshot.Controls {
 					brush = new HatchBrush(HatchStyle.Percent50, Color.White, Color.Gray);
 				}
 
-				if (Image != null) {
+				if (Image != null)
-					using (Graphics graphics = Graphics.FromImage(Image)) {
+                {
+                    using Graphics graphics = Graphics.FromImage(Image);
                     graphics.FillRectangle(brush, new Rectangle(0,13,16,3));
                 }
-				}
 
 				// cleanup GDI Object
 				brush.Dispose();

Greenshot/Controls/ToolStripEx.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Controls/ToolStripNumericUpDown.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Destinations/ClipboardDestination.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Destinations/EditorDestination.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Destinations/EmailDestination.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Destinations/FileDestination.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Destinations/FileWithDialogDestination.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Destinations/PickerDestination.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Destinations/PrinterDestination.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
@@ -118,20 +118,19 @@ namespace Greenshot.Destinations {
 		public override ExportInformation ExportCapture(bool manuallyInitiated, ISurface surface, ICaptureDetails captureDetails) {
 			ExportInformation exportInformation = new ExportInformation(Designation, Description);
 			PrinterSettings printerSettings;
-			if (!string.IsNullOrEmpty(printerName)) {
+			if (!string.IsNullOrEmpty(printerName))
-				using (PrintHelper printHelper = new PrintHelper(surface, captureDetails)) {
+            {
+                using PrintHelper printHelper = new PrintHelper(surface, captureDetails);
                 printerSettings = printHelper.PrintTo(printerName);
-				}
             } else if (!manuallyInitiated) {
 				PrinterSettings settings = new PrinterSettings();
-				using (PrintHelper printHelper = new PrintHelper(surface, captureDetails)) {
+                using PrintHelper printHelper = new PrintHelper(surface, captureDetails);
                 printerSettings = printHelper.PrintTo(settings.PrinterName);
-				}
+            } else
-			} else {
+            {
-				using (PrintHelper printHelper = new PrintHelper(surface, captureDetails)) {
+                using PrintHelper printHelper = new PrintHelper(surface, captureDetails);
                 printerSettings = printHelper.PrintWithDialog();
             }
-			}
 			if (printerSettings != null) {
 				exportInformation.ExportMade = true;
 			}

Greenshot/Drawing/Adorners/AbstractAdorner.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on Sourceforge: http://sourceforge.net/projects/greenshot/

Greenshot/Drawing/Adorners/MoveAdorner.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on Sourceforge: http://sourceforge.net/projects/greenshot/

Greenshot/Drawing/Adorners/ResizeAdorner.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on Sourceforge: http://sourceforge.net/projects/greenshot/

Greenshot/Drawing/Adorners/TargetAdorner.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on Sourceforge: http://sourceforge.net/projects/greenshot/

Greenshot/Drawing/ArrowContainer.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
@@ -68,8 +68,9 @@ namespace Greenshot.Drawing {
 						int alpha = basealpha;
 						int steps = 5;
 						int currentStep = 1;
-						while (currentStep <= steps) {
+						while (currentStep <= steps)
-							using (Pen shadowCapPen = new Pen(Color.FromArgb(alpha, 100, 100, 100), lineThickness)) {
+                        {
+                            using Pen shadowCapPen = new Pen(Color.FromArgb(alpha, 100, 100, 100), lineThickness);
                             SetArrowHeads(heads, shadowCapPen);
 
                             graphics.DrawLine(shadowCapPen,
@@ -79,18 +80,17 @@ namespace Greenshot.Drawing {
                                 Top + currentStep + Height);
 
                             currentStep++;
-								alpha = alpha - basealpha / steps;
+                            alpha -= basealpha / steps;
-							}
                         }
 
 					}
-					using (Pen pen = new Pen(lineColor, lineThickness)) {
+
+                    using Pen pen = new Pen(lineColor, lineThickness);
                     SetArrowHeads(heads, pen);
                     graphics.DrawLine(pen, Left, Top, Left + Width, Top + Height);
                 }
 			}
 		}
-		}
 		
 		private void SetArrowHeads(ArrowHeadCombination heads, Pen pen) {
 			if ( heads == ArrowHeadCombination.BOTH || heads == ArrowHeadCombination.START_POINT ) {
@@ -104,36 +104,37 @@ namespace Greenshot.Drawing {
 		public override Rectangle DrawingBounds {
 			get {
 				int lineThickness = GetFieldValueAsInt(FieldType.LINE_THICKNESS);
-				if (lineThickness > 0) {
+				if (lineThickness > 0)
-					using (Pen pen = new Pen(Color.White)) {
+                {
-						pen.Width = lineThickness;
+					using Pen pen = new Pen(Color.White)
+					{
+						Width = lineThickness
+					};
 					SetArrowHeads((ArrowHeadCombination)GetFieldValue(FieldType.ARROWHEADS), pen);
-						using (GraphicsPath path = new GraphicsPath()) {
+                    using GraphicsPath path = new GraphicsPath();
                     path.AddLine(Left, Top, Left + Width, Top + Height);
-							using (Matrix matrix = new Matrix()) {
+                    using Matrix matrix = new Matrix();
                     Rectangle drawingBounds = Rectangle.Round(path.GetBounds(matrix, pen));
                     drawingBounds.Inflate(2, 2);
                     return drawingBounds;
                 }
-						}
-					}
-				}
 				return Rectangle.Empty;
 			}
 		}
 		
 		public override bool ClickableAt(int x, int y) {
 			int lineThickness = GetFieldValueAsInt(FieldType.LINE_THICKNESS) + 10;
-			if (lineThickness > 0) {
+			if (lineThickness > 0)
-				using (Pen pen = new Pen(Color.White)) {
+            {
-					pen.Width = lineThickness;
+				using Pen pen = new Pen(Color.White)
+				{
+					Width = lineThickness
+				};
 				SetArrowHeads((ArrowHeadCombination)GetFieldValue(FieldType.ARROWHEADS), pen);
-					using (GraphicsPath path = new GraphicsPath()) {
+                using GraphicsPath path = new GraphicsPath();
                 path.AddLine(Left, Top, Left + Width, Top + Height);
                 return path.IsOutlineVisible(x, y, pen);
             }
-				}
-			}
 			return false;
 		}
 	}

Greenshot/Drawing/CropContainer.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
@@ -64,7 +64,8 @@ namespace Greenshot.Drawing {
 			{
 				return;
 			}
-			using (Brush cropBrush = new SolidBrush(Color.FromArgb(100, 150, 150, 100))) {
+
+            using Brush cropBrush = new SolidBrush(Color.FromArgb(100, 150, 150, 100));
             Rectangle cropRectangle = GuiRectangle.GetGuiRectangle(Left, Top, Width, Height);
             Rectangle selectionRect = new Rectangle(cropRectangle.Left - 1, cropRectangle.Top - 1, cropRectangle.Width + 1, cropRectangle.Height + 1);
 
@@ -79,7 +80,6 @@ namespace Greenshot.Drawing {
             // bottom
             g.FillRectangle(cropBrush, new Rectangle(0, cropRectangle.Top + cropRectangle.Height, _parent.Width, _parent.Height - (cropRectangle.Top + cropRectangle.Height)));
         }
-		}
 		
 		public override bool HasContextMenu {
 			get {

Greenshot/Drawing/CursorContainer.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
@@ -89,11 +89,11 @@ namespace Greenshot.Drawing {
 			if (!File.Exists(filename)) {
 				return;
 			}
-			using (Cursor fileCursor = new Cursor(filename)) {
+
+            using Cursor fileCursor = new Cursor(filename);
             Cursor = fileCursor;
             LOG.Debug("Loaded file: " + filename + " with resolution: " + Height + "," + Width);
         }
-		}
 
 		public override void Draw(Graphics graphics, RenderMode rm) {
 			if (cursor == null) {

Greenshot/Drawing/DrawableContainer.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
@@ -408,13 +408,15 @@ namespace Greenshot.Drawing
 			return r.Contains(x, y);
 		}
 		
-		protected void DrawSelectionBorder(Graphics g, Rectangle rect) {
+		protected void DrawSelectionBorder(Graphics g, Rectangle rect)
-			using (Pen pen = new Pen(Color.MediumSeaGreen)) {
+        {
-				pen.DashPattern = new float[]{1,2};
+			using Pen pen = new Pen(Color.MediumSeaGreen)
-				pen.Width = 1;
+			{
+				DashPattern = new float[] { 1, 2 },
+				Width = 1
+			};
 			g.DrawRectangle(pen, rect);
         }
-		}
 		
 
 		public void ResizeTo(int width, int height, int anchorPosition) {

Greenshot/Drawing/DrawableContainerList.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
@@ -484,8 +484,10 @@ namespace Greenshot.Drawing {
 			menu.Items.Add(item);
 
             // Delete
-			item = new ToolStripMenuItem(Language.GetString(LangKey.editor_deleteelement));
+            item = new ToolStripMenuItem(Language.GetString(LangKey.editor_deleteelement))
-			item.Image = (Image)EditorFormResources.GetObject("removeObjectToolStripMenuItem.Image");
+            {
+                Image = (Image)EditorFormResources.GetObject("removeObjectToolStripMenuItem.Image")
+            };
             item.Click += delegate {
 				surface.RemoveElements(this);
 			};
@@ -556,7 +558,6 @@ namespace Greenshot.Drawing {
 			}
 		}
 
-		#region IDisposable Support
         private bool _disposedValue; // To detect redundant calls
 
 		protected virtual void Dispose(bool disposing)
@@ -581,6 +582,5 @@ namespace Greenshot.Drawing {
 			// Do not change this code. Put cleanup code in Dispose(bool disposing) above.
 			Dispose(true);
 		}
-		#endregion
     }
 }

Greenshot/Drawing/EllipseContainer.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
@@ -75,28 +75,30 @@ namespace Greenshot.Drawing {
 				int alpha = basealpha;
 				int steps = 5;
 				int currentStep = lineVisible ? 1 : 0;
-				while (currentStep <= steps) {
+				while (currentStep <= steps)
-					using (Pen shadowPen = new Pen(Color.FromArgb(alpha, 100, 100, 100))) {
+                {
-						shadowPen.Width = lineVisible ? lineThickness : 1;
+                    using Pen shadowPen = new Pen(Color.FromArgb(alpha, 100, 100, 100))
+                    {
+                        Width = lineVisible ? lineThickness : 1
+                    };
                     Rectangle shadowRect = GuiRectangle.GetGuiRectangle(rect.Left + currentStep, rect.Top + currentStep, rect.Width, rect.Height);
                     graphics.DrawEllipse(shadowPen, shadowRect);
                     currentStep++;
-						alpha = alpha - basealpha / steps;
+                    alpha -= basealpha / steps;
-					}
                 }
 			}
 			//draw the original shape
-			if (Colors.IsVisible(fillColor)) {
+			if (Colors.IsVisible(fillColor))
-				using (Brush brush = new SolidBrush(fillColor)) {
+            {
+                using Brush brush = new SolidBrush(fillColor);
                 graphics.FillEllipse(brush, rect);
             }
-			}
+			if (lineVisible)
-			if (lineVisible) {
+            {
-				using (Pen pen = new Pen(lineColor, lineThickness)) {
+                using Pen pen = new Pen(lineColor, lineThickness);
                 graphics.DrawEllipse(pen, rect);
             }
 		}
-		}
 		
 		public override bool Contains(int x, int y) {
 			return EllipseContains(this, x, y);
@@ -133,14 +135,13 @@ namespace Greenshot.Drawing {
 			}
 
 			// check the rest of the lines
-			if (lineThickness > 0) {
+			if (lineThickness > 0)
-				using (Pen pen = new Pen(Color.White, lineThickness)) {
+            {
-					using (GraphicsPath path = new GraphicsPath()) {
+                using Pen pen = new Pen(Color.White, lineThickness);
+                using GraphicsPath path = new GraphicsPath();
                 path.AddEllipse(rect);
                 return path.IsOutlineVisible(x, y, pen);
             }
-				}
-			}
 			return false;
 		}
 	}

Greenshot/Drawing/Fields/AbstractFieldHolder.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
@@ -135,7 +135,6 @@ namespace Greenshot.Drawing.Fields
 			return GetField(fieldType)?.Value;
 		}
 
-		#region convenience methods to save us some casts outside
         public string GetFieldValueAsString(IFieldType fieldType)
 		{
 			return Convert.ToString(GetFieldValue(fieldType));
@@ -166,11 +165,10 @@ namespace Greenshot.Drawing.Fields
 			return Convert.ToBoolean(GetFieldValue(fieldType));
 		}
 
-		public Color GetFieldValueAsColor(IFieldType fieldType, Color defaultColor = default(Color))
+		public Color GetFieldValueAsColor(IFieldType fieldType, Color defaultColor = default)
 		{
 			return (Color)(GetFieldValue(fieldType) ?? defaultColor);
 		}
-		#endregion
 
         public bool HasField(IFieldType fieldType)
 		{

Greenshot/Drawing/Fields/AbstractFieldHolderWithChildren.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
@@ -45,7 +45,7 @@ namespace Greenshot.Drawing.Fields
 			remove { childrenChanged -= value; }
 		}
 
-		public List<IFieldHolder> Children = new List<IFieldHolder>();
+		public IList<IFieldHolder> Children = new List<IFieldHolder>();
 
 		public AbstractFieldHolderWithChildren()
 		{

Greenshot/Drawing/Fields/Binding/AbstractBindingConverter.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Drawing/Fields/Binding/BidirectionalBinding.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Drawing/Fields/Binding/DecimalDoublePercentageConverter.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Drawing/Fields/Binding/DecimalFloatConverter.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Drawing/Fields/Binding/DecimalIntConverter.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Drawing/Fields/Binding/IBindingConverter.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Drawing/Fields/Binding/IBindingValidator.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Drawing/Fields/Binding/NotNullValidator.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Drawing/Fields/Field.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
@@ -115,8 +115,7 @@ namespace Greenshot.Drawing.Fields
 
 		public override bool Equals(object obj)
 		{
-			var other = obj as Field;
+            if (!(obj is Field other))
-			if (other == null)
 			{
 				return false;
 			}

Greenshot/Drawing/Fields/FieldAggregator.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
@@ -80,8 +80,7 @@ namespace Greenshot.Drawing.Fields
 
 		public void BindElement(IDrawableContainer dc)
 		{
-			DrawableContainer container = dc as DrawableContainer;
+            if (!(dc is DrawableContainer container) || _boundContainers.Contains(container))
-			if (container == null || _boundContainers.Contains(container))
 			{
 				return;
 			}
@@ -100,8 +99,7 @@ namespace Greenshot.Drawing.Fields
 
 		public void UpdateElement(IDrawableContainer dc)
 		{
-			DrawableContainer container = dc as DrawableContainer;
+            if (!(dc is DrawableContainer container))
-			if (container == null)
 			{
 				return;
 			}
@@ -168,15 +166,12 @@ namespace Greenshot.Drawing.Fields
 			if (_boundContainers.Count > 0)
 			{
 				// take all fields from the least selected container...
-				DrawableContainer leastSelectedContainer = _boundContainers[_boundContainers.Count - 1] as DrawableContainer;
+                if (_boundContainers[_boundContainers.Count - 1] is DrawableContainer leastSelectedContainer)
-				if (leastSelectedContainer != null)
 				{
 					returnFields = leastSelectedContainer.GetFields();
 					for (int i = 0; i < _boundContainers.Count - 1; i++)
 					{
-						DrawableContainer dc = _boundContainers[i] as DrawableContainer;
+                        if (!(_boundContainers[i] is DrawableContainer dc)) continue;
-						if (dc != null)
-						{
                         IList<IField> fieldsToRemove = new List<IField>();
                         foreach (IField field in returnFields)
                         {
@@ -193,7 +188,6 @@ namespace Greenshot.Drawing.Fields
                     }
 				}
 			}
-			}
 			return returnFields ?? new List<IField>();
 		}
 

Greenshot/Drawing/Fields/FieldType.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Drawing/Fields/IFieldHolder.cs

@@ -1,53 +0,0 @@
-/*
- * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2015 Thomas Braun, Jens Klingen, Robin Krom
- * 
- * For more information see: http://getgreenshot.org/
- * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 1 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-using System.Collections.Generic;
-
-namespace Greenshot.Drawing.Fields {
-	/// <summary>
-	/// Any element holding Fields must provide access to it.
-	/// AbstractFieldHolder is the basic implementation.
-	/// If you need the fieldHolder to have child fieldHolders,
-	/// you should consider using IFieldHolderWithChildren.
-	/// </summary>
-	public interface IFieldHolder {
-		
-		event FieldChangedEventHandler FieldChanged;
-		
-		void AddField(Field field);
-		void RemoveField(Field field);
-		List<Field> GetFields();
-		Field GetField(FieldType fieldType);
-		bool HasField(FieldType fieldType);
-		void SetFieldValue(FieldType fieldType, object value);
-	}
-	
-	/// <summary>
-	/// Extended fieldHolder which has fieldHolder children.
-	/// Implementations should pass field values to and from 
-	/// their children.
-	/// AbstractFieldHolderWithChildren is the basic implementation.
-	/// </summary>
-	public interface IFieldHolderWithChildren : IFieldHolder {
-		void AddChild(IFieldHolder fieldHolder);
-		void RemoveChild(IFieldHolder fieldHolder);
-	}
-}

Greenshot/Drawing/FilterContainer.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
@@ -77,22 +77,22 @@ namespace Greenshot.Drawing {
 					int alpha = basealpha;
 					int steps = 5;
 					int currentStep = lineVisible ? 1 : 0;
-					while (currentStep <= steps) {
+					while (currentStep <= steps)
-						using (Pen shadowPen = new Pen(Color.FromArgb(alpha, 100, 100, 100), lineThickness)) {
+                    {
+                        using Pen shadowPen = new Pen(Color.FromArgb(alpha, 100, 100, 100), lineThickness);
                         Rectangle shadowRect = GuiRectangle.GetGuiRectangle(Left + currentStep, Top + currentStep, Width, Height);
                         graphics.DrawRectangle(shadowPen, shadowRect);
                         currentStep++;
-							alpha = alpha - basealpha / steps;
+                        alpha -= basealpha / steps;
-						}
                     }
 				}
 				Rectangle rect = GuiRectangle.GetGuiRectangle(Left, Top, Width, Height);
-				if (lineThickness > 0) {
+				if (lineThickness > 0)
-					using (Pen pen = new Pen(lineColor, lineThickness)) {
+                {
+                    using Pen pen = new Pen(lineColor, lineThickness);
                     graphics.DrawRectangle(pen, rect);
                 }
 			}
 		}
 	}
 }
-}

Greenshot/Drawing/Filters/AbstractFilter.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Drawing/Filters/BlurFilter.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
@@ -54,12 +54,12 @@ namespace Greenshot.Drawing.Filters {
 			}
 			if (GDIplus.IsBlurPossible(blurRadius)) {
 				GDIplus.DrawWithBlur(graphics, applyBitmap, applyRect, null, null, blurRadius, false);
-			} else {
+			} else
-				using (IFastBitmap fastBitmap = FastBitmap.CreateCloneOf(applyBitmap, applyRect)) {
+            {
+                using IFastBitmap fastBitmap = FastBitmap.CreateCloneOf(applyBitmap, applyRect);
                 ImageHelper.ApplyBoxBlur(fastBitmap, blurRadius);
                 fastBitmap.DrawTo(graphics, applyRect);
             }
-			}
 			graphics.Restore(state);
 		}
 	}

Greenshot/Drawing/Filters/BrightnessFilter.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Drawing/Filters/GrayscaleFilter.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Drawing/Filters/HighlightFilter.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Drawing/Filters/IFilter.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Drawing/Filters/MagnifierFilter.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Drawing/Filters/PixelizationFilter.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
@@ -48,12 +48,13 @@ namespace Greenshot.Drawing.Filters {
 			if (rect.Height < pixelSize) {
 				pixelSize = rect.Height;
 			}
-			using (IFastBitmap dest = FastBitmap.CreateCloneOf(applyBitmap, rect)) {
+
+            using IFastBitmap dest = FastBitmap.CreateCloneOf(applyBitmap, rect);
             using (IFastBitmap src = FastBitmap.Create(applyBitmap, rect)) {
                 List<Color> colors = new List<Color>();
                 int halbPixelSize = pixelSize / 2;
-					for (int y = src.Top - halbPixelSize; y < src.Bottom + halbPixelSize; y = y + pixelSize) {
+                for (int y = src.Top - halbPixelSize; y < src.Bottom + halbPixelSize; y += pixelSize) {
-						for (int x = src.Left - halbPixelSize; x <= src.Right + halbPixelSize; x = x + pixelSize) {
+                    for (int x = src.Left - halbPixelSize; x <= src.Right + halbPixelSize; x += pixelSize) {
                         colors.Clear();
                         for (int yy = y; yy < y + pixelSize; yy++) {
                             if (yy >= src.Top && yy < src.Bottom) {
@@ -81,4 +82,3 @@ namespace Greenshot.Drawing.Filters {
         }
 	}
 }
-}

Greenshot/Drawing/FreehandContainer.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
@@ -182,8 +182,10 @@ namespace Greenshot.Drawing {
 			
 			int lineThickness = GetFieldValueAsInt(FieldType.LINE_THICKNESS);
 			Color lineColor = GetFieldValueAsColor(FieldType.LINE_COLOR);
-			using (var pen = new Pen(lineColor)) {
+            using var pen = new Pen(lineColor)
-				pen.Width = lineThickness;
+            {
+                Width = lineThickness
+            };
             if (!(pen.Width > 0))
             {
                 return;
@@ -206,7 +208,6 @@ namespace Greenshot.Drawing {
             // Move back, otherwise everything is shifted
             graphics.TranslateTransform(-Left,-Top);
         }
-		}
 
         /// <summary>
         /// Draw a selectionborder around the freehand path
@@ -214,9 +215,10 @@ namespace Greenshot.Drawing {
         /// <param name="graphics">Graphics</param>
         /// <param name="linePen">Pen</param>
         /// <param name="path">GraphicsPath</param>
-        protected static void DrawSelectionBorder(Graphics graphics, Pen linePen, GraphicsPath path) {
+        protected static void DrawSelectionBorder(Graphics graphics, Pen linePen, GraphicsPath path)
-			using (var selectionPen = (Pen) linePen.Clone()) {
+        {
-				using (var selectionPath = (GraphicsPath)path.Clone()) {
+            using var selectionPen = (Pen) linePen.Clone();
+            using var selectionPath = (GraphicsPath)path.Clone();
             selectionPen.Width += 5;
             selectionPen.Color = Color.FromArgb(120, Color.LightSeaGreen);
             graphics.DrawPath(selectionPen, selectionPath);
@@ -226,8 +228,6 @@ namespace Greenshot.Drawing {
             selectionPen.Width = 1;
             graphics.DrawPath(selectionPen, selectionPath);
         }
-			}
-		}
 		
 		/// <summary>
 		/// Get the bounds in which we have something drawn, plus safety margin, these are not the normal bounds...
@@ -254,8 +254,8 @@ namespace Greenshot.Drawing {
             {
                 return false;
             }
-            var other = obj as FreehandContainer;
+
-            if (other != null && Equals(freehandPath, other.freehandPath)) {
+            if (obj is FreehandContainer other && Equals(freehandPath, other.freehandPath)) {
                 ret = true;
             }
             return ret;
@@ -272,12 +272,13 @@ namespace Greenshot.Drawing {
 			bool returnValue = base.ClickableAt(x, y);
 			if (returnValue) {
 				int lineThickness = GetFieldValueAsInt(FieldType.LINE_THICKNESS);
-				using (var pen = new Pen(Color.White)) {
+                using var pen = new Pen(Color.White)
-					pen.Width = lineThickness + 10;
+                {
+                    Width = lineThickness + 10
+                };
                 lock (_freehandPathLock)
                 {
                     returnValue = freehandPath.IsOutlineVisible(x - Left, y - Top, pen);
-                    }
                 }
             }
 			return returnValue;

Greenshot/Drawing/HighlightContainer.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
@@ -84,8 +84,10 @@ namespace Greenshot.Drawing {
 					Add(blurFilter);
 					break;
 				case PreparedFilter.GRAYSCALE:
-					AbstractFilter f = new GrayscaleFilter(this);
+                    AbstractFilter f = new GrayscaleFilter(this)
-					f.Invert = true;
+                    {
+                        Invert = true
+                    };
                     Add(f);
 					break;
 				case PreparedFilter.MAGNIFICATION:

Greenshot/Drawing/IconContainer.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
@@ -79,13 +79,13 @@ namespace Greenshot.Drawing {
 		}
 
 		public void Load(string filename) {
-			if (File.Exists(filename)) {
+			if (File.Exists(filename))
-				using (Icon fileIcon = new Icon(filename)) {
+            {
+                using Icon fileIcon = new Icon(filename);
                 Icon = fileIcon;
                 Log.Debug("Loaded file: " + filename + " with resolution: " + Height + "," + Width);
             }
 		}
-		}
 		
 		public override void Draw(Graphics graphics, RenderMode rm) {
 			if (icon != null) {

Greenshot/Drawing/ImageContainer.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
@@ -92,14 +92,14 @@ namespace Greenshot.Drawing {
 				CheckShadow(true);
 				Width = _shadowBitmap.Width;
 				Height = _shadowBitmap.Height;
-				Left = Left - _shadowOffset.X;
+				Left -= _shadowOffset.X;
-				Top = Top - _shadowOffset.Y;
+				Top -= _shadowOffset.Y;
 			} else {
 				Width = image.Width;
 				Height = image.Height;
 				if (_shadowBitmap != null) {
-					Left = Left + _shadowOffset.X;
+					Left += _shadowOffset.X;
-					Top = Top + _shadowOffset.Y;
+					Top += _shadowOffset.Y;
 				}
 			}
 		}
@@ -118,8 +118,8 @@ namespace Greenshot.Drawing {
 				} else {
 					Width = _shadowBitmap.Width;
 					Height = _shadowBitmap.Height;
-					Left = Left - _shadowOffset.X;
+					Left -= _shadowOffset.X;
-					Top = Top - _shadowOffset.Y;
+					Top -= _shadowOffset.Y;
 				}
 			}
 			get { return image; }
@@ -160,13 +160,12 @@ namespace Greenshot.Drawing {
 			if (rotateAngle != 0) {
 				Log.DebugFormat("Rotating element with {0} degrees.", rotateAngle);
 				DisposeShadow();
-				using (var tmpMatrix = new Matrix()) {
+                using var tmpMatrix = new Matrix();
                 using (image)
                 {
                     image = ImageHelper.ApplyEffect(image, new RotateEffect(rotateAngle), tmpMatrix);
                 }
             }
-			}
 			base.Transform(matrix);
 		}
 
@@ -192,12 +191,12 @@ namespace Greenshot.Drawing {
 		/// </summary>
 		/// <param name="shadow"></param>
 		private void CheckShadow(bool shadow) {
-			if (shadow && _shadowBitmap == null) {
+			if (shadow && _shadowBitmap == null)
-				using (var matrix = new Matrix()) {
+            {
+                using var matrix = new Matrix();
                 _shadowBitmap = ImageHelper.ApplyEffect(image, new DropShadowEffect(), matrix);
             }
 		}
-		}
 
 		/// <summary>
 		/// Draw the actual container to the graphics object

Greenshot/Drawing/LineContainer.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
@@ -73,8 +73,9 @@ namespace Greenshot.Drawing {
 					int alpha = basealpha;
 					int steps = 5;
 					int currentStep = 1;
-					while (currentStep <= steps) {
+					while (currentStep <= steps)
-						using (Pen shadowCapPen = new Pen(Color.FromArgb(alpha, 100, 100, 100), lineThickness)) {
+                    {
+                        using Pen shadowCapPen = new Pen(Color.FromArgb(alpha, 100, 100, 100), lineThickness);
                         graphics.DrawLine(shadowCapPen,
                             Left + currentStep,
                             Top + currentStep,
@@ -82,28 +83,27 @@ namespace Greenshot.Drawing {
                             Top + currentStep + Height);
 
                         currentStep++;
-							alpha = alpha - basealpha / steps;
+                        alpha -= basealpha / steps;
-						}
                     }
 				}
 
-				using (Pen pen = new Pen(lineColor, lineThickness)) {
+                using Pen pen = new Pen(lineColor, lineThickness);
                 graphics.DrawLine(pen, Left, Top, Left + Width, Top + Height);
             }
 		}
-		}
 		
 		public override bool ClickableAt(int x, int y) {
 			int lineThickness = GetFieldValueAsInt(FieldType.LINE_THICKNESS) +5;
-			if (lineThickness > 0) {
+			if (lineThickness > 0)
-				using (Pen pen = new Pen(Color.White)) {
+            {
-					pen.Width = lineThickness;
+                using Pen pen = new Pen(Color.White)
-					using (GraphicsPath path = new GraphicsPath()) {
+                {
+                    Width = lineThickness
+                };
+                using GraphicsPath path = new GraphicsPath();
                 path.AddLine(Left, Top, Left + Width, Top + Height);
                 return path.IsOutlineVisible(x, y, pen);
             }
-				}
-			}
 			return false;
 		}
 		

Greenshot/Drawing/ObfuscateContainer.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Drawing/Positions.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on Sourceforge: http://sourceforge.net/projects/greenshot/

Greenshot/Drawing/RectangleContainer.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
@@ -93,9 +93,12 @@ namespace Greenshot.Drawing {
 				int alpha = basealpha;
 				int steps = 5;
 				int currentStep = lineVisible ? 1 : 0;
-				while (currentStep <= steps) {
+				while (currentStep <= steps)
-					using (Pen shadowPen = new Pen(Color.FromArgb(alpha, 100, 100, 100))) {
+                {
-						shadowPen.Width = lineVisible ? lineThickness : 1;
+                    using Pen shadowPen = new Pen(Color.FromArgb(alpha, 100, 100, 100))
+                    {
+                        Width = lineVisible ? lineThickness : 1
+                    };
                     Rectangle shadowRect = GuiRectangle.GetGuiRectangle(
                         rect.Left + currentStep,
                         rect.Top + currentStep,
@@ -103,24 +106,23 @@ namespace Greenshot.Drawing {
                         rect.Height);
                     graphics.DrawRectangle(shadowPen, shadowRect);
                     currentStep++;
-						alpha = alpha - basealpha / steps;
+                    alpha -= basealpha / steps;
-					}
                 }
 			}
 
 
-			if (Colors.IsVisible(fillColor)) {
+			if (Colors.IsVisible(fillColor))
-				using (Brush brush = new SolidBrush(fillColor)) {
+            {
+                using Brush brush = new SolidBrush(fillColor);
                 graphics.FillRectangle(brush, rect);
             }
-			}
 
 			graphics.SmoothingMode = SmoothingMode.HighSpeed;
-			if (lineVisible) {
+			if (lineVisible)
-				using (Pen pen = new Pen(lineColor, lineThickness)) {
+            {
+                using Pen pen = new Pen(lineColor, lineThickness);
                 graphics.DrawRectangle(pen, rect);
             }
-			}
 
 		}
 		public override bool ClickableAt(int x, int y) {
@@ -142,14 +144,13 @@ namespace Greenshot.Drawing {
 			}
 
 			// check the rest of the lines
-			if (lineThickness > 0) {
+			if (lineThickness > 0)
-				using (Pen pen = new Pen(Color.White, lineThickness)) {
+            {
-					using (GraphicsPath path = new GraphicsPath()) {
+                using Pen pen = new Pen(Color.White, lineThickness);
+                using GraphicsPath path = new GraphicsPath();
                 path.AddRectangle(rect);
                 return path.IsOutlineVisible(x, y, pen);
             }
-				}
-			}
 			return false;
 		}
 	}

Greenshot/Drawing/RoundedRectangle.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Drawing/SpeechbubbleContainer.cs

@@ -38,7 +38,6 @@ namespace Greenshot.Drawing
 
 		private Point _initialGripperPoint;
 
-		#region TargetGripper serializing code
         // Only used for serializing the TargetGripper location
 		private Point _storedTargetGripperLocation;
 
@@ -62,7 +61,6 @@ namespace Greenshot.Drawing
 			base.OnDeserialized(streamingContext);
 			InitAdorner(Color.Green, _storedTargetGripperLocation);
 		}
-		#endregion
 
         public SpeechbubbleContainer(Surface parent)
 			: base(parent) {
@@ -132,13 +130,11 @@ namespace Greenshot.Drawing
 					int lineThickness = GetFieldValueAsInt(FieldType.LINE_THICKNESS);
 					Color lineColor = GetFieldValueAsColor(FieldType.LINE_COLOR);
 					bool shadow = GetFieldValueAsBool(FieldType.SHADOW);
-					using (Pen pen = new Pen(lineColor, lineThickness)) {
+                    using Pen pen = new Pen(lineColor, lineThickness);
                     int inflateValue = lineThickness + 2 + (shadow ? 6 : 0);
-						using (GraphicsPath tailPath = CreateTail()) {
+                    using GraphicsPath tailPath = CreateTail();
                     return Rectangle.Inflate(Rectangle.Union(Rectangle.Round(tailPath.GetBounds(new Matrix(), pen)), GuiRectangle.GetGuiRectangle(Left, Top, Width, Height)), inflateValue, inflateValue);
                 }
-					}
-				}
 				return Rectangle.Empty;
 			}
 		}
@@ -239,9 +235,9 @@ namespace Greenshot.Drawing
 				int alpha = basealpha;
 				const int steps = 5;
 				int currentStep = lineVisible ? 1 : 0;
-				using (Matrix shadowMatrix = new Matrix())
+                using Matrix shadowMatrix = new Matrix();
-				using (GraphicsPath bubbleClone = (GraphicsPath)bubble.Clone())
+                using GraphicsPath bubbleClone = (GraphicsPath)bubble.Clone();
-				using (GraphicsPath tailClone = (GraphicsPath)tail.Clone()) {
+                using GraphicsPath tailClone = (GraphicsPath)tail.Clone();
                 shadowMatrix.Translate(1, 1);
                 while (currentStep <= steps) {
                     using (Pen shadowPen = new Pen(Color.FromArgb(alpha, 100, 100, 100))) {
@@ -252,8 +248,7 @@ namespace Greenshot.Drawing
                         graphics.DrawPath(shadowPen, bubbleClone);
                     }
                     currentStep++;
-						alpha = alpha - basealpha / steps;
+                    alpha -= basealpha / steps;
-					}
                 }
             }
 
@@ -261,10 +256,9 @@ namespace Greenshot.Drawing
 			// draw the tail border where the bubble is not visible
 			using (Region clipRegion = new Region(bubble)) {
 				graphics.SetClip(clipRegion, CombineMode.Exclude);
-				using (Pen pen = new Pen(lineColor, lineThickness)) {
+                using Pen pen = new Pen(lineColor, lineThickness);
                 graphics.DrawPath(pen, tail);
             }
-			}
 			graphics.Restore(state);
 
 			if (Colors.IsVisible(fillColor)) {
@@ -282,11 +276,10 @@ namespace Greenshot.Drawing
 				// Draw bubble where the Tail is not visible.
 				using (Region clipRegion = new Region(tail)) {
 					graphics.SetClip(clipRegion, CombineMode.Exclude);
-					using (Pen pen = new Pen(lineColor, lineThickness)) {
+                    using Pen pen = new Pen(lineColor, lineThickness);
                     //pen.EndCap = pen.StartCap = LineCap.Round;
                     graphics.DrawPath(pen, bubble);
                 }
-				}
 				graphics.Restore(state);
 			}
 
@@ -315,21 +308,20 @@ namespace Greenshot.Drawing
 			if (Status != EditStatus.UNDRAWN) {
 				int lineThickness = GetFieldValueAsInt(FieldType.LINE_THICKNESS);
 				Color lineColor = GetFieldValueAsColor(FieldType.LINE_COLOR);
-				using (Pen pen = new Pen(lineColor, lineThickness)) {
+                using Pen pen = new Pen(lineColor, lineThickness);
                 using (GraphicsPath bubblePath = CreateBubble(lineThickness)) {
                     bubblePath.Widen(pen);
                     if (bubblePath.IsVisible(clickedPoint)) {
                         return true;
                     }
                 }
-					using (GraphicsPath tailPath = CreateTail()) {
+
+                using GraphicsPath tailPath = CreateTail();
                 tailPath.Widen(pen);
                 if (tailPath.IsVisible(clickedPoint)) {
                     return true;
                 }
             }
-				}
-			}
 
 			return false;
 		}

Greenshot/Drawing/StepLabelContainer.cs

@@ -54,7 +54,6 @@ namespace Greenshot.Drawing {
 			CreateDefaultAdorners();
 		}
 
-		#region Number serializing
         // Used to store the number of this label, so when deserializing it can be placed back to the StepLabels list in the right location
 		private int _number;
 		// Used to store the counter start of the Surface, as the surface is NOT stored.
@@ -79,7 +78,6 @@ namespace Greenshot.Drawing {
 				_counterStart = ((Surface) Parent).CounterStart;
 			}
 		}
-		#endregion
 
         /// <summary>
 		/// Restore values that don't serialize
@@ -211,12 +209,11 @@ namespace Greenshot.Drawing {
 			} else {
 				EllipseContainer.DrawEllipse(rect, graphics, rm, 0, Color.Transparent, fillColor, false);
 			}
-			using (FontFamily fam = new FontFamily(FontFamily.GenericSansSerif.Name)) {
+
-				using (Font font = new Font(fam, fontSize, FontStyle.Bold, GraphicsUnit.Pixel)) {
+            using FontFamily fam = new FontFamily(FontFamily.GenericSansSerif.Name);
+            using Font font = new Font(fam, fontSize, FontStyle.Bold, GraphicsUnit.Pixel);
             TextContainer.DrawText(graphics, rect, 0, lineColor, false, _stringFormat, text, font);
         }
-			}
-		}
 
 		public override bool ClickableAt(int x, int y) {
 			Rectangle rect = GuiRectangle.GetGuiRectangle(Left, Top, Width, Height);

Greenshot/Drawing/Surface.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
@@ -914,8 +914,7 @@ namespace Greenshot.Drawing
 				// Test if it's an url and try to download the image so we have it in the original form
 				if (possibleUrl != null && possibleUrl.StartsWith("http"))
                 {
-					using (Image image = NetworkHelper.DownloadImage(possibleUrl))
+                    using Image image = NetworkHelper.DownloadImage(possibleUrl);
-					{
                     if (image != null)
                     {
                         AddImageContainer(image, mouse.X, mouse.Y);
@@ -923,7 +922,6 @@ namespace Greenshot.Drawing
                     }
                 }
 			}
-			}
 
 			foreach (Image image in ClipboardHelper.GetImages(e.Data))
 			{
@@ -1537,10 +1535,9 @@ namespace Greenshot.Drawing
 		public void AddElement(IDrawableContainer element, bool makeUndoable = true, bool invalidate = true)
 		{
 			_elements.Add(element);
-			DrawableContainer container = element as DrawableContainer;
+            if (element is DrawableContainer container)
-			if (container != null)
 			{
-				container.FieldChanged += element_FieldChanged;
+				container.FieldChanged += Element_FieldChanged;
 			}
 			element.Parent = this;
 			if (element.Status == EditStatus.UNDRAWN)
@@ -1602,10 +1599,9 @@ namespace Greenshot.Drawing
 		{
 			DeselectElement(elementToRemove, generateEvents);
 			_elements.Remove(elementToRemove);
-			DrawableContainer element = elementToRemove as DrawableContainer;
+            if (elementToRemove is DrawableContainer element)
-			if (element != null)
 			{
-				element.FieldChanged -= element_FieldChanged;
+				element.FieldChanged -= Element_FieldChanged;
 			}
 			if (elementToRemove != null)
 			{
@@ -2099,7 +2095,7 @@ namespace Greenshot.Drawing
 			return _elements.CanPushDown(selectedElements);
 		}
 
-		public void element_FieldChanged(object sender, FieldChangedEventArgs e)
+		public void Element_FieldChanged(object sender, FieldChangedEventArgs e)
 		{
 			selectedElements.HandleFieldChangedEvent(sender, e);
 		}

Greenshot/Drawing/TextContainer.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
@@ -334,8 +334,7 @@ namespace Greenshot.Drawing
             FontStyle fontStyle = FontStyle.Regular;
 
             bool hasStyle = false;
-            using (var fontFamily = new FontFamily(fontFamilyName))
+            using var fontFamily = new FontFamily(fontFamilyName);
-            {
             bool boldAvailable = fontFamily.IsStyleAvailable(FontStyle.Bold);
             if (fontBold && boldAvailable)
             {
@@ -371,7 +370,6 @@ namespace Greenshot.Drawing
             }
             return new Font(fontFamily, fontSize, fontStyle, GraphicsUnit.Pixel);
         }
-        }
 
         /// <summary>
         /// Generate the Font-Formal so we can draw correctly
@@ -592,12 +590,11 @@ namespace Greenshot.Drawing
                     {
                         shadowRect.Inflate(-textOffset, -textOffset);
                     }
-                    using (Brush fontBrush = new SolidBrush(Color.FromArgb(alpha, 100, 100, 100)))
+
-                    {
+                    using Brush fontBrush = new SolidBrush(Color.FromArgb(alpha, 100, 100, 100));
                     graphics.DrawString(text, font, fontBrush, shadowRect, stringFormat);
                     currentStep++;
-                        alpha = alpha - basealpha / steps;
+                    alpha -= basealpha / steps;
-                    }
                 }
             }
 

Greenshot/Forms/AboutForm.Designer.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Forms/AboutForm.cs

@@ -1,6 +1,6 @@
 /*
 * Greenshot - a free and open source screenshot tool
-* Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+* Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
 *
 * For more information see: http://getgreenshot.org/
 * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
@@ -211,9 +211,9 @@ namespace Greenshot {
 		/// </summary>
 		/// <param name="sender"></param>
 		/// <param name="e"></param>
-		private void LinkLabelClicked(object sender, LinkLabelLinkClickedEventArgs e) {
+		private void LinkLabelClicked(object sender, LinkLabelLinkClickedEventArgs e)
-			LinkLabel linkLabel = sender as LinkLabel;
+        {
-			if (linkLabel != null) {
+            if (!(sender is LinkLabel linkLabel)) return;
             try {
                 linkLabel.LinkVisited = true;
                 Process.Start(linkLabel.Text);
@@ -221,7 +221,6 @@ namespace Greenshot {
                 MessageBox.Show(Language.GetFormattedString(LangKey.error_openlink, linkLabel.Text), Language.GetString(LangKey.error));
             }
         }
-		}
 
 		/// <summary>
 		/// Called from the AnimatingForm, for every frame
@@ -274,7 +273,7 @@ namespace Greenshot {
 				graphics.TranslateTransform(2, -2);
 				graphics.RotateTransform(20);
 
-				using (SolidBrush brush = new SolidBrush(_pixelColor)) {
+                using SolidBrush brush = new SolidBrush(_pixelColor);
                 int index = 0;
                 // We asume there is nothing to animate in the next Animate loop
                 _hasAnimationsLeft = false;
@@ -283,11 +282,10 @@ namespace Greenshot {
                     brush.Color = _pixelColors[index++];
                     graphics.FillEllipse(brush, pixel.Current);
                     // If a pixel still has frames left, the hasAnimationsLeft will be true
-						_hasAnimationsLeft = _hasAnimationsLeft | pixel.HasNext;
+                    _hasAnimationsLeft |= pixel.HasNext;
                     pixel.Next();
                 }
             }
-			}
 			pictureBox1.Invalidate();
 		}
 

Greenshot/Forms/AnimatingBaseForm.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Forms/BaseForm.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Forms/BugReportForm.Designer.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Forms/BugReportForm.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Forms/CaptureForm.Designer.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Forms/CaptureForm.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
@@ -185,8 +185,6 @@ namespace Greenshot.Forms {
 			}
 		}
 
-		#region key handling		
-
         private void CaptureFormKeyUp(object sender, KeyEventArgs e) {
 			switch(e.KeyCode) {
 				case Keys.ShiftKey:
@@ -306,9 +304,7 @@ namespace Greenshot.Forms {
 					break;
 			}
 		}
-		#endregion
 
-		#region events
         /// <summary>
 		/// The mousedown handler of the capture form
 		/// </summary>
@@ -568,7 +564,7 @@ namespace Greenshot.Forms {
 			screenBounds.Location = WindowCapture.GetLocationRelativeToScreenBounds(screenBounds.Location);
 			int relativeZoomSize = Math.Min(screenBounds.Width, screenBounds.Height) / 5;
 			// Make sure the final size is a plural of 4, this makes it look better
-			relativeZoomSize = relativeZoomSize - relativeZoomSize % 4;
+			relativeZoomSize -= relativeZoomSize % 4;
 			Size zoomSize = new Size(relativeZoomSize, relativeZoomSize);
 			Point zoomOffset = new Point(20, 20);
 
@@ -742,13 +738,14 @@ namespace Greenshot.Forms {
 					Pen rulerPen = new Pen(Color.SeaGreen);
 					
 					// horizontal ruler
-					if (fixedRect.Width > hSpace + 3) {
+					if (fixedRect.Width > hSpace + 3)
-						using (GraphicsPath p = RoundedRectangle.Create2(
+                    {
+                        using GraphicsPath p = RoundedRectangle.Create2(
                             fixedRect.X + (fixedRect.Width / 2 - hSpace / 2) + 3, 
                             fixedRect.Y - dist - 7,
                             measureWidth.Width - 3,
                             measureWidth.Height,
-										3)) {
+                            3);
                         graphics.FillPath(bgBrush, p);
                         graphics.DrawPath(rulerPen, p);
                         graphics.DrawString(captureWidth, rulerFont, rulerPen.Brush, fixedRect.X + (fixedRect.Width / 2 - hSpace / 2) + 3, fixedRect.Y - dist - 7);
@@ -757,16 +754,16 @@ namespace Greenshot.Forms {
                         graphics.DrawLine(rulerPen, fixedRect.X, fixedRect.Y - dist - 3, fixedRect.X, fixedRect.Y - dist + 3);
                         graphics.DrawLine(rulerPen, fixedRect.X + fixedRect.Width, fixedRect.Y - dist - 3, fixedRect.X + fixedRect.Width, fixedRect.Y - dist + 3);
                     }
-					}
 					
 					// vertical ruler
-					if (fixedRect.Height > vSpace + 3) {
+					if (fixedRect.Height > vSpace + 3)
-						using (GraphicsPath p = RoundedRectangle.Create2(
+                    {
+                        using GraphicsPath p = RoundedRectangle.Create2(
                             fixedRect.X - measureHeight.Width + 1, 
                             fixedRect.Y + (fixedRect.Height / 2 - vSpace / 2) + 2,
                             measureHeight.Width - 3,
                             measureHeight.Height - 1,
-										3)) {
+                            3);
                         graphics.FillPath(bgBrush, p);
                         graphics.DrawPath(rulerPen, p);
                         graphics.DrawString(captureHeight, rulerFont, rulerPen.Brush, fixedRect.X - measureHeight.Width + 1, fixedRect.Y + (fixedRect.Height / 2 - vSpace / 2) + 2);
@@ -775,7 +772,6 @@ namespace Greenshot.Forms {
                         graphics.DrawLine(rulerPen, fixedRect.X - dist - 3, fixedRect.Y, fixedRect.X - dist + 3, fixedRect.Y);
                         graphics.DrawLine(rulerPen, fixedRect.X - dist - 3, fixedRect.Y + fixedRect.Height, fixedRect.X - dist + 3, fixedRect.Y + fixedRect.Height);
                     }
-					}
 					
 					rulerPen.Dispose();
 					bgBrush.Dispose();
@@ -783,7 +779,7 @@ namespace Greenshot.Forms {
 				
 				// Display size of selected rectangle
 				// Prepare the font and text.
-				using (Font sizeFont = new Font( FontFamily.GenericSansSerif, 12 )) {
+                using Font sizeFont = new Font( FontFamily.GenericSansSerif, 12 );
                 // When capturing a Region we need to add 1 to the height/width for correction
                 string sizeText;
                 if (_captureMode == CaptureMode.Region) {
@@ -806,7 +802,7 @@ namespace Greenshot.Forms {
                         newSize = 20;
                     }
                     // Draw the size.
-						using (Font newSizeFont = new Font(FontFamily.GenericSansSerif, newSize, FontStyle.Bold)) {
+                    using Font newSizeFont = new Font(FontFamily.GenericSansSerif, newSize, FontStyle.Bold);
                     PointF sizeLocation = new PointF(fixedRect.X + _captureRect.Width / 2 - extent.Width / 2, fixedRect.Y + _captureRect.Height / 2 - newSizeFont.GetHeight() / 2);
                     graphics.DrawString(sizeText, newSizeFont, Brushes.LightSeaGreen, sizeLocation);
 
@@ -817,8 +813,6 @@ namespace Greenshot.Forms {
                         graphics.DrawString(title, sizeFont, Brushes.DarkOrange, debugLocation);
                     }
                 }
-					}
-				}
             } else {
 				if (!IsTerminalServerSession) {
 					using (Pen pen = new Pen(Color.LightSeaGreen)) {
@@ -829,9 +823,9 @@ namespace Greenshot.Forms {
 					}
 
 					string xy = _cursorPos.X + " x " + _cursorPos.Y;
-					using (Font f = new Font(FontFamily.GenericSansSerif, 8)) {
+                    using Font f = new Font(FontFamily.GenericSansSerif, 8);
                     Size xySize = TextRenderer.MeasureText(xy, f);
-						using (GraphicsPath gp = RoundedRectangle.Create2(_cursorPos.X + 5, _cursorPos.Y + 5, xySize.Width - 3, xySize.Height, 3)) {
+                    using GraphicsPath gp = RoundedRectangle.Create2(_cursorPos.X + 5, _cursorPos.Y + 5, xySize.Width - 3, xySize.Height, 3);
                     using (Brush bgBrush = new SolidBrush(Color.FromArgb(200, 217, 240, 227))) {
                         graphics.FillPath(bgBrush, gp);
                     }
@@ -842,8 +836,6 @@ namespace Greenshot.Forms {
                     }
                 }
 			}
-				}
-			}
 
 			// Zoom
 			if (_zoomAnimator != null && (IsAnimating(_zoomAnimator) || _captureMode != CaptureMode.Window)) {
@@ -857,6 +849,5 @@ namespace Greenshot.Forms {
 				DrawZoom(graphics, sourceRectangle, destinationRectangle);
 			}
 		}
-		#endregion
     }
 }

Greenshot/Forms/ColorDialog.Designer.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Forms/ColorDialog.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
@@ -35,7 +35,7 @@ namespace Greenshot {
 	/// </summary>
 	public partial class ColorDialog : BaseForm {
 		private static readonly EditorConfiguration EditorConfig = IniConfig.GetIniSection<EditorConfiguration>();
-
+        private static ColorDialog _instance;
 		public ColorDialog() {
 			SuspendLayout();
 			InitializeComponent();
@@ -44,8 +44,11 @@ namespace Greenshot {
 			CreateLastUsedColorButtonRow(5, 190, 15, 15);
 			ResumeLayout();
 			UpdateRecentColorsButtonRow();
+            _instance = this;
         }
 
+        public static ColorDialog GetInstance() => _instance;
+
 		private readonly List<Button> _colorButtons = new List<Button>();
 		private readonly List<Button> _recentColorButtons = new List<Button>();
 		private readonly ToolTip _toolTip = new ToolTip();
@@ -56,7 +59,8 @@ namespace Greenshot {
 			set { PreviewColor(value, this); }
 		}
 
-		#region user interface generation
+        public IList<Color> RecentColors => EditorConfig.RecentColors;
+
         private void CreateColorPalette(int x, int y, int w, int h) {
 			CreateColorButtonColumn(255, 0, 0, x, y, w, h, 11);
 			x += w;
@@ -123,9 +127,7 @@ namespace Greenshot {
 			}
 			Controls.AddRange(_recentColorButtons.ToArray());
 		}
-		#endregion
 
-		#region update user interface
         private void UpdateRecentColorsButtonRow() {
 			for (int i = 0; i < EditorConfig.RecentColors.Count && i < 12; i++) {
 				_recentColorButtons[i].BackColor = EditorConfig.RecentColors[i];
@@ -156,9 +158,6 @@ namespace Greenshot {
 			}
 			UpdateRecentColorsButtonRow();
 		}
-		#endregion
-
-		#region textbox event handlers
 
         private void TextBoxHexadecimalTextChanged(object sender, EventArgs e) {
 			if (_updateInProgress) {
@@ -166,9 +165,8 @@ namespace Greenshot {
 			}
 			TextBox textBox = (TextBox)sender;
 			string text = textBox.Text.Replace("#", "");
-			int i;
             Color c;
-			if (int.TryParse(text, NumberStyles.AllowHexSpecifier, Thread.CurrentThread.CurrentCulture, out i)) {
+			if (int.TryParse(text, NumberStyles.AllowHexSpecifier, Thread.CurrentThread.CurrentCulture, out var i)) {
 				c = Color.FromArgb(i);
 			} else {
 				try
@@ -200,9 +198,6 @@ namespace Greenshot {
 				AddToRecentColors(colorPanel.BackColor);
 			}
 		}
-		#endregion
-
-		#region button event handlers
 
         private void ColorButtonClick(object sender, EventArgs e) {
 			Button b = (Button)sender;
@@ -218,12 +213,9 @@ namespace Greenshot {
 			Hide();
 			AddToRecentColors(colorPanel.BackColor);
 		}
-		#endregion
 
-		#region helper functions
         private int GetColorPartIntFromString(string s) {
-			int ret;
+            int.TryParse(s, out var ret);
-			int.TryParse(s, out ret);
 			if (ret < 0)
 			{
 				ret = 0;
@@ -235,8 +227,6 @@ namespace Greenshot {
 			return ret;
 		}
 
-		#endregion
-
         private void PipetteUsed(object sender, PipetteUsedArgs e) {
 			Color = e.Color;
 		}

Greenshot/Forms/ColorDialog.resx

@@ -112,12 +112,12 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="pipette.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8

Greenshot/Forms/ColorPickerToolStripButton.cs

@@ -1,42 +1,65 @@
+/*
+ * Greenshot - a free and open source screenshot tool
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
+ * 
+ * For more information see: http://getgreenshot.org/
+ * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 1 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 using System;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.Windows.Forms;
 using System.Diagnostics;
 
-namespace GreenShot
+namespace Greenshot
 {
 	public delegate void ColorPickerEventHandler(object o, ColorPickerEventArgs e);
 	
-	public class ColorPickerToolStripButton : System.Windows.Forms.ToolStripButton
+	public class ColorPickerToolStripButton : ToolStripButton
 	{
-		private Color color;
+		private Color _color;
 		public Point Offset = new Point(0,0);
 		public event ColorPickerEventHandler ColorPicked;
-		private ColorDialog cd;
+		private readonly Greenshot.ColorDialog _cd;
 		
 		
 		public ColorPickerToolStripButton()
 		{
-			cd = ColorDialog.GetInstance();
+			_cd = Greenshot.ColorDialog.GetInstance();
-			this.Click += new System.EventHandler(this.ToolStripButton1Click);
+			Click += ToolStripButton1Click;
 		}
 		
 		public Color Color {
-			set {color = value;this.Invalidate();}
+			set {_color = value;Invalidate();}
-			get {return color;}
+			get {return _color;}
 		}
 		
 		protected override void OnPaint (PaintEventArgs e) {
 			base.OnPaint(e);
-			if(color != null) {
+			if(_color != null) {
 				// replace transparent color with selected color
 				Graphics g = e.Graphics;
 				//Graphics g = Graphics.FromImage(Image);
 				ColorMap[] colorMap = new ColorMap[1];
-			    colorMap[0] = new ColorMap();
+				colorMap[0] = new ColorMap
-			    colorMap[0].OldColor = Color.Magenta;//this.ImageTransparentColor;
+				{
-			    colorMap[0].NewColor = color;
+					OldColor = Color.Magenta,//this.ImageTransparentColor;
+					NewColor = _color
+				};
 				ImageAttributes attr = new ImageAttributes();
 			    attr.SetRemapTable(colorMap);
 			    Rectangle rect = new Rectangle(0, 0, Image.Width, Image.Height);
@@ -44,7 +67,7 @@ namespace GreenShot
 			  	// for now, we use the public variable Offset to define this manually
 			  	rect.Offset(Offset.X,Offset.Y);
 			  	//Image.
-			  	Debug.WriteLine("paint!"+this.Text+": "+color);
+			  	Debug.WriteLine("paint!"+Text+": "+_color);
 			  	//ssif(color.Equals(Color.Transparent)) ((Bitmap)Image).MakeTransparent(Color.Magenta);
 			    g.DrawImage(Image, rect, 0, 0, rect.Width, rect.Height, GraphicsUnit.Pixel, attr);
 			    //this.Image.In
@@ -52,22 +75,18 @@ namespace GreenShot
 			}
 		}
 		
-		void ToolStripButton1Click(object sender, System.EventArgs e)
+		void ToolStripButton1Click(object sender, EventArgs e)
 		{
-			cd.ShowDialog(this.Owner);
+			_cd.ShowDialog(Owner);
-			Color = cd.Color;
+			Color = _cd.Color;
-			if(ColorPicked != null) {
+			ColorPicked?.Invoke(this, new ColorPickerEventArgs(Color));
-				ColorPicked(this, new ColorPickerEventArgs(Color, cd.RecentColors));
-			}
 		}
 	}
 	
-	public class ColorPickerEventArgs : System.EventArgs {
+	public class ColorPickerEventArgs : EventArgs {
 		public Color Color;
-		public Color[] RecentColors;
+		public ColorPickerEventArgs(Color color) {
-		public ColorPickerEventArgs(Color color, Color[] recentColors) {
 			Color = color;
-			RecentColors = recentColors;
 		}
 		
 	}

Greenshot/Forms/DropShadowSettingsForm.Designer.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Forms/DropShadowSettingsForm.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Forms/ImageEditorForm.Designer.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Forms/ImageEditorForm.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
@@ -162,7 +162,7 @@ namespace Greenshot {
 				_surface.MovingElementChanged += delegate {
 					RefreshEditorControls();
 				};
-				_surface.DrawingModeChanged += surface_DrawingModeChanged;
+				_surface.DrawingModeChanged += Surface_DrawingModeChanged;
 				_surface.SurfaceSizeChanged += SurfaceSizeChanged;
 				_surface.SurfaceMessage += SurfaceMessageReceived;
 				_surface.FieldAggregator.FieldChanged += FieldAggregatorFieldChanged;
@@ -218,8 +218,9 @@ namespace Greenshot {
 		/// </summary>
 		/// <param name="sender"></param>
 		/// <param name="e"></param>
-		private void PropertiesToolStrip_Paint(object sender, PaintEventArgs e) {
+		private void PropertiesToolStrip_Paint(object sender, PaintEventArgs e)
-			using (Pen cbBorderPen = new Pen(SystemColors.ActiveBorder)) {
+        {
+            using Pen cbBorderPen = new Pen(SystemColors.ActiveBorder);
             // Loop over all items in the propertiesToolStrip
             foreach (ToolStripItem item in propertiesToolStrip.Items) {
                 ToolStripComboBox cb = item as ToolStripComboBox;
@@ -237,7 +238,6 @@ namespace Greenshot {
                 }
             }
         }
-		}
 
 		/// <summary>
 		/// Get all the destinations and display them in the file menu and the buttons
@@ -337,8 +337,7 @@ namespace Greenshot {
 		/// <param name="items"></param>
 		private void ClearItems(ToolStripItemCollection items) {
 			foreach(var item in items) {
-				ToolStripMenuItem menuItem = item as ToolStripMenuItem;
+                if (item is ToolStripMenuItem menuItem && menuItem.ShortcutKeys != Keys.None) {
-				if (menuItem != null && menuItem.ShortcutKeys != Keys.None) {
 					menuItem.ShortcutKeys = Keys.None;
 				}
 			}
@@ -440,7 +439,7 @@ namespace Greenshot {
 			Text = Path.GetFileName(fullpath) + " - " + Language.GetString(LangKey.editor_title);
 		}
 
-		private void surface_DrawingModeChanged(object source, SurfaceDrawingModeEventArgs eventArgs) {
+		private void Surface_DrawingModeChanged(object source, SurfaceDrawingModeEventArgs eventArgs) {
 			switch (eventArgs.DrawingMode) {
 				case DrawingModes.None:
 					SetButtonChecked(btnCursor);
@@ -481,8 +480,6 @@ namespace Greenshot {
 			}
 		}
 
-		#region plugin interfaces
-		
         /**
 		 * Interfaces for plugins, see GreenshotInterface for more details!
 		 */
@@ -500,9 +497,6 @@ namespace Greenshot {
 		public ToolStripMenuItem GetFileMenuItem() {
 			return fileStripMenuItem;
 		}
-		#endregion
-		
-		#region filesystem options
 
         private void BtnSaveClick(object sender, EventArgs e) {
 			string destinationDesignation = FileDestination.DESIGNATION;
@@ -526,9 +520,6 @@ namespace Greenshot {
 		private void CloseToolStripMenuItemClick(object sender, EventArgs e) {
 			Close();
 		}
-		#endregion
-		
-		#region drawing options
 
         private void BtnEllipseClick(object sender, EventArgs e) {
 			_surface.DrawingMode = DrawingModes.Ellipse;
@@ -642,9 +633,6 @@ namespace Greenshot {
 		private void BtnDeleteClick(object sender, EventArgs e) {
 			RemoveObjectToolStripMenuItemClick(sender, e);
 		}
-		#endregion
-		
-		#region copy&paste options
 
         private void CutToolStripMenuItemClick(object sender, EventArgs e) {
 			_surface.CutSelectedElements();
@@ -695,9 +683,6 @@ namespace Greenshot {
 			_surface.DuplicateSelectedElements();
 			UpdateClipboardSurfaceDependencies();
 		}
-		#endregion
-		
-		#region element properties
 
         private void UpOneLevelToolStripMenuItemClick(object sender, EventArgs e) {
 			_surface.PullElementsUp();
@@ -716,10 +701,6 @@ namespace Greenshot {
 		}
 
 
-		#endregion
-		
-		#region help
-
         private void HelpToolStripMenuItem1Click(object sender, EventArgs e) {
 			HelpFileLoader.LoadHelp();
 		}
@@ -739,9 +720,6 @@ namespace Greenshot {
 		private void BtnHelpClick(object sender, EventArgs e) {
 			HelpToolStripMenuItem1Click(sender, e);
 		}
-		#endregion
-		
-		#region image editor event handlers
 
         private void ImageEditorFormActivated(object sender, EventArgs e) {
 			UpdateClipboardSurfaceDependencies();
@@ -882,9 +860,7 @@ namespace Greenshot {
 		private void PanelMouseWheel(object sender, MouseEventArgs e) {
 			panel1.Focus();
 		}
-		#endregion
 
-		#region key handling
         protected override bool ProcessKeyPreview(ref Message msg) {
 			// disable default key handling if surface has requested a lock
 			if (!_surface.KeysLocked) {
@@ -919,9 +895,6 @@ namespace Greenshot {
 			}
 			return false;
 		}
-		#endregion
-		
-		#region helpers
 
         private void UpdateUndoRedoSurfaceDependencies() {
 			if (_surface == null) {
@@ -980,18 +953,11 @@ namespace Greenshot {
 			pasteToolStripMenuItem.Enabled = hasClipboard && !_controlsDisabledDueToConfirmable;
 		}
 
-		#endregion
-		
-		#region status label handling
         private void UpdateStatusLabel(string text, ContextMenuStrip contextMenu = null) {
 			statusLabel.Text = text;
 			statusStrip1.ContextMenuStrip = contextMenu;
 		}
 
-		private void ClearStatusLabel() {
-			UpdateStatusLabel(null);
-		}
-
         private void StatusLabelClicked(object sender, MouseEventArgs e) {
 			ToolStrip ss = (StatusStrip)((ToolStripStatusLabel)sender).Owner;
 			ss.ContextMenuStrip?.Show(ss, e.X, e.Y);
@@ -1004,7 +970,6 @@ namespace Greenshot {
 		private void OpenDirectoryMenuItemClick(object sender, EventArgs e) {
 			ExplorerHelper.OpenInExplorer(_surface.LastSaveFullPath);
 		}
-		#endregion
 
         private void BindFieldControls() {
 			// TODO: This is actually risky, if there are no references than the objects may be garbage collected
@@ -1221,12 +1186,12 @@ namespace Greenshot {
 				FileName = FilenameHelper.GetFilenameWithoutExtensionFromPattern(coreConfiguration.OutputFileFilenamePattern, _surface.CaptureDetails)
 			};
 			DialogResult dialogResult = saveFileDialog.ShowDialog();
-			if(dialogResult.Equals(DialogResult.OK)) {
+			if(dialogResult.Equals(DialogResult.OK))
-				using (Stream streamWrite = File.OpenWrite(saveFileDialog.FileName)) {
+            {
+                using Stream streamWrite = File.OpenWrite(saveFileDialog.FileName);
                 _surface.SaveElementsToStream(streamWrite);
             }
 		}
-		}
 
 		private void LoadElementsToolStripMenuItemClick(object sender, EventArgs e) {
 			OpenFileDialog openFileDialog = new OpenFileDialog
@@ -1243,8 +1208,7 @@ namespace Greenshot {
 
 		private void DestinationToolStripMenuItemClick(object sender, EventArgs e) {
 			IDestination clickedDestination = null;
-			var control = sender as Control;
+            if (sender is Control control) {
-			if (control != null) {
 				Control clickedControl = control;
 				if (clickedControl.ContextMenuStrip != null) {
 					clickedControl.ContextMenuStrip.Show(Cursor.Position);
@@ -1254,8 +1218,7 @@ namespace Greenshot {
 			}
 			else
 			{
-				var item = sender as ToolStripMenuItem;
+                if (sender is ToolStripMenuItem item) {
-				if (item != null) {
 					ToolStripMenuItem clickedMenuItem = item;
 					clickedDestination = (IDestination)clickedMenuItem.Tag;
 				}

Greenshot/Forms/ImageEditorForm.resx

@@ -112,12 +112,12 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="btnCursor.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -940,90 +940,90 @@
 </value>
   </data>
   <data name="btnStepLabel01.Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\icons\notification-counter-01.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\icons\notification-counter-01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="btnStepLabel02.Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\icons\notification-counter-02.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\icons\notification-counter-02.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="btnStepLabel03.Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\icons\notification-counter-03.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\icons\notification-counter-03.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="btnStepLabel04.Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\icons\notification-counter-04.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\icons\notification-counter-04.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="btnStepLabel05.Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\icons\notification-counter-05.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\icons\notification-counter-05.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="btnStepLabel06.Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\icons\notification-counter-06.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\icons\notification-counter-06.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="btnStepLabel07.Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\icons\notification-counter-07.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\icons\notification-counter-07.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="btnStepLabel08.Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\icons\notification-counter-08.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\icons\notification-counter-08.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="btnStepLabel09.Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\icons\notification-counter-09.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\icons\notification-counter-09.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="btnStepLabel10.Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\icons\notification-counter-10.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\icons\notification-counter-10.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="btnStepLabel11.Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\icons\notification-counter-11.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\icons\notification-counter-11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="btnStepLabel12.Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\icons\notification-counter-12.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\icons\notification-counter-12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="btnStepLabel13.Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\icons\notification-counter-13.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\icons\notification-counter-13.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="btnStepLabel14.Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\icons\notification-counter-14.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\icons\notification-counter-14.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="btnStepLabel15.Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\icons\notification-counter-15.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\icons\notification-counter-15.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="btnStepLabel16.Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\icons\notification-counter-16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\icons\notification-counter-16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="btnStepLabel17.Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\icons\notification-counter-17.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\icons\notification-counter-17.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="btnStepLabel18.Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\icons\notification-counter-18.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\icons\notification-counter-18.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="btnStepLabel19.Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\icons\notification-counter-19.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\icons\notification-counter-19.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="btnStepLabel20+.Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\icons\notification-counter-20-plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\icons\notification-counter-20-plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="btnStepLabel20.Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\icons\notification-counter-20.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\icons\notification-counter-20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="btnSpeechBubble.Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\icons\balloon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\icons\balloon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="btnResize.Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\icons\resize.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\icons\resize.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>551, 17</value>
   </metadata>
-  <metadata name="toolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="toolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 54</value>
   </metadata>
-  <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>662, 17</value>
   </metadata>
-  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>452, 17</value>
   </metadata>
-  <metadata name="propertiesToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="propertiesToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>116, 54</value>
   </metadata>
-  <metadata name="fileSavedStatusContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="fileSavedStatusContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
 </root>

Greenshot/Forms/LanguageDialog.Designer.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Forms/LanguageDialog.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Forms/MainForm.Designer.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Forms/MainForm.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016  Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020  Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
@@ -30,7 +30,7 @@ using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Windows.Forms;
-
+using System.Windows.Forms.Integration;
 using Greenshot.Configuration;
 using Greenshot.Experimental;
 using Greenshot.Forms;
@@ -219,27 +219,30 @@ namespace Greenshot {
 							}
 							greenshotProcess.Dispose();
 						}
-						if (!matchedThisProcess) {
+						if (!matchedThisProcess)
-							using (Process currentProcess = Process.GetCurrentProcess()) {
+                        {
+                            using Process currentProcess = Process.GetCurrentProcess();
                             instanceInfo.Append(index + ": ").AppendLine(Kernel32.GetProcessPath(currentProcess.Id));
                         }
-						}
 
                         // A dirty fix to make sure the message box is visible as a Greenshot window on the taskbar
-						using (Form dummyForm = new Form()) {
+                        using Form dummyForm = new Form
-							dummyForm.Icon = GreenshotResources.getGreenshotIcon();
+                        {
-							dummyForm.ShowInTaskbar = true;
+                            Icon = GreenshotResources.getGreenshotIcon(),
-							dummyForm.FormBorderStyle = FormBorderStyle.None;
+                            ShowInTaskbar = true,
-							dummyForm.Location = new Point(int.MinValue, int.MinValue);
+                            FormBorderStyle = FormBorderStyle.None,
+                            Location = new Point(int.MinValue, int.MinValue)
+                        };
                         dummyForm.Load += delegate { dummyForm.Size = Size.Empty; };
                         dummyForm.Show();
                         MessageBox.Show(dummyForm, Language.GetString(LangKey.error_multipleinstances) + "\r\n" + instanceInfo, Language.GetString(LangKey.error), MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
                     }
-					}
 					FreeMutex();
 					Application.Exit();
 					return;
 				}
+                // Make sure we can use forms
+                WindowsFormsHost.EnableWindowsFormsInterop();
 
 				// BUG-1809: Add message filter, to filter out all the InputLangChanged messages which go to a target control with a handle > 32 bit.
 				Application.AddMessageFilter(new WmInputLangChangeRequestFilter());
@@ -489,8 +492,6 @@ namespace Greenshot {
 			base.WndProc(ref m);
 		}
 
-		#region hotkeys
-
         /// <summary>
 		/// Helper method to cleanly register a hotkey
 		/// </summary>
@@ -653,7 +654,6 @@ namespace Greenshot {
 			}
 			return success;
 		}
-		#endregion
 
         public void UpdateUi() {
 			// As the form is never loaded, call ApplyLanguage ourselves
@@ -668,8 +668,6 @@ namespace Greenshot {
 		}
 
 
-		#region mainform events
-
         private void MainFormFormClosing(object sender, FormClosingEventArgs e) {
 			LOG.DebugFormat("Mainform closing, reason: {0}", e.CloseReason);
 			_instance = null;
@@ -680,9 +678,6 @@ namespace Greenshot {
 			Hide();
 			ShowInTaskbar = false;
 		}
-		#endregion
-
-		#region key handlers
 
         private void CaptureRegion() {
 			CaptureHelper.CaptureRegion(true);
@@ -721,11 +716,8 @@ namespace Greenshot {
 				CaptureHelper.CaptureWindow(true);
 			}
 		}
-		#endregion
 
 
-		#region contextmenu
-
         private void ContextMenuOpening(object sender, CancelEventArgs e)	{
 			contextmenu_captureclipboard.Enabled = ClipboardHelper.ContainsImage();
 			contextmenu_capturelastregion.Enabled = coreConfiguration.LastCapturedRegion != Rectangle.Empty;
@@ -880,15 +872,13 @@ namespace Greenshot {
 		}
 		
 		private void ShowThumbnailOnEnter(object sender, EventArgs e) {
-			ToolStripMenuItem captureWindowItem = sender as ToolStripMenuItem;
+            if (!(sender is ToolStripMenuItem captureWindowItem)) return;
-			if (captureWindowItem != null) {
             WindowDetails window = captureWindowItem.Tag as WindowDetails;
             if (_thumbnailForm == null) {
                 _thumbnailForm = new ThumbnailForm();
             }
             _thumbnailForm.ShowThumbnail(window, captureWindowItem.GetCurrentParent().TopLevelControl);
         }
-		}
 
 		private void HideThumbnailOnLeave(object sender, EventArgs e)
 		{
@@ -1083,8 +1073,7 @@ namespace Greenshot {
 		}
 
 		private void CheckStateChangedHandler(object sender, EventArgs e) {
-			ToolStripMenuSelectListItem captureMouseItem = sender as ToolStripMenuSelectListItem;
+            if (sender is ToolStripMenuSelectListItem captureMouseItem) {
-			if (captureMouseItem != null) {
 				_conf.CaptureMousepointer = captureMouseItem.Checked;
 			}
 		}
@@ -1191,8 +1180,7 @@ namespace Greenshot {
 
 		private void QuickSettingBoolItemChanged(object sender, EventArgs e) {
 			ToolStripMenuSelectListItem item = ((ItemCheckedChangedEventArgs)e).Item;
-			IniValue iniValue = item.Data as IniValue;
+            if (item.Data is IniValue iniValue) {
-			if (iniValue != null) {
 				iniValue.Value = item.Checked;
 				IniConfig.Save();
 			}
@@ -1228,7 +1216,6 @@ namespace Greenshot {
 			// Rebuild the quick settings menu with the new settings.
 			InitializeQuickSettingsMenu();
 		}
-		#endregion
 
         private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) {
 			Exception exceptionToLog = e.ExceptionObject as Exception;

Greenshot/Forms/MainForm.resx

@@ -112,15 +112,15 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="contextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="contextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>293, 17</value>
   </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="contextmenu_capturearea.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -290,10 +290,10 @@
         +SFiYP97gICHXEhM7AyNjTWERES8ohKJlsECgPwD74Vfj6xWOBYAAAAASUVORK5CYII=
 </value>
   </data>
-  <metadata name="notifyIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="notifyIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>193, 17</value>
   </metadata>
-  <metadata name="backgroundWorkerTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="backgroundWorkerTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
 </root>

Greenshot/Forms/MovableShowColorForm.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
@@ -85,8 +85,9 @@ namespace Greenshot.Forms {
 		/// </summary>
 		/// <param name="screenCoordinates">Point with the coordinates</param>
 		/// <returns>Color at the specified screenCoordinates</returns>
-		private static Color GetPixelColor(Point screenCoordinates) {
+		private static Color GetPixelColor(Point screenCoordinates)
-			using (SafeWindowDcHandle screenDC = SafeWindowDcHandle.FromDesktop()) {
+        {
+            using SafeWindowDcHandle screenDC = SafeWindowDcHandle.FromDesktop();
             try {
                 uint pixel = GDI32.GetPixel(screenDC, screenCoordinates.X, screenCoordinates.Y);
                 Color color = Color.FromArgb(255, (int)(pixel & 0xFF), (int)(pixel & 0xFF00) >> 8, (int)(pixel & 0xFF0000) >> 16);
@@ -97,4 +98,3 @@ namespace Greenshot.Forms {
         }
 	}
 }
-}

Greenshot/Forms/PrintOptionsDialog.Designer.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Forms/PrintOptionsDialog.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Forms/ResizeSettingsForm.Designer.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot

Greenshot/Forms/ResizeSettingsForm.cs

@@ -1,6 +1,6 @@
 /*
  * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
  * 
  * For more information see: http://getgreenshot.org/
  * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
@@ -65,10 +65,8 @@ namespace Greenshot.Forms {
 		}
 
 		private static bool Validate(object sender) {
-			TextBox textbox = sender as TextBox;
+            if (sender is TextBox textbox) {
-			if (textbox != null) {
+                if (!double.TryParse(textbox.Text, out var numberEntered)) {
-				double numberEntered;
-				if (!double.TryParse(textbox.Text, out numberEntered)) {
 					textbox.BackColor = Color.Red;
 					return false;
 				}