Merge pull request #17 from MichaelTheShifter/shiftui_integration

Shiftui integration

12 files changed, 176 insertions, 176 deletions

diff --git a/source/WindowsFormsApplication1/FinalMission/ChoiceControl.Designer.cs b/source/WindowsFormsApplication1/FinalMission/ChoiceControl.Designer.cs
index f055644..b890d55 100644
--- a/source/WindowsFormsApplication1/FinalMission/ChoiceControl.Designer.cs
+++ b/source/WindowsFormsApplication1/FinalMission/ChoiceControl.Designer.cs
@@ -1,6 +1,6 @@
 namespace ShiftOS.FinalMission
 {
-    partial class ChoiceControl
+    partial class ChoiceWidget
     {
         /// <summary> 
         /// Required designer variable.
@@ -28,13 +28,13 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.lbnumber = new System.Windows.Forms.Label();
-            this.lbdescription = new System.Windows.Forms.Label();
+            this.lbnumber = new ShiftUI.Label();
+            this.lbdescription = new ShiftUI.Label();
             this.SuspendLayout();
             // 
             // lbnumber
             // 
-            this.lbnumber.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lbnumber.Dock = ShiftUI.DockStyle.Fill;
             this.lbnumber.Font = new System.Drawing.Font("Microsoft Sans Serif", 36F);
             this.lbnumber.Location = new System.Drawing.Point(0, 0);
             this.lbnumber.Name = "lbnumber";
@@ -46,7 +46,7 @@
             // 
             // lbdescription
             // 
-            this.lbdescription.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.lbdescription.Dock = ShiftUI.DockStyle.Bottom;
             this.lbdescription.Location = new System.Drawing.Point(0, 75);
             this.lbdescription.Name = "lbdescription";
             this.lbdescription.Size = new System.Drawing.Size(112, 27);
@@ -55,13 +55,13 @@
             this.lbdescription.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             this.lbdescription.Click += new System.EventHandler(this.lbdescription_Click);
             // 
-            // ChoiceControl
+            // ChoiceWidget
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.lbnumber);
-            this.Controls.Add(this.lbdescription);
-            this.Name = "ChoiceControl";
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
+            this.Widgets.Add(this.lbnumber);
+            this.Widgets.Add(this.lbdescription);
+            this.Name = "ChoiceWidget";
             this.Size = new System.Drawing.Size(112, 102);
             this.ResumeLayout(false);
 
@@ -69,7 +69,7 @@
 
         #endregion
 
-        private System.Windows.Forms.Label lbnumber;
-        private System.Windows.Forms.Label lbdescription;
+        private ShiftUI.Label lbnumber;
+        private ShiftUI.Label lbdescription;
     }
 }
diff --git a/source/WindowsFormsApplication1/FinalMission/ChoiceControl.cs b/source/WindowsFormsApplication1/FinalMission/ChoiceControl.cs
index 1230d6b..439fb73 100644
--- a/source/WindowsFormsApplication1/FinalMission/ChoiceControl.cs
+++ b/source/WindowsFormsApplication1/FinalMission/ChoiceControl.cs
@@ -6,14 +6,14 @@ using System.Data;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS.FinalMission
 {
     [DefaultEvent("Selected")]
-    public partial class ChoiceControl : UserControl
+    public partial class ChoiceWidget : UserWidget
     {
-        public ChoiceControl()
+        public ChoiceWidget()
         {
             InitializeComponent();
         }
diff --git a/source/WindowsFormsApplication1/FinalMission/ChoiceControl.resx b/source/WindowsFormsApplication1/FinalMission/ChoiceControl.resx
index 1af7de1..ffb4fb5 100644
--- a/source/WindowsFormsApplication1/FinalMission/ChoiceControl.resx
+++ b/source/WindowsFormsApplication1/FinalMission/ChoiceControl.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/FinalMission/ChooseYourApproach.Designer.cs b/source/WindowsFormsApplication1/FinalMission/ChooseYourApproach.Designer.cs
index 587093c..2cba002 100644
--- a/source/WindowsFormsApplication1/FinalMission/ChooseYourApproach.Designer.cs
+++ b/source/WindowsFormsApplication1/FinalMission/ChooseYourApproach.Designer.cs
@@ -29,26 +29,26 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ChooseYourApproach));
-            this.pnlmain = new System.Windows.Forms.Panel();
-            this.lbdesc = new System.Windows.Forms.Label();
-            this.lbtitle = new System.Windows.Forms.Label();
-            this.pnldescription = new System.Windows.Forms.Panel();
-            this.choicedesc = new System.Windows.Forms.Label();
-            this.fldescbuttons = new System.Windows.Forms.FlowLayoutPanel();
-            this.btnbegin = new System.Windows.Forms.Button();
-            this.choicetitle = new System.Windows.Forms.Label();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.pnlchoices = new System.Windows.Forms.Panel();
-            this.choiceControl3 = new ShiftOS.FinalMission.ChoiceControl();
-            this.choiceControl2 = new ShiftOS.FinalMission.ChoiceControl();
-            this.cc_sidewithdevx = new ShiftOS.FinalMission.ChoiceControl();
-            this.pnlconfirm = new System.Windows.Forms.Panel();
-            this.lbconfirm = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
-            this.button1 = new System.Windows.Forms.Button();
-            this.button2 = new System.Windows.Forms.Button();
-            this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
-            this.button3 = new System.Windows.Forms.Button();
+            this.pnlmain = new ShiftUI.Panel();
+            this.lbdesc = new ShiftUI.Label();
+            this.lbtitle = new ShiftUI.Label();
+            this.pnldescription = new ShiftUI.Panel();
+            this.choicedesc = new ShiftUI.Label();
+            this.fldescbuttons = new ShiftUI.FlowLayoutPanel();
+            this.btnbegin = new ShiftUI.Button();
+            this.choicetitle = new ShiftUI.Label();
+            this.panel1 = new ShiftUI.Panel();
+            this.pnlchoices = new ShiftUI.Panel();
+            this.choiceWidget3 = new ShiftOS.FinalMission.ChoiceWidget();
+            this.choiceWidget2 = new ShiftOS.FinalMission.ChoiceWidget();
+            this.cc_sidewithdevx = new ShiftOS.FinalMission.ChoiceWidget();
+            this.pnlconfirm = new ShiftUI.Panel();
+            this.lbconfirm = new ShiftUI.Label();
+            this.label2 = new ShiftUI.Label();
+            this.button1 = new ShiftUI.Button();
+            this.button2 = new ShiftUI.Button();
+            this.flowLayoutPanel1 = new ShiftUI.FlowLayoutPanel();
+            this.button3 = new ShiftUI.Button();
             this.pnlmain.SuspendLayout();
             this.pnldescription.SuspendLayout();
             this.fldescbuttons.SuspendLayout();
@@ -59,10 +59,10 @@
             // 
             // pnlmain
             // 
-            this.pnlmain.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnlmain.Controls.Add(this.lbdesc);
-            this.pnlmain.Controls.Add(this.lbtitle);
+            this.pnlmain.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.pnlmain.Widgets.Add(this.lbdesc);
+            this.pnlmain.Widgets.Add(this.lbtitle);
             this.pnlmain.Location = new System.Drawing.Point(318, 27);
             this.pnlmain.Name = "pnlmain";
             this.pnlmain.Size = new System.Drawing.Size(692, 178);
@@ -70,7 +70,7 @@
             // 
             // lbdesc
             // 
-            this.lbdesc.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lbdesc.Dock = ShiftUI.DockStyle.Fill;
             this.lbdesc.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
             this.lbdesc.Location = new System.Drawing.Point(0, 38);
             this.lbdesc.Name = "lbdesc";
@@ -82,7 +82,7 @@
             // 
             // lbtitle
             // 
-            this.lbtitle.Dock = System.Windows.Forms.DockStyle.Top;
+            this.lbtitle.Dock = ShiftUI.DockStyle.Top;
             this.lbtitle.Font = new System.Drawing.Font("Lucida Console", 19F);
             this.lbtitle.Location = new System.Drawing.Point(0, 0);
             this.lbtitle.Name = "lbtitle";
@@ -93,11 +93,11 @@
             // 
             // pnldescription
             // 
-            this.pnldescription.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnldescription.Controls.Add(this.choicedesc);
-            this.pnldescription.Controls.Add(this.fldescbuttons);
-            this.pnldescription.Controls.Add(this.choicetitle);
+            this.pnldescription.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.pnldescription.Widgets.Add(this.choicedesc);
+            this.pnldescription.Widgets.Add(this.fldescbuttons);
+            this.pnldescription.Widgets.Add(this.choicetitle);
             this.pnldescription.Location = new System.Drawing.Point(318, 357);
             this.pnldescription.Name = "pnldescription";
             this.pnldescription.Size = new System.Drawing.Size(692, 178);
@@ -105,7 +105,7 @@
             // 
             // choicedesc
             // 
-            this.choicedesc.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.choicedesc.Dock = ShiftUI.DockStyle.Fill;
             this.choicedesc.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
             this.choicedesc.Location = new System.Drawing.Point(0, 38);
             this.choicedesc.Name = "choicedesc";
@@ -118,8 +118,8 @@
             // 
             // fldescbuttons
             // 
-            this.fldescbuttons.Controls.Add(this.btnbegin);
-            this.fldescbuttons.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.fldescbuttons.Widgets.Add(this.btnbegin);
+            this.fldescbuttons.Dock = ShiftUI.DockStyle.Bottom;
             this.fldescbuttons.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
             this.fldescbuttons.Location = new System.Drawing.Point(0, 141);
             this.fldescbuttons.Name = "fldescbuttons";
@@ -129,8 +129,8 @@
             // btnbegin
             // 
             this.btnbegin.AutoSize = true;
-            this.btnbegin.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnbegin.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnbegin.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.btnbegin.FlatStyle = ShiftUI.FlatStyle.Standard;
             this.btnbegin.Location = new System.Drawing.Point(3, 3);
             this.btnbegin.Name = "btnbegin";
             this.btnbegin.Size = new System.Drawing.Size(62, 32);
@@ -141,7 +141,7 @@
             // 
             // choicetitle
             // 
-            this.choicetitle.Dock = System.Windows.Forms.DockStyle.Top;
+            this.choicetitle.Dock = ShiftUI.DockStyle.Top;
             this.choicetitle.Font = new System.Drawing.Font("Lucida Console", 19F);
             this.choicetitle.Location = new System.Drawing.Point(0, 0);
             this.choicetitle.Name = "choicetitle";
@@ -159,12 +159,12 @@
             // 
             // pnlchoices
             // 
-            this.pnlchoices.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnlchoices.Controls.Add(this.choiceControl3);
-            this.pnlchoices.Controls.Add(this.choiceControl2);
-            this.pnlchoices.Controls.Add(this.cc_sidewithdevx);
+            this.pnlchoices.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.pnlchoices.Widgets.Add(this.choiceWidget3);
+            this.pnlchoices.Widgets.Add(this.choiceWidget2);
+            this.pnlchoices.Widgets.Add(this.cc_sidewithdevx);
             this.pnlchoices.Location = new System.Drawing.Point(510, 228);
             this.pnlchoices.MaximumSize = new System.Drawing.Size(338, 91);
             this.pnlchoices.MinimumSize = new System.Drawing.Size(338, 91);
@@ -172,32 +172,32 @@
             this.pnlchoices.Size = new System.Drawing.Size(338, 91);
             this.pnlchoices.TabIndex = 3;
             // 
-            // choiceControl3
+            // choiceWidget3
             // 
-            this.choiceControl3.ChoiceName = "Destroy DevX";
-            this.choiceControl3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.choiceControl3.Location = new System.Drawing.Point(112, 0);
-            this.choiceControl3.Name = "choiceControl3";
-            this.choiceControl3.Number = 2;
-            this.choiceControl3.Size = new System.Drawing.Size(114, 91);
-            this.choiceControl3.TabIndex = 2;
-            this.choiceControl3.Selected += new System.EventHandler(this.cc_sidewithdevx_Selected);
+            this.choiceWidget3.ChoiceName = "Destroy DevX";
+            this.choiceWidget3.Dock = ShiftUI.DockStyle.Fill;
+            this.choiceWidget3.Location = new System.Drawing.Point(112, 0);
+            this.choiceWidget3.Name = "choiceWidget3";
+            this.choiceWidget3.Number = 2;
+            this.choiceWidget3.Size = new System.Drawing.Size(114, 91);
+            this.choiceWidget3.TabIndex = 2;
+            this.choiceWidget3.Selected += new System.EventHandler(this.cc_sidewithdevx_Selected);
             // 
-            // choiceControl2
+            // choiceWidget2
             // 
-            this.choiceControl2.ChoiceName = "End it all";
-            this.choiceControl2.Dock = System.Windows.Forms.DockStyle.Right;
-            this.choiceControl2.Location = new System.Drawing.Point(226, 0);
-            this.choiceControl2.Name = "choiceControl2";
-            this.choiceControl2.Number = 3;
-            this.choiceControl2.Size = new System.Drawing.Size(112, 91);
-            this.choiceControl2.TabIndex = 1;
-            this.choiceControl2.Selected += new System.EventHandler(this.cc_sidewithdevx_Selected);
+            this.choiceWidget2.ChoiceName = "End it all";
+            this.choiceWidget2.Dock = ShiftUI.DockStyle.Right;
+            this.choiceWidget2.Location = new System.Drawing.Point(226, 0);
+            this.choiceWidget2.Name = "choiceWidget2";
+            this.choiceWidget2.Number = 3;
+            this.choiceWidget2.Size = new System.Drawing.Size(112, 91);
+            this.choiceWidget2.TabIndex = 1;
+            this.choiceWidget2.Selected += new System.EventHandler(this.cc_sidewithdevx_Selected);
             // 
             // cc_sidewithdevx
             // 
             this.cc_sidewithdevx.ChoiceName = "Side with DevX";
-            this.cc_sidewithdevx.Dock = System.Windows.Forms.DockStyle.Left;
+            this.cc_sidewithdevx.Dock = ShiftUI.DockStyle.Left;
             this.cc_sidewithdevx.Location = new System.Drawing.Point(0, 0);
             this.cc_sidewithdevx.Name = "cc_sidewithdevx";
             this.cc_sidewithdevx.Number = 1;
@@ -207,12 +207,12 @@
             // 
             // pnlconfirm
             // 
-            this.pnlconfirm.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnlconfirm.Controls.Add(this.lbconfirm);
-            this.pnlconfirm.Controls.Add(this.flowLayoutPanel1);
-            this.pnlconfirm.Controls.Add(this.label2);
+            this.pnlconfirm.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.pnlconfirm.Widgets.Add(this.lbconfirm);
+            this.pnlconfirm.Widgets.Add(this.flowLayoutPanel1);
+            this.pnlconfirm.Widgets.Add(this.label2);
             this.pnlconfirm.Location = new System.Drawing.Point(56, 27);
             this.pnlconfirm.Name = "pnlconfirm";
             this.pnlconfirm.Size = new System.Drawing.Size(1220, 449);
@@ -221,7 +221,7 @@
             // 
             // lbconfirm
             // 
-            this.lbconfirm.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lbconfirm.Dock = ShiftUI.DockStyle.Fill;
             this.lbconfirm.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
             this.lbconfirm.Location = new System.Drawing.Point(0, 38);
             this.lbconfirm.Name = "lbconfirm";
@@ -232,7 +232,7 @@
             // 
             // label2
             // 
-            this.label2.Dock = System.Windows.Forms.DockStyle.Top;
+            this.label2.Dock = ShiftUI.DockStyle.Top;
             this.label2.Font = new System.Drawing.Font("Lucida Console", 19F);
             this.label2.Location = new System.Drawing.Point(0, 0);
             this.label2.Name = "label2";
@@ -243,10 +243,10 @@
             // 
             // button1
             // 
-            this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.button1.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Right)));
             this.button1.AutoSize = true;
-            this.button1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.button1.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.button1.FlatStyle = ShiftUI.FlatStyle.Standard;
             this.button1.Location = new System.Drawing.Point(1233, 510);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(83, 25);
@@ -257,10 +257,10 @@
             // 
             // button2
             // 
-            this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.button2.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Right)));
             this.button2.AutoSize = true;
-            this.button2.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.button2.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.button2.FlatStyle = ShiftUI.FlatStyle.Standard;
             this.button2.Location = new System.Drawing.Point(1210, 12);
             this.button2.Name = "button2";
             this.button2.Size = new System.Drawing.Size(106, 25);
@@ -271,8 +271,8 @@
             // 
             // flowLayoutPanel1
             // 
-            this.flowLayoutPanel1.Controls.Add(this.button3);
-            this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.flowLayoutPanel1.Widgets.Add(this.button3);
+            this.flowLayoutPanel1.Dock = ShiftUI.DockStyle.Bottom;
             this.flowLayoutPanel1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
             this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 412);
             this.flowLayoutPanel1.Name = "flowLayoutPanel1";
@@ -282,8 +282,8 @@
             // button3
             // 
             this.button3.AutoSize = true;
-            this.button3.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.button3.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.button3.FlatStyle = ShiftUI.FlatStyle.Standard;
             this.button3.Location = new System.Drawing.Point(3, 3);
             this.button3.Name = "button3";
             this.button3.Size = new System.Drawing.Size(71, 32);
@@ -295,21 +295,21 @@
             // ChooseYourApproach
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
             this.ClientSize = new System.Drawing.Size(1328, 547);
-            this.Controls.Add(this.button2);
-            this.Controls.Add(this.button1);
-            this.Controls.Add(this.pnlconfirm);
-            this.Controls.Add(this.pnlchoices);
-            this.Controls.Add(this.panel1);
-            this.Controls.Add(this.pnldescription);
-            this.Controls.Add(this.pnlmain);
+            this.Widgets.Add(this.button2);
+            this.Widgets.Add(this.button1);
+            this.Widgets.Add(this.pnlconfirm);
+            this.Widgets.Add(this.pnlchoices);
+            this.Widgets.Add(this.panel1);
+            this.Widgets.Add(this.pnldescription);
+            this.Widgets.Add(this.pnlmain);
             this.ForeColor = System.Drawing.Color.LightGreen;
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.FormBorderStyle = ShiftUI.FormBorderStyle.None;
             this.Name = "ChooseYourApproach";
             this.Text = "ChooseYourApproach";
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.onClose);
+            this.FormClosing += new ShiftUI.FormClosingEventHandler(this.onClose);
             this.Load += new System.EventHandler(this.ChooseYourApproach_Load);
             this.pnlmain.ResumeLayout(false);
             this.pnldescription.ResumeLayout(false);
@@ -326,25 +326,25 @@
 
         #endregion
 
-        private System.Windows.Forms.Panel pnlmain;
-        private System.Windows.Forms.Label lbdesc;
-        private System.Windows.Forms.Label lbtitle;
-        private System.Windows.Forms.Panel pnldescription;
-        private System.Windows.Forms.Label choicedesc;
-        private System.Windows.Forms.FlowLayoutPanel fldescbuttons;
-        private System.Windows.Forms.Button btnbegin;
-        private System.Windows.Forms.Label choicetitle;
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Panel pnlchoices;
-        private ChoiceControl choiceControl3;
-        private ChoiceControl choiceControl2;
-        private ChoiceControl cc_sidewithdevx;
-        private System.Windows.Forms.Panel pnlconfirm;
-        private System.Windows.Forms.Label lbconfirm;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Button button1;
-        private System.Windows.Forms.Button button2;
-        private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
-        private System.Windows.Forms.Button button3;
+        private ShiftUI.Panel pnlmain;
+        private ShiftUI.Label lbdesc;
+        private ShiftUI.Label lbtitle;
+        private ShiftUI.Panel pnldescription;
+        private ShiftUI.Label choicedesc;
+        private ShiftUI.FlowLayoutPanel fldescbuttons;
+        private ShiftUI.Button btnbegin;
+        private ShiftUI.Label choicetitle;
+        private ShiftUI.Panel panel1;
+        private ShiftUI.Panel pnlchoices;
+        private ChoiceWidget choiceWidget3;
+        private ChoiceWidget choiceWidget2;
+        private ChoiceWidget cc_sidewithdevx;
+        private ShiftUI.Panel pnlconfirm;
+        private ShiftUI.Label lbconfirm;
+        private ShiftUI.Label label2;
+        private ShiftUI.Button button1;
+        private ShiftUI.Button button2;
+        private ShiftUI.FlowLayoutPanel flowLayoutPanel1;
+        private ShiftUI.Button button3;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/FinalMission/ChooseYourApproach.cs b/source/WindowsFormsApplication1/FinalMission/ChooseYourApproach.cs
index c757699..4081c01 100644
--- a/source/WindowsFormsApplication1/FinalMission/ChooseYourApproach.cs
+++ b/source/WindowsFormsApplication1/FinalMission/ChooseYourApproach.cs
@@ -9,7 +9,7 @@ using System.Media;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 using NAudio;
 using NAudio.Wave;
 
@@ -47,7 +47,7 @@ namespace ShiftOS.FinalMission
 
         private void cc_sidewithdevx_Selected(object sender, EventArgs e)
         {
-            var cc = (ChoiceControl)sender;
+            var cc = (ChoiceWidget)sender;
             choice = cc.Number;
             SetupUI();
         }
diff --git a/source/WindowsFormsApplication1/FinalMission/ChooseYourApproach.resx b/source/WindowsFormsApplication1/FinalMission/ChooseYourApproach.resx
index 76cd2b7..54d4820 100644
--- a/source/WindowsFormsApplication1/FinalMission/ChooseYourApproach.resx
+++ b/source/WindowsFormsApplication1/FinalMission/ChooseYourApproach.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="lbdesc.Text" xml:space="preserve">
     <value>The time has come.
diff --git a/source/WindowsFormsApplication1/FinalMission/MissionGuide.Designer.cs b/source/WindowsFormsApplication1/FinalMission/MissionGuide.Designer.cs
index 45a51f1..8e0f629 100644
--- a/source/WindowsFormsApplication1/FinalMission/MissionGuide.Designer.cs
+++ b/source/WindowsFormsApplication1/FinalMission/MissionGuide.Designer.cs
@@ -29,21 +29,21 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.flbuttons = new System.Windows.Forms.FlowLayoutPanel();
-            this.btnstart = new System.Windows.Forms.Button();
-            this.tmr_setupui = new System.Windows.Forms.Timer(this.components);
-            this.lbprompt = new System.Windows.Forms.Label();
+            this.panel1 = new ShiftUI.Panel();
+            this.flbuttons = new ShiftUI.FlowLayoutPanel();
+            this.btnstart = new ShiftUI.Button();
+            this.tmr_setupui = new ShiftUI.Timer(this.components);
+            this.lbprompt = new ShiftUI.Label();
             this.panel1.SuspendLayout();
             this.flbuttons.SuspendLayout();
             this.SuspendLayout();
             // 
             // panel1
             // 
-            this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.panel1.Controls.Add(this.lbprompt);
-            this.panel1.Controls.Add(this.flbuttons);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel1.BorderStyle = ShiftUI.BorderStyle.FixedSingle;
+            this.panel1.Widgets.Add(this.lbprompt);
+            this.panel1.Widgets.Add(this.flbuttons);
+            this.panel1.Dock = ShiftUI.DockStyle.Fill;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
             this.panel1.Size = new System.Drawing.Size(520, 189);
@@ -51,9 +51,9 @@
             // 
             // flbuttons
             // 
-            this.flbuttons.Controls.Add(this.btnstart);
-            this.flbuttons.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.flbuttons.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft;
+            this.flbuttons.Widgets.Add(this.btnstart);
+            this.flbuttons.Dock = ShiftUI.DockStyle.Bottom;
+            this.flbuttons.FlowDirection = ShiftUI.FlowDirection.RightToLeft;
             this.flbuttons.Location = new System.Drawing.Point(0, 155);
             this.flbuttons.Name = "flbuttons";
             this.flbuttons.Size = new System.Drawing.Size(518, 32);
@@ -62,8 +62,8 @@
             // btnstart
             // 
             this.btnstart.AutoSize = true;
-            this.btnstart.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnstart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnstart.AutoSizeMode = ShiftUI.AutoSizeMode.GrowAndShrink;
+            this.btnstart.FlatStyle = ShiftUI.FlatStyle.Standard;
             this.btnstart.Location = new System.Drawing.Point(435, 3);
             this.btnstart.Name = "btnstart";
             this.btnstart.Size = new System.Drawing.Size(80, 23);
@@ -79,11 +79,11 @@
             // 
             // lbprompt
             // 
-            this.lbprompt.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lbprompt.Dock = ShiftUI.DockStyle.Fill;
             this.lbprompt.Location = new System.Drawing.Point(0, 0);
-            this.lbprompt.Margin = new System.Windows.Forms.Padding(50);
+            this.lbprompt.Margin = new ShiftUI.Padding(50);
             this.lbprompt.Name = "lbprompt";
-            this.lbprompt.Padding = new System.Windows.Forms.Padding(15);
+            this.lbprompt.Padding = new ShiftUI.Padding(15);
             this.lbprompt.Size = new System.Drawing.Size(518, 155);
             this.lbprompt.TabIndex = 1;
             this.lbprompt.Text = "label1";
@@ -91,13 +91,13 @@
             // MissionGuide
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 11F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.Black;
             this.ClientSize = new System.Drawing.Size(520, 189);
-            this.Controls.Add(this.panel1);
+            this.Widgets.Add(this.panel1);
             this.Font = new System.Drawing.Font("Lucida Console", 8.25F);
             this.ForeColor = System.Drawing.Color.LightGreen;
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.FormBorderStyle = ShiftUI.FormBorderStyle.None;
             this.Name = "MissionGuide";
             this.Text = "MissionGuide";
             this.panel1.ResumeLayout(false);
@@ -109,10 +109,10 @@
 
         #endregion
 
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.FlowLayoutPanel flbuttons;
-        private System.Windows.Forms.Button btnstart;
-        private System.Windows.Forms.Timer tmr_setupui;
-        private System.Windows.Forms.Label lbprompt;
+        private ShiftUI.Panel panel1;
+        private ShiftUI.FlowLayoutPanel flbuttons;
+        private ShiftUI.Button btnstart;
+        private ShiftUI.Timer tmr_setupui;
+        private ShiftUI.Label lbprompt;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/FinalMission/MissionGuide.cs b/source/WindowsFormsApplication1/FinalMission/MissionGuide.cs
index 11f1f10..e7523cb 100644
--- a/source/WindowsFormsApplication1/FinalMission/MissionGuide.cs
+++ b/source/WindowsFormsApplication1/FinalMission/MissionGuide.cs
@@ -6,7 +6,7 @@ using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS.FinalMission
 {
diff --git a/source/WindowsFormsApplication1/FinalMission/MissionGuide.resx b/source/WindowsFormsApplication1/FinalMission/MissionGuide.resx
index 10f6fc7..326353a 100644
--- a/source/WindowsFormsApplication1/FinalMission/MissionGuide.resx
+++ b/source/WindowsFormsApplication1/FinalMission/MissionGuide.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="tmr_setupui.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
diff --git a/source/WindowsFormsApplication1/FinalMission/QuestViewer.Designer.cs b/source/WindowsFormsApplication1/FinalMission/QuestViewer.Designer.cs
index 89cfd19..fa70485 100644
--- a/source/WindowsFormsApplication1/FinalMission/QuestViewer.Designer.cs
+++ b/source/WindowsFormsApplication1/FinalMission/QuestViewer.Designer.cs
@@ -28,12 +28,12 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.lbobjectives = new System.Windows.Forms.ListBox();
+            this.lbobjectives = new ShiftUI.ListBox();
             this.SuspendLayout();
             // 
             // lbobjectives
             // 
-            this.lbobjectives.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lbobjectives.Dock = ShiftUI.DockStyle.Fill;
             this.lbobjectives.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Italic);
             this.lbobjectives.FormattingEnabled = true;
             this.lbobjectives.ItemHeight = 16;
@@ -45,9 +45,9 @@
             // QuestViewer
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(389, 423);
-            this.Controls.Add(this.lbobjectives);
+            this.Widgets.Add(this.lbobjectives);
             this.Name = "QuestViewer";
             this.Text = "QuestViewer";
             this.Load += new System.EventHandler(this.QuestViewer_Load);
@@ -57,6 +57,6 @@
 
         #endregion
 
-        private System.Windows.Forms.ListBox lbobjectives;
+        private ShiftUI.ListBox lbobjectives;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/FinalMission/QuestViewer.cs b/source/WindowsFormsApplication1/FinalMission/QuestViewer.cs
index 3b447f9..2a943e5 100644
--- a/source/WindowsFormsApplication1/FinalMission/QuestViewer.cs
+++ b/source/WindowsFormsApplication1/FinalMission/QuestViewer.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS.FinalMission
 {
@@ -22,7 +22,7 @@ namespace ShiftOS.FinalMission
         {
             SetupList();
             StartQuestCheckThread();
-            var tmr = new System.Windows.Forms.Timer();
+            var tmr = new ShiftUI.Timer();
             tmr.Interval = 500;
             tmr.Tick += (object s, EventArgs a) =>
             {
diff --git a/source/WindowsFormsApplication1/FinalMission/QuestViewer.resx b/source/WindowsFormsApplication1/FinalMission/QuestViewer.resx
index 1af7de1..ffb4fb5 100644
--- a/source/WindowsFormsApplication1/FinalMission/QuestViewer.resx
+++ b/source/WindowsFormsApplication1/FinalMission/QuestViewer.resx
@@ -15,8 +15,8 @@
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, ShiftUI, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, ShiftUI, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, ShiftUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
\ No newline at end of file