Changeset 14

Timestamp:

Aug 2, 2022, 11:46:25 AM (2 years ago)

Author:

chronos

Message:

• Modified: Various improvements.

Location:

Common

Files:

• ComboBoxEx.Designer.cs (modified) (1 diff)
• ComboBoxEx.cs (modified) (3 diffs)
• CsvExport.cs (modified) (2 diffs)
• Dialogs.cs (added)
• DpiScaling.cs (modified) (6 diffs)
• FileExt.cs (modified) (1 diff)
• FormDimensions.cs (modified) (11 diffs)
• FormFind.Designer.cs (modified) (7 diffs)
• FormFind.cs (modified) (4 diffs)
• FormProgress.Designer.cs (modified) (4 diffs)
• FormProgress.cs (modified) (14 diffs)
• ListViewComparer.cs (modified) (7 diffs)
• NamedList.cs (added)
• Prompt.cs (modified) (13 diffs)
• RecentFiles.cs (modified) (3 diffs)
• Registry.cs (modified) (5 diffs)
• RichTextBoxEx.Designer.cs (modified) (1 diff)
• RichTextBoxEx.cs (modified) (23 diffs)
• RichTextBoxEx.resx (modified) (1 diff)
• SplitButton.cs (added)
• Table.cs (modified) (6 diffs)
• Theme.cs (modified) (5 diffs)
• XmlExt.cs (added)

Common/ComboBoxEx.Designer.cs

@@ -1 @@
-namespace Common
+namespace Common
 {
     partial class ComboBoxEx

Common/ComboBoxEx.cs

@@ -1 @@
-using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
 using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 using Microsoft.Win32;
-using Common;
 
 namespace Common
@@ -27 +22 @@
             if (Text.Trim() != "")
             {
+                BeginUpdate();
                 string previousText = Text;
                 int index = Items.IndexOf(Text);
@@ -35 +31 @@
                 while (Items.Count > maxHistoryCount)
                     Items.RemoveAt(Items.Count - 1);
+                EndUpdate();
             }
         }

Common/CsvExport.cs

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using System.IO;
 using System.Windows.Forms;
-using System.Threading.Tasks;
 
 namespace Common
@@ -11 +8 @@
     class CsvExport
     {
-        public void ListViewToCSV(ListView listView, string filePath, bool includeHidden)
+        public void ListViewToCsv(ListView listView, string filePath, bool includeHidden)
         {
             // Make header string
             StringBuilder result = new StringBuilder();
-            WriteCSVRow(result, listView.Columns.Count, i => includeHidden || listView.Columns[i].Width > 0, i => listView.Columns[i].Text);
+            WriteCsvRow(result, listView.Columns.Count, i => includeHidden || listView.Columns[i].Width > 0, i => listView.Columns[i].Text);
 
             // Export data rows
             foreach (ListViewItem listItem in listView.Items)
-                WriteCSVRow(result, listView.Columns.Count, i => includeHidden || listView.Columns[i].Width > 0, i => listItem.SubItems[i].Text);
+                WriteCsvRow(result, listView.Columns.Count, i => includeHidden || listView.Columns[i].Width > 0, i => listItem.SubItems[i].Text);
 
             File.WriteAllText(filePath, result.ToString());
         }
 
-        public void DataGridViewToCSV(DataGridView dataGridView, string filePath, bool includeHidden)
+        public void DataGridViewToCsv(DataGridView dataGridView, string filePath, bool includeHidden)
         {
             // Make header string
             StringBuilder result = new StringBuilder();
-            WriteCSVRow(result, dataGridView.Columns.Count, i => includeHidden || dataGridView.Columns[i].Width > 0, i => dataGridView.Columns[i].HeaderText);
+            WriteCsvRow(result, dataGridView.Columns.Count, i => includeHidden || dataGridView.Columns[i].Width > 0, i => dataGridView.Columns[i].HeaderText);
 
             // Export data rows
             foreach (DataGridViewRow row in dataGridView.Rows)
-                WriteCSVRow(result, row.Cells.Count, i => includeHidden || row.Cells[i].Size.Width > 0, i => row.Cells[i].Value.ToString());
+                WriteCsvRow(result, row.Cells.Count, i => includeHidden || row.Cells[i].Size.Width > 0, i => row.Cells[i].Value.ToString());
 
             File.WriteAllText(filePath, result.ToString());
         }        
 
-        private void WriteCSVRow(StringBuilder result, int itemsCount, Func<int, bool> isColumnNeeded, Func<int, string> columnValue)
+        private void WriteCsvRow(StringBuilder result, int itemsCount, Func<int, bool> isColumnNeeded, Func<int, string> columnValue)
         {
             bool isFirstTime = true;

Common/DpiScaling.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 using System.Drawing;
 using System.ComponentModel;
+using Microsoft.Win32;
 
 namespace Common
@@ -12 +8 @@
     class DpiScaling
     {
-        public static float systemDpi = 0;
-        public static bool useCustomDpi = false;
-        public static float customDpi = 96;
-        private static bool changed = false;        
+        public static float SystemDpi;
+        public static bool UseCustomDpi;
+        public static float CustomDpi = 96;
+        private static bool _changed;        
 
         public static void ApplyToComponent(Component component)
@@ -29 +25 @@
             {
                 //(component as ToolStrip).AutoSize = false;
-                Size newSize = new Size((int)((component as ToolStrip).ImageScalingSize.Width * customDpi / 96F),
-                    (int)((component as ToolStrip).ImageScalingSize.Height * customDpi / 96F));
+                Size newSize = new Size((int)((component as ToolStrip).ImageScalingSize.Width * CustomDpi / 96F),
+                    (int)((component as ToolStrip).ImageScalingSize.Height * CustomDpi / 96F));
 /*                foreach (ToolStripItem item in (component as ToolStrip).Items)
                 {
@@ -58 +54 @@
             if (component is MenuStrip)
             {
-                (component as MenuStrip).Font = new System.Drawing.Font((component as MenuStrip).Font.FontFamily, 8.25F * customDpi / 96F,
-                  (component as MenuStrip).Font.Style, System.Drawing.GraphicsUnit.Point, (component as MenuStrip).Font.GdiCharSet);
+                (component as MenuStrip).Font = new Font((component as MenuStrip).Font.FontFamily, 8.25F * CustomDpi / 96F,
+                  (component as MenuStrip).Font.Style, GraphicsUnit.Point, (component as MenuStrip).Font.GdiCharSet);
             }
             if (component is TabControl)
@@ -70 +66 @@
             if (component is ToolStripItem)
             {
-                (component as ToolStripItem).Font = new System.Drawing.Font((component as ToolStripItem).Font.FontFamily, 8.25F * customDpi / 96F,
-                  (component as ToolStripItem).Font.Style, System.Drawing.GraphicsUnit.Point, (component as ToolStripItem).Font.GdiCharSet);
+                (component as ToolStripItem).Font = new Font((component as ToolStripItem).Font.FontFamily, 8.25F * CustomDpi / 96F,
+                  (component as ToolStripItem).Font.Style, GraphicsUnit.Point, (component as ToolStripItem).Font.GdiCharSet);
             }
         }
@@ -77 +73 @@
         public static void Apply(Form form)
         {
-            if (useCustomDpi) changed = true;
-            if (systemDpi == 0)
+            if (UseCustomDpi) _changed = true;
+            if (SystemDpi == 0)
             {
                 Graphics graphics = form.CreateGraphics();
-                systemDpi = graphics.DpiX;
+                SystemDpi = graphics.DpiX;
             }
-            if (useCustomDpi || changed)
+            if (UseCustomDpi || _changed)
             {
-                form.Font = new System.Drawing.Font(form.Font.FontFamily, 8.25F * customDpi / 96F,
-                    form.Font.Style, System.Drawing.GraphicsUnit.Point, form.Font.GdiCharSet);
+                form.Font = new Font(form.Font.FontFamily, 8.25F * CustomDpi / 96F,
+                    form.Font.Style, GraphicsUnit.Point, form.Font.GdiCharSet);
                 ApplyToComponent(form);
             }            
         }
 
-        public static float Scale(float size)
+        public static float Scale(float size, float baseDpi = 96F)
         {
-            if (useCustomDpi) size = size * customDpi / 96F;
+            if (UseCustomDpi)
+            {
+                size = size * CustomDpi / baseDpi;
+            }
+            else
+            {
+                size = size * SystemDpi / baseDpi;
+            }
+
             return size;
+        }
+
+        public static void LoadFromRegistry(string regSubKey = "")
+        {
+            if (Application.UserAppDataRegistry == null) return;
+            RegistryKey regKey = Application.UserAppDataRegistry.OpenSubKey(regSubKey);
+            if (regKey == null) return;
+
+            CustomDpi = regKey.GetValueInt("CustomDpiEnabled", (int)CustomDpi);
+            UseCustomDpi = regKey.GetValueBool("StackTrace", UseCustomDpi);
+        }
+
+        public static void SaveToRegistry(string regSubKey = "")
+        {
+            if (Application.UserAppDataRegistry == null) return;
+            RegistryKey regKey = Application.UserAppDataRegistry.OpenSubKey(regSubKey, true);
+            if (regKey == null) regKey = Application.UserAppDataRegistry.CreateSubKey(regSubKey);
+
+            regKey.SetValueInt("CustomDpiEnabled", (int)CustomDpi);
+            regKey.SetValueBool("StackTrace", UseCustomDpi);
         }
     }

Common/FileExt.cs

@@ -23 +23 @@
             } else File.WriteAllText(fileName, content);
         }
+
+        public static string GetExactPathName(string pathName)
+        {
+            if (!(File.Exists(pathName) || Directory.Exists(pathName)))
+                return pathName;
+
+            var di = new DirectoryInfo(pathName);
+
+            if (di.Parent != null)
+            {
+                return Path.Combine(
+                    GetExactPathName(di.Parent.FullName),
+                    di.Parent.GetFileSystemInfos(di.Name)[0].Name);
+            }
+            else
+            {
+                return di.FullName.ToUpper();
+            }
+        }
     }
 }

Common/FormDimensions.cs

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Drawing;
 using System.Windows.Forms;
@@ -12 +9 @@
     class FormDimensions
     {
-        public Form form;
+        public Form Form;
         public string RegSubKey;
-        public FormWindowState defaultFormWindowState = FormWindowState.Normal;
+        public FormWindowState DefaultFormWindowState = FormWindowState.Normal;
 
         [DllImport("user32.dll")]
@@ -73 +70 @@
         public void Load(Form form, Form parentForm = null)
         {
-            this.form = form;
+            this.Form = form;
             RegistryKey regKey = Application.UserAppDataRegistry.OpenSubKey(RegSubKey + "\\" + form.Name);
             if (regKey == null) regKey = Application.UserAppDataRegistry.CreateSubKey(RegSubKey + "\\" + form.Name);
@@ -103 +100 @@
                 (int)regKey.GetValue("RestoreBoundsWidth" + name, restoreBounds.Width),
                 (int)regKey.GetValue("RestoreBoundsHeight" + name, restoreBounds.Height));
-            FormWindowState windowState = (FormWindowState)regKey.GetValue("State" + name, (int)defaultFormWindowState);
+            FormWindowState windowState = (FormWindowState)regKey.GetValue("State" + name, (int)DefaultFormWindowState);
             if (parentForm != null)
             {
@@ -150 +147 @@
         public void Save(Form form, Form parentForm = null)
         {
-            this.form = form;
+            this.Form = form;
             RegistryKey regKey = Application.UserAppDataRegistry.OpenSubKey(RegSubKey + "\\" + form.Name, true);
             if (regKey == null) regKey = Application.UserAppDataRegistry.CreateSubKey(RegSubKey + "\\" + form.Name);
@@ -191 +188 @@
             if (control is ListView)
             {
-                RegistryKey regKey = Application.UserAppDataRegistry.OpenSubKey(RegSubKey + "\\" + form.Name + "\\" + control.Name, true);
-                if (regKey == null) regKey = Application.UserAppDataRegistry.CreateSubKey(RegSubKey + "\\" + form.Name + "\\" + control.Name);
+                RegistryKey regKey = Application.UserAppDataRegistry.OpenSubKey(RegSubKey + "\\" + Form.Name + "\\" + control.Name, true);
+                if (regKey == null) regKey = Application.UserAppDataRegistry.CreateSubKey(RegSubKey + "\\" + Form.Name + "\\" + control.Name);
 
                 for (int I = 0; I < (control as ListView).Columns.Count; I++)
@@ -202 +199 @@
             if (control is DataGridView)
             {
-                RegistryKey regKey = Application.UserAppDataRegistry.OpenSubKey(RegSubKey + "\\" + form.Name + "\\" + control.Name, true);
-                if (regKey == null) regKey = Application.UserAppDataRegistry.CreateSubKey(RegSubKey + "\\" + form.Name + "\\" + control.Name);
+                RegistryKey regKey = Application.UserAppDataRegistry.OpenSubKey(RegSubKey + "\\" + Form.Name + "\\" + control.Name, true);
+                if (regKey == null) regKey = Application.UserAppDataRegistry.CreateSubKey(RegSubKey + "\\" + Form.Name + "\\" + control.Name);
 
                 for (int I = 0; I < (control as DataGridView).Columns.Count; I++)
@@ -213 +210 @@
             if (control is SplitContainer)
             {
-                RegistryKey regKey = Application.UserAppDataRegistry.OpenSubKey(RegSubKey + "\\" + form.Name + "\\" + control.Name, true);
-                if (regKey == null) regKey = Application.UserAppDataRegistry.CreateSubKey(RegSubKey + "\\" + form.Name + "\\" + control.Name);
+                RegistryKey regKey = Application.UserAppDataRegistry.OpenSubKey(RegSubKey + "\\" + Form.Name + "\\" + control.Name, true);
+                if (regKey == null) regKey = Application.UserAppDataRegistry.CreateSubKey(RegSubKey + "\\" + Form.Name + "\\" + control.Name);
 
                 if (regKey.GetValue("SplitterDistance") != null)
@@ -230 +227 @@
             if (control is ListView)
             {
-                RegistryKey regKey = Application.UserAppDataRegistry.OpenSubKey(RegSubKey + "\\" + form.Name + "\\" + control.Name, true);
-                if (regKey == null) regKey = Application.UserAppDataRegistry.CreateSubKey(RegSubKey + "\\" + form.Name + "\\" + control.Name);
+                RegistryKey regKey = Application.UserAppDataRegistry.OpenSubKey(RegSubKey + "\\" + Form.Name + "\\" + control.Name, true);
+                if (regKey == null) regKey = Application.UserAppDataRegistry.CreateSubKey(RegSubKey + "\\" + Form.Name + "\\" + control.Name);
 
                 for (int I = 0; I < (control as ListView).Columns.Count; I++)
@@ -240 +237 @@
             if (control is DataGridView)
             {
-                RegistryKey regKey = Application.UserAppDataRegistry.OpenSubKey(RegSubKey + "\\" + form.Name + "\\" + control.Name, true);
-                if (regKey == null) regKey = Application.UserAppDataRegistry.CreateSubKey(RegSubKey + "\\" + form.Name + "\\" + control.Name);
+                RegistryKey regKey = Application.UserAppDataRegistry.OpenSubKey(RegSubKey + "\\" + Form.Name + "\\" + control.Name, true);
+                if (regKey == null) regKey = Application.UserAppDataRegistry.CreateSubKey(RegSubKey + "\\" + Form.Name + "\\" + control.Name);
 
                 for (int I = 0; I < (control as DataGridView).Columns.Count; I++)
@@ -250 +247 @@
             if (control is SplitContainer)
             {
-                RegistryKey regKey = Application.UserAppDataRegistry.OpenSubKey(RegSubKey + "\\" + form.Name + "\\" + control.Name, true);
-                if (regKey == null) regKey = Application.UserAppDataRegistry.CreateSubKey(RegSubKey + "\\" + form.Name + "\\" + control.Name);
+                RegistryKey regKey = Application.UserAppDataRegistry.OpenSubKey(RegSubKey + "\\" + Form.Name + "\\" + control.Name, true);
+                if (regKey == null) regKey = Application.UserAppDataRegistry.CreateSubKey(RegSubKey + "\\" + Form.Name + "\\" + control.Name);
 
                 regKey.SetValue("SplitterDistance", (control as SplitContainer).SplitterDistance);

Common/FormFind.Designer.cs

@@ -1 @@
-namespace Common
+namespace Common
 {
     partial class FormFind
@@ -41 +41 @@
             // 
             this.buttonFindNext.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonFindNext.Location = new System.Drawing.Point(405, 15);
-            this.buttonFindNext.Margin = new System.Windows.Forms.Padding(4);
+            this.buttonFindNext.Location = new System.Drawing.Point(468, 19);
+            this.buttonFindNext.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.buttonFindNext.Name = "buttonFindNext";
-            this.buttonFindNext.Size = new System.Drawing.Size(117, 28);
+            this.buttonFindNext.Size = new System.Drawing.Size(132, 35);
             this.buttonFindNext.TabIndex = 4;
             this.buttonFindNext.Text = "Find next";
@@ -54 +54 @@
             this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.buttonCancel.Location = new System.Drawing.Point(405, 86);
-            this.buttonCancel.Margin = new System.Windows.Forms.Padding(4);
+            this.buttonCancel.Location = new System.Drawing.Point(468, 108);
+            this.buttonCancel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(116, 28);
+            this.buttonCancel.Size = new System.Drawing.Size(130, 35);
             this.buttonCancel.TabIndex = 6;
             this.buttonCancel.Text = "Cancel";
@@ -66 +66 @@
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(16, 21);
+            this.label1.Location = new System.Drawing.Point(18, 26);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(72, 17);
+            this.label1.Size = new System.Drawing.Size(82, 20);
             this.label1.TabIndex = 0;
             this.label1.Text = "Find what:";
+            this.label1.Click += new System.EventHandler(this.label1_Click);
             // 
             // checkBoxMatchWholeWordOnly
             // 
             this.checkBoxMatchWholeWordOnly.AutoSize = true;
-            this.checkBoxMatchWholeWordOnly.Location = new System.Drawing.Point(20, 58);
-            this.checkBoxMatchWholeWordOnly.Margin = new System.Windows.Forms.Padding(4);
+            this.checkBoxMatchWholeWordOnly.Location = new System.Drawing.Point(22, 72);
+            this.checkBoxMatchWholeWordOnly.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.checkBoxMatchWholeWordOnly.Name = "checkBoxMatchWholeWordOnly";
-            this.checkBoxMatchWholeWordOnly.Size = new System.Drawing.Size(172, 21);
+            this.checkBoxMatchWholeWordOnly.Size = new System.Drawing.Size(193, 24);
             this.checkBoxMatchWholeWordOnly.TabIndex = 2;
             this.checkBoxMatchWholeWordOnly.Text = "Match whole word only";
             this.checkBoxMatchWholeWordOnly.UseVisualStyleBackColor = true;
+            this.checkBoxMatchWholeWordOnly.CheckedChanged += new System.EventHandler(this.checkBoxMatchWholeWordOnly_CheckedChanged);
             // 
             // checkBoxMatchCase
             // 
             this.checkBoxMatchCase.AutoSize = true;
-            this.checkBoxMatchCase.Location = new System.Drawing.Point(20, 86);
-            this.checkBoxMatchCase.Margin = new System.Windows.Forms.Padding(4);
+            this.checkBoxMatchCase.Location = new System.Drawing.Point(22, 108);
+            this.checkBoxMatchCase.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.checkBoxMatchCase.Name = "checkBoxMatchCase";
-            this.checkBoxMatchCase.Size = new System.Drawing.Size(102, 21);
+            this.checkBoxMatchCase.Size = new System.Drawing.Size(116, 24);
             this.checkBoxMatchCase.TabIndex = 3;
             this.checkBoxMatchCase.Text = "Match case";
             this.checkBoxMatchCase.UseVisualStyleBackColor = true;
+            this.checkBoxMatchCase.CheckedChanged += new System.EventHandler(this.checkBoxMatchCase_CheckedChanged);
             // 
             // buttonFindPrevious
             // 
             this.buttonFindPrevious.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonFindPrevious.Location = new System.Drawing.Point(405, 50);
-            this.buttonFindPrevious.Margin = new System.Windows.Forms.Padding(4);
+            this.buttonFindPrevious.Location = new System.Drawing.Point(468, 62);
+            this.buttonFindPrevious.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.buttonFindPrevious.Name = "buttonFindPrevious";
-            this.buttonFindPrevious.Size = new System.Drawing.Size(116, 28);
+            this.buttonFindPrevious.Size = new System.Drawing.Size(130, 35);
             this.buttonFindPrevious.TabIndex = 5;
             this.buttonFindPrevious.Text = "Find previous";
@@ -112 +115 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.comboBoxWhat.FormattingEnabled = true;
-            this.comboBoxWhat.Location = new System.Drawing.Point(95, 18);
+            this.comboBoxWhat.Location = new System.Drawing.Point(107, 22);
+            this.comboBoxWhat.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.comboBoxWhat.Name = "comboBoxWhat";
-            this.comboBoxWhat.Size = new System.Drawing.Size(297, 24);
+            this.comboBoxWhat.Size = new System.Drawing.Size(346, 28);
             this.comboBoxWhat.TabIndex = 7;
+            this.comboBoxWhat.SelectedIndexChanged += new System.EventHandler(this.comboBoxWhat_SelectedIndexChanged);
             this.comboBoxWhat.TextChanged += new System.EventHandler(this.textBoxWhat_TextChanged);
             this.comboBoxWhat.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBoxWhat_KeyPress);
@@ -121 +126 @@
             // FormFind
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(537, 126);
+            this.ClientSize = new System.Drawing.Size(616, 175);
             this.Controls.Add(this.comboBoxWhat);
             this.Controls.Add(this.buttonFindPrevious);
@@ -131 +136 @@
             this.Controls.Add(this.buttonCancel);
             this.Controls.Add(this.buttonFindNext);
-            this.Margin = new System.Windows.Forms.Padding(4);
+            this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.MaximizeBox = false;
             this.MinimizeBox = false;
-            this.MinimumSize = new System.Drawing.Size(394, 162);
+            this.MinimumSize = new System.Drawing.Size(440, 189);
             this.Name = "FormFind";
             this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;

Common/FormFind.cs

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
 using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 using Microsoft.Win32;
@@ -96 +90 @@
             Theme.UseTheme(this);
             DpiScaling.Apply(this);
-            this.Icon = Icon.ExtractAssociatedIcon(Application.ExecutablePath);
+            Icon = Icon.ExtractAssociatedIcon(Application.ExecutablePath);
             new FormDimensions().Load(this, Owner);
             comboBoxWhat.Focus();
@@ -112 +106 @@
         {
             SaveToRegistry();
-            richTextBox.formFind = null;
+            richTextBox.FormFind = null;
             new FormDimensions().Save(this, Owner);
         }
@@ -156 +150 @@
             comboBoxWhat.SaveToRegistry();
         }
+
+        private void comboBoxWhat_SelectedIndexChanged(object sender, EventArgs e)
+        {
+
+        }
+
+        private void label1_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void checkBoxMatchWholeWordOnly_CheckedChanged(object sender, EventArgs e)
+        {
+
+        }
+
+        private void checkBoxMatchCase_CheckedChanged(object sender, EventArgs e)
+        {
+
+        }
     }
 }

Common/FormProgress.Designer.cs

@@ -40 +40 @@
             this.progressBar1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.progressBar1.Location = new System.Drawing.Point(9, 28);
+            this.progressBar1.Location = new System.Drawing.Point(14, 43);
+            this.progressBar1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.progressBar1.Name = "progressBar1";
-            this.progressBar1.Size = new System.Drawing.Size(320, 19);
+            this.progressBar1.Size = new System.Drawing.Size(492, 29);
             this.progressBar1.TabIndex = 0;
             // 
@@ -53 +54 @@
             // 
             this.labelOperation.AutoSize = true;
-            this.labelOperation.Location = new System.Drawing.Point(9, 9);
+            this.labelOperation.Location = new System.Drawing.Point(14, 14);
+            this.labelOperation.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.labelOperation.Name = "labelOperation";
-            this.labelOperation.Size = new System.Drawing.Size(16, 13);
+            this.labelOperation.Size = new System.Drawing.Size(21, 20);
             this.labelOperation.TabIndex = 1;
             this.labelOperation.Text = "   ";
@@ -62 +64 @@
             // 
             this.labelTime.AutoSize = true;
-            this.labelTime.Location = new System.Drawing.Point(9, 53);
+            this.labelTime.Location = new System.Drawing.Point(14, 82);
+            this.labelTime.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.labelTime.Name = "labelTime";
-            this.labelTime.Size = new System.Drawing.Size(16, 13);
+            this.labelTime.Size = new System.Drawing.Size(21, 20);
             this.labelTime.TabIndex = 2;
             this.labelTime.Text = "   ";
@@ -70 +73 @@
             // FormProgress
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(338, 75);
+            this.ClientSize = new System.Drawing.Size(519, 132);
             this.Controls.Add(this.labelTime);
             this.Controls.Add(this.labelOperation);
             this.Controls.Add(this.progressBar1);
-            this.MinimumSize = new System.Drawing.Size(216, 98);
+            this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.MinimumSize = new System.Drawing.Size(313, 121);
             this.Name = "FormProgress";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;

Common/FormProgress.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Data;
 using System.Drawing;
 using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 
@@ -12 +10 @@
     public partial class FormProgress : Form
     {
-        public List<Progress> tasks;
-        public DateTime startTime;
-        public Progress currentTask;
+        public List<Progress> Tasks;
+        public DateTime StartTime;
+        public Progress CurrentTask;
 
         public FormProgress()
@@ -20 +18 @@
             InitializeComponent();
 
-            tasks = new List<Progress>();
-            currentTask = null;
+            Tasks = new List<Progress>();
+            CurrentTask = null;
         }
 
@@ -27 +25 @@
         {
             int steps = 10000;
-            int total = tasks.Count * steps;
-            int current = 0;
-            int index = tasks.IndexOf(currentTask);
+            int total = Tasks.Count * steps;
+            int current;
+            int index = Tasks.IndexOf(CurrentTask);
             if (index >= 0)
             {
                 current = index * steps;
-                if (currentTask.total > 0) current += (int)(index + ((double)currentTask.current / currentTask.total) * steps);
+                if (CurrentTask.Total > 0) current += (int)(index + ((double)CurrentTask.Current / CurrentTask.Total) * steps);
             }
             else current = 0;
@@ -40 +38 @@
                 else progressBar1.Value = total;
             progressBar1.Visible = current > 0;
-            if (currentTask != null) labelOperation.Text = currentTask.operation;
+            if (CurrentTask != null) labelOperation.Text = CurrentTask.Operation;
                 else labelOperation.Text = "";
             if ((current > 0) && (total > 0))
             {
-                TimeSpan timeDiff = TimeSpan.FromSeconds((DateTime.Now - startTime).TotalSeconds / current * (total - current));
+                TimeSpan timeDiff = TimeSpan.FromSeconds((DateTime.Now - StartTime).TotalSeconds / current * (total - current));
                 string remaining = timeDiff.ToString(@"hh\:mm\:ss");
-                if (timeDiff.TotalDays >= 1) remaining = Math.Truncate(timeDiff.TotalDays).ToString() + " days " + remaining;
-                labelTime.Text = "Remaining time: " + remaining;
+                if (timeDiff.TotalDays >= 1) remaining = Math.Truncate(timeDiff.TotalDays) + " days " + remaining;
+                labelTime.Text = @"Remaining time: " + remaining;
             } 
             else labelTime.Text = "";
@@ -56 +54 @@
             Theme.UseTheme(this);
             DpiScaling.Apply(this);
-            this.Icon = Icon.ExtractAssociatedIcon(Application.Execut‌​ablePath);
+            Icon = Icon.ExtractAssociatedIcon(Application.Execut‌​ablePath);
 
             timer1_Tick(this, null);
@@ -65 +63 @@
         private void FormProgress_FormClosing(object sender, FormClosingEventArgs e)
         {
-            currentTask.terminated = true;
+            CurrentTask.Terminated = true;
             timer1.Enabled = false;
         }
@@ -71 +69 @@
         private void bg_DoWork(object sender, DoWorkEventArgs e)
         {
-            currentTask.Execute();
-            currentTask.completed = !currentTask.terminated;
+            CurrentTask.Execute();
+            CurrentTask.Completed = !CurrentTask.Terminated;
         }
 
@@ -79 +77 @@
             if (e.Error != null)
             {
-                currentTask.terminated = true;
-                MessageBox.Show(e.Error.Message, "Error in background task", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                CurrentTask.Terminated = true;
+                MessageBox.Show(e.Error.Message, @"Error in background task", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
-            if (!currentTask.terminated)
+            if (!CurrentTask.Terminated)
             {
-                int nextIndex = tasks.IndexOf(currentTask) + 1;
-                if (nextIndex < tasks.Count)
+                int nextIndex = Tasks.IndexOf(CurrentTask) + 1;
+                if (nextIndex < Tasks.Count)
                 {
-                    currentTask = tasks[nextIndex];
+                    CurrentTask = Tasks[nextIndex];
                     BackgroundWorker bg = new BackgroundWorker();
-                    bg.DoWork += new DoWorkEventHandler(bg_DoWork);
-                    bg.RunWorkerCompleted += new RunWorkerCompletedEventHandler(bg_DoWorkerCompleted);
+                    bg.DoWork += bg_DoWork;
+                    bg.RunWorkerCompleted += bg_DoWorkerCompleted;
                     bg.RunWorkerAsync();
                 }
@@ -100 +98 @@
         public void AddTask(string name, Progress.CallbackEventHandler progressCallback)
         {
-            Progress newTask = new Progress();
-            newTask.terminated = false;
-            newTask.total = 0;
-            newTask.current = 0;
-            newTask.operation = name;
-            newTask.callback += progressCallback;
-            tasks.Add(newTask);
+            Progress newTask = new Progress
+            {
+                Terminated = false, 
+                Total = 0, 
+                Current = 0, 
+                Operation = name
+            };
+            newTask.Callback += progressCallback;
+            Tasks.Add(newTask);
         }
 
         public void StartTask(string name, Progress.CallbackEventHandler progressCallback)
         {
-            tasks.Clear();
+            Tasks.Clear();
             AddTask(name, progressCallback);
             Start();
@@ -118 +118 @@
         public void Start()
         {
-            if (tasks.Count > 0)
+            if (Tasks.Count > 0)
             {
-                startTime = DateTime.Now;
-                currentTask = tasks.First();
+                StartTime = DateTime.Now;
+                CurrentTask = Tasks.First();
                 BackgroundWorker bg = new BackgroundWorker();
-                bg.DoWork += new DoWorkEventHandler(bg_DoWork);
-                bg.RunWorkerCompleted += new RunWorkerCompletedEventHandler(bg_DoWorkerCompleted);
+                bg.DoWork += bg_DoWork;
+                bg.RunWorkerCompleted += bg_DoWorkerCompleted;
                 bg.RunWorkerAsync();
                 ShowDialog();
@@ -133 +133 @@
         {
             int completed = 0;
-            foreach (var task in tasks)
+            foreach (var task in Tasks)
             {
-                if (task.completed) completed += 1;
+                if (task.Completed) completed += 1;
             }
-            return completed == tasks.Count;
+            return completed == Tasks.Count;
         }
     }
@@ -143 +143 @@
     public interface IProgress
     {
-        void SetTotal(int Value);
-        void SetProgress(int Value);
+        void SetTotal(int value);
+        void SetProgress(int value);
         bool GetTerminated();
         void SetOperation(string text);
@@ -152 +152 @@
     public class Progress : IProgress
     {
-        public int total;
-        public int current;
-        public bool terminated;
-        public bool completed; // If task was not terminated during execution.
-        public string operation;
+        public int Total;
+        public int Current;
+        public bool Terminated;
+        public bool Completed; // If task was not terminated during execution.
+        public string Operation;
         public delegate void CallbackEventHandler(Progress progress);
-        public event CallbackEventHandler callback;
-        public Exception exception;
+        public event CallbackEventHandler Callback;
 
-        public void SetTotal(int Value)
+        public void SetTotal(int value)
         {
-            total = Value;
+            Total = value;
         }
 
-        public void SetProgress(int Value)
+        public void SetProgress(int value)
         {
-            current = Value;
+            Current = value;
         }
 
         public bool GetTerminated()
         {
-            return terminated;
+            return Terminated;
         }
 
         public void SetOperation(string text)
         {
-            operation = text;
+            Operation = text;
         }
 
         public void Execute()
         {
-            if (callback != null) callback(this);
+            Callback?.Invoke(this);
         }
     }

Common/ListViewComparer.cs

@@ -2 +2 @@
 using System.Windows.Forms;
 using System.Runtime.InteropServices;
-using System.Globalization;
+using System.Collections;
 
 namespace Common
 {
-    public enum ColumnDataType  { String, Integer, DateTime };
+    public enum ColumnDataType { String, Integer, DateTime, Decimal, Custom };
 
     // Supports sorting by column in ascending or descending order
-    public class ListViewItemComparer : System.Collections.IComparer
+    public class ListViewItemComparer : IComparer
     {
-        private int column = 0;
-        private SortOrder order = 0;
-
-        public void ColumnClick(int column)
+        private int column;
+        private SortOrder order;
+
+        public void ColumnClick(int newColumn)
         {
             // Determine if clicked column is already the column that is being sorted.
-            if (column == this.column)
+            if (newColumn == column)
             {
                 // Reverse the current sort direction for this column.
@@ -32 +32 @@
             {
                 // Set the column number that is to be sorted; default to ascending.
-                this.column = column;
+                column = newColumn;
                 order = SortOrder.Ascending;
             }
         }
 
-        public void SetColumn(int column)
-        {
-            this.column = column;
-        }
-
-        public void SetOrder(SortOrder order)
-        {
-            this.order = order;
+        public void SetColumn(int newColumn)
+        {
+            column = newColumn;
+        }
+
+        public void SetOrder(SortOrder newOrder)
+        {
+            order = newOrder;
         }
 
@@ -53 +53 @@
         }
 
+        public delegate int CompareItemEventHandler(ListViewItem x, ListViewItem y, int column);
+
+        public event CompareItemEventHandler OnCompareItem;
+
         public int Compare(object x, object y)
         {
+            ListViewItem listViewItemX = (ListViewItem)x;
+            ListViewItem listViewItemY = (ListViewItem)y;
+
             int result = 0;
-            if ((column < ((ListViewItem)x).SubItems.Count) && (column < ((ListViewItem)y).SubItems.Count) && (column >= 0))
-            {
-                ColumnDataType dataType = ColumnDataType.String;
-
-                if (((ListViewItem)x).ListView.Columns[column].Tag != null)
-                    dataType = (ColumnDataType)(((ListViewItem)x).ListView.Columns[column].Tag);
-                if (dataType == ColumnDataType.Integer)
-                {
-                    int xi = 0;
-                    int yi = 0;
-                    if (int.TryParse(((ListViewItem)x).SubItems[column].Text, out xi) && 
-                        int.TryParse(((ListViewItem)y).SubItems[column].Text, out yi))
-                    {
-                        if (xi < yi) result = -1;
-                        else if (xi > yi) result = 1;
-                        else result = 0;
-                    }
-                } else
-                if (dataType == ColumnDataType.DateTime)
-                {
-                    DateTime xi;
-                    DateTime yi;
-                    if (DateTime.TryParse(((ListViewItem)x).SubItems[column].Text, out xi) && 
-                        DateTime.TryParse(((ListViewItem)y).SubItems[column].Text, out yi))
-                    {
-                        result = DateTime.Compare(xi, yi);
-                    }
-                }
-                else result = String.Compare(((ListViewItem)x).SubItems[column].Text, ((ListViewItem)y).SubItems[column].Text);
-            }
-            if (order == SortOrder.Ascending)
-            {
-                return result;
-            }
-            else if (order == SortOrder.Descending)
-            {
-                return -result;
-            }
-            else
-            {
-                return 0;
+            if (listViewItemX != null && listViewItemY != null)
+            {
+                if (column < listViewItemX.SubItems.Count && column < listViewItemY.SubItems.Count && column >= 0)
+                {
+                    ColumnDataType dataType = ColumnDataType.String;
+
+                    if (listViewItemX.ListView.Columns[column].Tag != null)
+                    {
+                        dataType = (ColumnDataType) (listViewItemX.ListView.Columns[column].Tag);
+                    }
+
+                    if (dataType == ColumnDataType.Integer)
+                    {
+                        if (int.TryParse(listViewItemX.SubItems[column].Text, out var xi) &&
+                            int.TryParse(listViewItemY.SubItems[column].Text, out var yi))
+                        {
+                            if (xi < yi) result = -1;
+                            else if (xi > yi) result = 1;
+                            else result = 0;
+                        }
+                    }
+                    else if (dataType == ColumnDataType.Decimal)
+                    {
+                        if (decimal.TryParse(listViewItemX.SubItems[column].Text, out var xi) &&
+                            decimal.TryParse(listViewItemY.SubItems[column].Text, out var yi))
+                        {
+                            if (xi < yi) result = -1;
+                            else if (xi > yi) result = 1;
+                            else result = 0;
+                        }
+                    }
+                    else if (dataType == ColumnDataType.DateTime)
+                    {
+                        if (DateTime.TryParse(listViewItemX.SubItems[column].Text, out var xi) &&
+                            DateTime.TryParse(listViewItemY.SubItems[column].Text, out var yi))
+                        {
+                            result = DateTime.Compare(xi, yi);
+                        }
+                    }
+                    else if (dataType == ColumnDataType.Custom)
+                    {
+                        if (OnCompareItem != null)
+                        {
+                            result = OnCompareItem(listViewItemX, listViewItemY, column);
+                        }
+                    }
+                    else
+                        result = string.CompareOrdinal(listViewItemX.SubItems[column].Text,
+                            listViewItemY.SubItems[column].Text);
+                }
+                else
+                {
+                    if (!listViewItemX.Selected && listViewItemY.Selected) result = 1;
+                    else if (listViewItemX.Selected && !listViewItemY.Selected) result = -1;
+                }
+            }
+
+            switch (order)
+            {
+                case SortOrder.Ascending:
+                    return result;
+                case SortOrder.Descending:
+                    return -result;
+                default:
+                    return 0;
             }
         }
@@ -103 +134 @@
         {
             if (listView.ListViewItemSorter == null)
+            {
                 listView.ListViewItemSorter = new ListViewItemComparer();
-            (listView.ListViewItemSorter as ListViewItemComparer).SetOrder(order);
-            (listView.ListViewItemSorter as ListViewItemComparer).SetColumn(column);
+            }
+
+            ((ListViewItemComparer) listView.ListViewItemSorter).SetOrder(order);
+            ((ListViewItemComparer) listView.ListViewItemSorter).SetColumn(column);
             if ((column != -1) && (order != SortOrder.None))
             {
@@ -113 +147 @@
             listView.ColumnClick += delegate (object sender, ColumnClickEventArgs e)
             {
-                ((sender as ListView).ListViewItemSorter as ListViewItemComparer).ColumnClick(e.Column);
-                (sender as ListView).Sort();
-                (sender as ListView).SetSortIcon(((sender as ListView).ListViewItemSorter as ListViewItemComparer).column, ((sender as ListView).ListViewItemSorter as ListViewItemComparer).order);
+                ((ListViewItemComparer) ((ListView) sender).ListViewItemSorter).ColumnClick(e.Column);
+                ((ListView) sender).Sort();
+                ((ListView) sender).SetSortIcon(((ListViewItemComparer) ((ListView) sender).ListViewItemSorter).column, ((ListViewItemComparer) ((ListView) sender).ListViewItemSorter).order);
             };
         }
@@ -181 +215 @@
 
 
-        //This method used to set arrow icon
+        // This method used to set arrow icon
         public static void SetSortIcon(this ListView listView, int columnIndex, SortOrder order)
         {
@@ -189 +223 @@
             {
                 IntPtr columnPtr = new IntPtr(columnNumber);
-                LVCOLUMN lvColumn = new LVCOLUMN();
-                lvColumn.mask = HDI_FORMAT;
+                LVCOLUMN lvColumn = new LVCOLUMN {mask = HDI_FORMAT};
 
                 SendMessageLVCOLUMN(columnHeader, HDM_GETITEM, columnPtr, ref lvColumn);
 
-                if (!(order == SortOrder.None) && columnNumber == columnIndex)
+                if (order != SortOrder.None && columnNumber == columnIndex)
                 {
                     switch (order)
                     {
-                        case System.Windows.Forms.SortOrder.Ascending:
+                        case SortOrder.Ascending:
                             lvColumn.fmt &= ~HDF_SORTDOWN;
                             lvColumn.fmt |= HDF_SORTUP;
                             break;
-                        case System.Windows.Forms.SortOrder.Descending:
+                        case SortOrder.Descending:
                             lvColumn.fmt &= ~HDF_SORTUP;
                             lvColumn.fmt |= HDF_SORTDOWN;

Common/Prompt.cs

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.IO;
-using System.Threading.Tasks;
 using System.Drawing;
 using System.Windows.Forms;
@@ -25 +21 @@
             TextBox textBox = new TextBox() { Left = 50, Top = 44, Width = 400, Text = initialValue };
             textBox.SelectAll();
-            Button confirmation = new Button() { Text = "Ok", Left = 350, Width = 100, Top = 70, DialogResult = DialogResult.OK };
+            Button confirmation = new Button() { Text = @"Ok", Left = 350, Width = 100, Top = 70, DialogResult = DialogResult.OK };
             confirmation.Click += (sender, e) => { prompt.Close(); };
             prompt.Controls.Add(textBox);
@@ -31 +27 @@
             prompt.Controls.Add(textLabel);
             prompt.AcceptButton = confirmation;
-            prompt.Load += delegate (object sender3, EventArgs e3)
+            prompt.Load += delegate
             {
                 Theme.UseTheme(prompt);
@@ -71 +67 @@
             };
             numericUpDown.Select(0, numericUpDown.Text.Length);
-            Button confirmation = new Button() { Text = "Ok", Left = 350, Width = 100, Top = 70, DialogResult = DialogResult.OK };
+            Button confirmation = new Button() { Text = @"Ok", Left = 350, Width = 100, Top = 70, DialogResult = DialogResult.OK };
             confirmation.Click += (sender, e) => { prompt.Close(); };
             prompt.Controls.Add(numericUpDown);
@@ -77 +73 @@
             prompt.Controls.Add(textLabel);
             prompt.AcceptButton = confirmation;
-            prompt.Load += delegate (object sender3, EventArgs e3)
+            prompt.Load += delegate
             {
                 Theme.UseTheme(prompt);
@@ -117 +113 @@
                 comboBox.SelectedIndex = 0;
             }
-            Button confirmation = new Button() { Text = "Ok", Left = 350, Width = 100, Top = 70, DialogResult = DialogResult.OK };
+            Button confirmation = new Button() { Text = @"Ok", Left = 350, Width = 100, Top = 70, DialogResult = DialogResult.OK };
             confirmation.Click += (sender, e) => { prompt.Close(); };
             prompt.Controls.Add(comboBox);
@@ -123 +119 @@
             prompt.Controls.Add(textLabel);
             prompt.AcceptButton = confirmation;
-            prompt.Load += delegate (object sender3, EventArgs e3)
+            prompt.Load += delegate
             {
                 Theme.UseTheme(prompt);
@@ -155 +151 @@
             Button confirmation = new Button()
             {
-                Text = "Ok",
+                Text = @"Ok",
                 Left = 350,
                 Width = 100,
@@ -193 +189 @@
             prompt.Controls.Add(textLabel);
             prompt.AcceptButton = confirmation;
-            prompt.Load += delegate (object sender3, EventArgs e3)
+            prompt.Load += delegate
             {
                 Theme.UseTheme(prompt);
@@ -224 +220 @@
             Label textLabel = new Label() { Left = 50, Top = 20, AutoSize = true, Text = text };
             RichTextBox textBox = new RichTextBox() { Left = 50, Top = 44, Width = 400, Height = dataSize, Text = initialValue };
+            textBox.TextChanged += delegate
+            {
+                Theme.UseTheme(prompt);
+            };
             textBox.SelectAll();
-            Button confirmation = new Button() { Text = "Ok", Left = 350, Width = 100, Top = dataSize + 70, DialogResult = DialogResult.OK };
+            Button confirmation = new Button() { Text = @"Ok", Left = 350, Width = 100, Top = dataSize + 70, DialogResult = DialogResult.OK };
             confirmation.Click += (sender, e) => { prompt.Close(); };
             prompt.Controls.Add(textBox);
@@ -231 +231 @@
             prompt.Controls.Add(textLabel);
             prompt.AcceptButton = confirmation;
-            prompt.Load += delegate (object sender3, EventArgs e3)
+            prompt.Load += delegate
             {
                 Theme.UseTheme(prompt);
@@ -260 +260 @@
         {
             result = fileName;
-            OpenFileDialog openFileDialog = new OpenFileDialog() { Filter = fileType + " (." + fileExtension + ")|*." + 
-                fileExtension + "|Any file|*.*", DefaultExt = fileExtension };
+            OpenFileDialog openFileDialog = new OpenFileDialog() { Filter = fileType + @"|*." + 
+                fileExtension + @"|Any file|*.*", DefaultExt = fileExtension };
             if (!string.IsNullOrEmpty(fileName))
             {
@@ -282 +282 @@
         {
             result = fileName;
-            SaveFileDialog saveFileDialog = new SaveFileDialog()
-            {
-                Filter = fileType + "|*." +
-                fileExtension + "|Any file|*.*",
+            SaveFileDialog saveFileDialog = new SaveFileDialog
+            {
+                Filter = fileType + @"|*." +
+                fileExtension + @"|Any file|*.*",
                 DefaultExt = fileExtension
             };

Common/RecentFiles.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 using Microsoft.Win32;
@@ -42 +39 @@
         }    
 
-        public void LoadFromRegistry(string RegSubKey)
+        public void LoadFromRegistry(string regSubKey)
         {
-            RegistryKey regKey = Application.UserAppDataRegistry.OpenSubKey(RegSubKey);
-            if (regKey == null) regKey = Application.UserAppDataRegistry.CreateSubKey(RegSubKey);
+            RegistryKey regKey = Application.UserAppDataRegistry.OpenSubKey(regSubKey);
+            if (regKey == null) regKey = Application.UserAppDataRegistry.CreateSubKey(regSubKey);
 
             int count = (int)regKey.GetValue("Count", 0);
@@ -56 +53 @@
         }
 
-        public void SaveToRegistry(string RegSubKey)
+        public void SaveToRegistry(string regSubKey)
         {
-            RegistryKey regKey = Application.UserAppDataRegistry.OpenSubKey(RegSubKey, true);
-            if (regKey == null) regKey = Application.UserAppDataRegistry.CreateSubKey(RegSubKey);
+            RegistryKey regKey = Application.UserAppDataRegistry.OpenSubKey(regSubKey, true);
+            if (regKey == null) regKey = Application.UserAppDataRegistry.CreateSubKey(regSubKey);
 
             regKey.SetValue("Count", Items.Count);

Common/Registry.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Microsoft.Win32;
 
@@ -17 +12 @@
                 if ((string)value == "True") return true;
                 else return false;
+            }
+            else return defaultValue;
+        }
+
+        public static bool? GetValueBoolNullable(this RegistryKey regKey, string name, bool? defaultValue)
+        {
+            object value = regKey.GetValue(name, defaultValue);
+            if (value is string)
+            {
+                if ((string)value == "False") return false;
+                else if ((string)value == "True") return true;
+                else return null;
             }
             else return defaultValue;
@@ -35 +42 @@
         }
 
+        public static int? GetValueIntNullable(this RegistryKey regKey, string name, int? defaultValue)
+        {
+            object value = regKey.GetValue(name, defaultValue);
+            if (value is int) return (int)value;
+            else if (value is string && (string)value == "") return null;
+            else return defaultValue;
+        }
+
         public static long GetValueLong(this RegistryKey regKey, string name, long defaultValue)
         {
             object value = regKey.GetValue(name, defaultValue);
-            if (value is long) return (long)value;
+            if (value is string && long.TryParse(value.ToString(), out long longValue)) return longValue;
             else return defaultValue;
         }
@@ -54 +69 @@
         public static void SetValueBool(this RegistryKey regKey, string name, bool value)
         {
-            regKey.SetValue(name, value);
+            if (value) regKey.SetValue(name, "True");
+                else regKey.SetValue(name, "False");
         }
 
+        public static void SetValueBoolNullable(this RegistryKey regKey, string name, bool? value)
+        {
+            if (value != null)
+            {
+                if (value.Value) regKey.SetValue(name, "True");
+                else regKey.SetValue(name, "False");
+            } else regKey.SetValue(name, "");
+        }
+    
         public static void SetValueString(this RegistryKey regKey, string name, string value)
         {
@@ -66 +91 @@
         {
             regKey.SetValue(name, value);
+        }
+
+        public static void SetValueIntNullable(this RegistryKey regKey, string name, int? value)
+        {
+            if (value != null)
+            {
+                regKey.SetValue(name, value.Value);
+            } else regKey.SetValue(name, "");
         }
 

Common/RichTextBoxEx.Designer.cs

@@ -1 @@
-namespace Common
+namespace Common
 {
     partial class RichTextBoxEx

Common/RichTextBoxEx.cs

@@ -9 +9 @@
     public partial class RichTextBoxEx : RichTextBox
     {
-        private bool linksActive = false;
+        private bool linksActive;
         public delegate void LinkClickHandler(string link);
         public event LinkClickHandler LinkClick;
         public string Title { get; set; }
-        public Form parentForm;
-        public List<LinkMatch> linkMatches;
-        public FormFind formFind;
-        public string previousRtf;
+        public Form ParentForm;
+        public List<LinkMatch> LinkMatches;
+        public FormFind FormFind;
+        public string PreviousRtf;
         private ToolStripMenuItem tsmiUndo;
         private ToolStripMenuItem tsmiRedo;
@@ -31 +31 @@
         {
             //InitializeComponent();
-            KeyDown += new System.Windows.Forms.KeyEventHandler(this.HandleKeyDown);
-            KeyUp += new System.Windows.Forms.KeyEventHandler(this.HandleKeyUp);
-            MouseClick += new System.Windows.Forms.MouseEventHandler(this.HandleMouseClick);
-            MouseLeave += new EventHandler(this.HandleMouseLeave);
-            Leave += new EventHandler(this.HandleLeave);
-            SelectionChanged += delegate (object sender, EventArgs e)
+            KeyDown += HandleKeyDown;
+            KeyUp += HandleKeyUp;
+            MouseClick += HandleMouseClick;
+            MouseLeave += HandleMouseLeave;
+            Leave += HandleLeave;
+            SelectionChanged += delegate
             {
                 if (interfaceUpdateEnabled) UpdateInterface();
             };
             AddContextMenu();
-            linkMatches = new List<LinkMatch>();
+            LinkMatches = new List<LinkMatch>();
         }
 
@@ -54 +54 @@
             ReadOnly = false;
             interfaceUpdateEnabled = false;
-            previousRtf = Rtf;
+            PreviousRtf = Rtf;
             RichTextBoxContext context = new RichTextBoxContext();
             context.SaveContext(this);
             List<int> linkMatchStart = new List<int>();
-            foreach (var linkMatch in linkMatches)
+            foreach (var linkMatch in LinkMatches)
+            {
                 linkMatchStart.Add(-2);
+            }
+
             List<string> linkMatchStartString = new List<string>();
-            foreach (var linkMatch in linkMatches)
-                linkMatchStartString.Add(linkMatch.startString.ToLowerInvariant());
+            foreach (var linkMatch in LinkMatches)
+                linkMatchStartString.Add(linkMatch.StartString.ToLowerInvariant());
 
             string content = richTextBox.Text;
@@ -71 +74 @@
 
             int contentStart = 0;
-            int selectionStart = 0;
             do
             {
@@ -79 +81 @@
                 {
                     int i = 0;
-                    foreach (var linkMatch in linkMatches)
+                    foreach (var linkMatch in LinkMatches)
                     {
                         if ((linkMatchStart[i] < contentStart) && (linkMatchStart[i] != -1))
                         {
-                            if (linkMatch.caseSensitive)
+                            if (linkMatch.CaseSensitive)
                             {
-                                linkMatchStart[i] = content.IndexOf(linkMatch.startString, contentStart, StringComparison.Ordinal);
+                                linkMatchStart[i] = content.IndexOf(linkMatch.StartString, contentStart, StringComparison.Ordinal);
                             } else
                             {
@@ -103 +105 @@
 
                 int index = firstIndex;
-                string startString = firstMatch.startString;
+                string startString = firstMatch.StartString;
 
                 int linkLength = startString.Length;
-                selectionStart = index;
-
-                string linkTextAfter = "";
-                if (firstMatch.ExecuteMatch(content, index + startString.Length, out linkTextAfter))
-                {
-                    if ((firstMatch.startString != "") || ((firstMatch.startString == "") && (linkTextAfter.Length == 5) &&
+                var selectionStart = index;
+
+                if (firstMatch.ExecuteMatch(content, index + startString.Length, out var linkTextAfter))
+                {
+                    if ((firstMatch.StartString != "") || ((firstMatch.StartString == "") && (linkTextAfter.Length == 5) &&
                         ((index < 1) ||
                         ((index >= 1) && ((content[index - 1] == ' ') || (content[index - 1] == '\n'))))
@@ -175 +176 @@
         public void UndoUnknownActions()
         {
+            int i = 0;
             while (CanUndo && (UndoActionId == UndoNameId.Unknown))
             {
                 Undo();
-            }
-        }
-
-        private void HideRichTextBoxLinks(RichTextBox richTextBox)
+                i++;
+                if (i > 1000) break;
+            }
+        }
+
+        private void HideRichTextBoxLinks()
         {
             bool lastReadOnlyState = ReadOnly;
@@ -188 +192 @@
             RichTextBoxContext context = new RichTextBoxContext();
             context.SaveContext(this);
-            Rtf = previousRtf;
+            Rtf = PreviousRtf;
             UndoUnknownActions();
 
@@ -219 +223 @@
             if ((e.KeyCode == Keys.ControlKey) && linksActive)
             {
-                HideRichTextBoxLinks(this);
+                HideRichTextBoxLinks();
                 linksActive = false;
             }
@@ -228 +232 @@
             if ((e.Button == MouseButtons.Left) && linksActive)
             {
-                int linkStart = 0;
-                int linkEnd = 0;
+                int linkStart;
+                int linkEnd;
                 int mousePointerCharIndex = GetCharIndexFromPosition(e.Location);
                 SelectionStart = mousePointerCharIndex;
@@ -238 +242 @@
                     {
                         SelectionStart -= 1;
-                        continue;
                     }
                     else
@@ -257 +260 @@
                     {
                         SelectionStart += 1;
-                        continue;
                     }
                     else
@@ -273 +275 @@
                     if (link != "")
                     {
-                        foreach (var linkMatch in linkMatches)
+                        foreach (var linkMatch in LinkMatches)
                         {
-                            if ((link.Length >= linkMatch.startString.Length) && (
-                                (linkMatch.caseSensitive && (link.Substring(0, linkMatch.startString.Length) == linkMatch.startString)) ||
-                                (!linkMatch.caseSensitive && (link.ToLowerInvariant().Substring(0, linkMatch.startString.Length) == linkMatch.startString.ToLower()))))
+                            if ((link.Length >= linkMatch.StartString.Length) && (
+                                (linkMatch.CaseSensitive && (link.Substring(0, linkMatch.StartString.Length) == linkMatch.StartString)) ||
+                                (!linkMatch.CaseSensitive && (link.ToLowerInvariant().Substring(0, linkMatch.StartString.Length) == linkMatch.StartString.ToLower()))))
                             {
-                                string linkNumber = link.Substring(linkMatch.startString.Length).Trim(new char[] { ' ', '#' });
+                                string linkNumber = link.Substring(linkMatch.StartString.Length).Trim(new char[] { ' ', '#' });
                                 if (int.TryParse(linkNumber, out int number))
                                 {
@@ -287 +289 @@
                             }
                         }
-                        if (LinkClick != null) LinkClick(link);
-                        HideRichTextBoxLinks(this);
+
+                        LinkClick?.Invoke(link);
+                        HideRichTextBoxLinks();
                         linksActive = false;
                     }
@@ -297 +300 @@
         public void ShowInWindow()
         {
-            Form textForm = new Form()
+            Form textForm = new Form
             {
                 Name = "FormRichTextBox",
@@ -304 +307 @@
                 FormBorderStyle = FormBorderStyle.Sizable,
                 Text = Title,
-                Font = new Font(this.Font.FontFamily, this.Font.Size),
+                Font = new Font(Font.FontFamily, Font.Size),
                 StartPosition = FormStartPosition.CenterScreen,
+                Icon = Icon.ExtractAssociatedIcon(Application.ExecutablePath),
             };
-            textForm.Icon = Icon.ExtractAssociatedIcon(Application.ExecutablePath);
-            RichTextBoxEx richTextBox = new RichTextBoxEx();
-            richTextBox.parentForm = textForm;
-            richTextBox.Dock = DockStyle.Fill;
-            richTextBox.Text = this.Text;
-            richTextBox.Title = this.Title;
-            richTextBox.linkMatches = this.linkMatches;
-            richTextBox.ReadOnly = this.ReadOnly;
-            richTextBox.LinkClick = delegate (string linkText)
-            {
-                if (this.LinkClick != null) this.LinkClick.Invoke(linkText);
+            RichTextBoxEx richTextBox = new RichTextBoxEx
+            {
+                ParentForm = textForm,
+                Dock = DockStyle.Fill,
+                Text = Text,
+                Title = Title,
+                LinkMatches = LinkMatches,
+                ReadOnly = ReadOnly,
+                LinkClick = delegate(string linkText) { LinkClick?.Invoke(linkText); }
             };
             textForm.Controls.Add(richTextBox);
-            textForm.Load += delegate (object sender3, EventArgs e3)
+            textForm.Load += delegate
             {
                 Theme.UseTheme(textForm);
                 DpiScaling.Apply(textForm);
-                new FormDimensions().Load(textForm, parentForm);
+                new FormDimensions().Load(textForm, ParentForm);
                 richTextBox.ClearUndo();
             };
-            textForm.FormClosing += delegate (object sender2, FormClosingEventArgs e2)
-            {
-                new FormDimensions().Save(textForm, parentForm);
+            textForm.FormClosing += delegate
+            {
+                new FormDimensions().Save(textForm, ParentForm);
             };
             textForm.Show();
@@ -336 +338 @@
         private void UpdateInterface()
         {
-            tsmiUndo.Enabled = CanUndo && !this.ReadOnly;
-            tsmiRedo.Enabled = CanRedo && !this.ReadOnly;
-            tsmiCut.Enabled = (SelectionLength != 0) && !this.ReadOnly;
+            tsmiUndo.Enabled = CanUndo && !ReadOnly;
+            tsmiRedo.Enabled = CanRedo && !ReadOnly;
+            tsmiCut.Enabled = (SelectionLength != 0) && !ReadOnly;
             tsmiCopy.Enabled = SelectionLength != 0;
-            tsmiPaste.Enabled = Clipboard.ContainsText() && !this.ReadOnly;
-            tsmiDelete.Enabled = (SelectionLength != 0) && !this.ReadOnly;
+            tsmiPaste.Enabled = Clipboard.ContainsText() && !ReadOnly;
+            tsmiDelete.Enabled = (SelectionLength != 0) && !ReadOnly;
             tsmiSelectAll.Enabled = (TextLength > 0) && (SelectionLength < TextLength);
         }
@@ -349 +351 @@
             if (linksActive)
             {
-                HideRichTextBoxLinks(this);
+                HideRichTextBoxLinks();
                 linksActive = false;
             }
@@ -435 +437 @@
                 tsmiFind.Click += (sender, e) => {
                     HideLinks();
-                    if (formFind == null)
-                    {
-                        formFind = new FormFind();
-                        formFind.richTextBox = this;
-                        formFind.Owner = parentForm;
-                    }
-                    formFind.Show();
-                    formFind.BringToFront();
+                    if (FormFind == null)
+                    {
+                        FormFind = new FormFind();
+                        FormFind.richTextBox = this;
+                        FormFind.Owner = ParentForm;
+                    }
+                    FormFind.Show();
+                    FormFind.BringToFront();
                 };
                 tsmiFind.ShortcutKeys = Keys.F | Keys.Control;
@@ -514 +516 @@
     public class LinkMatch
     {
-        public string startString;
-        public bool caseSensitive;
+        public string StartString;
+        public bool CaseSensitive;
         public delegate bool MatchHandler(string inContent, int startIndex, out string outContent);
         public delegate void LinkActionHandler(int number);
@@ -523 +525 @@
         public LinkMatch(string startString, MatchHandler matchHandler, LinkActionHandler action)
         {
-            this.startString = startString;
+            StartString = startString;
             Match = matchHandler;
             LinkAction = action;
@@ -551 +553 @@
 
             // Try to connect to following number
-            string number;
             numberStart = startIndex;
             while (((content.Length - numberStart) >= 1) && ((content[numberStart] == ' ') || (content[numberStart] == '#')))
@@ -564 +565 @@
                 i++;
             }
-            number = content.Substring(numberStart, i);
+            var number = content.Substring(numberStart, i);
 
             if (int.TryParse(number, out int intNumber))

Common/RichTextBoxEx.resx

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 

Common/Table.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.Eventing.Reader;
 using System.Linq;
+using System.Windows.Forms;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace Common
 {
-    public class Row
-    {
-        public List<string> cells = new List<string>();
-
-        public void AddCell(string text)
-        {
-            cells.Add(text);
-        }
-    }
-
     public enum OutputFormat
     {
         Excel,
         Plain,
-        Csv
+        Csv,
+        Html,
+        ListView
     };
+
+    public class Row
+    {
+        public List<string> Cells = new List<string>();
+
+        public void AddCell(string text)
+        {
+            Cells.Add(text);
+        }
+    }
 
     public class Table
     {
-        public List<Row> rows = new List<Row>();
+        public List<Row> Rows = new List<Row>();
 
         public void Clear()
         {
-            rows.Clear();
+            Rows.Clear();
         }
 
@@ -37 +38 @@
         {
             Row row = new Row();
-            rows.Add(row);
+            Rows.Add(row);
             return row;
         }
@@ -44 +45 @@
         {
             StringBuilder output = new StringBuilder();
-            foreach (var row in rows)
+            foreach (var row in Rows)
             {
-                output.AppendLine(string.Join("\t", row.cells));
+                output.AppendLine(string.Join("\t", row.Cells));
             }
             return output.ToString();
@@ -54 +55 @@
         {
             StringBuilder output = new StringBuilder();
-            foreach (var row in rows)
+            foreach (var row in Rows)
             {
-                output.AppendLine(string.Join(Environment.NewLine, row.cells));
+                output.AppendLine(string.Join(Environment.NewLine, row.Cells));
                 output.AppendLine();
                 output.AppendLine("===========================");
@@ -67 +68 @@
         {
             StringBuilder output = new StringBuilder();
-            foreach (var row in rows)
+            foreach (var row in Rows)
             {
-                output.AppendLine(string.Join(",", row.cells.Select(x => "\"" + x + "\"")));
+                output.AppendLine(string.Join(",", row.Cells.Select(x => "\"" + x + "\"")));
             }
             return output.ToString();
+        }
+
+        public string GetOutputHtml()
+        {
+            StringBuilder output = new StringBuilder();
+            output.AppendLine("<table border=\"1\">");
+            foreach (var row in Rows)
+            {
+                output.AppendLine("<tr><td>" + string.Join("</td><td>", row.Cells.Select(x => x.Replace(Environment.NewLine, "<br/>"))) + "</td></tr>");
+            }
+            output.AppendLine("</table>");
+            return output.ToString();
+        }
+
+        public void GetOutputListView(ListView listView)
+        {
+            foreach (var row in Rows)
+            {
+                if (listView.Columns.Count == 0 && row.Cells.Count > 0)
+                {
+                    while (listView.Columns.Count < row.Cells.Count)
+                        listView.Columns.Add(row.Cells[listView.Columns.Count]);
+                }
+                else
+                {
+                    while (listView.Columns.Count < row.Cells.Count)
+                        listView.Columns.Add("");
+                    ListViewItem item = new ListViewItem();
+                    int i = 0;
+                    foreach (var cell in row.Cells)
+                    {
+                        if (i == 0) item.Text = cell;
+                          else item.SubItems.Add(cell);
+                        i++;
+                    }
+                    listView.Items.Add(item);
+                }
+            }
+
+            foreach (ColumnHeader column in listView.Columns)
+            {
+                column.Width = listView.Width / listView.Columns.Count;
+            }
         }
 
@@ -79 +123 @@
             else if (outputFormat == OutputFormat.Plain) return GetOutputPlain();
             else if (outputFormat == OutputFormat.Csv) return GetOutputCsv();
+            else if (outputFormat == OutputFormat.Html) return GetOutputHtml();
             else return "";
         }

Common/Theme.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 using System.Drawing;
 using System.ComponentModel;
-using System.IO;
 
 namespace Common
@@ -14 +8 @@
     {
         public delegate void ApplyThemeHandler(Component component);
-        static public event ApplyThemeHandler OnApplyTheme = null;
-        static public Color ColorWindow;
-        static public Color ColorWindowText;
-        static public Color ColorControl;
-        static public Color ColorControlText;
-        static public Color ColorControlSelected;
-        static public bool used = false;
-        static private string name;
-        static public string Name
-        {
-            get { return name; }
+        public static event ApplyThemeHandler OnApplyTheme;
+        public static Color ColorWindow;
+        public static Color ColorWindowText;
+        public static Color ColorControl;
+        public static Color ColorControlText;
+        public static Color ColorControlSelected;
+        public static bool Used;
+        private static string _name;
+        public static string Name
+        {
+            get => _name;
             set
             {
-                name = value;
-                if (value == "Dark")
-                {
-                    ColorWindow = Color.FromArgb(0x20, 0x20, 0x20);
-                    ColorWindowText = Color.White;
-                    ColorControl = Color.FromArgb(0x40, 0x40, 0x40);
-                    ColorControlText = Color.White;
-                    ColorControlSelected = Color.FromArgb(255, 96, 125, 155);
-                }
-                else
-                if (value == "Light")
-                {
-                    ColorWindow = Color.White;
-                    ColorWindowText = Color.Black;
-                    ColorControl = Color.FromArgb(0xe0, 0xe0, 0xe0);
-                    ColorControlText = Color.Black;
-                    ColorControlSelected = Color.FromArgb(255, 196, 225, 255);
-                }
-                else
-                {
-                    name = "System";
-                    ColorWindow = Color.FromKnownColor(KnownColor.Window);
-                    ColorWindowText = Color.FromKnownColor(KnownColor.WindowText);
-                    ColorControl = Color.FromKnownColor(KnownColor.Control);
-                    ColorControlText = Color.FromKnownColor(KnownColor.ControlText);
-                    ColorControlSelected = Color.FromArgb(255, 196, 225, 255);
-                } 
+                _name = value;
+                switch (value)
+                {
+                    case "Dark":
+                        ColorWindow = Color.FromArgb(0x20, 0x20, 0x20);
+                        ColorWindowText = Color.White;
+                        ColorControl = Color.FromArgb(0x40, 0x40, 0x40);
+                        ColorControlText = Color.White;
+                        ColorControlSelected = Color.FromArgb(255, 96, 125, 155);
+                        break;
+                    case "Light":
+                        ColorWindow = Color.White;
+                        ColorWindowText = Color.Black;
+                        ColorControl = Color.FromArgb(0xe0, 0xe0, 0xe0);
+                        ColorControlText = Color.Black;
+                        ColorControlSelected = Color.FromArgb(255, 196, 225, 255);
+                        break;
+                    default:
+                        _name = "System";
+                        ColorWindow = Color.FromKnownColor(KnownColor.Window);
+                        ColorWindowText = Color.FromKnownColor(KnownColor.WindowText);
+                        ColorControl = Color.FromKnownColor(KnownColor.Control);
+                        ColorControlText = Color.FromKnownColor(KnownColor.ControlText);
+                        ColorControlSelected = Color.FromArgb(255, 196, 225, 255);
+                        break;
+                }
             }
         }
@@ -72 +65 @@
                     // Exchange dark with light colors and vice versa
                     if (color == Color.DarkBlue) color = Color.LightBlue;
-                    if (color == Color.LightBlue) color = Color.DarkBlue;
+                    else if (color == Color.LightBlue) color = Color.DarkBlue;
                     else if (color == Color.DarkGreen) color = Color.LightGreen;
                     else if (color == Color.LightGreen) color = Color.DarkGreen;
@@ -97 +90 @@
         public static void ApplyTheme(Component component)
         {
-            if (component is Control)
-            {
-                foreach (Control child in (component as Control).Controls)
+            if (component is Control control)
+            {
+                foreach (Control child in control.Controls)
                 {
                     ApplyTheme(child);
                 }
 
-                if ((component is TextBox) || (component is NumericUpDown) || (component is ComboBox) || (component is RichTextBox)
-                    || (component is ListView))
-                {
-                    (component as Control).BackColor = ColorWindow;
-                    (component as Control).ForeColor = ColorWindowText;
+                if ((control is TextBox) || (control is NumericUpDown) || (control is ComboBox) || (control is RichTextBox)
+                    || (control is ListView))
+                {
+                    control.BackColor = ColorWindow;
+                    control.ForeColor = ColorWindowText;
                 }
                 else
                 {
-                    (component as Control).BackColor = ColorControl;
-                    (component as Control).ForeColor = ColorControlText;
-                }
-                if ((component as Control).ContextMenuStrip != null)
-                {
-                    ApplyTheme((component as Control).ContextMenuStrip);
-                }
-            }
-
-            if ((component is Button) && (Name == "System"))
-            {
-                (component as Button).UseVisualStyleBackColor = true;
-            } else
-            if (component is LinkLabel)
-            {
-                (component as LinkLabel).LinkColor = ColorControlText;
-                (component as LinkLabel).ActiveLinkColor = ColorControlText;
-                (component as LinkLabel).VisitedLinkColor = ColorControlText;
-            } else
-            if (component is TabControl)
-            {
-                foreach (TabPage tabPage in (component as TabControl).TabPages)
+                    control.BackColor = ColorControl;
+                    control.ForeColor = ColorControlText;
+                }
+                if (control.ContextMenuStrip != null)
+                {
+                    ApplyTheme(control.ContextMenuStrip);
+                }
+            }
+
+            if (component is SplitButton splitButton)
+            {
+                ApplyTheme(splitButton.Menu);
+            }
+            if ((component is Button button) && (Name == "System"))
+            {
+                button.UseVisualStyleBackColor = true;
+            } else
+            if (component is LinkLabel linkLabel)
+            {
+                linkLabel.LinkColor = ColorControlText;
+                linkLabel.ActiveLinkColor = ColorControlText;
+                linkLabel.VisitedLinkColor = ColorControlText;
+            } else
+            if (component is TabControl tabControl)
+            {
+                foreach (TabPage tabPage in tabControl.TabPages)
                 {
                     ApplyTheme(tabPage);
                 }
             } else
-            if (component is ToolStrip)
-            {
-                (component as ToolStrip).RenderMode = ToolStripRenderMode.Professional;
-                (component as ToolStrip).Renderer = new ToolStripProfessionalRenderer(new ThemeColorTable());
-                foreach (ToolStripItem item in (component as ToolStrip).Items)
-                {
-                    if (item is ToolStripMenuItem)
+            if (component is ToolStrip toolStrip)
+            {
+                toolStrip.RenderMode = ToolStripRenderMode.Professional;
+                toolStrip.Renderer = new ToolStripProfessionalRenderer(new ThemeColorTable());
+                foreach (ToolStripItem item in toolStrip.Items)
+                {
+                    if (item is ToolStripMenuItem toolStripMenuItem)
                     {
-
-                        if ((item as ToolStripMenuItem).HasDropDownItems)
-                            foreach (ToolStripItem dropDownItem in (item as ToolStripMenuItem).DropDownItems)
+                        if (toolStripMenuItem.DropDownItems.Count > 0)
+                        {
+                            foreach (ToolStripItem dropDownItem in toolStripMenuItem.DropDownItems)
                             {
                                 ApplyTheme(dropDownItem);
                             }
+                        }
                     }
                     ApplyTheme(item);
                 }
             } else
-            if (component is ToolStripItem)
-            {
-                (component as ToolStripItem).ForeColor = ColorControlText;
-                (component as ToolStripItem).BackColor = ColorControl;
-            } else
-            if (component is DataGridView)
-            {
-                (component as DataGridView).BackgroundColor = ColorWindow;
-                (component as DataGridView).DefaultCellStyle.BackColor = ColorWindow;
-                (component as DataGridView).DefaultCellStyle.ForeColor = ColorWindowText;
-                (component as DataGridView).ColumnHeadersDefaultCellStyle.BackColor = ColorWindow;
-                (component as DataGridView).ColumnHeadersDefaultCellStyle.ForeColor = ColorWindowText;
-            } else
-            if (component is RichTextBox)
-            {
-                (component as RichTextBox).SelectAll();
-                (component as RichTextBox).SelectionColor = ColorWindowText;
-                (component as RichTextBox).SelectionLength = 0;
-            } else
-            
-            if (OnApplyTheme != null) OnApplyTheme(component);
+            if (component is ToolStripItem toolStripItem)
+            {
+                toolStripItem.ForeColor = ColorControlText;
+                toolStripItem.BackColor = ColorControl;
+                if (toolStripItem is ToolStripMenuItem toolStripMenuItem)
+                {
+                    if (toolStripMenuItem.DropDownItems.Count > 0)
+                    {
+                        foreach (ToolStripItem dropDownItem in toolStripMenuItem.DropDownItems)
+                        {
+                            ApplyTheme(dropDownItem);
+                        }
+                    }
+                }
+            } else
+            if (component is DataGridView dataGridView)
+            {
+                dataGridView.BackgroundColor = ColorWindow;
+                dataGridView.DefaultCellStyle.BackColor = ColorWindow;
+                dataGridView.DefaultCellStyle.ForeColor = ColorWindowText;
+                dataGridView.ColumnHeadersDefaultCellStyle.BackColor = ColorWindow;
+                dataGridView.ColumnHeadersDefaultCellStyle.ForeColor = ColorWindowText;
+            } else
+            if (component is RichTextBox richTextBox)
+            {
+                richTextBox.SelectAll();
+                richTextBox.SelectionColor = ColorWindowText;
+                richTextBox.SelectionLength = 0;
+            } else
+            {
+                OnApplyTheme?.Invoke(component);
+            }
         }
 
         public static void UseTheme(Form form)
         {
-            if (!used && (name == "System")) return;
+            if (!Used && (_name == "System")) return;
             ApplyTheme(form);
-            used = true;
+            Used = true;
         }
     }
@@ -189 +198 @@
     public class ThemeColorTable : ProfessionalColorTable
     {
-        public override Color MenuStripGradientBegin
-        {
-            get
-            {
-                return Theme.ColorControl;
-            }
-        }
-
-        public override Color MenuStripGradientEnd
-        {
-            get
-            {
-                return Theme.ColorControl;
-            }
-        }
-
-        public override Color ToolStripContentPanelGradientBegin
-        {
-            get
-            {
-                return Theme.ColorControl;
-            }
-        }
-
-        public override Color ToolStripContentPanelGradientEnd
-        {
-            get
-            {
-                return Theme.ColorControl;
-            }
-        }
-
-        public override Color ToolStripDropDownBackground
-        {
-            get
-            {
-                return Theme.ColorControl;
-            }
-        }
-
-        public override Color ToolStripGradientBegin
-        {
-            get
-            {
-                return Theme.ColorControl;
-            }
-        }
-
-        public override Color ToolStripGradientMiddle
-        {
-            get
-            {
-                return Theme.ColorControl;
-            }
-        }
-
-        public override Color ToolStripGradientEnd
-        {
-            get
-            {
-                return Theme.ColorControl;
-            }
-        }
-
-        public override Color MenuItemSelected
-        {
-            get
-            {
-                return Theme.ColorControlSelected;
-            }
-        }
-
-        public override Color MenuItemSelectedGradientBegin
-        {
-            get
-            {
-                return Theme.ColorControlSelected;
-            }
-        }
-
-        public override Color MenuItemSelectedGradientEnd
-        {
-            get
-            {
-                return Theme.ColorControlSelected;
-            }
-        }
-
-        public override Color ImageMarginGradientBegin
-        {
-            get
-            {
-                return Theme.ColorControl;
-            }
-        }
-
-        public override Color ImageMarginGradientMiddle
-        {
-            get
-            {
-                return Theme.ColorControl;
-            }
-        }
-
-        public override Color ImageMarginGradientEnd
-        {
-            get
-            {
-                return Theme.ColorControl;
-            }
-        }
-
-        public override Color MenuItemPressedGradientBegin
-        {
-            get
-            {
-                return Theme.ColorControlSelected;
-            }
-        }
-
-        public override Color MenuItemPressedGradientMiddle
-        {
-            get
-            {
-                return Theme.ColorControlSelected;
-            }
-        }
-
-        public override Color MenuItemPressedGradientEnd
-        {
-            get
-            {
-                return Theme.ColorControlSelected;
-            }
-        }
+        public override Color MenuStripGradientBegin => Theme.ColorControl;
+        public override Color MenuStripGradientEnd => Theme.ColorControl;
+        public override Color ToolStripContentPanelGradientBegin => Theme.ColorControl;
+        public override Color ToolStripContentPanelGradientEnd => Theme.ColorControl;
+        public override Color ToolStripDropDownBackground => Theme.ColorControl;
+        public override Color ToolStripGradientBegin => Theme.ColorControl;
+        public override Color ToolStripGradientMiddle => Theme.ColorControl;
+        public override Color ToolStripGradientEnd => Theme.ColorControl;
+        public override Color MenuItemSelected => Theme.ColorControlSelected;
+        public override Color MenuItemSelectedGradientBegin => Theme.ColorControlSelected;
+        public override Color MenuItemSelectedGradientEnd => Theme.ColorControlSelected;
+        public override Color ImageMarginGradientBegin => Theme.ColorControl;
+        public override Color ImageMarginGradientMiddle => Theme.ColorControl;
+        public override Color ImageMarginGradientEnd => Theme.ColorControl;
+        public override Color MenuItemPressedGradientBegin => Theme.ColorControlSelected;
+        public override Color MenuItemPressedGradientMiddle => Theme.ColorControlSelected;
+        public override Color MenuItemPressedGradientEnd => Theme.ColorControlSelected;
     }
 }