Desktop preview

7 files changed, 478 insertions, 24 deletions

diff --git a/ShiftOS.WinForms/Applications/Shifter.Designer.cs b/ShiftOS.WinForms/Applications/Shifter.Designer.cs
index f919834..593f43d 100644
--- a/ShiftOS.WinForms/Applications/Shifter.Designer.cs
+++ b/ShiftOS.WinForms/Applications/Shifter.Designer.cs
@@ -95,6 +95,29 @@ namespace ShiftOS.WinForms.Applications
             this.pnlintro = new System.Windows.Forms.Panel();
             this.label1 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
+            this.pnldesktoppreview = new System.Windows.Forms.Panel();
+            this.pnlscreensaver = new System.Windows.Forms.Panel();
+            this.pnlssicon = new System.Windows.Forms.Panel();
+            this.desktoppanel = new System.Windows.Forms.Panel();
+            this.lbtime = new System.Windows.Forms.Label();
+            this.panelbuttonholder = new System.Windows.Forms.FlowLayoutPanel();
+            this.sysmenuholder = new System.Windows.Forms.Panel();
+            this.menuStrip1 = new System.Windows.Forms.MenuStrip();
+            this.apps = new System.Windows.Forms.ToolStripMenuItem();
+            this.pnladvancedal = new System.Windows.Forms.Panel();
+            this.flapps = new System.Windows.Forms.FlowLayoutPanel();
+            this.flcategories = new System.Windows.Forms.FlowLayoutPanel();
+            this.pnlalsystemactions = new System.Windows.Forms.Panel();
+            this.btnshutdown = new System.Windows.Forms.Button();
+            this.pnlstatus = new System.Windows.Forms.Panel();
+            this.lbalstatus = new System.Windows.Forms.Label();
+            this.item1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.item2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.item3ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.item4ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.item5ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.shutdownToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.separatorToolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
             this.panel1.SuspendLayout();
             this.pnlpreview.SuspendLayout();
             this.pnlwindow.SuspendLayout();
@@ -106,6 +129,14 @@ namespace ShiftOS.WinForms.Applications
             this.mspreview.SuspendLayout();
             this.tspreview.SuspendLayout();
             this.pnlintro.SuspendLayout();
+            this.pnldesktoppreview.SuspendLayout();
+            this.pnlscreensaver.SuspendLayout();
+            this.desktoppanel.SuspendLayout();
+            this.sysmenuholder.SuspendLayout();
+            this.menuStrip1.SuspendLayout();
+            this.pnladvancedal.SuspendLayout();
+            this.pnlalsystemactions.SuspendLayout();
+            this.pnlstatus.SuspendLayout();
             this.SuspendLayout();
             // 
             // panel1
@@ -121,6 +152,7 @@ namespace ShiftOS.WinForms.Applications
             // 
             // pnlpreview
             // 
+            this.pnlpreview.Controls.Add(this.pnldesktoppreview);
             this.pnlpreview.Controls.Add(this.pnlintro);
             this.pnlpreview.Controls.Add(this.pnlwindow);
             this.pnlpreview.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -500,6 +532,214 @@ namespace ShiftOS.WinForms.Applications
             this.label2.Text = resources.GetString("label2.Text");
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
+            // pnldesktoppreview
+            // 
+            this.pnldesktoppreview.Controls.Add(this.pnlscreensaver);
+            this.pnldesktoppreview.Controls.Add(this.desktoppanel);
+            this.pnldesktoppreview.Controls.Add(this.pnladvancedal);
+            this.pnldesktoppreview.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pnldesktoppreview.Location = new System.Drawing.Point(0, 0);
+            this.pnldesktoppreview.Name = "pnldesktoppreview";
+            this.pnldesktoppreview.Size = new System.Drawing.Size(757, 286);
+            this.pnldesktoppreview.TabIndex = 2;
+            // 
+            // pnlscreensaver
+            // 
+            this.pnlscreensaver.Controls.Add(this.pnlssicon);
+            this.pnlscreensaver.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pnlscreensaver.Location = new System.Drawing.Point(0, 24);
+            this.pnlscreensaver.Name = "pnlscreensaver";
+            this.pnlscreensaver.Size = new System.Drawing.Size(757, 262);
+            this.pnlscreensaver.TabIndex = 3;
+            this.pnlscreensaver.Visible = false;
+            // 
+            // pnlssicon
+            // 
+            this.pnlssicon.Location = new System.Drawing.Point(303, 495);
+            this.pnlssicon.Name = "pnlssicon";
+            this.pnlssicon.Size = new System.Drawing.Size(200, 100);
+            this.pnlssicon.TabIndex = 0;
+            // 
+            // desktoppanel
+            // 
+            this.desktoppanel.BackColor = System.Drawing.Color.Green;
+            this.desktoppanel.Controls.Add(this.lbtime);
+            this.desktoppanel.Controls.Add(this.panelbuttonholder);
+            this.desktoppanel.Controls.Add(this.sysmenuholder);
+            this.desktoppanel.Dock = System.Windows.Forms.DockStyle.Top;
+            this.desktoppanel.Location = new System.Drawing.Point(0, 0);
+            this.desktoppanel.Name = "desktoppanel";
+            this.desktoppanel.Size = new System.Drawing.Size(757, 24);
+            this.desktoppanel.TabIndex = 2;
+            // 
+            // lbtime
+            // 
+            this.lbtime.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.lbtime.AutoSize = true;
+            this.lbtime.Location = new System.Drawing.Point(-536, 0);
+            this.lbtime.Name = "lbtime";
+            this.lbtime.Size = new System.Drawing.Size(35, 13);
+            this.lbtime.TabIndex = 0;
+            this.lbtime.Text = "label1";
+            this.lbtime.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // panelbuttonholder
+            // 
+            this.panelbuttonholder.AutoSize = true;
+            this.panelbuttonholder.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+            this.panelbuttonholder.Location = new System.Drawing.Point(107, -77);
+            this.panelbuttonholder.Name = "panelbuttonholder";
+            this.panelbuttonholder.Size = new System.Drawing.Size(0, 0);
+            this.panelbuttonholder.TabIndex = 2;
+            // 
+            // sysmenuholder
+            // 
+            this.sysmenuholder.Controls.Add(this.menuStrip1);
+            this.sysmenuholder.Location = new System.Drawing.Point(12, 5);
+            this.sysmenuholder.Name = "sysmenuholder";
+            this.sysmenuholder.Size = new System.Drawing.Size(68, 24);
+            this.sysmenuholder.TabIndex = 1;
+            // 
+            // menuStrip1
+            // 
+            this.menuStrip1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.apps});
+            this.menuStrip1.Location = new System.Drawing.Point(0, 0);
+            this.menuStrip1.Name = "menuStrip1";
+            this.menuStrip1.Padding = new System.Windows.Forms.Padding(0);
+            this.menuStrip1.Size = new System.Drawing.Size(68, 24);
+            this.menuStrip1.TabIndex = 0;
+            this.menuStrip1.Text = "menuStrip1";
+            // 
+            // apps
+            // 
+            this.apps.AutoSize = false;
+            this.apps.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.item1ToolStripMenuItem,
+            this.item2ToolStripMenuItem,
+            this.item3ToolStripMenuItem,
+            this.item4ToolStripMenuItem,
+            this.item5ToolStripMenuItem,
+            this.separatorToolStripMenuItem1,
+            this.shutdownToolStripMenuItem});
+            this.apps.Name = "apps";
+            this.apps.Padding = new System.Windows.Forms.Padding(0);
+            this.apps.Size = new System.Drawing.Size(58, 20);
+            this.apps.Tag = "applauncherbutton";
+            this.apps.Text = "ShiftOS";
+            // 
+            // pnladvancedal
+            // 
+            this.pnladvancedal.Controls.Add(this.flapps);
+            this.pnladvancedal.Controls.Add(this.flcategories);
+            this.pnladvancedal.Controls.Add(this.pnlalsystemactions);
+            this.pnladvancedal.Controls.Add(this.pnlstatus);
+            this.pnladvancedal.Location = new System.Drawing.Point(0, -53);
+            this.pnladvancedal.Name = "pnladvancedal";
+            this.pnladvancedal.Size = new System.Drawing.Size(433, 417);
+            this.pnladvancedal.TabIndex = 4;
+            this.pnladvancedal.Visible = false;
+            // 
+            // flapps
+            // 
+            this.flapps.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.flapps.Location = new System.Drawing.Point(221, 58);
+            this.flapps.Name = "flapps";
+            this.flapps.Size = new System.Drawing.Size(212, 328);
+            this.flapps.TabIndex = 3;
+            // 
+            // flcategories
+            // 
+            this.flcategories.Dock = System.Windows.Forms.DockStyle.Left;
+            this.flcategories.Location = new System.Drawing.Point(0, 58);
+            this.flcategories.Name = "flcategories";
+            this.flcategories.Size = new System.Drawing.Size(221, 328);
+            this.flcategories.TabIndex = 2;
+            // 
+            // pnlalsystemactions
+            // 
+            this.pnlalsystemactions.Controls.Add(this.btnshutdown);
+            this.pnlalsystemactions.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.pnlalsystemactions.Location = new System.Drawing.Point(0, 386);
+            this.pnlalsystemactions.Name = "pnlalsystemactions";
+            this.pnlalsystemactions.Size = new System.Drawing.Size(433, 31);
+            this.pnlalsystemactions.TabIndex = 1;
+            // 
+            // btnshutdown
+            // 
+            this.btnshutdown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnshutdown.AutoSize = true;
+            this.btnshutdown.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+            this.btnshutdown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnshutdown.Location = new System.Drawing.Point(363, 3);
+            this.btnshutdown.Name = "btnshutdown";
+            this.btnshutdown.Size = new System.Drawing.Size(67, 25);
+            this.btnshutdown.TabIndex = 0;
+            this.btnshutdown.Text = "Shutdown";
+            this.btnshutdown.UseVisualStyleBackColor = true;
+            // 
+            // pnlstatus
+            // 
+            this.pnlstatus.Controls.Add(this.lbalstatus);
+            this.pnlstatus.Dock = System.Windows.Forms.DockStyle.Top;
+            this.pnlstatus.Location = new System.Drawing.Point(0, 0);
+            this.pnlstatus.Name = "pnlstatus";
+            this.pnlstatus.Size = new System.Drawing.Size(433, 58);
+            this.pnlstatus.TabIndex = 0;
+            // 
+            // lbalstatus
+            // 
+            this.lbalstatus.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lbalstatus.Location = new System.Drawing.Point(0, 0);
+            this.lbalstatus.Name = "lbalstatus";
+            this.lbalstatus.Size = new System.Drawing.Size(433, 58);
+            this.lbalstatus.TabIndex = 0;
+            this.lbalstatus.Text = "michael@system\r\n0 Codepoints\r\n0 installed, 0 available";
+            this.lbalstatus.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // item1ToolStripMenuItem
+            // 
+            this.item1ToolStripMenuItem.Name = "item1ToolStripMenuItem";
+            this.item1ToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.item1ToolStripMenuItem.Text = "Item 1";
+            // 
+            // item2ToolStripMenuItem
+            // 
+            this.item2ToolStripMenuItem.Name = "item2ToolStripMenuItem";
+            this.item2ToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.item2ToolStripMenuItem.Text = "Item 2";
+            // 
+            // item3ToolStripMenuItem
+            // 
+            this.item3ToolStripMenuItem.Name = "item3ToolStripMenuItem";
+            this.item3ToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.item3ToolStripMenuItem.Text = "Item 3";
+            // 
+            // item4ToolStripMenuItem
+            // 
+            this.item4ToolStripMenuItem.Name = "item4ToolStripMenuItem";
+            this.item4ToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.item4ToolStripMenuItem.Text = "Item 4";
+            // 
+            // item5ToolStripMenuItem
+            // 
+            this.item5ToolStripMenuItem.Name = "item5ToolStripMenuItem";
+            this.item5ToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.item5ToolStripMenuItem.Text = "Item 5";
+            // 
+            // shutdownToolStripMenuItem
+            // 
+            this.shutdownToolStripMenuItem.Name = "shutdownToolStripMenuItem";
+            this.shutdownToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.shutdownToolStripMenuItem.Text = "Shutdown";
+            // 
+            // separatorToolStripMenuItem1
+            // 
+            this.separatorToolStripMenuItem1.Name = "separatorToolStripMenuItem1";
+            this.separatorToolStripMenuItem1.Size = new System.Drawing.Size(149, 6);
+            // 
             // Shifter
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -523,6 +763,18 @@ namespace ShiftOS.WinForms.Applications
             this.tspreview.ResumeLayout(false);
             this.tspreview.PerformLayout();
             this.pnlintro.ResumeLayout(false);
+            this.pnldesktoppreview.ResumeLayout(false);
+            this.pnlscreensaver.ResumeLayout(false);
+            this.desktoppanel.ResumeLayout(false);
+            this.desktoppanel.PerformLayout();
+            this.sysmenuholder.ResumeLayout(false);
+            this.sysmenuholder.PerformLayout();
+            this.menuStrip1.ResumeLayout(false);
+            this.menuStrip1.PerformLayout();
+            this.pnladvancedal.ResumeLayout(false);
+            this.pnlalsystemactions.ResumeLayout(false);
+            this.pnlalsystemactions.PerformLayout();
+            this.pnlstatus.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
@@ -571,5 +823,28 @@ namespace ShiftOS.WinForms.Applications
         private System.Windows.Forms.Panel pnlintro;
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Panel pnldesktoppreview;
+        private System.Windows.Forms.Panel pnlscreensaver;
+        private System.Windows.Forms.Panel pnlssicon;
+        private System.Windows.Forms.Panel desktoppanel;
+        private System.Windows.Forms.Label lbtime;
+        private System.Windows.Forms.FlowLayoutPanel panelbuttonholder;
+        private System.Windows.Forms.Panel sysmenuholder;
+        private System.Windows.Forms.MenuStrip menuStrip1;
+        private System.Windows.Forms.ToolStripMenuItem apps;
+        private System.Windows.Forms.Panel pnladvancedal;
+        private System.Windows.Forms.FlowLayoutPanel flapps;
+        private System.Windows.Forms.FlowLayoutPanel flcategories;
+        private System.Windows.Forms.Panel pnlalsystemactions;
+        private System.Windows.Forms.Button btnshutdown;
+        private System.Windows.Forms.Panel pnlstatus;
+        private System.Windows.Forms.Label lbalstatus;
+        private System.Windows.Forms.ToolStripMenuItem item1ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem item2ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem item3ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem item4ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem item5ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripSeparator separatorToolStripMenuItem1;
+        private System.Windows.Forms.ToolStripMenuItem shutdownToolStripMenuItem;
     }
 }
\ No newline at end of file
diff --git a/ShiftOS.WinForms/Applications/Shifter.cs b/ShiftOS.WinForms/Applications/Shifter.cs
index e22956f..600a9b2 100644
--- a/ShiftOS.WinForms/Applications/Shifter.cs
+++ b/ShiftOS.WinForms/Applications/Shifter.cs
@@ -47,6 +47,164 @@ namespace ShiftOS.WinForms.Applications
             PopulateShifter();
         }
 
+        [ShifterMeta("Desktop")]
+        public void ResetDesktop()
+        {
+            pnldesktoppreview.BringToFront();
+            pnldesktoppreview.Tag = "keepbg";
+            SetupDesktop();
+        }
+
+        /// <summary>
+        /// Populates the panel buttons.
+        /// </summary>
+        /// <returns>The panel buttons.</returns>
+        public void PopulatePanelButtons()
+        {
+            if (DesktopFunctions.ShowDefaultElements == true)
+            {
+                panelbuttonholder.Controls.Clear();
+                if (Shiftorium.IsInitiated == true)
+                {
+                    if (Shiftorium.UpgradeInstalled("wm_panel_buttons"))
+                    {
+
+                        var pnlbtn = new Panel();
+                        pnlbtn.Margin = new Padding(2, LoadedSkin.PanelButtonFromTop, 0, 0);
+                        pnlbtn.BackColor = LoadedSkin.PanelButtonColor;
+                        pnlbtn.BackgroundImage = GetImage("panelbutton");
+                        pnlbtn.BackgroundImageLayout = GetImageLayout("panelbutton");
+
+                        var pnlbtntext = new Label();
+                        pnlbtntext.Text = "Panel Button Text";
+                        pnlbtntext.AutoSize = true;
+                        pnlbtntext.Location = LoadedSkin.PanelButtonFromLeft;
+                        pnlbtntext.ForeColor = LoadedSkin.PanelButtonTextColor;
+                        pnlbtntext.BackColor = Color.Transparent;
+
+                        pnlbtn.BackColor = LoadedSkin.PanelButtonColor;
+                        if (pnlbtn.BackgroundImage != null)
+                        {
+                            pnlbtntext.BackColor = Color.Transparent;
+                        }
+                        pnlbtn.Size = LoadedSkin.PanelButtonSize;
+                        pnlbtn.Tag = "keepbg";
+                        pnlbtntext.Tag = "keepbg";
+                        pnlbtn.Controls.Add(pnlbtntext);
+                        this.panelbuttonholder.Controls.Add(pnlbtn);
+                        pnlbtn.Show();
+                        pnlbtntext.Show();
+
+                        pnlbtntext.Font = LoadedSkin.PanelButtonFont;
+
+
+
+
+                    }
+                }
+            }
+
+        }
+
+        /// <summary>
+        /// Setups the desktop.
+        /// </summary>
+        /// <returns>The desktop.</returns>
+        public void SetupDesktop()
+        {
+            if (DesktopFunctions.ShowDefaultElements == true)
+            {
+                desktoppanel.BackColor = Color.Green;
+
+                //upgrades
+
+                if (Shiftorium.IsInitiated == true)
+                {
+                    desktoppanel.Visible = Shiftorium.UpgradeInstalled("desktop");
+                    lbtime.Visible = Shiftorium.UpgradeInstalled("desktop_clock_widget");
+
+                    //skinning
+                    lbtime.ForeColor = LoadedSkin.DesktopPanelClockColor;
+
+                    panelbuttonholder.Top = 0;
+                    panelbuttonholder.Left = LoadedSkin.PanelButtonHolderFromLeft;
+                    panelbuttonholder.Height = desktoppanel.Height;
+                    panelbuttonholder.BackColor = Color.Transparent;
+                    panelbuttonholder.Margin = new Padding(0, 0, 0, 0);
+
+                    sysmenuholder.Visible = Shiftorium.UpgradeInstalled("app_launcher");
+
+                    //The Color Picker can give us transparent colors - which Windows Forms fucking despises when dealing with form backgrounds.
+                    //To compensate, we must recreate the desktop color and make the alpha channel '255'.
+                    pnldesktoppreview.BackColor = Color.FromArgb(LoadedSkin.DesktopColor.R, LoadedSkin.DesktopColor.G, LoadedSkin.DesktopColor.B);
+                    //Not doing this will cause an ArgumentException.
+
+                    DitheringEngine.DitherImage(SkinEngine.GetImage("desktopbackground"), new Action<Image>((img) =>
+                    {
+                        pnldesktoppreview.BackgroundImage = img;
+                    }));
+                    pnldesktoppreview.BackgroundImageLayout = GetImageLayout("desktopbackground");
+                    desktoppanel.BackColor = LoadedSkin.DesktopPanelColor;
+
+                    var pnlimg = GetImage("desktoppanel");
+                    if (pnlimg != null)
+                    {
+                        var bmp = new Bitmap(pnlimg);
+                        bmp.MakeTransparent(Color.FromArgb(1, 0, 1));
+                        pnlimg = bmp;
+                    }
+
+                    desktoppanel.BackgroundImage = pnlimg;
+                    if (desktoppanel.BackgroundImage != null)
+                    {
+                        desktoppanel.BackColor = Color.Transparent;
+                    }
+                    var appimg = GetImage("applauncher");
+                    if (appimg != null)
+                    {
+                        var bmp = new Bitmap(appimg);
+                        bmp.MakeTransparent(Color.FromArgb(1, 0, 1));
+                        appimg = bmp;
+                    }
+                    menuStrip1.BackgroundImage = appimg;
+                    lbtime.ForeColor = LoadedSkin.DesktopPanelClockColor;
+                    lbtime.Font = LoadedSkin.DesktopPanelClockFont;
+                    if (desktoppanel.BackgroundImage == null)
+                    {
+                        lbtime.BackColor = LoadedSkin.DesktopPanelClockBackgroundColor;
+                    }
+                    else
+                    {
+                        lbtime.BackColor = Color.Transparent;
+                    }
+                    apps.Text = LoadedSkin.AppLauncherText;
+                    sysmenuholder.Location = LoadedSkin.AppLauncherFromLeft;
+                    sysmenuholder.Size = LoadedSkin.AppLauncherHolderSize;
+                    apps.Size = sysmenuholder.Size;
+                    menuStrip1.Renderer = new ShiftOSMenuRenderer(new AppLauncherColorTable(LoadedSkin));
+                    desktoppanel.BackgroundImageLayout = GetImageLayout("desktoppanel");
+                    desktoppanel.Height = LoadedSkin.DesktopPanelHeight;
+                    if (LoadedSkin.DesktopPanelPosition == 1)
+                    {
+                        desktoppanel.Dock = DockStyle.Bottom;
+                    }
+                    else
+                    {
+                        desktoppanel.Dock = DockStyle.Top;
+                    }
+                }
+            }
+            else
+            {
+                desktoppanel.Hide();
+            }
+
+            PopulatePanelButtons();
+        }
+
+
+
+
         [ShifterMeta("Windows")]
         public void SetupWindowPreview()
         {
diff --git a/ShiftOS.WinForms/Applications/Shifter.resx b/ShiftOS.WinForms/Applications/Shifter.resx
index 9533980..c18f92a 100644
--- a/ShiftOS.WinForms/Applications/Shifter.resx
+++ b/ShiftOS.WinForms/Applications/Shifter.resx
@@ -117,20 +117,23 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="label2.Text" xml:space="preserve">
-    <value>The Shifter is a brilliant application for ShiftOS that allows you to customize almost every aspect of the user interface.
-
-To use the Shifter, simply select a category from the left, then a list of sub-categories will show up. Choose a sub-category, then a list of settings will appear. You can modify any one of these settings. A live preview of what you are editing will show, and you can use it to see what your new user experience will look like.
-
-When you are done, hit Apply Changes to apply your changes!
-
-You can also earn Codepoints through the Shifter. The more you tweak and customize, the more Codepoints you'll earn! Go nuts! Shift it your way!</value>
-  </data>
+  <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>230, 17</value>
+  </metadata>
+  <metadata name="tspreview.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>127, 17</value>
+  </metadata>
+  <metadata name="mspreview.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="mspreview.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <metadata name="tspreview.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>127, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
@@ -145,7 +148,7 @@ You can also earn Codepoints through the Shifter. The more you tweak and customi
         TgDQASA1MVpwzwAAAABJRU5ErkJggg==
 </value>
   </data>
-  <data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
@@ -160,7 +163,7 @@ You can also earn Codepoints through the Shifter. The more you tweak and customi
         TgDQASA1MVpwzwAAAABJRU5ErkJggg==
 </value>
   </data>
-  <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
@@ -175,7 +178,13 @@ You can also earn Codepoints through the Shifter. The more you tweak and customi
         TgDQASA1MVpwzwAAAABJRU5ErkJggg==
 </value>
   </data>
-  <metadata name="mspreview.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
+  <data name="label2.Text" xml:space="preserve">
+    <value>The Shifter is a brilliant application for ShiftOS that allows you to customize almost every aspect of the user interface.
+
+To use the Shifter, simply select a category from the left, then a list of sub-categories will show up. Choose a sub-category, then a list of settings will appear. You can modify any one of these settings. A live preview of what you are editing will show, and you can use it to see what your new user experience will look like.
+
+When you are done, hit Apply Changes to apply your changes!
+
+You can also earn Codepoints through the Shifter. The more you tweak and customize, the more Codepoints you'll earn! Go nuts! Shift it your way!</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ShiftOS.WinForms/Tools/ControlManager.cs b/ShiftOS.WinForms/Tools/ControlManager.cs
index 781e045..1c6f40c 100644
--- a/ShiftOS.WinForms/Tools/ControlManager.cs
+++ b/ShiftOS.WinForms/Tools/ControlManager.cs
@@ -277,7 +277,7 @@ namespace ShiftOS.WinForms.Tools
             {
                 for (int i = 0; i < frm.Controls.Count; i++)
                 {
-                    SetupControls(frm.Controls[i], false);
+                        SetupControls(frm.Controls[i], false);
                 }
 
             };
diff --git a/ShiftOS.WinForms/Tools/ShiftOSMenuRenderer.cs b/ShiftOS.WinForms/Tools/ShiftOSMenuRenderer.cs
index a31edd9..81e8c89 100644
--- a/ShiftOS.WinForms/Tools/ShiftOSMenuRenderer.cs
+++ b/ShiftOS.WinForms/Tools/ShiftOSMenuRenderer.cs
@@ -364,14 +364,18 @@ namespace ShiftOS.WinForms.Tools
             return SkinEngine.GetImage(id);
         }
 
-        public Skin LoadedSkin
+        public AppLauncherColorTable()
         {
-            get
-            {
-                return SkinEngine.LoadedSkin;
-            }
+            LoadedSkin = SkinEngine.LoadedSkin;
+        }
+
+        public AppLauncherColorTable(Skin skn)
+        {
+            LoadedSkin = skn;
         }
 
+        public Skin LoadedSkin { get; private set; }
+
         public override Color ButtonSelectedHighlight
         {
             get { return LoadedSkin.Menu_ButtonSelectedHighlight; }
diff --git a/ShiftOS.WinForms/WindowBorder.cs b/ShiftOS.WinForms/WindowBorder.cs
index e716803..e809f90 100644
--- a/ShiftOS.WinForms/WindowBorder.cs
+++ b/ShiftOS.WinForms/WindowBorder.cs
@@ -129,6 +129,7 @@ namespace ShiftOS.WinForms
 
             this.pnlcontents.Controls.Add(this._parentWindow);
             this._parentWindow.Dock = DockStyle.Fill;
+            this._parentWindow.Show();
             ControlManager.SetupControls(this._parentWindow);
 
             ParentWindow.OnSkinLoad();
@@ -208,7 +209,6 @@ namespace ShiftOS.WinForms
             this.Left = (Screen.PrimaryScreen.Bounds.Width - this.Width) / 2;
             this.Top = (Screen.PrimaryScreen.Bounds.Height - this.Height) / 2;
             ParentWindow.OnLoad();
-            this._parentWindow.Show();
         }
 
         /// <summary>
diff --git a/ShiftOS_TheReturn/ServerManager.cs b/ShiftOS_TheReturn/ServerManager.cs
index 4fce247..d356600 100644
--- a/ShiftOS_TheReturn/ServerManager.cs
+++ b/ShiftOS_TheReturn/ServerManager.cs
@@ -34,6 +34,7 @@ using System.Threading;
 using ShiftOS;
 using static ShiftOS.Engine.SaveSystem;
 using Newtonsoft.Json;
+using System.Net.Sockets;
 
 namespace ShiftOS.Engine
 {
@@ -191,8 +192,15 @@ namespace ShiftOS.Engine
                 }
             };
 
-            client.Connect(mud_address, port);
-
+            try
+            {
+                client.Connect(mud_address, port);
+            }
+            catch(SocketException ex)
+            {
+                System.Diagnostics.Debug.Print(ex.ToString());
+                Initiate(mud_address, port);
+            }
         }
 
         public static void SendMessage(string name, string contents)