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

1 files changed, 31 insertions, 30 deletions

diff --git a/ShiftOS.Engine/WindowManager/InfoboxTemplate.cs b/ShiftOS.Engine/WindowManager/InfoboxTemplate.cs
index f261ace..a5be129 100644
--- a/ShiftOS.Engine/WindowManager/InfoboxTemplate.cs
+++ b/ShiftOS.Engine/WindowManager/InfoboxTemplate.cs
@@ -1,11 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 using System.Media;
 using System.IO;
@@ -14,37 +8,39 @@ namespace ShiftOS.Engine.WindowManager
 {
     public partial class InfoboxTemplate : UserControl
     {
-        Stream str;
-        public int buttonChoice;
-        public int buttonSelected;
-        public InfoboxTemplate(buttonType type)
+        Stream _str;
+        private int _buttonChoice;
+	    private int _buttonSelected;
+        public InfoboxTemplate(ButtonType type)
         {
             InitializeComponent();
+            
             switch (type)
             {
-                case buttonType.OK:
+                case ButtonType.Ok:
                     btnOpt1.Text = "OK";
                     btnOpt2.Hide();
-                    btnOpt1.Location = new Point(122, 134);
-                    buttonChoice = 1;
+                    btnOpt1.Location = new Point(109, 134);
+                    _buttonChoice = 1;
                     break;
-                case buttonType.OKCancel:
+                case ButtonType.OkCancel:
                     btnOpt1.Text = "OK";
                     btnOpt2.Text = "Cancel";
-                    buttonChoice = 2;
+                    _buttonChoice = 2;
                     break;
-                case buttonType.YesNo:
+                case ButtonType.YesNo:
                     btnOpt1.Text = "Yes";
                     btnOpt2.Text = "No";
-                    buttonChoice = 3;
+                    _buttonChoice = 3;
                     break;
             }
         }
-        public enum buttonType
+
+        public enum ButtonType
         {
             YesNo,
-            OKCancel,
-            OK
+            OkCancel,
+            Ok
         }
 
         private void btnOpt1_Click(object sender, EventArgs e)
@@ -52,12 +48,12 @@ namespace ShiftOS.Engine.WindowManager
             switch (btnOpt1.Text)
             {
                 case "OK":
-                    buttonSelected = 1;
-                    ParentForm.Close();
+                    _buttonSelected = 1;
+                    ParentForm?.Close();
                     break;
                 case "Yes":
-                    buttonSelected = 2;
-                    ParentForm.Close();
+                    _buttonSelected = 2;
+                    ParentForm?.Close();
                     break;
             }
         }
@@ -67,24 +63,29 @@ namespace ShiftOS.Engine.WindowManager
             switch (btnOpt2.Text)
             {
                 case "No":
-                    buttonSelected = 3;
+                    _buttonSelected = 3;
                     break;
                 case "Cancel":
-                    buttonSelected = 4;
+                    _buttonSelected = 4;
                     break;
             }
         }
+
         public void Play()
         {
-            str = Properties.Resources.infobox;
-            SoundPlayer sp = new SoundPlayer(str);
+            _str = Properties.Resources.infobox;
+            SoundPlayer sp = new SoundPlayer(_str);
             sp.Play();
             sp.Stream.Position = 0;
         }
 
-        private void InfoboxTemplate_Load(object sender, EventArgs e)
+        private void InfoboxTemplate_Load(object sender, EventArgs e) 
+			=> Play();
+
+	    private void changeSize_Tick(object sender, EventArgs e)
         {
-            Play();
+            this.Height += label1.Height;
+            this.Width += label1.Width;
         }
     }
 }