added some stuff to the gitignore

7 files changed, 36 insertions, 23 deletions

diff --git a/.vs/ShiftOS/v15/sqlite3/storage.ide b/.vs/ShiftOS/v15/sqlite3/storage.ide
index 683886f..03eedd0 100644
--- a/.vs/ShiftOS/v15/sqlite3/storage.ide
+++ b/.vs/ShiftOS/v15/sqlite3/storage.ide
diff --git a/ShiftOS.Engine/Resources/Symbolinfo - Copy.png b/ShiftOS.Engine/Resources/Symbolinfo - Copy.png
new file mode 100644
index 0000000..659d9b3
--- /dev/null
+++ b/ShiftOS.Engine/Resources/Symbolinfo - Copy.png
diff --git a/ShiftOS.Engine/Resources/symbolWarning.png b/ShiftOS.Engine/Resources/symbolWarning.png
new file mode 100644
index 0000000..f8805f6
--- /dev/null
+++ b/ShiftOS.Engine/Resources/symbolWarning.png
diff --git a/ShiftOS.Engine/Tools.cs b/ShiftOS.Engine/Tools.cs
index eca7b59..792ccef 100644
--- a/ShiftOS.Engine/Tools.cs
+++ b/ShiftOS.Engine/Tools.cs
@@ -3,7 +3,6 @@ using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
 using System.Runtime.InteropServices;
-using ImageMagick;
 
 namespace ShiftOS.Engine
 {
diff --git a/ShiftOS.Engine/WindowManager/InfoboxTemplate.Designer.cs b/ShiftOS.Engine/WindowManager/InfoboxTemplate.Designer.cs
index a046516..a076c2a 100644
--- a/ShiftOS.Engine/WindowManager/InfoboxTemplate.Designer.cs
+++ b/ShiftOS.Engine/WindowManager/InfoboxTemplate.Designer.cs
@@ -33,7 +33,7 @@
             this.btnOpt2 = new System.Windows.Forms.Button();
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
             this.changeSize = new System.Windows.Forms.Timer(this.components);
-            this.label1 = new System.Windows.Forms.TextBox();
+            this.label1 = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.SuspendLayout();
             // 
@@ -84,14 +84,13 @@
             // 
             // label1
             // 
-            this.label1.BackColor = System.Drawing.SystemColors.Window;
-            this.label1.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            this.label1.Font = new System.Drawing.Font("Lucida Console", 9F);
-            this.label1.Location = new System.Drawing.Point(111, 61);
-            this.label1.Multiline = true;
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("Lucida Console", 9.25F);
+            this.label1.Location = new System.Drawing.Point(105, 55);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(219, 57);
+            this.label1.Size = new System.Drawing.Size(55, 13);
             this.label1.TabIndex = 3;
+            this.label1.Text = "label1";
             // 
             // InfoboxTemplate
             // 
@@ -116,6 +115,6 @@
         public System.Windows.Forms.Button btnOpt2;
         public System.Windows.Forms.PictureBox pictureBox1;
         private System.Windows.Forms.Timer changeSize;
-        public System.Windows.Forms.TextBox label1;
+        public System.Windows.Forms.Label label1;
     }
 }
diff --git a/ShiftOS.Engine/WindowManager/ShiftWM.cs b/ShiftOS.Engine/WindowManager/ShiftWM.cs
index 539d469..0c69fb7 100644
--- a/ShiftOS.Engine/WindowManager/ShiftWM.cs
+++ b/ShiftOS.Engine/WindowManager/ShiftWM.cs
@@ -17,6 +17,15 @@ namespace ShiftOS.Engine.WindowManager
 		    return Windows.First(p => (uint) control.Tag == p.Id);
 	    }
 
+        /// <summary>
+        /// Shows a new Window based on a UserControl.
+        /// </summary>
+        /// <param name="content">The UserControl to use</param>
+        /// <param name="title">The program's title</param>
+        /// <param name="icon">The icon to show</param>
+        /// <param name="showAsInfobox">Checks if this is an infobox</param>
+        /// <param name="resize">Enables or disables resizing</param>
+        /// <returns></returns>
         public static ShiftWindow Init(UserControl content, string title, Icon icon, bool showAsInfobox = false, bool resize = true)
         {
             // Setup Window
@@ -68,13 +77,19 @@ namespace ShiftOS.Engine.WindowManager
             return app;
         }
 
+        /// <summary>
+        /// Shows a new infobox.
+        /// </summary>
+        /// <param name="title">The title of the infobox.</param>
+        /// <param name="body">The infobox's content.</param>
+        /// <param name="type">The ButtonType used for the infobox.</param>
+        /// <returns></returns>
         public static InfoboxTemplate StartInfoboxSession(string title, string body, ButtonType type)
         {
-	        InfoboxTemplate info = new InfoboxTemplate(type)
-	        {
-		        label1 = { Text = body }
-	        };
-
+            InfoboxTemplate info = new InfoboxTemplate(type)
+            {
+                label1 = { Text = body }
+            };
 	        Init(info, title, Properties.Resources.iconInfoBox_fw.ToIcon(), true, false);
             return info;
         }
diff --git a/ShiftOS.Main/HijackScreen.cs b/ShiftOS.Main/HijackScreen.cs
index ef1db92..721d49e 100644
--- a/ShiftOS.Main/HijackScreen.cs
+++ b/ShiftOS.Main/HijackScreen.cs
@@ -167,19 +167,19 @@ namespace ShiftOS.Main
                     textgeninput = lblhackwords;
                     textgen.Interval = 10;
                     rtext = "";
-                    TextType("Congratulations, you have been involuntarily selected to be an Alpha Tester for ShiftOS." + Environment.NewLine + Environment.NewLine);
+                    TextType("Congratulations, " + Environment.UserName + "you have been involuntarily selected to be an Alpha Tester for ShiftOS!" + Environment.NewLine + Environment.NewLine);
                     break;
                 case 4:
-                    TextType("At this current point in time I do not wish to reveal my identity or future intentions." + Environment.NewLine + Environment.NewLine);
+                    TextType("At this time, I do not wish to reveal any of my intentions and idenity." + Environment.NewLine + Environment.NewLine);
                     break;
                 case 5:
                     TextType("I just need to use you and your computer as an external test bed to evolve my experimental operating system." + Environment.NewLine + Environment.NewLine);
                     break;
                 case 6:
-                    TextType("Right now ShiftOS is practically non-existent but I’ll work on coding it remotely as you use it." + Environment.NewLine + Environment.NewLine);
+                    TextType("I need to expand the name of ShiftOS, so I'll work on it, and you'll have the chance to use ShiftOS!" + Environment.NewLine + Environment.NewLine);
                     break;
                 case 7:
-                    TextType("Your hard drive will now be formatted in preparation for the installation of ShiftOS" + Environment.NewLine + Environment.NewLine);
+                    TextType("Your hard drive will now be formatted in preparation for the installation of ShiftOS." + Environment.NewLine + Environment.NewLine);
                     break;
                 case 8:
                     TextType("Starting Format.");
@@ -201,23 +201,23 @@ namespace ShiftOS.Main
                     rtext = "";
                     break;
                 case 20:
-                    TextType("Scanning Drive C:/");
+                    TextType("Scanning Drive C:\\...");
                     break;
                 case 21:
 
                     TextType(Environment.NewLine + Environment.NewLine + "Drive Label: " + cdrive.VolumeLabel);
                     break;
                 case 22:
-                    TextType(Environment.NewLine + "Total Drive Size: " + String.Format((cdrive.TotalSize / 1024 / 1024 / 1024).ToString(), "0.00") + " GigaBytes ");
+                    TextType(Environment.NewLine + "Total Drive Size: " + String.Format((cdrive.TotalSize / 1024 / 1024 / 1024).ToString(), "0.00") + "GB. ");
                     break;
                 case 23:
-                    TextType(Environment.NewLine + "Old File System: " + cdrive.DriveFormat + " ");
+                    TextType(Environment.NewLine + "Old File System: " + cdrive.DriveFormat + ". ");
                     break;
                 case 24:
-                    TextType(Environment.NewLine + "New File System: ShiftFS ");
+                    TextType(Environment.NewLine + "New File System: ShiftFS. ");
                     break;
                 case 25:
-                    TextType(Environment.NewLine + Environment.NewLine + "Formatting C:/ - ");
+                    TextType(Environment.NewLine + Environment.NewLine + "Formatting C:\\... - ");
                     conversationtimer.Interval = 100;
                     break;
                 case 26: // TODO: to 126