Merge pull request #17 from MichaelTheShifter/shiftui_integration

Shiftui integration

1 files changed, 34 insertions, 34 deletions

diff --git a/source/WindowsFormsApplication1/Apps/Shiftnet.Designer.cs b/source/WindowsFormsApplication1/Apps/Shiftnet.Designer.cs
index cafae5f..ea78334 100644
--- a/source/WindowsFormsApplication1/Apps/Shiftnet.Designer.cs
+++ b/source/WindowsFormsApplication1/Apps/Shiftnet.Designer.cs
@@ -1,4 +1,6 @@
-namespace ShiftOS
+using System;
+
+namespace ShiftOS
 {
     partial class Shiftnet
     {
@@ -28,12 +30,12 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.pnlcontrols = new System.Windows.Forms.Panel();
-            this.btngo = new System.Windows.Forms.Button();
-            this.btnhome = new System.Windows.Forms.Button();
-            this.txtaddress = new System.Windows.Forms.TextBox();
-            this.wbshiftnet = new System.Windows.Forms.WebBrowser();
-            this.panel1 = new System.Windows.Forms.Panel();
+            this.pnlcontrols = new ShiftUI.Panel();
+            this.btngo = new ShiftUI.Button();
+            this.btnhome = new ShiftUI.Button();
+            this.txtaddress = new ShiftUI.TextBox();
+            this.wbshiftnet = new Gecko.GeckoWebBrowser();
+            this.panel1 = new ShiftUI.Panel();
             this.pnlcontrols.SuspendLayout();
             this.panel1.SuspendLayout();
             this.SuspendLayout();
@@ -41,10 +43,10 @@
             // pnlcontrols
             // 
             this.pnlcontrols.BackColor = System.Drawing.Color.Gray;
-            this.pnlcontrols.Controls.Add(this.btngo);
-            this.pnlcontrols.Controls.Add(this.btnhome);
-            this.pnlcontrols.Controls.Add(this.txtaddress);
-            this.pnlcontrols.Dock = System.Windows.Forms.DockStyle.Top;
+            this.pnlcontrols.Widgets.Add(this.btngo);
+            this.pnlcontrols.Widgets.Add(this.btnhome);
+            this.pnlcontrols.Widgets.Add(this.txtaddress);
+            this.pnlcontrols.Dock = ShiftUI.DockStyle.Top;
             this.pnlcontrols.Location = new System.Drawing.Point(0, 0);
             this.pnlcontrols.Name = "pnlcontrols";
             this.pnlcontrols.Size = new System.Drawing.Size(792, 42);
@@ -52,9 +54,9 @@
             // 
             // btngo
             // 
-            this.btngo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btngo.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.btngo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btngo.Anchor = ((ShiftUI.AnchorStyles)((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Right)));
+            this.btngo.DialogResult = ShiftUI.DialogResult.Cancel;
+            this.btngo.FlatStyle = ShiftUI.FlatStyle.Standard;
             this.btngo.Font = new System.Drawing.Font("Times New Roman", 8.25F);
             this.btngo.ForeColor = System.Drawing.Color.White;
             this.btngo.Location = new System.Drawing.Point(731, 9);
@@ -67,8 +69,8 @@
             // 
             // btnhome
             // 
-            this.btnhome.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.btnhome.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnhome.DialogResult = ShiftUI.DialogResult.Cancel;
+            this.btnhome.FlatStyle = ShiftUI.FlatStyle.Standard;
             this.btnhome.Font = new System.Drawing.Font("Times New Roman", 8.25F);
             this.btnhome.ForeColor = System.Drawing.Color.White;
             this.btnhome.Location = new System.Drawing.Point(4, 12);
@@ -81,9 +83,9 @@
             // 
             // txtaddress
             // 
-            this.txtaddress.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtaddress.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.txtaddress.Anchor = ((ShiftUI.AnchorStyles)(((ShiftUI.AnchorStyles.Top | ShiftUI.AnchorStyles.Left) 
+            | ShiftUI.AnchorStyles.Right)));
+            this.txtaddress.BorderStyle = ShiftUI.BorderStyle.None;
             this.txtaddress.Font = new System.Drawing.Font("Times New Roman", 13F);
             this.txtaddress.Location = new System.Drawing.Point(85, 12);
             this.txtaddress.Name = "txtaddress";
@@ -94,21 +96,19 @@
             // 
             // wbshiftnet
             // 
-            this.wbshiftnet.AllowWebBrowserDrop = false;
-            this.wbshiftnet.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.wbshiftnet.IsWebBrowserContextMenuEnabled = false;
+            this.wbshiftnet.Dock = (System.Windows.Forms.DockStyle)ShiftUI.DockStyle.Fill;
             this.wbshiftnet.Location = new System.Drawing.Point(0, 42);
             this.wbshiftnet.MinimumSize = new System.Drawing.Size(20, 20);
             this.wbshiftnet.Name = "wbshiftnet";
             this.wbshiftnet.Size = new System.Drawing.Size(792, 463);
             this.wbshiftnet.TabIndex = 1;
-            this.wbshiftnet.Navigating += new System.Windows.Forms.WebBrowserNavigatingEventHandler(this.LinkInterceptor);
+            this.wbshiftnet.Navigating += new EventHandler<Gecko.Events.GeckoNavigatingEventArgs>(this.LinkInterceptor);
             // 
             // panel1
             // 
-            this.panel1.Controls.Add(this.wbshiftnet);
-            this.panel1.Controls.Add(this.pnlcontrols);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel1.Widgets.Add(this.wbshiftnet.ToWidget());
+            this.panel1.Widgets.Add(this.pnlcontrols);
+            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(792, 505);
@@ -118,10 +118,10 @@
             // 
             this.AcceptButton = this.btngo;
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = ShiftUI.AutoScaleMode.Font;
             this.CancelButton = this.btnhome;
             this.ClientSize = new System.Drawing.Size(792, 505);
-            this.Controls.Add(this.panel1);
+            this.Widgets.Add(this.panel1);
             this.Name = "Shiftnet";
             this.Text = "MainForm";
             this.Load += new System.EventHandler(this.MainForm_Load);
@@ -134,12 +134,12 @@
 
         #endregion
 
-        private System.Windows.Forms.Panel pnlcontrols;
-        private System.Windows.Forms.WebBrowser wbshiftnet;
-        private System.Windows.Forms.Button btngo;
-        private System.Windows.Forms.Button btnhome;
-        private System.Windows.Forms.TextBox txtaddress;
-        private System.Windows.Forms.Panel panel1;
+        private ShiftUI.Panel pnlcontrols;
+        private Gecko.GeckoWebBrowser wbshiftnet;
+        private ShiftUI.Button btngo;
+        private ShiftUI.Button btnhome;
+        private ShiftUI.TextBox txtaddress;
+        private ShiftUI.Panel panel1;
 
     }
 }
\ No newline at end of file