From 78a5a4281cde2105e59164890caa949ef7617510 Mon Sep 17 00:00:00 2001
From: Michael <Michael@some.where>
Date: Sun, 26 Feb 2017 10:24:27 -0500
Subject: [PATCH] more beta 1.2 stuff

---
 ShiftOS.WinForms/Applications/ColorPicker.cs      | 1 -
 ShiftOS.WinForms/Applications/MUDControlCentre.cs | 3 +--
 ShiftOS.WinForms/Applications/ShiftLetters.cs     | 3 ++-
 ShiftOS.WinForms/Applications/Terminal.cs         | 1 -
 ShiftOS.WinForms/Oobe.cs                          | 8 +-------
 ShiftOS.WinForms/Tools/ControlManager.cs          | 5 +----
 ShiftOS.WinForms/WinformsDesktop.cs               | 5 -----
 7 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/ShiftOS.WinForms/Applications/ColorPicker.cs b/ShiftOS.WinForms/Applications/ColorPicker.cs
index a8c0b3f..bf35567 100644
--- a/ShiftOS.WinForms/Applications/ColorPicker.cs
+++ b/ShiftOS.WinForms/Applications/ColorPicker.cs
@@ -1049,7 +1049,6 @@ namespace ShiftOS.WinForms.Applications
                 case 1:
                     pnlpink1.BackColor = Color.HotPink;
                     pnlpink1.Show();
-                    break;
                     pnlpink1.BackColor = Color.DeepPink;
                     pnlpink1.Show();
                     pnlpink2.BackColor = Color.HotPink;
diff --git a/ShiftOS.WinForms/Applications/MUDControlCentre.cs b/ShiftOS.WinForms/Applications/MUDControlCentre.cs
index 6426562..02fe868 100644
--- a/ShiftOS.WinForms/Applications/MUDControlCentre.cs
+++ b/ShiftOS.WinForms/Applications/MUDControlCentre.cs
@@ -243,8 +243,7 @@ namespace ShiftOS.WinForms.Applications
         }
 
         private Shop editingShop = null;
-        private string editingShopOldName = "";
-
+        
         public void ShowCreateShop()
         {
             this.Invoke(new Action(() =>
diff --git a/ShiftOS.WinForms/Applications/ShiftLetters.cs b/ShiftOS.WinForms/Applications/ShiftLetters.cs
index e4adde2..6547d8d 100644
--- a/ShiftOS.WinForms/Applications/ShiftLetters.cs
+++ b/ShiftOS.WinForms/Applications/ShiftLetters.cs
@@ -177,6 +177,7 @@ namespace ShiftOS.WinForms.Applications
             if (ShiftoriumFrontend.UpgradeInstalled("sl_contributors_wordlist")) comboBox1.Items.Add("Contributors");
             if (Shiftorium.UpgradeInstalled("sl_operating_systems_wordlist")) comboBox1.Items.Add("Operating Systems");
             btnrestart.Visible = true;
+            lblword.Left = (this.Width - lblword.Width) / 2;
         }
 
         public void OnUpgrade()
@@ -191,7 +192,7 @@ namespace ShiftOS.WinForms.Applications
 
         public void OnSkinLoad()
         {
-
+            lblword.Left = (this.Width - lblword.Width) / 2;
         }
 
         string lastword = "";
diff --git a/ShiftOS.WinForms/Applications/Terminal.cs b/ShiftOS.WinForms/Applications/Terminal.cs
index ff3569b..7bab213 100644
--- a/ShiftOS.WinForms/Applications/Terminal.cs
+++ b/ShiftOS.WinForms/Applications/Terminal.cs
@@ -187,7 +187,6 @@ namespace ShiftOS.WinForms.Applications
 
 
         public static event TextSentEventHandler TextSent;
-        public event EventHandler OnComplete;
 
         public void ResetAllKeywords()
         {
diff --git a/ShiftOS.WinForms/Oobe.cs b/ShiftOS.WinForms/Oobe.cs
index aa37792..7370396 100644
--- a/ShiftOS.WinForms/Oobe.cs
+++ b/ShiftOS.WinForms/Oobe.cs
@@ -54,15 +54,10 @@ namespace ShiftOS.WinForms
         string rtext;
         string gtexttotype;
         int charcount;
-        int currentletter;
         int slashcount;
-        int conversationcount = 0;
         Label textgeninput;
-        bool needtoclose = false;
         public bool upgraded = false;
-        int hackeffect;
-        int percentcount;
-
+        
         private bool typing = false;
         
         public void TextType(string texttotype)
@@ -74,7 +69,6 @@ namespace ShiftOS.WinForms
             
             charcount = texttotype.Length;
             gtexttotype = texttotype;
-            currentletter = 0;
             slashcount = 1;
             foreach (var c in gtexttotype)
             {
diff --git a/ShiftOS.WinForms/Tools/ControlManager.cs b/ShiftOS.WinForms/Tools/ControlManager.cs
index 32f0217..5cc4813 100644
--- a/ShiftOS.WinForms/Tools/ControlManager.cs
+++ b/ShiftOS.WinForms/Tools/ControlManager.cs
@@ -194,10 +194,7 @@ namespace ShiftOS.WinForms.Tools
                     }
                 }
 
-                Image dithered = null;
-
-                
-                                ctrl.ForeColor = SkinEngine.LoadedSkin.ControlTextColor;
+                ctrl.ForeColor = SkinEngine.LoadedSkin.ControlTextColor;
 
                 ctrl.Font = SkinEngine.LoadedSkin.MainFont;
 
diff --git a/ShiftOS.WinForms/WinformsDesktop.cs b/ShiftOS.WinForms/WinformsDesktop.cs
index 45730c4..81079e4 100644
--- a/ShiftOS.WinForms/WinformsDesktop.cs
+++ b/ShiftOS.WinForms/WinformsDesktop.cs
@@ -48,11 +48,6 @@ namespace ShiftOS.WinForms
     /// </summary>
     public partial class WinformsDesktop : Form, IDesktop
     {
-        /// <summary>
-        /// Occurs when window added.
-        /// </summary>
-        private static event Action<WindowBorder> windowAdded;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="ShiftOS.WinForms.WinformsDesktop"/> class.
         /// </summary>