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

1 files changed, 12 insertions, 10 deletions

diff --git a/ShiftOS.Main/ShiftOS/Apps/TestForm.cs b/ShiftOS.Main/ShiftOS/Apps/TestForm.cs
index c8cd086..1fd3b18 100644
--- a/ShiftOS.Main/ShiftOS/Apps/TestForm.cs
+++ b/ShiftOS.Main/ShiftOS/Apps/TestForm.cs
@@ -1,5 +1,8 @@
 using System;
+using System.Drawing;
+using System.Linq;
 using System.Windows.Forms;
+using ShiftOS.Engine;
 using ShiftOS.Engine.WindowManager;
 using ShiftOS.Main.ShiftOS.Apps;
 
@@ -7,8 +10,6 @@ namespace ShiftOS.Main
 {
     public partial class TestForm : Form
     {
-        public ShiftWM shiftWM = new ShiftWM();
-
         public TestForm()
         {
             InitializeComponent();
@@ -16,15 +17,16 @@ namespace ShiftOS.Main
 
         private void Button1_Click(object sender, EventArgs e)
         {
-            ShiftDemo demo = new ShiftDemo();
-            demo.label1.Text = textBox2.Text;
-            shiftWM.Init(demo, textBox1.Text, null);
-            shiftWM.StartInfoboxSession(textBox1.Text, textBox2.Text, InfoboxTemplate.buttonType.OK);
-        }
+	        ShiftDemo demo = new ShiftDemo {label1 = {Text = textBox2.Text}};
 
-        private void button2_Click(object sender, EventArgs e)
-        {
-            shiftWM.Init(new Shifter(), "Shifter", Properties.Resources.iconShifter);
+	        var item = typeof(SystemIcons).GetProperties()
+		        .First(p => p.Name == comboBox1.SelectedItem as string);
+
+			ShiftWM.Init(demo, textBox1.Text, (item.GetMethod.Invoke(null, new object[0]) as Icon));
+	        ShiftWM.StartInfoboxSession(textBox1.Text, textBox2.Text, InfoboxTemplate.ButtonType.Ok);
         }
+
+        private void button2_Click(object sender, EventArgs e) 
+			=> ShiftWM.Init(new Shifter(), "Shifter", Properties.Resources.iconShifter.ToIcon());
     }
 }