Merge remote-tracking branch 'refs/remotes/ShiftOS-Rewind/master'

1 files changed, 29 insertions, 0 deletions

diff --git a/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.cs b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.cs
new file mode 100644
index 0000000..74b2079
--- /dev/null
+++ b/ShiftOS.Main/ShiftOS/Apps/ShifterStuff/Shifter.cs
@@ -0,0 +1,29 @@
+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.WindowManager;
+
+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();
+        }
+
+        private void button1_Click(object sender, EventArgs e)
+        {
+            colorType = 1;
+            wm.Init(new SelectColor(), "Select a color", Properties.Resources.iconColourPicker_fw);
+        }
+    }
+}