Merge pull request #5 from AShifter/master

Update WM

7 files changed, 8 insertions, 8 deletions

diff --git a/ShiftOS.Main/ShiftOS.Main.csproj b/ShiftOS.Main/ShiftOS.Main.csproj
index 1343d99..77bf889 100644
--- a/ShiftOS.Main/ShiftOS.Main.csproj
+++ b/ShiftOS.Main/ShiftOS.Main.csproj
@@ -52,16 +52,16 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ShiftDemo.cs">
+    <Compile Include="ShiftOS\Apps\ShiftDemo.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="ShiftDemo.Designer.cs">
+    <Compile Include="ShiftOS\Apps\ShiftDemo.Designer.cs">
       <DependentUpon>ShiftDemo.cs</DependentUpon>
     </Compile>
-    <Compile Include="TestForm.cs">
+    <Compile Include="ShiftOS\Apps\TestForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="TestForm.Designer.cs">
+    <Compile Include="ShiftOS\Apps\TestForm.Designer.cs">
       <DependentUpon>TestForm.cs</DependentUpon>
     </Compile>
     <EmbeddedResource Include="HijackScreen.resx">
@@ -77,10 +77,10 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
-    <EmbeddedResource Include="ShiftDemo.resx">
+    <EmbeddedResource Include="ShiftOS\Apps\ShiftDemo.resx">
       <DependentUpon>ShiftDemo.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="TestForm.resx">
+    <EmbeddedResource Include="ShiftOS\Apps\TestForm.resx">
       <DependentUpon>TestForm.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="Properties\Settings.settings">
diff --git a/ShiftOS.Main/ShiftDemo.Designer.cs b/ShiftOS.Main/ShiftOS/Apps/ShiftDemo.Designer.cs
index 5c3a0de..5c3a0de 100644
--- a/ShiftOS.Main/ShiftDemo.Designer.cs
+++ b/ShiftOS.Main/ShiftOS/Apps/ShiftDemo.Designer.cs
diff --git a/ShiftOS.Main/ShiftDemo.cs b/ShiftOS.Main/ShiftOS/Apps/ShiftDemo.cs
index 1f400c8..1f400c8 100644
--- a/ShiftOS.Main/ShiftDemo.cs
+++ b/ShiftOS.Main/ShiftOS/Apps/ShiftDemo.cs
diff --git a/ShiftOS.Main/ShiftDemo.resx b/ShiftOS.Main/ShiftOS/Apps/ShiftDemo.resx
index 1af7de1..1af7de1 100644
--- a/ShiftOS.Main/ShiftDemo.resx
+++ b/ShiftOS.Main/ShiftOS/Apps/ShiftDemo.resx
diff --git a/ShiftOS.Main/TestForm.Designer.cs b/ShiftOS.Main/ShiftOS/Apps/TestForm.Designer.cs
index 654466d..654466d 100644
--- a/ShiftOS.Main/TestForm.Designer.cs
+++ b/ShiftOS.Main/ShiftOS/Apps/TestForm.Designer.cs
diff --git a/ShiftOS.Main/TestForm.cs b/ShiftOS.Main/ShiftOS/Apps/TestForm.cs
index e1f926f..85be4a3 100644
--- a/ShiftOS.Main/TestForm.cs
+++ b/ShiftOS.Main/ShiftOS/Apps/TestForm.cs
@@ -7,7 +7,6 @@ namespace ShiftOS.Main
     public partial class TestForm : Form
     {
         public ShiftWM shiftWM = new ShiftWM();
-        public ShiftDemo demo = new ShiftDemo();
 
         public TestForm()
         {
@@ -16,8 +15,9 @@ 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);
+            shiftWM.Init(demo, textBox1.Text, null);
         }
     }
 }
diff --git a/ShiftOS.Main/TestForm.resx b/ShiftOS.Main/ShiftOS/Apps/TestForm.resx
index 1af7de1..1af7de1 100644
--- a/ShiftOS.Main/TestForm.resx
+++ b/ShiftOS.Main/ShiftOS/Apps/TestForm.resx