Merge pull request #17 from MichaelTheShifter/shiftui_integration

Shiftui integration

1 files changed, 17 insertions, 9 deletions

diff --git a/source/WindowsFormsApplication1/Apps/NetGen.cs b/source/WindowsFormsApplication1/Apps/NetGen.cs
index 616505d..2c64971 100644
--- a/source/WindowsFormsApplication1/Apps/NetGen.cs
+++ b/source/WindowsFormsApplication1/Apps/NetGen.cs
@@ -7,16 +7,24 @@ using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using ShiftUI;
 
 namespace ShiftOS
 {
     public partial class NetGen : Form
     {
-        public NetGen()
-        {
-            InitializeComponent();
-        }
+		public NetGen()
+		{
+			try
+			{
+				InitializeComponent();
+			}
+			catch (Exception ex)
+			{
+				API.Crash(ex);
+				Close();
+			}
+		}
 
         private EnemyHacker network = null;
         private int stage = 0;
@@ -51,7 +59,7 @@ namespace ShiftOS
                     {
                         foreach(var p in potentialModules)
                         {
-                            pnlnetdesign.Controls.Remove(p);
+                            pnlnetdesign.Widgets.Remove(p);
                             p.Hide();
                             
                         }
@@ -71,7 +79,7 @@ namespace ShiftOS
                     var c = network.Network[0].Deploy();
                     c.Left = (pnlnetdesign.Width - 64) / 2;
                     c.Top = (pnlnetdesign.Height - 64) / 2;
-                    pnlnetdesign.Controls.Add(c);
+                    pnlnetdesign.Widgets.Add(c);
                     c.Select += (s, a) =>
                     {
                         ShowSysInf(c);
@@ -236,7 +244,7 @@ namespace ShiftOS
                     fmod.HP = fmod.GetTotalHP();
                     var computerToPlace = fmod.Deploy();
                     computerToPlace.Location = new Point(x, y);
-                    pnlnetdesign.Controls.Add(computerToPlace);
+                    pnlnetdesign.Widgets.Add(computerToPlace);
                     potentialModules.Add(computerToPlace);
                     computerToPlace.Select += (s, a) =>
                     {
@@ -270,7 +278,7 @@ namespace ShiftOS
             if(SelectedSystem != null)
             {
                 potentialModules.Remove(SelectedSystem);
-                pnlnetdesign.Controls.Remove(SelectedSystem);
+                pnlnetdesign.Widgets.Remove(SelectedSystem);
                 SelectedSystem.Dispose();
             }
             SelectedSystem = null;