Issue#332

xcom2-launcher/xcom2-launcher/Forms/AboutBox.cs

@@ -9,6 +9,7 @@ partial class AboutBox : Form
         public AboutBox()
         {
             InitializeComponent();
+            CancelButton = okButton;
         }
 
         private void AboutBox_Load(object sender, EventArgs e)

xcom2-launcher/xcom2-launcher/Forms/CategoryManager.cs

@@ -20,7 +20,8 @@ public partial class CategoryManager : Form
         public CategoryManager(Settings settings)
         {
             InitializeComponent();
-
+
+            CancelButton = bClose;
             Settings = settings;
 
             foreach (var cat in settings.Mods.CategoryNames)

xcom2-launcher/xcom2-launcher/Forms/CleanModsForm.cs

@@ -12,12 +12,12 @@ public CleanModsForm(Settings settings)
         {
             InitializeComponent();
 
-            // 
+            CancelButton = bClose;
             Mods = settings.Mods;
 
             // todo save cleaning settings?
             // Register Events
-            button1.Click += onStartButtonClicked;
+            bStart.Click += onStartButtonClicked;
         }
 
         private ModList Mods { get; }

xcom2-launcher/xcom2-launcher/Forms/ConfigDiff.cs

@@ -35,6 +35,7 @@ public static ConfigDiff Instance
 		public ConfigDiff()
 		{
 			InitializeComponent();
+			CancelButton = bClose;
 		}
 
 		public void CompareStrings(string s1, string s2)
@@ -90,11 +91,6 @@ private void BeginUpdate()
 			_updating++;
 		}
 
-		private void btCompare_Click(object sender, EventArgs e)
-		{
-			Compare();
-		}
-
 		private void Compare()
 		{
 			fctb1.Clear();
@@ -144,11 +140,16 @@ private void fctb_TextChanged(object sender, TextChangedEventArgs e)
 		{
 			IniLanguage.Process(e);
 		}
+
+		private void bClose_Click(object sender, EventArgs e)
+		{
+			Close();
+		}
 	}
 
-	#region Merge stuffs
+    #region Merge stuffs
 
-	namespace DiffMergeStuffs
+    namespace DiffMergeStuffs
 	{
 		public class SimpleDiff<T>
 		{

xcom2-launcher/xcom2-launcher/Forms/MainForm.Events.cs

@@ -199,7 +199,7 @@ internal void RegisterEvents()
             editOptionsToolStripMenuItem.Click += delegate
             {
                 Log.Info("Menu->Options->Settings");
-                var dialog = new SettingsDialog(Settings);
+                using var dialog = new SettingsDialog(Settings);
 
                 if (dialog.ShowDialog() == DialogResult.OK)
                 {
@@ -234,7 +234,11 @@ internal void RegisterEvents()
             #region Menu->Tools
 
             // -> Tools
-            cleanModsToolStripMenuItem.Click += delegate { new CleanModsForm(Settings).ShowDialog(); };
+            cleanModsToolStripMenuItem.Click += delegate
+            {
+                using var dlg = new CleanModsForm(Settings);
+                dlg.ShowDialog();
+            };
 
             importFromXCOM2ToolStripMenuItem.Click += delegate
             {
@@ -289,7 +293,7 @@ internal void RegisterEvents()
             infoToolStripMenuItem.Click += delegate
             {
                 Log.Info("Menu->About->About");
-                AboutBox about = new AboutBox();
+                using var about = new AboutBox();
                 about.ShowDialog();
             };
 
@@ -356,7 +360,7 @@ private void ManageCategoriesToolStripMenuItem_Click(object sender, EventArgs e)
         {
             Log.Info("Menu->Options->Categories");
 
-            CategoryManager catManager = new CategoryManager(Settings);
+            using var catManager = new CategoryManager(Settings);
             var result = catManager.ShowDialog();
 
             if (result == DialogResult.OK)
@@ -459,7 +463,7 @@ private void ExportCheckboxCheckedChanged(object sender, EventArgs e)
 
         private void ExportLoadButtonClick(object sender, EventArgs e)
         {
-            var dialog = new OpenFileDialog
+            using var dialog = new OpenFileDialog
             {
                 Filter = "Text files|*.txt",
                 DefaultExt = "txt",
@@ -608,7 +612,7 @@ private void ExportLoadButtonClick(object sender, EventArgs e)
 
         private void ExportSaveButtonClick(object sender, EventArgs eventArgs)
         {
-            var dialog = new SaveFileDialog
+            using var dialog = new SaveFileDialog
             {
                 Filter = "Text files|*.txt",
                 DefaultExt = "txt",

xcom2-launcher/xcom2-launcher/Forms/MainForm.ModList.cs

@@ -727,7 +727,7 @@ private ContextMenuStrip CreateModListContextMenu(ModEntry m, ModTag tag)
 
             editColor.Click += (sender, e) =>
             {
-                var colorPicker = new ColorDialog
+                using var colorPicker = new ColorDialog
                 {
                     AllowFullOpen = true,
                     Color = tag.Color,

xcom2-launcher/xcom2-launcher/Forms/MainForm.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.Linq;
@@ -13,7 +12,6 @@
 using XCOM2Launcher.XCOM;
 using JR.Utils.GUI.Forms;
 using XCOM2Launcher.Classes.Mod;
-using XCOM2Launcher.Steam;
 
 namespace XCOM2Launcher.Forms
 {