From 5fbba28fa6e600237c3e1daa75ba9c57a9c264cc Mon Sep 17 00:00:00 2001
From: Markus Hofknecht <Markus@Hofknecht.eu>
Date: Fri, 25 Aug 2023 21:47:18 +0200
Subject: [PATCH] [Feature] Framework Self-Contained, not more necessary to
 install .Net 6 sdk (#277), version 1.3.3.0

---
 Packaging/Packaging.wapproj                   | 10 -------
 ...nSettingsInSystemtrayIconRightClickForm.cs |  6 +++-
 .../HotkeyTextboxControl/HotkeyControl.cs     | 14 +++++++++
 UserInterface/SettingsForm.cs                 | 30 ++++++++-----------
 Utilities/Log.cs                              |  1 -
 5 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/Packaging/Packaging.wapproj b/Packaging/Packaging.wapproj
index 90d7779..ce16b8d 100644
--- a/Packaging/Packaging.wapproj
+++ b/Packaging/Packaging.wapproj
@@ -51,13 +51,8 @@
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <DefaultLanguage>en-US</DefaultLanguage>
     <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
-    <EntryPointProjectUniqueName>..\SystemTrayMenu.csproj</EntryPointProjectUniqueName>
-    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
-    <GenerateTestArtifacts>True</GenerateTestArtifacts>
     <AppxBundlePlatforms>x86|x64</AppxBundlePlatforms>
-    <AppInstallerUri>https://github.com/Hofknecht/SystemTrayMenu/releases</AppInstallerUri>
-    <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
     <AppxSymbolPackageEnabled>True</AppxSymbolPackageEnabled>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -95,11 +90,6 @@
   <ItemGroup>
     <None Include="Package.StoreAssociation.xml" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\SystemTrayMenu.csproj">
-      <SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
diff --git a/UserInterface/HintYouCanOpenSettingsInSystemtrayIconRightClickForm.cs b/UserInterface/HintYouCanOpenSettingsInSystemtrayIconRightClickForm.cs
index ebd4088..ef0046a 100644
--- a/UserInterface/HintYouCanOpenSettingsInSystemtrayIconRightClickForm.cs
+++ b/UserInterface/HintYouCanOpenSettingsInSystemtrayIconRightClickForm.cs
@@ -1,4 +1,8 @@
-namespace SystemTrayMenu.UserInterface
+// <copyright file="HintYouCanOpenSettingsInSystemtrayIconRightClickForm.cs" company="PlaceholderCompany">
+// Copyright (c) PlaceholderCompany. All rights reserved.
+// </copyright>
+
+namespace SystemTrayMenu.UserInterface
 {
     using System.Windows.Forms;
     using SystemTrayMenu.Utilities;
diff --git a/UserInterface/HotkeyTextboxControl/HotkeyControl.cs b/UserInterface/HotkeyTextboxControl/HotkeyControl.cs
index 500934d..ca20347 100644
--- a/UserInterface/HotkeyTextboxControl/HotkeyControl.cs
+++ b/UserInterface/HotkeyTextboxControl/HotkeyControl.cs
@@ -416,6 +416,20 @@ namespace SystemTrayMenu.UserInterface.HotkeyTextboxControl
             return HotkeyToString(HotkeyModifiers, Hotkey);
         }
 
+        /// <summary>
+        /// Disposes of the resources used by the HotkeyControl.
+        /// </summary>
+        /// <param name="disposing">True if being called from Dispose, false otherwise.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                dummy.Dispose();
+            }
+
+            base.Dispose(disposing);
+        }
+
         /// <summary>
         /// Handles some misc keys, such as Ctrl+Delete and Shift+Insert.
         /// </summary>
diff --git a/UserInterface/SettingsForm.cs b/UserInterface/SettingsForm.cs
index c37e142..d3a0fc1 100644
--- a/UserInterface/SettingsForm.cs
+++ b/UserInterface/SettingsForm.cs
@@ -580,23 +580,6 @@ namespace SystemTrayMenu.UserInterface
             textBoxColorArrowHoverBackgroundDarkMode.Text = Settings.Default.ColorArrowHoverBackgroundDarkMode;
         }
 
-        private void ShowHintToFindSettings(object sender, EventArgs e)
-        {
-            if (!((CheckBox)sender).Checked &&
-                Settings.Default.ShowHintYouCanOpenSettingsInSystemtrayIconRightClick)
-            {
-                using (HintYouCanOpenSettingsInSystemtrayIconRightClickForm hintForm = new())
-                {
-                    hintForm.ShowDialog();
-                    Settings.Default.ShowHintYouCanOpenSettingsInSystemtrayIconRightClick =
-                        hintForm.GetShowHintAgain();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets NewHotKey.
-        /// </summary>
         public string NewHotKey { get; } = string.Empty;
 
         /// <summary>
@@ -819,6 +802,18 @@ namespace SystemTrayMenu.UserInterface
             return useStartupTask;
         }
 
+        private void ShowHintToFindSettings(object sender, EventArgs e)
+        {
+            if (!((CheckBox)sender).Checked &&
+                Settings.Default.ShowHintYouCanOpenSettingsInSystemtrayIconRightClick)
+            {
+                using HintYouCanOpenSettingsInSystemtrayIconRightClickForm hintForm = new();
+                hintForm.ShowDialog();
+                Settings.Default.ShowHintYouCanOpenSettingsInSystemtrayIconRightClick =
+                    hintForm.GetShowHintAgain();
+            }
+        }
+
         private void SettingsForm_Load(object sender, EventArgs e)
         {
             AdjustControlMultilineIfNecessary(checkBoxStayOpenWhenFocusLost);
@@ -1509,6 +1504,7 @@ namespace SystemTrayMenu.UserInterface
 
         private void SettingsForm_FormClosed(object sender, FormClosedEventArgs e)
         {
+            textBoxHotkey?.Dispose();
             settingsForm?.Dispose();
             settingsForm = null;
         }
diff --git a/Utilities/Log.cs b/Utilities/Log.cs
index 2d5a998..cefeba1 100644
--- a/Utilities/Log.cs
+++ b/Utilities/Log.cs
@@ -167,7 +167,6 @@ namespace SystemTrayMenu.Utilities
 
                 using Process p = new()
                 {
-
                     StartInfo = new ProcessStartInfo(fileName)
                     {
                         FileName = fileName,