Merge remote-tracking branch 'refs/remotes/ShiftOS-Rewind/master'

1 files changed, 82 insertions, 79 deletions

diff --git a/ShiftOS.Engine/WindowManager/InfoboxTemplate.cs b/ShiftOS.Engine/WindowManager/InfoboxTemplate.cs
index a5be129..c2b45e0 100644
--- a/ShiftOS.Engine/WindowManager/InfoboxTemplate.cs
+++ b/ShiftOS.Engine/WindowManager/InfoboxTemplate.cs
@@ -1,91 +1,94 @@
 using System;
 using System.Drawing;
-using System.Windows.Forms;
-using System.Media;
 using System.IO;
+using System.Media;
+using System.Windows.Forms;
+using ShiftOS.Engine.Properties;
 
 namespace ShiftOS.Engine.WindowManager
 {
-    public partial class InfoboxTemplate : UserControl
-    {
-        Stream _str;
-        private int _buttonChoice;
-	    private int _buttonSelected;
-        public InfoboxTemplate(ButtonType type)
-        {
-            InitializeComponent();
-            
-            switch (type)
-            {
-                case ButtonType.Ok:
-                    btnOpt1.Text = "OK";
-                    btnOpt2.Hide();
-                    btnOpt1.Location = new Point(109, 134);
-                    _buttonChoice = 1;
-                    break;
-                case ButtonType.OkCancel:
-                    btnOpt1.Text = "OK";
-                    btnOpt2.Text = "Cancel";
-                    _buttonChoice = 2;
-                    break;
-                case ButtonType.YesNo:
-                    btnOpt1.Text = "Yes";
-                    btnOpt2.Text = "No";
-                    _buttonChoice = 3;
-                    break;
-            }
-        }
+	public partial class InfoboxTemplate : UserControl
+	{
+		public enum ButtonType
+		{
+			YesNo,
+			OkCancel,
+			Ok
+		}
 
-        public enum ButtonType
-        {
-            YesNo,
-            OkCancel,
-            Ok
-        }
+		public enum DialogResult
+		{
+			Yes,
+			No,
+			Cancel,
+			Ok
+		}
 
-        private void btnOpt1_Click(object sender, EventArgs e)
-        {
-            switch (btnOpt1.Text)
-            {
-                case "OK":
-                    _buttonSelected = 1;
-                    ParentForm?.Close();
-                    break;
-                case "Yes":
-                    _buttonSelected = 2;
-                    ParentForm?.Close();
-                    break;
-            }
-        }
+		int _buttonChoice;
+		int _buttonSelected;
+		Stream _str;
 
-        private void btnOpt2_Click(object sender, EventArgs e)
-        {
-            switch (btnOpt2.Text)
-            {
-                case "No":
-                    _buttonSelected = 3;
-                    break;
-                case "Cancel":
-                    _buttonSelected = 4;
-                    break;
-            }
-        }
+		public InfoboxTemplate(ButtonType type)
+		{
+			InitializeComponent();
 
-        public void Play()
-        {
-            _str = Properties.Resources.infobox;
-            SoundPlayer sp = new SoundPlayer(_str);
-            sp.Play();
-            sp.Stream.Position = 0;
-        }
+			switch (type)
+			{
+				case ButtonType.Ok:
+					btnOpt1.Text = "OK";
+					btnOpt2.Hide();
+					btnOpt1.Location = new Point(109, 134);
+					_buttonChoice = 1;
+					break;
+				case ButtonType.OkCancel:
+					btnOpt1.Text = "OK";
+					btnOpt2.Text = "Cancel";
+					_buttonChoice = 2;
+					break;
+				case ButtonType.YesNo:
+					btnOpt1.Text = "Yes";
+					btnOpt2.Text = "No";
+					_buttonChoice = 3;
+					break;
+			}
+		}
 
-        private void InfoboxTemplate_Load(object sender, EventArgs e) 
-			=> Play();
+		void btnOpt1_Click(object sender, EventArgs e)
+		{
+			switch (btnOpt1.Text)
+			{
+				case "OK":
+					ParentForm?.Close();
+					break;
+				case "Yes":
+					_buttonSelected = 2;
+					ParentForm?.Close();
+					break;
+			}
+		}
+
+		void btnOpt2_Click(object sender, EventArgs e)
+		{
+			switch (btnOpt2.Text)
+			{
+				case "No":
+					_buttonSelected = 3;
+					break;
+				case "Cancel":
+					_buttonSelected = 4;
+					break;
+			}
+		}
 
-	    private void changeSize_Tick(object sender, EventArgs e)
-        {
-            this.Height += label1.Height;
-            this.Width += label1.Width;
-        }
-    }
-}
+		public void Play()
+		{
+			_str = Resources.infobox;
+			var sp = new SoundPlayer(_str);
+			sp.Play();
+			sp.Stream.Position = 0;
+		}
+
+		void InfoboxTemplate_Load(object sender, EventArgs e)
+			=> Play();
+	}
+}
\ No newline at end of file