From a913f006708312fa844d304641b207e9ff730b30 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@zerotier.com>
Date: Fri, 8 May 2015 11:55:09 -0700
Subject: Windows WebControl based wrapper for web UI.

---
 windows/WebUIWrapper/Form1.Designer.cs | 70 ++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 windows/WebUIWrapper/Form1.Designer.cs

(limited to 'windows/WebUIWrapper/Form1.Designer.cs')

diff --git a/windows/WebUIWrapper/Form1.Designer.cs b/windows/WebUIWrapper/Form1.Designer.cs
new file mode 100644
index 00000000..350772e0
--- /dev/null
+++ b/windows/WebUIWrapper/Form1.Designer.cs
@@ -0,0 +1,70 @@
+namespace WebUIWrapper
+{
+    partial class Form1
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
+            this.webContainer = new System.Windows.Forms.WebBrowser();
+            this.SuspendLayout();
+            // 
+            // webContainer
+            // 
+            this.webContainer.AllowNavigation = false;
+            this.webContainer.AllowWebBrowserDrop = false;
+            this.webContainer.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.webContainer.IsWebBrowserContextMenuEnabled = false;
+            this.webContainer.Location = new System.Drawing.Point(0, 0);
+            this.webContainer.MinimumSize = new System.Drawing.Size(20, 20);
+            this.webContainer.Name = "webContainer";
+            this.webContainer.ScriptErrorsSuppressed = true;
+            this.webContainer.ScrollBarsEnabled = false;
+            this.webContainer.Size = new System.Drawing.Size(1012, 556);
+            this.webContainer.TabIndex = 0;
+            this.webContainer.Url = new System.Uri("", System.UriKind.Relative);
+            this.webContainer.WebBrowserShortcutsEnabled = false;
+            // 
+            // Form1
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1012, 556);
+            this.Controls.Add(this.webContainer);
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Name = "Form1";
+            this.Text = "ZeroTier One";
+            this.Load += new System.EventHandler(this.Form1_Load);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.WebBrowser webContainer;
+    }
+}
+
-- 
cgit v1.2.3


From c1e5c1c710d48fd065cce963834f3eec3ec1a69c Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@zerotier.com>
Date: Fri, 8 May 2015 14:51:24 -0700
Subject: Fix some settings on WebControl implementation.

---
 windows/WebUIWrapper/Form1.Designer.cs | 5 -----
 windows/WebUIWrapper/Form1.cs          | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'windows/WebUIWrapper/Form1.Designer.cs')

diff --git a/windows/WebUIWrapper/Form1.Designer.cs b/windows/WebUIWrapper/Form1.Designer.cs
index 350772e0..8d8eb9e9 100644
--- a/windows/WebUIWrapper/Form1.Designer.cs
+++ b/windows/WebUIWrapper/Form1.Designer.cs
@@ -35,18 +35,13 @@
             // webContainer
             // 
             this.webContainer.AllowNavigation = false;
-            this.webContainer.AllowWebBrowserDrop = false;
             this.webContainer.Dock = System.Windows.Forms.DockStyle.Fill;
             this.webContainer.IsWebBrowserContextMenuEnabled = false;
             this.webContainer.Location = new System.Drawing.Point(0, 0);
             this.webContainer.MinimumSize = new System.Drawing.Size(20, 20);
             this.webContainer.Name = "webContainer";
-            this.webContainer.ScriptErrorsSuppressed = true;
-            this.webContainer.ScrollBarsEnabled = false;
             this.webContainer.Size = new System.Drawing.Size(1012, 556);
             this.webContainer.TabIndex = 0;
-            this.webContainer.Url = new System.Uri("", System.UriKind.Relative);
-            this.webContainer.WebBrowserShortcutsEnabled = false;
             // 
             // Form1
             // 
diff --git a/windows/WebUIWrapper/Form1.cs b/windows/WebUIWrapper/Form1.cs
index 35ee5369..40d5da9d 100644
--- a/windows/WebUIWrapper/Form1.cs
+++ b/windows/WebUIWrapper/Form1.cs
@@ -62,7 +62,7 @@ namespace WebUIWrapper
                     this.Close();
                     return;
                 }
-                webContainer.Url = new System.Uri("http://127.0.0.1:" + port.ToString() + "/index.html?authToken=" + authToken);
+                webContainer.Navigate("http://127.0.0.1:" + port.ToString() + "/index.html?authToken=" + authToken);
             }
             catch
             {
-- 
cgit v1.2.3