Cleanup Code

Signed-off-by: Kláben Szabolcs Bence (Tudi20) <[email protected]>

Author: lilyremigia

Universal THCRAP Launcher/Form1.cs

@@ -16,28 +16,6 @@ namespace Universal_THCRAP_Launcher
 {
     public partial class Form1 : Form
     {
-        #region Global variables
-        private const string ConfigFile = "utl_config.js";
-        private readonly Image _custom = new Bitmap(Resources.Custom);
-        private readonly Image _game = new Bitmap(Resources.Game);
-
-        private readonly Image _gameAndCustom = new Bitmap(Resources.GameAndCustom);
-        private readonly List<string> _gamesList = new List<string>();
-
-        private readonly Image _sortAscending = new Bitmap(Resources.Sort_Ascending);
-        private readonly Image _sortDescending = new Bitmap(Resources.Sort_Decending);
-
-        private readonly Image _star = new Bitmap(Resources.Star);
-        private readonly Image _starHollow = new Bitmap(Resources.Star_Hollow);
-
-        private List<string> _jsFiles = new List<string>();
-
-        private int[] _resizeConstants;
-        
-        private Configuration Configuration1 { get; set; }
-        private Favourites Favourites1 { get; set; } = new Favourites(new List<string>(), new List<string>());
-        #endregion
-        
         public Form1()
         {
             InitializeComponent();
@@ -63,7 +41,7 @@ private void Form1_Load(object sender, EventArgs e)
             const string msgError2 =
                 "games.js couldn't be found.\nMake sure you run thcrap_configure.exe first!";
             if (!File.Exists("games.js")) ErrorAndExit(msgError2);
-            
+
             DeleteOutdatedConfig();
 
             #region Load data from files
@@ -96,15 +74,16 @@ private void Form1_Load(object sender, EventArgs e)
                 file = File.ReadAllText(ConfigFile);
                 Configuration1 = JsonConvert.DeserializeObject<Configuration>(file, settings);
             }
-            
+
             //Load favourites
             if (File.Exists("favourites.js"))
             {
                 file = File.ReadAllText("favourites.js");
                 Favourites1 = JsonConvert.DeserializeObject<Favourites>(file);
             }
+
             #endregion
-            
+
             #region  Fix patch stack list
 
             for (var i = 0; i < _jsFiles.Count; i++)
@@ -141,14 +120,13 @@ private void Form1_Load(object sender, EventArgs e)
                 _gamesList.Add(item.Key);
                 listBox2.Items.Add(item.Key);
             }
-            
+
             SetDefaultSettings();
-            
+
             //Change Form settings
             SetDesktopLocation(Configuration1.Window.Location[0], Configuration1.Window.Location[1]);
             Size = new Size(Configuration1.Window.Size[0], Configuration1.Window.Size[1]);
-            
-            //Display config
+
             checkBox1.Checked = Configuration1.ExitAfterStartup;
 
             //Update Display favourites
@@ -184,11 +162,12 @@ private void SetDefaultSettings()
 
             if (Configuration1.Window == null)
             {
-                var window = new Window {Size = new[] {Size.Width, Size.Height}, Location = new[] {Location.X, Location.Y}};
+                var window = new Window
+                    {Size = new[] {Size.Width, Size.Height}, Location = new[] {Location.X, Location.Y}};
                 Configuration1.Window = window;
             }
-            
-            
+
+
             //Default sort
             for (var i = 0; i < 2; i++)
                 if (Configuration1.IsDescending[i] == "false")
@@ -249,8 +228,6 @@ private void SetDefaultSettings()
             //Default exe type button state
             filterByType_button.BackgroundImage = _gameAndCustom;
             for (var i = 0; i < Configuration1.FilterExeType; i++) filterByType_button_Click(null, new EventArgs());
-
-            
         }
 
 
@@ -269,9 +246,9 @@ private void Form1_Shown(object sender, EventArgs e)
 
         private void DeleteOutdatedConfig()
         {
-                if(File.Exists("uthcrapl_confis.js")) File.Delete("uthcrapl_confis.js");
+            if (File.Exists("uthcrapl_confis.js")) File.Delete("uthcrapl_confis.js");
         }
-        
+
         private void Form1_Resize(object sender, EventArgs e)
         {
             button1.Size = new Size(Size.Width - _resizeConstants[0], button1.Size.Height);
@@ -290,7 +267,7 @@ private void Form1_Resize(object sender, EventArgs e)
             filterByType_button.Location = new Point(
                 star_button2.Location.X + _resizeConstants[6], splitContainer1.Location.Y - _resizeConstants[4]);
         }
-        
+
         private static void AddStars(ListBox listBox, IEnumerable<string> list)
         {
             foreach (var variable in list)
@@ -337,7 +314,7 @@ private void ReadConfig()
             if (listBox2.SelectedIndex == -1 && listBox2.Items.Count > 0)
                 listBox2.SelectedIndex = 0;
         }
-        
+
         /// <summary>
         ///     Updates the configuration and favourites list
         /// </summary>
@@ -422,7 +399,107 @@ private void button1_MouseHover(object sender, EventArgs e) =>
         private void button1_MouseLeave(object sender, EventArgs e) =>
             button1.BackgroundImage = Resources.Shinmera_Banner_5_mini_size;
 
+        private void SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (ModifierKeys != Keys.None) return;
+            var lb = (ListBox) sender;
+            switch (lb.Name)
+            {
+                case "listBox1":
+                    if (lb.SelectedIndex != -1)
+                        Configuration1.LastConfig = lb.SelectedItem.ToString().Replace(" ★", "");
+                    break;
+                case "listBox2":
+                    if (lb.SelectedIndex != -1)
+                        Configuration1.LastGame = lb.SelectedItem.ToString().Replace(" ★", "");
+                    break;
+                default:
+                    Debug.WriteLine("Invalid ListBox!");
+                    break;
+            }
+        }
+
+        private void checkBox1_CheckedChanged(object sender, EventArgs e) =>
+            Configuration1.ExitAfterStartup = checkBox1.Checked;
+
+        private void Form1_KeyUp(object sender, KeyEventArgs e)
+        {
+            if (ModifierKeys != Keys.None)
+            {
+                listBox1.SelectedItem = Configuration1.LastConfig;
+                listBox2.SelectedItem = Configuration1.LastGame;
+            }
+
+            switch (e.KeyCode)
+            {
+                case Keys.F2 when sender.GetType().FullName != "System.Windows.Forms.ListBox":
+                case Keys.Enter when sender.GetType().FullName != "System.Windows.Forms.ListBox":
+                    return;
+                case Keys.Enter:
+                    UpdateConfigFile();
+                    StartThcrap();
+                    break;
+                case Keys.F2:
+                    var lb = (ListBox) sender;
+                    if (!lb.SelectedItem.ToString().Contains("★"))
+                    {
+                        if (lb.Equals(listBox1))
+                            Favourites1.Patches.Add(lb.Items[lb.SelectedIndex].ToString());
+
+                        if (lb.Equals(listBox2))
+                            Favourites1.Games.Add(lb.Items[lb.SelectedIndex].ToString());
+                        lb.Items[lb.SelectedIndex] += " ★";
+                    }
+                    else
+                    {
+                        lb.Items[lb.SelectedIndex] = lb.Items[lb.SelectedIndex].ToString().Replace(" ★", "");
+                    }
+
+                    UpdateConfigFile();
+                    break;
+            }
+        }
+
+        private static void RestartProgram()
+        {
+            Process.Start(Assembly.GetEntryAssembly().Location);
+            Application.Exit();
+        }
+
+        private static void ShowKeyboardShortcuts()
+        {
+            MessageBox.Show(Resources.KeyboardShortcuts,
+                @"Keyboard Shortcuts", MessageBoxButtons.OK, MessageBoxIcon.Information);
+        }
+
+        private void Form1_FormClosing(object sender, FormClosingEventArgs e) => UpdateConfigFile();
+
+        #region Global variables
+
+        private const string ConfigFile = "utl_config.js";
+        private readonly Image _custom = new Bitmap(Resources.Custom);
+        private readonly Image _game = new Bitmap(Resources.Game);
+
+        private readonly Image _gameAndCustom = new Bitmap(Resources.GameAndCustom);
+        private readonly List<string> _gamesList = new List<string>();
+
+        private readonly Image _sortAscending = new Bitmap(Resources.Sort_Ascending);
+        private readonly Image _sortDescending = new Bitmap(Resources.Sort_Decending);
+
+        private readonly Image _star = new Bitmap(Resources.Star);
+        private readonly Image _starHollow = new Bitmap(Resources.Star_Hollow);
+
+        private List<string> _jsFiles = new List<string>();
+
+        private int[] _resizeConstants;
+
+        private Configuration Configuration1 { get; set; }
+        private Favourites Favourites1 { get; set; } = new Favourites(new List<string>(), new List<string>());
+
+        #endregion
+
         #region Sorting/Filtering Button functions
+
         private void sort_az_button1_Click(object sender, EventArgs e)
         {
             var isDesc = Configuration1.IsDescending;
@@ -461,7 +538,7 @@ private void sort_az_button2_Click(object sender, EventArgs e)
 
             Configuration1.IsDescending = isDesc;
             ReadConfig();
-        }       
+        }
 
         private void star_button1_Click(object sender, EventArgs e)
         {
@@ -520,7 +597,7 @@ private void star_button2_Click(object sender, EventArgs e)
             Configuration1.OnlyFavourites = onlyFav;
             ReadConfig();
         }
-        
+
         private void filterByType_button_Click(object sender, EventArgs e)
         {
             if (filterByType_button.BackgroundImage.Equals(_gameAndCustom))
@@ -556,85 +633,13 @@ private void filterByType_button_Click(object sender, EventArgs e)
                 if (sender != null) Configuration1.FilterExeType = 0;
             }
         }
-        #endregion
-
-        private void SelectedIndexChanged(object sender, EventArgs e)
-        {
-            if (ModifierKeys != Keys.None) return;
-            var lb = (ListBox) sender;
-            switch (lb.Name)
-            {
-                case "listBox1":
-                    if (lb.SelectedIndex != -1)
-                        Configuration1.LastConfig = lb.SelectedItem.ToString().Replace(" ★", "");
-                    break;
-                case "listBox2":
-                    if (lb.SelectedIndex != -1)
-                        Configuration1.LastGame = lb.SelectedItem.ToString().Replace(" ★", "");
-                    break;
-                default:
-                    Debug.WriteLine("Invalid ListBox!");
-                    break;
-            }
-        }
 
-        private void checkBox1_CheckedChanged(object sender, EventArgs e) =>
-            Configuration1.ExitAfterStartup = checkBox1.Checked;
-
-        private void Form1_KeyUp(object sender, KeyEventArgs e)
-        {
-            if (ModifierKeys != Keys.None)
-            {
-                listBox1.SelectedItem = Configuration1.LastConfig;
-                listBox2.SelectedItem = Configuration1.LastGame;
-            }
-
-            switch (e.KeyCode)
-            {
-                case Keys.F2 when sender.GetType().FullName != "System.Windows.Forms.ListBox":
-                case Keys.Enter when sender.GetType().FullName != "System.Windows.Forms.ListBox":
-                    return;
-                case Keys.Enter:
-                    UpdateConfigFile();
-                    StartThcrap();
-                    break;
-                case Keys.F2:
-                    var lb = (ListBox) sender;
-                    if (!lb.SelectedItem.ToString().Contains("★"))
-                    {
-                        if (lb.Equals(listBox1))
-                            Favourites1.Patches.Add(lb.Items[lb.SelectedIndex].ToString());
-
-                        if (lb.Equals(listBox2))
-                            Favourites1.Games.Add(lb.Items[lb.SelectedIndex].ToString());
-                        lb.Items[lb.SelectedIndex] += " ★";
-                    }
-                    else
-                    {
-                        lb.Items[lb.SelectedIndex] = lb.Items[lb.SelectedIndex].ToString().Replace(" ★", "");
-                    }
-
-                    UpdateConfigFile();
-                    break;
-            }
-            
-        }
+        #endregion
 
-        private static void RestartProgram()
-        {
-            Process.Start(Assembly.GetEntryAssembly().Location);
-            Application.Exit();
-        }
-        
-        private static void ShowKeyboardShortcuts()
-        {
-            MessageBox.Show(Resources.KeyboardShortcuts,
-                @"Keyboard Shortcuts", MessageBoxButtons.OK, MessageBoxIcon.Information);
-        }
-        
         #region Tool Strip functions
+
         private void keyboardShortcutsToolStripMenuItem_Click(object sender, EventArgs e) => ShowKeyboardShortcuts();
-        
+
         private void restartToolStripMenuItem_Click(object sender, EventArgs e) => RestartProgram();
 
         private void exitToolStripMenuItem_Click(object sender, EventArgs e) => Application.Exit();
@@ -689,12 +694,10 @@ private void createShortcutToolStripMenuItem_Click(object sender, EventArgs e)
             shortcut.Save();
         }
 
-        private void openSelectedPatchConfigurationToolStripMenuItem_Click(object sender, EventArgs e) => Process.Start(Directory.GetCurrentDirectory() + @"/" + listBox1.SelectedItem.ToString().Replace(" ★", ""));
+        private void openSelectedPatchConfigurationToolStripMenuItem_Click(object sender, EventArgs e) =>
+            Process.Start(Directory.GetCurrentDirectory() + @"/" + listBox1.SelectedItem.ToString().Replace(" ★", ""));
 
         #endregion
-        
-        private void Form1_FormClosing(object sender, FormClosingEventArgs e) => UpdateConfigFile();
-        
     }
 
     public class Configuration