Refactor

Author: Beelink

.vs/QuickLibrary/v16/.suo

@@ -19,7 +19,9 @@ public static DialogResult ShowConfirm(
 		{
 			YesNoForm ynf = new YesNoForm(messageText, yesBtnText, yesBtnImage, showNoBtn, noBtnText, noBtnImage, windowTitle, darkMode);
 			ynf.Owner = owner;
-			return ynf.ShowDialog();
+			DialogResult dr = ynf.ShowDialog();
+			ynf.Dispose();
+			return dr;
 		}
 
 		public static DialogResult ShowInfo(
@@ -31,7 +33,9 @@ public static DialogResult ShowInfo(
 		{
 			OkForm of = new OkForm(messageText, windowTitle, darkMode);
 			of.Owner = owner;
-			return of.ShowDialog();
+			DialogResult dr = of.ShowDialog();
+			of.Dispose();
+			return dr;
 		}
 	}
 }

.vs/QuickLibrary/v16/Server/sqlite3/storage.ide

@@ -169,10 +169,7 @@ public struct SHELLEXECUTEINFO
 		public static string GetMessageBoxText(DialogBoxCommandID messageId)
 		{
 			string str = Marshal.PtrToStringAuto(MB_GetString((int)messageId));
-			if (str[0] == '&')
-			{
-				str = str.Substring(1, str.Length - 1);
-			}
+			if (str[0] == '&') str = str.Substring(1, str.Length - 1);
 			return str;
 		}
 

QuickLibrary/DialogMan.cs

@@ -33,10 +33,7 @@ public OkForm(string messageText, string windowTitle, bool darkMode = false)
 
 		private void OkForm_KeyDown(object sender, KeyEventArgs e)
 		{
-			if (e.KeyCode == Keys.Escape)
-			{
-				Close();
-			}
+			if (e.KeyCode == Keys.Escape) Close();
 		}
 
 		private void okBtn_Click(object sender, EventArgs e)

QuickLibrary/NativeMan.cs

@@ -32,6 +32,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.5.5")]
-[assembly: AssemblyFileVersion("2.5.5")]
+[assembly: AssemblyVersion("2.5.6")]
+[assembly: AssemblyFileVersion("2.5.6")]
 [assembly: NeutralResourcesLanguage("en")]

QuickLibrary/OkForm.cs

@@ -22,29 +22,15 @@ internal YesNoForm(
 			(new DropShadow()).ApplyShadows(this);
 			SetDraggableControls(new List<Control>() { titleLabel });
 
-			if (yesBtnText.Length == 0)
-			{
-				yesBtn.Text = NativeMan.GetMessageBoxText(NativeMan.DialogBoxCommandID.IDYES);
-			}
-			else
-			{
-				yesBtn.Text = yesBtnText;
-			}
+			yesBtn.Text = yesBtnText.Length == 0 ? NativeMan.GetMessageBoxText(NativeMan.DialogBoxCommandID.IDYES) : yesBtnText;
 			if (yesBtnImage != null)
 			{
 				yesBtn.Image = yesBtnImage;
 				yesBtn.TextAlign = ContentAlignment.MiddleRight;
 				yesBtn.Text = " " + yesBtn.Text;
 			}
 
-			if (noBtnText.Length == 0)
-			{
-				noBtn.Text = NativeMan.GetMessageBoxText(NativeMan.DialogBoxCommandID.IDNO);
-			}
-			else
-			{
-				noBtn.Text = noBtnText;
-			}
+			noBtn.Text = noBtnText.Length == 0 ? NativeMan.GetMessageBoxText(NativeMan.DialogBoxCommandID.IDNO) : noBtnText;
 			if (noBtnImage != null)
 			{
 				noBtn.Image = noBtnImage;
@@ -58,14 +44,8 @@ internal YesNoForm(
 			textBox.BackColor = BackColor;
 			textBox.Text = messageText;
 
-			if (showNoBtn)
-			{
-				noBtn.Visible = true;
-			}
-			else
-			{
-				Size = new Size(Size.Width, Size.Height - noBtn.Height - 10);
-			}
+			if (showNoBtn) noBtn.Visible = true;
+			else Size = new Size(Size.Width, Size.Height - noBtn.Height - 10);
 
 			infoTooltip.SetToolTip(closeBtn, NativeMan.GetMessageBoxText(NativeMan.DialogBoxCommandID.IDCLOSE) + " | Alt+F4");
 
@@ -83,10 +63,7 @@ internal YesNoForm(
 
 		private void YesNoForm_KeyDown(object sender, KeyEventArgs e)
 		{
-			if (e.KeyCode == Keys.Escape)
-			{
-				Close();
-			}
+			if (e.KeyCode == Keys.Escape) Close();
 		}
 
 		private void yesBtn_Click(object sender, EventArgs e)