Merge pull request #17 from MichaelTheShifter/shiftui_integration

Shiftui integration

5 files changed, 33 insertions, 33 deletions

diff --git a/source/WindowsFormsApplication1/Online/ConnectionManager.Designer.cs b/source/WindowsFormsApplication1/Online/ConnectionManager.Designer.cs
index 89abcca..c126d85 100644
--- a/source/WindowsFormsApplication1/Online/ConnectionManager.Designer.cs
+++ b/source/WindowsFormsApplication1/Online/ConnectionManager.Designer.cs
@@ -28,21 +28,21 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.lbconnections = new System.Windows.Forms.ListBox();
-            this.flbuttons = new System.Windows.Forms.FlowLayoutPanel();
-            this.btnadd = new System.Windows.Forms.Button();
-            this.btnconnect = new System.Windows.Forms.Button();
-            this.btndisconnect = new System.Windows.Forms.Button();
+            this.panel1 = new ShiftUI.Panel();
+            this.lbconnections = new ShiftUI.ListBox();
+            this.flbuttons = new ShiftUI.FlowLayoutPanel();
+            this.btnadd = new ShiftUI.Button();
+            this.btnconnect = new ShiftUI.Button();
+            this.btndisconnect = new ShiftUI.Button();
             this.panel1.SuspendLayout();
             this.flbuttons.SuspendLayout();
             this.SuspendLayout();
             // 
             // panel1
             // 
-            this.panel1.Controls.Add(this.flbuttons);
-            this.panel1.Controls.Add(this.lbconnections);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel1.Widgets.Add(this.flbuttons);
+            this.panel1.Widgets.Add(this.lbconnections);
+            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(684, 531);
@@ -50,9 +50,9 @@
             // 
             // lbconnections
             // 
-            this.lbconnections.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.lbconnections.Anchor = ((ShiftUI.AnchorStyles)((((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Bottom) 
+            | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
             this.lbconnections.FormattingEnabled = true;
             this.lbconnections.Location = new System.Drawing.Point(13, 13);
             this.lbconnections.Name = "lbconnections";
@@ -62,11 +62,11 @@
             // 
             // flbuttons
             // 
-            this.flbuttons.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.flbuttons.Controls.Add(this.btnadd);
-            this.flbuttons.Controls.Add(this.btnconnect);
-            this.flbuttons.Controls.Add(this.btndisconnect);
+            this.flbuttons.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Bottom | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.flbuttons.Widgets.Add(this.btnadd);
+            this.flbuttons.Widgets.Add(this.btnconnect);
+            this.flbuttons.Widgets.Add(this.btndisconnect);
             this.flbuttons.Location = new System.Drawing.Point(13, 489);
             this.flbuttons.Name = "flbuttons";
             this.flbuttons.Size = new System.Drawing.Size(659, 30);
@@ -105,9 +105,9 @@
             // ConnectionManager
             // 
             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(684, 531);
-            this.Controls.Add(this.panel1);
+            this.Widgets.Add(this.panel1);
             this.Name = "ConnectionManager";
             this.Text = "ConnectionManager";
             this.Load += new System.EventHandler(this.ConnectionManager_Load);
@@ -119,11 +119,11 @@
 
         #endregion
 
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.FlowLayoutPanel flbuttons;
-        private System.Windows.Forms.Button btnadd;
-        private System.Windows.Forms.Button btnconnect;
-        private System.Windows.Forms.Button btndisconnect;
-        private System.Windows.Forms.ListBox lbconnections;
+        private ShiftUI.Panel panel1;
+        private ShiftUI.FlowLayoutPanel flbuttons;
+        private ShiftUI.Button btnadd;
+        private ShiftUI.Button btnconnect;
+        private ShiftUI.Button btndisconnect;
+        private ShiftUI.ListBox lbconnections;
     }
 }
\ No newline at end of file
diff --git a/source/WindowsFormsApplication1/Online/ConnectionManager.cs b/source/WindowsFormsApplication1/Online/ConnectionManager.cs
index eaf2a24..af22ad2 100644
--- a/source/WindowsFormsApplication1/Online/ConnectionManager.cs
+++ b/source/WindowsFormsApplication1/Online/ConnectionManager.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
 {
diff --git a/source/WindowsFormsApplication1/Online/ConnectionManager.resx b/source/WindowsFormsApplication1/Online/ConnectionManager.resx
index 1af7de1..ffb4fb5 100644
--- a/source/WindowsFormsApplication1/Online/ConnectionManager.resx
+++ b/source/WindowsFormsApplication1/Online/ConnectionManager.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/Online/Hacking/Matchmaker.cs b/source/WindowsFormsApplication1/Online/Hacking/Matchmaker.cs
index 1fb6f1b..85e672b 100644
--- a/source/WindowsFormsApplication1/Online/Hacking/Matchmaker.cs
+++ b/source/WindowsFormsApplication1/Online/Hacking/Matchmaker.cs
@@ -18,7 +18,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS.Online.Hacking
 {
diff --git a/source/WindowsFormsApplication1/Online/Package_Grabber.cs b/source/WindowsFormsApplication1/Online/Package_Grabber.cs
index b6bbc61..854e96f 100644
--- a/source/WindowsFormsApplication1/Online/Package_Grabber.cs
+++ b/source/WindowsFormsApplication1/Online/Package_Grabber.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using System.IO;
 using System.IO.Compression;
 using Newtonsoft.Json;
-using System.Windows.Forms;
+using ShiftUI;
 using System.Threading;
 using System.Drawing;
 using NetSockets;
@@ -188,7 +188,7 @@ namespace ShiftOS
                     Directory.CreateDirectory(downloadpath);
                 }
                 WebClient wc = new WebClient();
-                wc.DownloadFile("http://playshiftos.ml/shiftnet/packages/" + pkgname + ".pkg", downloadpath + pkgname + ".pkg");
+                wc.DownloadFile("http://releases.playshiftos.ml/shiftnet/packages/" + pkgname + ".pkg", downloadpath + pkgname + ".pkg");
                 LastPackage_DownloadPath = downloadpath + pkgname + ".pkg";
             }
             catch