From a25baf08203237fc2eeeb4b7ca720f7d47f8a666 Mon Sep 17 00:00:00 2001
From: John T <reflectron@outlook.com>
Date: Wed, 27 Sep 2017 18:32:16 -0400
Subject: added desktop and some small additions and changes to shiftwm

---
 ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.cs | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.cs')

diff --git a/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.cs b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.cs
index 74b2079..098920f 100644
--- a/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.cs
+++ b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.cs
@@ -1,12 +1,6 @@
 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 ShiftOS.Engine;
 using ShiftOS.Engine.WindowManager;
 
 namespace ShiftOS.Main.ShiftOS.Apps
@@ -14,7 +8,6 @@ namespace ShiftOS.Main.ShiftOS.Apps
     public partial class Shifter : UserControl
     {
         public int colorType; //This is a check to see what option was chosen.
-        ShiftWM wm = new ShiftWM();
         public Shifter()
         {
             InitializeComponent();
@@ -23,7 +16,7 @@ namespace ShiftOS.Main.ShiftOS.Apps
         private void button1_Click(object sender, EventArgs e)
         {
             colorType = 1;
-            wm.Init(new SelectColor(), "Select a color", Properties.Resources.iconColourPicker_fw);
+            ShiftWM.Init(new SelectColor(), "Select a color", Properties.Resources.iconColourPicker_fw.ToIcon());
         }
     }
 }
-- 
cgit v1.2.3