diff options
| author | John T <[email protected]> | 2017-09-27 18:32:16 -0400 |
|---|---|---|
| committer | John T <[email protected]> | 2017-09-27 18:32:16 -0400 |
| commit | a25baf08203237fc2eeeb4b7ca720f7d47f8a666 (patch) | |
| tree | 2664b08ca0f9b57ed0a9240ab54441ece6ac2d71 /ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.cs | |
| parent | dc7533184a88271bfd2a3aae299532ec7632144d (diff) | |
| download | shiftos-rewind-a25baf08203237fc2eeeb4b7ca720f7d47f8a666.tar.gz shiftos-rewind-a25baf08203237fc2eeeb4b7ca720f7d47f8a666.tar.bz2 shiftos-rewind-a25baf08203237fc2eeeb4b7ca720f7d47f8a666.zip | |
added desktop and some small additions and changes to shiftwm
Diffstat (limited to 'ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.cs')
| -rw-r--r-- | ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.cs | 11 |
1 files changed, 2 insertions, 9 deletions
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()); } } } |
