From 6040574d8d9263ac50a607d12195c44c3746f47b Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Mon, 19 Oct 2015 20:20:42 -0700
Subject: set up project and base UI for a native windows UI for ZeroTier

---
 windows/WinUI/MainWindow.xaml | 95 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 95 insertions(+)
 create mode 100644 windows/WinUI/MainWindow.xaml

(limited to 'windows/WinUI/MainWindow.xaml')

diff --git a/windows/WinUI/MainWindow.xaml b/windows/WinUI/MainWindow.xaml
new file mode 100644
index 00000000..c104dfb6
--- /dev/null
+++ b/windows/WinUI/MainWindow.xaml
@@ -0,0 +1,95 @@
+<Window
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" x:Class="WinUI.MainWindow"
+        Title="ZeroTier One" Height="495" Width="705">
+	
+	<Window.Resources>
+		<ResourceDictionary>
+			<Style TargetType="{x:Type TabItem}">
+				<Setter Property="BorderThickness"
+						Value="3" />
+				<Setter Property="BorderBrush"
+						Value="Blue" />
+				<Setter Property="VerticalContentAlignment"
+						Value="Center" />
+				<Setter Property="HorizontalContentAlignment"
+						Value="Center" />
+				<Setter Property="Template">
+					<Setter.Value>
+						<ControlTemplate TargetType="{x:Type TabItem}">
+							<Border>
+								<Grid>
+									<Grid>
+										<Border x:Name="border" 
+												CornerRadius="3,3,0,0"
+												Background="{TemplateBinding Background}"
+												BorderBrush="{TemplateBinding BorderBrush}"
+												BorderThickness="1,1,1,0" />
+									</Grid>
+									<Border BorderThickness="{TemplateBinding BorderThickness}"
+											Padding="{TemplateBinding Padding}">
+										<ContentPresenter ContentSource="Header"
+														  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+														  VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+									</Border>
+								</Grid>
+							</Border>
+							<ControlTemplate.Triggers>
+								<Trigger Property="IsSelected"
+										 Value="True">
+									<Setter TargetName="border"
+											Property="BorderBrush"
+												Value="#ff91a2a3" />
+									<Setter TargetName="border"
+											Property="BorderThickness"
+											Value="0,3,0,0" />
+								</Trigger>
+							</ControlTemplate.Triggers>
+						</ControlTemplate>
+					</Setter.Value>
+				</Setter>
+			</Style>
+		</ResourceDictionary>
+	</Window.Resources>
+
+	<DockPanel>
+		<StatusBar DockPanel.Dock="Bottom" Height="34" Background="#FF234447" Margin="0">
+			<StatusBar.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="*"/>
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+							<ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="Auto"/>
+							<ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+                    </Grid>
+                </ItemsPanelTemplate>
+            </StatusBar.ItemsPanel>
+			<StatusBarItem Grid.Column="0" x:Name="networkId" Content="Network ID" Foreground="White"/>
+			<StatusBarItem Grid.Column="1" x:Name="onlineStatus" Content="ONLINE" Foreground="White"/>
+			<StatusBarItem Grid.Column="2" x:Name="versionString" Content="1.0.5" Foreground="White" Margin="0"/>
+			<StatusBarItem Grid.Column="3" x:Name="blank" Content="" Height="43" Foreground="White" Margin="6,0,-6,-9"/>
+			<StatusBarItem Grid.Column="4">
+				<TextBox x:Name="joinNetworkID" Height="23" TextWrapping="Wrap" Width="120" HorizontalAlignment="Right" RenderTransformOrigin="1.168,0.478" ToolTip="Enter Network ID"/>
+			</StatusBarItem>
+			<StatusBarItem Grid.Column="5" x:Name="statusBarButton" Foreground="White" RenderTransformOrigin="0.789,0.442">
+				<Button x:Name="joinButton" Content="Join" Background="#FFFFB354" Width="77.423"/>
+			</StatusBarItem>
+		</StatusBar>
+		<TabControl>
+			<TabItem x:Name="Networks" Header="Networks" Background="#FF234447" Foreground="White" IsSelected="True" IsManipulationEnabled="True">
+				<Grid Background="#FFE5E5E5"/>
+			</TabItem>
+			<TabItem x:Name="Peers" Header="Peers" Background="#FF234447" Foreground="White">
+				<Grid Background="#FFE5E5E5"/>
+			</TabItem>
+		</TabControl>
+	</DockPanel>
+</Window>
-- 
cgit v1.2.3


From 80d02d189a4450d2773e18de6a56c02d0290c5cd Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Mon, 19 Oct 2015 20:30:21 -0700
Subject: set the main window icon

---
 windows/WinUI/MainWindow.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'windows/WinUI/MainWindow.xaml')

diff --git a/windows/WinUI/MainWindow.xaml b/windows/WinUI/MainWindow.xaml
index c104dfb6..299d3676 100644
--- a/windows/WinUI/MainWindow.xaml
+++ b/windows/WinUI/MainWindow.xaml
@@ -2,7 +2,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" x:Class="WinUI.MainWindow"
-        Title="ZeroTier One" Height="495" Width="705">
+        Title="ZeroTier One" Height="495" Width="705" Icon="ZeroTierIcon.ico">
 	
 	<Window.Resources>
 		<ResourceDictionary>
-- 
cgit v1.2.3


From 5b6ddaa2d744dfc726829da0893a7f03c9043c8a Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Wed, 21 Oct 2015 20:29:03 -0700
Subject: Base windows UI is working.

* No joining/leaving networks yet, but they do display.
* Nothing is updated yet after first load of the app.  Need to set up a background task to run updates.
---
 .gitignore                            |   1 +
 windows/WinUI/APIHandler.cs           |  69 ++++++++++++++++++++++
 windows/WinUI/MainWindow.xaml         |  15 +++--
 windows/WinUI/MainWindow.xaml.cs      |  21 +++++++
 windows/WinUI/NetworkInfoView.xaml    | 107 ++++++++++++++++++----------------
 windows/WinUI/NetworkInfoView.xaml.cs |  40 ++++++++++++-
 windows/WinUI/NetworksPage.xaml       |  11 ++++
 windows/WinUI/NetworksPage.xaml.cs    |  40 +++++++++++++
 windows/WinUI/WinUI.csproj            |  25 +++++++-
 windows/WinUI/ZeroTierNetwork.cs      |  26 +++++++++
 windows/WinUI/ZeroTierStatus.cs       |  21 +++++++
 windows/WinUI/packages.config         |   4 ++
 windows/packages/.gitignore           |   3 +
 windows/packages/repositories.config  |   4 ++
 14 files changed, 329 insertions(+), 58 deletions(-)
 create mode 100644 windows/WinUI/APIHandler.cs
 create mode 100644 windows/WinUI/NetworksPage.xaml
 create mode 100644 windows/WinUI/NetworksPage.xaml.cs
 create mode 100644 windows/WinUI/ZeroTierNetwork.cs
 create mode 100644 windows/WinUI/ZeroTierStatus.cs
 create mode 100644 windows/WinUI/packages.config
 create mode 100644 windows/packages/.gitignore
 create mode 100644 windows/packages/repositories.config

(limited to 'windows/WinUI/MainWindow.xaml')

diff --git a/.gitignore b/.gitignore
index f008e76c..d9654839 100755
--- a/.gitignore
+++ b/.gitignore
@@ -71,3 +71,4 @@ java/build_win32/
 /java/mac32_64/
 windows/WinUI/obj/
 windows/WinUI/bin/
+windows/ZeroTierOne/Debug/
diff --git a/windows/WinUI/APIHandler.cs b/windows/WinUI/APIHandler.cs
new file mode 100644
index 00000000..c13bca53
--- /dev/null
+++ b/windows/WinUI/APIHandler.cs
@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Net;
+using System.IO;
+using Newtonsoft.Json;
+
+namespace WinUI
+{
+    
+
+    public class APIHandler
+    {
+        static string authtoken = "p3ptrzds5jkr2hbx5ipbyf04";  // delete me!
+
+        private string url = null;
+
+        public APIHandler()
+        {
+            url = "http://127.0.0.1:9993";
+        }
+
+        public APIHandler(string host, int port)
+        {
+            url = "http://" + host + ":" + port;
+        }
+
+        public ZeroTierStatus getStatus()
+        {
+            var request = WebRequest.Create(url + "/status" + "?auth=" + authtoken) as HttpWebRequest;
+            if (request != null)
+            {
+                request.Method = "GET";
+                request.ContentType = "application/json";
+            }
+
+            var httpResponse = (HttpWebResponse)request.GetResponse();
+            using (var streamReader = new StreamReader(httpResponse.GetResponseStream()))
+            {
+                var responseText = streamReader.ReadToEnd();
+
+                ZeroTierStatus status = JsonConvert.DeserializeObject<ZeroTierStatus>(responseText);
+                return status;
+            }
+        }
+
+        public List<ZeroTierNetwork> getNetworks()
+        {
+            var request = WebRequest.Create(url + "/network" + "?auth=" + authtoken) as HttpWebRequest;
+            if (request != null)
+            {
+                request.Method = "GET";
+                request.ContentType = "application/json";
+            }
+
+            var httpResponse = (HttpWebResponse)request.GetResponse();
+            using (var streamReader = new StreamReader(httpResponse.GetResponseStream()))
+            {
+                var responseText = streamReader.ReadToEnd();
+                Console.WriteLine(responseText);
+
+                List<ZeroTierNetwork> networkList = JsonConvert.DeserializeObject<List<ZeroTierNetwork>>(responseText);
+                return networkList;
+            }
+        }
+    }
+}
diff --git a/windows/WinUI/MainWindow.xaml b/windows/WinUI/MainWindow.xaml
index 299d3676..52a76ebb 100644
--- a/windows/WinUI/MainWindow.xaml
+++ b/windows/WinUI/MainWindow.xaml
@@ -1,7 +1,10 @@
 <Window
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" x:Class="WinUI.MainWindow"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+        xmlns:local="clr-namespace:WinUI"
+        mc:Ignorable="d" x:Class="WinUI.MainWindow"
         Title="ZeroTier One" Height="495" Width="705" Icon="ZeroTierIcon.ico">
 	
 	<Window.Resources>
@@ -84,10 +87,12 @@
 			</StatusBarItem>
 		</StatusBar>
 		<TabControl>
-			<TabItem x:Name="Networks" Header="Networks" Background="#FF234447" Foreground="White" IsSelected="True" IsManipulationEnabled="True">
-				<Grid Background="#FFE5E5E5"/>
-			</TabItem>
-			<TabItem x:Name="Peers" Header="Peers" Background="#FF234447" Foreground="White">
+            <TabItem x:Name="Networks" Header="Networks" Background="#FF234447" Foreground="White" IsSelected="True" IsManipulationEnabled="True">
+                <Grid>
+                    <local:NetworksPage x:Name="networksPage" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
+                </Grid>
+            </TabItem>
+            <TabItem x:Name="Peers" Header="Peers" Background="#FF234447" Foreground="White">
 				<Grid Background="#FFE5E5E5"/>
 			</TabItem>
 		</TabControl>
diff --git a/windows/WinUI/MainWindow.xaml.cs b/windows/WinUI/MainWindow.xaml.cs
index 589910f7..8e2d7993 100644
--- a/windows/WinUI/MainWindow.xaml.cs
+++ b/windows/WinUI/MainWindow.xaml.cs
@@ -20,9 +20,30 @@ namespace WinUI
     /// </summary>
     public partial class MainWindow : Window
     {
+        APIHandler handler = new APIHandler();
+
         public MainWindow()
         {
             InitializeComponent();
+
+            updateStatus();
+            updateNetworks();
+        }
+
+        private void updateStatus()
+        {
+            var status = handler.getStatus();
+
+            this.networkId.Content = status.address;
+            this.versionString.Content = status.version;
+            this.onlineStatus.Content = (status.online ? "ONLINE" : "OFFLINE");
+        }
+
+        private void updateNetworks()
+        {
+            var networks = handler.getNetworks();
+
+            networksPage.setNetworks(networks);
         }
     }
 }
diff --git a/windows/WinUI/NetworkInfoView.xaml b/windows/WinUI/NetworkInfoView.xaml
index e81b6ff2..1e090381 100644
--- a/windows/WinUI/NetworkInfoView.xaml
+++ b/windows/WinUI/NetworkInfoView.xaml
@@ -1,55 +1,62 @@
-<Page x:Class="WinUI.NetworkInfoView"
+<UserControl x:Class="WinUI.NetworkInfoView"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
       mc:Ignorable="d"
-	Title="NetworkInfoView" FontFamily="/ZeroTier One;component/Fonts/#Segoe UI" Height="284" Width="316.333">
-	<DockPanel LastChildFill="True">
-		<StatusBar DockPanel.Dock="Top">
-			<StatusBar.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <Grid>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="*"/>
-                        </Grid.RowDefinitions>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="*"/>
-							<ColumnDefinition Width="Auto"/>
-                        </Grid.ColumnDefinitions>
-                    </Grid>
-                </ItemsPanelTemplate>
-            </StatusBar.ItemsPanel>
-			<StatusBarItem Grid.Column="0">
-				<TextBlock x:Name="networkId" TextWrapping="Wrap" Text="8056c2e21c000001" Foreground="#FF91A2A3"/>
-			</StatusBarItem>
-			<StatusBarItem Grid.Column="1"/>
-			<StatusBarItem Grid.Column="2">
-				<TextBlock x:Name="networkName" TextWrapping="Wrap" Text="earth.zerotier.net"/>
-			</StatusBarItem>
-			
-		</StatusBar>
-		<StackPanel Width="80.483" OpacityMask="Black" Background="White">
-			<TextBlock TextWrapping="Wrap" Text="Status" HorizontalAlignment="Right"/>
-			<TextBlock TextWrapping="Wrap" Text="Type" HorizontalAlignment="Right"/>
-			<TextBlock TextWrapping="Wrap" Text="MAC" HorizontalAlignment="Right"/>
-			<TextBlock TextWrapping="Wrap" Text="MTU" HorizontalAlignment="Right"/>
-			<TextBlock TextWrapping="Wrap" Text="Broadcast" HorizontalAlignment="Right"/>
-			<TextBlock TextWrapping="Wrap" Text="Bridging" HorizontalAlignment="Right"/>
-			<TextBlock TextWrapping="Wrap" Text="Device" HorizontalAlignment="Right"/>
-			<TextBlock TextWrapping="Wrap" Text="Managed IPs" HorizontalAlignment="Right"/>
-		</StackPanel>
-		<StackPanel Background="#FFEEEEEE" DockPanel.Dock="Right">
-			<TextBlock TextWrapping="Wrap" HorizontalAlignment="Right" Text="OK" TextAlignment="Right"/>
-			<TextBlock TextWrapping="Wrap" Text="PUBLIC" HorizontalAlignment="Right"/>
-			<TextBlock TextWrapping="Wrap" HorizontalAlignment="Right"><Span><Run Text="02:83:4a:1e:4b:3a"/></Span></TextBlock>
-			<TextBlock TextWrapping="Wrap" Text="2800" HorizontalAlignment="Right"/>
-			<TextBlock TextWrapping="Wrap" Text="ENABLED" HorizontalAlignment="Right"/>
-			<TextBlock TextWrapping="Wrap" Text="DISABLED" HorizontalAlignment="Right"/>
-			<TextBlock TextWrapping="Wrap" HorizontalAlignment="Right"><Span><Run Text="ethernet_32771"/></Span></TextBlock>
-			<TextBlock TextWrapping="Wrap" HorizontalAlignment="Right" TextAlignment="Right"><Span><Run Text="28.2.169.248/7 "/></Span><LineBreak/><Span><Run Text="fd80:56c2:e21c:0000:0199:9383:4a02:a9f8/88"/></Span></TextBlock>
-		</StackPanel>
-		<StatusBar DockPanel.Dock="Bottom"/>
-	</DockPanel>
-</Page>
+	>
+	<Grid Background="#FFFFFFFF" Margin="5,0,5,1">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="auto"/>
+            <ColumnDefinition Width="*"/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto"/>
+            <RowDefinition Height="auto"/>
+            <RowDefinition Height="auto"/>
+            <RowDefinition Height="auto"/>
+            <RowDefinition Height="auto"/>
+            <RowDefinition Height="auto"/>
+            <RowDefinition Height="auto"/>
+            <RowDefinition Height="auto"/>
+            <RowDefinition Height="auto"/>
+            <RowDefinition Height="auto"/>
+        </Grid.RowDefinitions>
+
+        <Grid Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="auto"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+
+            <TextBlock x:Name="networkId" Text="8056c2e21c000001" HorizontalAlignment="Left" Grid.Column="0" Foreground="#FF91A2A3"/>
+            <TextBlock x:Name="networkName" Text="earth.zerotier.net" HorizontalAlignment="Right" Grid.Column="1" Foreground="#FF000000"/>
+        </Grid>
+
+        <TextBlock TextWrapping="Wrap" Text="Status" HorizontalAlignment="Right" Grid.Column="0" Grid.Row="1" Foreground="#FF000000"/>
+        <TextBlock TextWrapping="Wrap" Text="Type" HorizontalAlignment="Right" Grid.Column="0" Grid.Row="2" Foreground="#FF000000"/>
+        <TextBlock TextWrapping="Wrap" Text="MAC" HorizontalAlignment="Right" Grid.Column="0" Grid.Row="3" Foreground="#FF000000"/>
+        <TextBlock TextWrapping="Wrap" Text="MTU" HorizontalAlignment="Right" Grid.Column="0" Grid.Row="4" Foreground="#FF000000"/>
+        <TextBlock TextWrapping="Wrap" Text="Broadcast" HorizontalAlignment="Right" Grid.Column="0" Grid.Row="5" Foreground="#FF000000"/>
+        <TextBlock TextWrapping="Wrap" Text="Bridging" HorizontalAlignment="Right" Grid.Column="0" Grid.Row="6" Foreground="#FF000000"/>
+        <TextBlock TextWrapping="Wrap" Text="Device" HorizontalAlignment="Right" Grid.Column="0" Grid.Row="7" Foreground="#FF000000"/>
+        <TextBlock TextWrapping="Wrap" Text="Managed IPs" HorizontalAlignment="Right" Grid.Column="0" Grid.Row="8" Foreground="#FF000000"/>
+
+        <TextBlock x:Name="networkStatus" TextWrapping="Wrap" HorizontalAlignment="Right" Text="OK" TextAlignment="Right"  Grid.Column="1" Grid.Row="1" Foreground="#FF000000"/>
+        <TextBlock x:Name="networkType" TextWrapping="Wrap" Text="PUBLIC" HorizontalAlignment="Right"  Grid.Column="1" Grid.Row="2" Foreground="#FF000000"/>
+        <TextBlock x:Name="macAddress" TextWrapping="Wrap" HorizontalAlignment="Right"  Grid.Column="1" Grid.Row="3" Foreground="#FF000000"><Span><Run Text="02:83:4a:1e:4b:3a"/></Span></TextBlock>
+        <TextBlock x:Name="mtu" TextWrapping="Wrap" Text="2800" HorizontalAlignment="Right"  Grid.Column="1" Grid.Row="4" Foreground="#FF000000"/>
+        <TextBlock x:Name="broadcastEnabled" TextWrapping="Wrap" Text="ENABLED" HorizontalAlignment="Right"  Grid.Column="1" Grid.Row="5" Foreground="#FF000000"/>
+        <TextBlock x:Name="bridgingEnabled" TextWrapping="Wrap" Text="DISABLED" HorizontalAlignment="Right"  Grid.Column="1" Grid.Row="6" Foreground="#FF000000"/>
+        <TextBlock x:Name="deviceName" TextWrapping="Wrap" HorizontalAlignment="Right"  Grid.Column="1" Grid.Row="7" Foreground="#FF000000"><Span><Run Text="ethernet_32771"/></Span></TextBlock>
+        <TextBlock x:Name="managedIps" TextWrapping="Wrap" HorizontalAlignment="Right" TextAlignment="Right"  Grid.Column="1" Grid.Row="8" Foreground="#FF000000"><Span><Run Text="28.2.169.248/7 "/></Span><LineBreak/><Span><Run Text="fd80:56c2:e21c:0000:0199:9383:4a02:a9f8/88"/></Span></TextBlock>
+
+        <Grid Grid.Column="0" Grid.Row="9" Grid.ColumnSpan="2" Background="#FFFFFFFF">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Button />
+            <Button x:Name="leaveButton" Content="Leave" HorizontalAlignment="Right" VerticalAlignment="Top" Width="75" Background="#FFFFB354"/>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/windows/WinUI/NetworkInfoView.xaml.cs b/windows/WinUI/NetworkInfoView.xaml.cs
index 89648c0e..c941e64e 100644
--- a/windows/WinUI/NetworkInfoView.xaml.cs
+++ b/windows/WinUI/NetworkInfoView.xaml.cs
@@ -18,11 +18,47 @@ namespace WinUI
     /// <summary>
     /// Interaction logic for NetworkInfoView.xaml
     /// </summary>
-    public partial class NetworkInfoView : Page
+    public partial class NetworkInfoView : UserControl
     {
-        public NetworkInfoView()
+        ZeroTierNetwork network;
+
+        public NetworkInfoView(ZeroTierNetwork network)
         {
             InitializeComponent();
+            this.network = network;
+
+            updateNetworkData();
+        }
+
+        private void updateNetworkData()
+        {
+            this.networkId.Text = network.nwid;
+            this.networkName.Text = network.name;
+            this.networkStatus.Text = network.status;
+            this.networkType.Text = network.type;
+            this.macAddress.Text = network.mac;
+            this.mtu.Text = network.mtu.ToString();
+            this.broadcastEnabled.Text = (network.broadcastEnabled ? "ENABLED" : "DISABLED");
+            this.bridgingEnabled.Text = (network.bridge ? "ENABLED" : "DISABLED");
+            this.deviceName.Text = network.portDeviceName;
+
+            string iplist = "";
+            for (int i = 0; i < network.assignedAddresses.Length; ++i)
+            {
+                iplist += network.assignedAddresses[i];
+                if (i < (network.assignedAddresses.Length - 1))
+                    iplist += "\n";
+            }
+
+            this.managedIps.Text = iplist;
+        }
+
+        public bool hasNetwork(ZeroTierNetwork network)
+        {
+            if (this.network.nwid.Equals(network.nwid))
+                return true;
+
+            return false;
         }
     }
 }
diff --git a/windows/WinUI/NetworksPage.xaml b/windows/WinUI/NetworksPage.xaml
new file mode 100644
index 00000000..d8888bf0
--- /dev/null
+++ b/windows/WinUI/NetworksPage.xaml
@@ -0,0 +1,11 @@
+<UserControl x:Class="WinUI.NetworksPage"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d" 
+             d:DesignHeight="300" d:DesignWidth="300">
+    <WrapPanel x:Name="wrapPanel" Background="#FF555555">
+
+    </WrapPanel>
+</UserControl>
diff --git a/windows/WinUI/NetworksPage.xaml.cs b/windows/WinUI/NetworksPage.xaml.cs
new file mode 100644
index 00000000..60ae0b88
--- /dev/null
+++ b/windows/WinUI/NetworksPage.xaml.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace WinUI
+{
+    /// <summary>
+    /// Interaction logic for NetworksPage.xaml
+    /// </summary>
+    public partial class NetworksPage : UserControl
+    {
+        public NetworksPage()
+        {
+            InitializeComponent();
+        }
+
+        public void setNetworks(List<ZeroTierNetwork> networks)
+        {
+            this.wrapPanel.Children.Clear();
+
+            for (int i = 0; i < networks.Count; ++i)
+            {
+                this.wrapPanel.Children.Add(
+                    new NetworkInfoView(
+                        networks.ElementAt<ZeroTierNetwork>(i)));
+            }
+        }
+    }
+}
diff --git a/windows/WinUI/WinUI.csproj b/windows/WinUI/WinUI.csproj
index d78e058f..855e8fa5 100644
--- a/windows/WinUI/WinUI.csproj
+++ b/windows/WinUI/WinUI.csproj
@@ -55,7 +55,8 @@
     <StartupObject>WinUI.App</StartupObject>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>ZeroTierIcon.ico</ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>false</SignAssembly>
@@ -64,9 +65,18 @@
     <SignManifests>false</SignManifests>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Accessibility" />
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="PresentationUI, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="ReachFramework" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Printing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
@@ -76,6 +86,8 @@
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
+    <Reference Include="UIAutomationProvider" />
+    <Reference Include="UIAutomationTypes" />
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -85,10 +97,16 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="NetworksPage.xaml.cs">
+      <DependentUpon>NetworksPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ZeroTierNetwork.cs" />
+    <Compile Include="ZeroTierStatus.cs" />
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Compile Include="APIHandler.cs" />
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
@@ -101,6 +119,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="NetworksPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Simple Styles.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -131,6 +153,7 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/windows/WinUI/ZeroTierNetwork.cs b/windows/WinUI/ZeroTierNetwork.cs
new file mode 100644
index 00000000..2dec53d2
--- /dev/null
+++ b/windows/WinUI/ZeroTierNetwork.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WinUI
+{
+    public class ZeroTierNetwork
+    {
+        public string nwid;
+        public string mac;
+        public string name;
+        public string status;
+        public string type;
+        public int mtu;
+        public bool dhcp;
+        public bool bridge;
+        public bool broadcastEnabled;
+        public int portError;
+        public int netconfRevision;
+        public string[] multicastSubscriptions;
+        public string[] assignedAddresses;
+        public string portDeviceName;
+    }
+}
diff --git a/windows/WinUI/ZeroTierStatus.cs b/windows/WinUI/ZeroTierStatus.cs
new file mode 100644
index 00000000..9eafdb26
--- /dev/null
+++ b/windows/WinUI/ZeroTierStatus.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WinUI
+{
+    public class ZeroTierStatus
+    {
+        public string address;
+        public string publicIdentity;
+        public bool online;
+        public bool tcpFallbackActive;
+        public int versionMajor;
+        public int versionMinor;
+        public int versionRev;
+        public string version;
+        public UInt64 clock;
+    }
+}
diff --git a/windows/WinUI/packages.config b/windows/WinUI/packages.config
new file mode 100644
index 00000000..505e5883
--- /dev/null
+++ b/windows/WinUI/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
+</packages>
\ No newline at end of file
diff --git a/windows/packages/.gitignore b/windows/packages/.gitignore
new file mode 100644
index 00000000..0acda714
--- /dev/null
+++ b/windows/packages/.gitignore
@@ -0,0 +1,3 @@
+*
+!repositories.config
+!.gitignore
\ No newline at end of file
diff --git a/windows/packages/repositories.config b/windows/packages/repositories.config
new file mode 100644
index 00000000..f8197655
--- /dev/null
+++ b/windows/packages/repositories.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<repositories>
+  <repository path="..\WinUI\packages.config" />
+</repositories>
\ No newline at end of file
-- 
cgit v1.2.3


From fe6960888a7a12a71d79059f52985cd21241658d Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Wed, 21 Oct 2015 20:40:43 -0700
Subject: add a scroll bar to the network info view

---
 windows/WinUI/MainWindow.xaml   | 10 ++++++++--
 windows/WinUI/NetworksPage.xaml |  6 ++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'windows/WinUI/MainWindow.xaml')

diff --git a/windows/WinUI/MainWindow.xaml b/windows/WinUI/MainWindow.xaml
index 52a76ebb..d3b4d47f 100644
--- a/windows/WinUI/MainWindow.xaml
+++ b/windows/WinUI/MainWindow.xaml
@@ -88,8 +88,14 @@
 		</StatusBar>
 		<TabControl>
             <TabItem x:Name="Networks" Header="Networks" Background="#FF234447" Foreground="White" IsSelected="True" IsManipulationEnabled="True">
-                <Grid>
-                    <local:NetworksPage x:Name="networksPage" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
+                <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="*"/>
+                    </Grid.RowDefinitions>
+                    <local:NetworksPage x:Name="networksPage" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Grid.Column="0" Grid.Row="0" Margin="0,0,0,0"/>
                 </Grid>
             </TabItem>
             <TabItem x:Name="Peers" Header="Peers" Background="#FF234447" Foreground="White">
diff --git a/windows/WinUI/NetworksPage.xaml b/windows/WinUI/NetworksPage.xaml
index d8888bf0..0dd87fbb 100644
--- a/windows/WinUI/NetworksPage.xaml
+++ b/windows/WinUI/NetworksPage.xaml
@@ -5,7 +5,9 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300">
-    <WrapPanel x:Name="wrapPanel" Background="#FF555555">
+    <ScrollViewer x:Name="MyScrollViewer" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto"  HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+        <WrapPanel x:Name="wrapPanel" Background="#FF555555"  HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
 
-    </WrapPanel>
+        </WrapPanel>
+    </ScrollViewer>
 </UserControl>
-- 
cgit v1.2.3


From 62059a91aa22cb8e109f96b9d2290136d599eca1 Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Fri, 23 Oct 2015 15:36:42 -0700
Subject: C#-ifying stuff

---
 windows/WinUI/MainWindow.xaml             |  4 +--
 windows/WinUI/MainWindow.xaml.cs          | 22 +++++++++---
 windows/WinUI/NetworkInfoView.xaml.cs     | 32 +++++++++---------
 windows/WinUI/WinUI.csproj                |  2 ++
 windows/WinUI/ZeroTierNetwork.cs          | 56 +++++++++++++++++++++++--------
 windows/WinUI/ZeroTierPeer.cs             | 42 +++++++++++++++++++++++
 windows/WinUI/ZeroTierPeerPhysicalPath.cs | 27 +++++++++++++++
 windows/WinUI/ZeroTierStatus.cs           | 36 +++++++++++++++-----
 8 files changed, 175 insertions(+), 46 deletions(-)
 create mode 100644 windows/WinUI/ZeroTierPeer.cs
 create mode 100644 windows/WinUI/ZeroTierPeerPhysicalPath.cs

(limited to 'windows/WinUI/MainWindow.xaml')

diff --git a/windows/WinUI/MainWindow.xaml b/windows/WinUI/MainWindow.xaml
index d3b4d47f..ed03a968 100644
--- a/windows/WinUI/MainWindow.xaml
+++ b/windows/WinUI/MainWindow.xaml
@@ -80,10 +80,10 @@
 			<StatusBarItem Grid.Column="2" x:Name="versionString" Content="1.0.5" Foreground="White" Margin="0"/>
 			<StatusBarItem Grid.Column="3" x:Name="blank" Content="" Height="43" Foreground="White" Margin="6,0,-6,-9"/>
 			<StatusBarItem Grid.Column="4">
-				<TextBox x:Name="joinNetworkID" Height="23" TextWrapping="Wrap" Width="120" HorizontalAlignment="Right" RenderTransformOrigin="1.168,0.478" ToolTip="Enter Network ID"/>
+				<TextBox x:Name="joinNetworkID" Height="23" TextWrapping="Wrap" Width="120" HorizontalAlignment="Right" RenderTransformOrigin="1.168,0.478" ToolTip="Enter Network ID" TextChanged="joinNetworkID_TextChanged"/>
 			</StatusBarItem>
 			<StatusBarItem Grid.Column="5" x:Name="statusBarButton" Foreground="White" RenderTransformOrigin="0.789,0.442">
-				<Button x:Name="joinButton" Content="Join" Background="#FFFFB354" Width="77.423"/>
+				<Button x:Name="joinButton" Content="Join" Background="#FFFFB354" Width="77.423" Click="joinButton_Click"/>
 			</StatusBarItem>
 		</StatusBar>
 		<TabControl>
diff --git a/windows/WinUI/MainWindow.xaml.cs b/windows/WinUI/MainWindow.xaml.cs
index 8e2d7993..8398d62c 100644
--- a/windows/WinUI/MainWindow.xaml.cs
+++ b/windows/WinUI/MainWindow.xaml.cs
@@ -32,18 +32,30 @@ namespace WinUI
 
         private void updateStatus()
         {
-            var status = handler.getStatus();
+            var status = handler.GetStatus();
 
-            this.networkId.Content = status.address;
-            this.versionString.Content = status.version;
-            this.onlineStatus.Content = (status.online ? "ONLINE" : "OFFLINE");
+            this.networkId.Content = status.Address;
+            this.versionString.Content = status.Version;
+            this.onlineStatus.Content = (status.Online ? "ONLINE" : "OFFLINE");
         }
 
         private void updateNetworks()
         {
-            var networks = handler.getNetworks();
+            var networks = handler.GetNetworks();
 
             networksPage.setNetworks(networks);
         }
+
+        private void joinButton_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void joinNetworkID_TextChanged(object sender, TextChangedEventArgs e)
+        {
+
+        }
+
+
     }
 }
diff --git a/windows/WinUI/NetworkInfoView.xaml.cs b/windows/WinUI/NetworkInfoView.xaml.cs
index c941e64e..cbc268ca 100644
--- a/windows/WinUI/NetworkInfoView.xaml.cs
+++ b/windows/WinUI/NetworkInfoView.xaml.cs
@@ -27,35 +27,35 @@ namespace WinUI
             InitializeComponent();
             this.network = network;
 
-            updateNetworkData();
+            UpdateNetworkData();
         }
 
-        private void updateNetworkData()
+        private void UpdateNetworkData()
         {
-            this.networkId.Text = network.nwid;
-            this.networkName.Text = network.name;
-            this.networkStatus.Text = network.status;
-            this.networkType.Text = network.type;
-            this.macAddress.Text = network.mac;
-            this.mtu.Text = network.mtu.ToString();
-            this.broadcastEnabled.Text = (network.broadcastEnabled ? "ENABLED" : "DISABLED");
-            this.bridgingEnabled.Text = (network.bridge ? "ENABLED" : "DISABLED");
-            this.deviceName.Text = network.portDeviceName;
+            this.networkId.Text = network.NetworkId;
+            this.networkName.Text = network.NetworkName;
+            this.networkStatus.Text = network.NetworkStatus;
+            this.networkType.Text = network.NetworkType;
+            this.macAddress.Text = network.MacAddress;
+            this.mtu.Text = network.MTU.ToString();
+            this.broadcastEnabled.Text = (network.BroadcastEnabled ? "ENABLED" : "DISABLED");
+            this.bridgingEnabled.Text = (network.Bridge ? "ENABLED" : "DISABLED");
+            this.deviceName.Text = network.DeviceName;
 
             string iplist = "";
-            for (int i = 0; i < network.assignedAddresses.Length; ++i)
+            for (int i = 0; i < network.AssignedAddresses.Length; ++i)
             {
-                iplist += network.assignedAddresses[i];
-                if (i < (network.assignedAddresses.Length - 1))
+                iplist += network.AssignedAddresses[i];
+                if (i < (network.AssignedAddresses.Length - 1))
                     iplist += "\n";
             }
 
             this.managedIps.Text = iplist;
         }
 
-        public bool hasNetwork(ZeroTierNetwork network)
+        public bool HasNetwork(ZeroTierNetwork network)
         {
-            if (this.network.nwid.Equals(network.nwid))
+            if (this.network.NetworkId.Equals(network.NetworkId))
                 return true;
 
             return false;
diff --git a/windows/WinUI/WinUI.csproj b/windows/WinUI/WinUI.csproj
index 855e8fa5..c996db8c 100644
--- a/windows/WinUI/WinUI.csproj
+++ b/windows/WinUI/WinUI.csproj
@@ -100,6 +100,8 @@
     <Compile Include="NetworksPage.xaml.cs">
       <DependentUpon>NetworksPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="ZeroTierPeerPhysicalPath.cs" />
+    <Compile Include="ZeroTierPeer.cs" />
     <Compile Include="ZeroTierNetwork.cs" />
     <Compile Include="ZeroTierStatus.cs" />
     <Page Include="MainWindow.xaml">
diff --git a/windows/WinUI/ZeroTierNetwork.cs b/windows/WinUI/ZeroTierNetwork.cs
index 2dec53d2..cce65441 100644
--- a/windows/WinUI/ZeroTierNetwork.cs
+++ b/windows/WinUI/ZeroTierNetwork.cs
@@ -3,24 +3,52 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Newtonsoft.Json;
 
 namespace WinUI
 {
     public class ZeroTierNetwork
     {
-        public string nwid;
-        public string mac;
-        public string name;
-        public string status;
-        public string type;
-        public int mtu;
-        public bool dhcp;
-        public bool bridge;
-        public bool broadcastEnabled;
-        public int portError;
-        public int netconfRevision;
-        public string[] multicastSubscriptions;
-        public string[] assignedAddresses;
-        public string portDeviceName;
+        [JsonProperty("nwid")]
+        public string NetworkId { get; set; }
+
+        [JsonProperty("mac")]
+        public string MacAddress { get; set; }
+
+        [JsonProperty("name")]
+        public string NetworkName { get; set; }
+
+        [JsonProperty("status")]
+        public string NetworkStatus { get; set; }
+
+        [JsonProperty("type")]
+        public string NetworkType { get; set; }
+
+        [JsonProperty("mtu")]
+        public int MTU { get; set; }
+
+        [JsonProperty("dhcp")]
+        public bool DHCP { get; set; }
+
+        [JsonProperty("bridge")]
+        public bool Bridge { get; set ; }
+
+        [JsonProperty("broadcastEnabled")]
+        public bool BroadcastEnabled { get ; set; }
+
+        [JsonProperty("portError")]
+        public int PortError { get; set; }
+
+        [JsonProperty("netconfRevision")]
+        public int NetconfRevision { get; set; }
+
+        [JsonProperty("multicastSubscriptions")]
+        public string[] MulticastSubscriptions { get; set; }
+
+        [JsonProperty("assignedAddresses")]
+        public string[] AssignedAddresses { get; set; }
+
+        [JsonProperty("portDeviceName")]
+        public string DeviceName { get; set; }
     }
 }
diff --git a/windows/WinUI/ZeroTierPeer.cs b/windows/WinUI/ZeroTierPeer.cs
new file mode 100644
index 00000000..ba925a6f
--- /dev/null
+++ b/windows/WinUI/ZeroTierPeer.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+
+namespace WinUI
+{
+    public class ZeroTierPeer
+    {
+        [JsonProperty("address")]
+        public string Address { get; set; }
+
+        [JsonProperty("lastUnicastFrame")]
+        public int LastUnicastFrame { get; set; }
+
+        [JsonProperty("lastMulticastFrame")]
+        public int LastMulticastFrame { get; set; }
+
+        [JsonProperty("versionMajor")]
+        public int VersionMajor { get; set; }
+
+        [JsonProperty("versionMinor")]
+        public int VersionMinor { get; set; }
+
+        [JsonProperty("versionRev")]
+        public int Versionrev { get; set; }
+
+        [JsonProperty("version")]
+        public string Version { get; set; }
+
+        [JsonProperty("latency")]
+        public string Latency { get; set; }
+
+        [JsonProperty("role")]
+        public string Role { get; set; }
+
+        [JsonProperty("paths")]
+        public List<ZeroTierPeerPhysicalPath> Paths { get; set; }
+    }
+}
diff --git a/windows/WinUI/ZeroTierPeerPhysicalPath.cs b/windows/WinUI/ZeroTierPeerPhysicalPath.cs
new file mode 100644
index 00000000..51bb3d5b
--- /dev/null
+++ b/windows/WinUI/ZeroTierPeerPhysicalPath.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+
+namespace WinUI
+{
+    public class ZeroTierPeerPhysicalPath
+    {
+        [JsonProperty("address")]
+        public string Address { get; set; }
+
+        [JsonProperty("lastSend")]
+        public int LastSend { get; set; }
+
+        [JsonProperty("lastReceive")]
+        public int LastReceive { get; set; }
+
+        [JsonProperty("fixed")]
+        public bool Fixed { get; set; }
+
+        [JsonProperty("preferred")]
+        public bool Preferred { get; set; }
+    }
+}
diff --git a/windows/WinUI/ZeroTierStatus.cs b/windows/WinUI/ZeroTierStatus.cs
index 9eafdb26..2851d017 100644
--- a/windows/WinUI/ZeroTierStatus.cs
+++ b/windows/WinUI/ZeroTierStatus.cs
@@ -3,19 +3,37 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Newtonsoft.Json;
 
 namespace WinUI
 {
     public class ZeroTierStatus
     {
-        public string address;
-        public string publicIdentity;
-        public bool online;
-        public bool tcpFallbackActive;
-        public int versionMajor;
-        public int versionMinor;
-        public int versionRev;
-        public string version;
-        public UInt64 clock;
+        [JsonProperty("address")]
+        public string Address { get; set; }
+
+        [JsonProperty("publicIdentity")]
+        public string PublicIdentity { get; set; }
+
+        [JsonProperty("online")]
+        public bool Online { get; set; }
+
+        [JsonProperty("tcpFallbackActive")]
+        public bool TcpFallbackActive { get; set; }
+
+        [JsonProperty("versionMajor")]
+        public int VersionMajor { get; set; }
+
+        [JsonProperty("versionMinor")]
+        public int VersionMinor { get; set; }
+
+        [JsonProperty("versionRev")]
+        public int VersionRev { get; set; }
+
+        [JsonProperty("version")]
+        public string Version { get; set; }
+
+        [JsonProperty("clock")]
+        public UInt64 Clock { get; set; }
     }
 }
-- 
cgit v1.2.3


From 7e635d37ad6cfa1195c8f141dd533564e478cc36 Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Fri, 23 Oct 2015 15:49:04 -0700
Subject: only accept hex characters for network id

---
 windows/WinUI/MainWindow.xaml    | 2 +-
 windows/WinUI/MainWindow.xaml.cs | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'windows/WinUI/MainWindow.xaml')

diff --git a/windows/WinUI/MainWindow.xaml b/windows/WinUI/MainWindow.xaml
index ed03a968..ea5d547e 100644
--- a/windows/WinUI/MainWindow.xaml
+++ b/windows/WinUI/MainWindow.xaml
@@ -80,7 +80,7 @@
 			<StatusBarItem Grid.Column="2" x:Name="versionString" Content="1.0.5" Foreground="White" Margin="0"/>
 			<StatusBarItem Grid.Column="3" x:Name="blank" Content="" Height="43" Foreground="White" Margin="6,0,-6,-9"/>
 			<StatusBarItem Grid.Column="4">
-				<TextBox x:Name="joinNetworkID" Height="23" TextWrapping="Wrap" Width="120" HorizontalAlignment="Right" RenderTransformOrigin="1.168,0.478" ToolTip="Enter Network ID" TextChanged="joinNetworkID_TextChanged"/>
+				<TextBox x:Name="joinNetworkID" Height="23" TextWrapping="Wrap" Width="120" HorizontalAlignment="Right" RenderTransformOrigin="1.168,0.478" ToolTip="Enter Network ID" PreviewTextInput="OnNetworkEntered" MaxLength="16"/>
 			</StatusBarItem>
 			<StatusBarItem Grid.Column="5" x:Name="statusBarButton" Foreground="White" RenderTransformOrigin="0.789,0.442">
 				<Button x:Name="joinButton" Content="Join" Background="#FFFFB354" Width="77.423" Click="joinButton_Click"/>
diff --git a/windows/WinUI/MainWindow.xaml.cs b/windows/WinUI/MainWindow.xaml.cs
index 8398d62c..3c4f0b59 100644
--- a/windows/WinUI/MainWindow.xaml.cs
+++ b/windows/WinUI/MainWindow.xaml.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
@@ -51,11 +52,10 @@ namespace WinUI
 
         }
 
-        private void joinNetworkID_TextChanged(object sender, TextChangedEventArgs e)
+        private void OnNetworkEntered(object sender, TextCompositionEventArgs e)
         {
-
+            Regex regex = new Regex("[0-9a-fxA-FX]");
+            e.Handled = !regex.IsMatch(e.Text);
         }
-
-
     }
 }
-- 
cgit v1.2.3


From 095539de29563d23001a558141b2cec2487530a1 Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Mon, 26 Oct 2015 19:21:21 -0700
Subject: Initial peers page

---
 windows/WinUI/MainWindow.xaml    |  6 ++++--
 windows/WinUI/MainWindow.xaml.cs |  5 +++++
 windows/WinUI/PeersPage.xaml     | 19 +++++++++++++++++++
 windows/WinUI/PeersPage.xaml.cs  | 39 +++++++++++++++++++++++++++++++++++++++
 windows/WinUI/WinUI.csproj       |  7 +++++++
 windows/WinUI/ZeroTierPeer.cs    | 24 ++++++++++++++++++++++++
 6 files changed, 98 insertions(+), 2 deletions(-)
 create mode 100644 windows/WinUI/PeersPage.xaml
 create mode 100644 windows/WinUI/PeersPage.xaml.cs

(limited to 'windows/WinUI/MainWindow.xaml')

diff --git a/windows/WinUI/MainWindow.xaml b/windows/WinUI/MainWindow.xaml
index ea5d547e..83b75703 100644
--- a/windows/WinUI/MainWindow.xaml
+++ b/windows/WinUI/MainWindow.xaml
@@ -99,8 +99,10 @@
                 </Grid>
             </TabItem>
             <TabItem x:Name="Peers" Header="Peers" Background="#FF234447" Foreground="White">
-				<Grid Background="#FFE5E5E5"/>
-			</TabItem>
+                <Grid Background="#FFE5E5E5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                    <local:PeersPage x:Name="peersPage" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"></local:PeersPage>
+                </Grid>
+            </TabItem>
 		</TabControl>
 	</DockPanel>
 </Window>
diff --git a/windows/WinUI/MainWindow.xaml.cs b/windows/WinUI/MainWindow.xaml.cs
index 4e7638b6..e0aeca42 100644
--- a/windows/WinUI/MainWindow.xaml.cs
+++ b/windows/WinUI/MainWindow.xaml.cs
@@ -73,7 +73,12 @@ namespace WinUI
 
         private void updatePeers()
         {
+            var peers = handler.GetPeers();
 
+            peersPage.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
+            {
+                peersPage.SetPeers(peers);
+            }));
         }
 
         private void OnUpdateTimer(object source, ElapsedEventArgs e)
diff --git a/windows/WinUI/PeersPage.xaml b/windows/WinUI/PeersPage.xaml
new file mode 100644
index 00000000..64c21132
--- /dev/null
+++ b/windows/WinUI/PeersPage.xaml
@@ -0,0 +1,19 @@
+<UserControl x:Class="WinUI.PeersPage"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d" 
+             d:DesignHeight="300" d:DesignWidth="300" Background="White" Foreground="Black">
+    <DataGrid x:Name="dataGrid" AutoGenerateColumns="False" CanUserResizeColumns="True" Margin="0,0,0,0" CanUserReorderColumns="False">
+        <DataGrid.Columns>
+            <DataGridTextColumn Header="Address" Binding="{Binding Address}"/>
+            <DataGridTextColumn Header="Version" Binding="{Binding VersionString}"/>
+            <DataGridTextColumn Header="Latency" Binding="{Binding Latency}"/>
+            <DataGridTextColumn Header="Data Paths" Binding="{Binding DataPaths}"/>
+            <DataGridTextColumn Header="Last Unicast" Binding="{Binding LastUnicastFrame}"/>
+            <DataGridTextColumn Header="Last Multicast" Binding="{Binding LastMulticastFrame}"/>
+            <DataGridTextColumn Header="Role" Binding="{Binding Role}"/>
+        </DataGrid.Columns>
+    </DataGrid>
+</UserControl>
diff --git a/windows/WinUI/PeersPage.xaml.cs b/windows/WinUI/PeersPage.xaml.cs
new file mode 100644
index 00000000..b1dd8adf
--- /dev/null
+++ b/windows/WinUI/PeersPage.xaml.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace WinUI
+{
+    /// <summary>
+    /// Interaction logic for PeersPage.xaml
+    /// </summary>
+    public partial class PeersPage : UserControl
+    {
+        private List<ZeroTierPeer> peersList = new List<ZeroTierPeer>();
+
+        public PeersPage()
+        {
+            InitializeComponent();
+
+            dataGrid.ItemsSource = peersList;
+        }
+
+        public void SetPeers(List<ZeroTierPeer> peerList)
+        {
+            this.peersList = peerList;
+            dataGrid.ItemsSource = this.peersList;
+            dataGrid.Items.Refresh();
+        }
+    }
+}
diff --git a/windows/WinUI/WinUI.csproj b/windows/WinUI/WinUI.csproj
index c996db8c..a743408d 100644
--- a/windows/WinUI/WinUI.csproj
+++ b/windows/WinUI/WinUI.csproj
@@ -100,6 +100,9 @@
     <Compile Include="NetworksPage.xaml.cs">
       <DependentUpon>NetworksPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="PeersPage.xaml.cs">
+      <DependentUpon>PeersPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="ZeroTierPeerPhysicalPath.cs" />
     <Compile Include="ZeroTierPeer.cs" />
     <Compile Include="ZeroTierNetwork.cs" />
@@ -125,6 +128,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="PeersPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Simple Styles.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/windows/WinUI/ZeroTierPeer.cs b/windows/WinUI/ZeroTierPeer.cs
index 5377f74a..3153f7e2 100644
--- a/windows/WinUI/ZeroTierPeer.cs
+++ b/windows/WinUI/ZeroTierPeer.cs
@@ -30,6 +30,17 @@ namespace WinUI
         [JsonProperty("version")]
         public string Version { get; set; }
 
+        public string VersionString
+        {
+            get
+            {
+                if (Version == "-1.-1.-1")
+                    return "-";
+                else
+                    return Version;
+            }
+        }
+
         [JsonProperty("latency")]
         public string Latency { get; set; }
 
@@ -38,5 +49,18 @@ namespace WinUI
 
         [JsonProperty("paths")]
         public List<ZeroTierPeerPhysicalPath> Paths { get; set; }
+
+        public string DataPaths
+        {
+            get
+            {
+                string pathStr = "";
+                foreach(ZeroTierPeerPhysicalPath path in Paths)
+                {
+                    pathStr += path.Address + "\n";
+                }
+                return pathStr;
+            }
+        }
     }
 }
-- 
cgit v1.2.3


From 300a951730a21d75b4800f12e8e23ca9473293ca Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Mon, 26 Oct 2015 19:39:54 -0700
Subject: Figured out how to expand controls to fill parent.  yay

---
 windows/WinUI/MainWindow.xaml    | 10 ++++++++--
 windows/WinUI/MainWindow.xaml.cs |  1 +
 windows/WinUI/NetworksPage.xaml  |  2 +-
 windows/WinUI/PeersPage.xaml     |  2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'windows/WinUI/MainWindow.xaml')

diff --git a/windows/WinUI/MainWindow.xaml b/windows/WinUI/MainWindow.xaml
index 83b75703..2dc8e40c 100644
--- a/windows/WinUI/MainWindow.xaml
+++ b/windows/WinUI/MainWindow.xaml
@@ -99,8 +99,14 @@
                 </Grid>
             </TabItem>
             <TabItem x:Name="Peers" Header="Peers" Background="#FF234447" Foreground="White">
-                <Grid Background="#FFE5E5E5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                    <local:PeersPage x:Name="peersPage" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"></local:PeersPage>
+                <Grid Background="#FFE5E5E5" HorizontalAlignment="Left" VerticalAlignment="Top">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="*"/>
+                    </Grid.RowDefinitions>
+                    <local:PeersPage x:Name="peersPage" HorizontalAlignment="Left" VerticalAlignment="Top" Grid.Column="0" Grid.Row="0"/>
                 </Grid>
             </TabItem>
 		</TabControl>
diff --git a/windows/WinUI/MainWindow.xaml.cs b/windows/WinUI/MainWindow.xaml.cs
index e0aeca42..666a82e1 100644
--- a/windows/WinUI/MainWindow.xaml.cs
+++ b/windows/WinUI/MainWindow.xaml.cs
@@ -35,6 +35,7 @@ namespace WinUI
 
             updateStatus();
             updateNetworks();
+            updatePeers();
 
             DataObject.AddPastingHandler(joinNetworkID, OnPaste);
 
diff --git a/windows/WinUI/NetworksPage.xaml b/windows/WinUI/NetworksPage.xaml
index 0dd87fbb..f8aec61b 100644
--- a/windows/WinUI/NetworksPage.xaml
+++ b/windows/WinUI/NetworksPage.xaml
@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300">
-    <ScrollViewer x:Name="MyScrollViewer" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto"  HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+    <ScrollViewer x:Name="MyScrollViewer" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto"  HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Width="{Binding RelativeSource={RelativeSource AncestorType={x:Type Window}}, Path=ActualWidth}" Height="{Binding RelativeSource={RelativeSource AncestorType={x:Type Window}}, Path=ActualHeight}">
         <WrapPanel x:Name="wrapPanel" Background="#FF555555"  HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
 
         </WrapPanel>
diff --git a/windows/WinUI/PeersPage.xaml b/windows/WinUI/PeersPage.xaml
index 64c21132..ab498eea 100644
--- a/windows/WinUI/PeersPage.xaml
+++ b/windows/WinUI/PeersPage.xaml
@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300" Background="White" Foreground="Black">
-    <DataGrid x:Name="dataGrid" AutoGenerateColumns="False" CanUserResizeColumns="True" Margin="0,0,0,0" CanUserReorderColumns="False">
+    <DataGrid x:Name="dataGrid" AutoGenerateColumns="False" CanUserResizeColumns="True" Margin="0,0,0,0" CanUserReorderColumns="False" Width="{Binding RelativeSource={RelativeSource AncestorType={x:Type Window}}, Path=ActualWidth}" Height="{Binding RelativeSource={RelativeSource AncestorType={x:Type Window}}, Path=ActualHeight}">
         <DataGrid.Columns>
             <DataGridTextColumn Header="Address" Binding="{Binding Address}"/>
             <DataGridTextColumn Header="Version" Binding="{Binding VersionString}"/>
-- 
cgit v1.2.3


From 87496e9f4a78fae5f9e9bf88479525a3811da522 Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Mon, 26 Oct 2015 19:53:03 -0700
Subject: can now leave networks

---
 windows/WinUI/MainWindow.xaml         |  2 +-
 windows/WinUI/MainWindow.xaml.cs      |  2 ++
 windows/WinUI/NetworkInfoView.xaml    | 23 ++++++++++++-----------
 windows/WinUI/NetworkInfoView.xaml.cs | 12 ++++++++++--
 windows/WinUI/NetworksPage.xaml.cs    |  8 ++++++++
 5 files changed, 33 insertions(+), 14 deletions(-)

(limited to 'windows/WinUI/MainWindow.xaml')

diff --git a/windows/WinUI/MainWindow.xaml b/windows/WinUI/MainWindow.xaml
index 2dc8e40c..553d44fe 100644
--- a/windows/WinUI/MainWindow.xaml
+++ b/windows/WinUI/MainWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
         xmlns:local="clr-namespace:WinUI"
         mc:Ignorable="d" x:Class="WinUI.MainWindow"
-        Title="ZeroTier One" Height="495" Width="705" Icon="ZeroTierIcon.ico">
+        Title="ZeroTier One" Height="500" Width="700" Icon="ZeroTierIcon.ico">
 	
 	<Window.Resources>
 		<ResourceDictionary>
diff --git a/windows/WinUI/MainWindow.xaml.cs b/windows/WinUI/MainWindow.xaml.cs
index 666a82e1..f6cb4f44 100644
--- a/windows/WinUI/MainWindow.xaml.cs
+++ b/windows/WinUI/MainWindow.xaml.cs
@@ -33,6 +33,8 @@ namespace WinUI
         {
             InitializeComponent();
 
+            networksPage.SetAPIHandler(handler);
+
             updateStatus();
             updateNetworks();
             updatePeers();
diff --git a/windows/WinUI/NetworkInfoView.xaml b/windows/WinUI/NetworkInfoView.xaml
index 1e090381..86f2b98c 100644
--- a/windows/WinUI/NetworkInfoView.xaml
+++ b/windows/WinUI/NetworkInfoView.xaml
@@ -8,6 +8,7 @@
 	<Grid Background="#FFFFFFFF" Margin="5,0,5,1">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="auto"/>
+            <ColumnDefinition Width="10"/>
             <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
@@ -23,7 +24,7 @@
             <RowDefinition Height="auto"/>
         </Grid.RowDefinitions>
 
-        <Grid Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2">
+        <Grid Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="3">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="auto"/>
                 <ColumnDefinition Width="*"/>
@@ -42,21 +43,21 @@
         <TextBlock TextWrapping="Wrap" Text="Device" HorizontalAlignment="Right" Grid.Column="0" Grid.Row="7" Foreground="#FF000000"/>
         <TextBlock TextWrapping="Wrap" Text="Managed IPs" HorizontalAlignment="Right" Grid.Column="0" Grid.Row="8" Foreground="#FF000000"/>
 
-        <TextBlock x:Name="networkStatus" TextWrapping="Wrap" HorizontalAlignment="Right" Text="OK" TextAlignment="Right"  Grid.Column="1" Grid.Row="1" Foreground="#FF000000"/>
-        <TextBlock x:Name="networkType" TextWrapping="Wrap" Text="PUBLIC" HorizontalAlignment="Right"  Grid.Column="1" Grid.Row="2" Foreground="#FF000000"/>
-        <TextBlock x:Name="macAddress" TextWrapping="Wrap" HorizontalAlignment="Right"  Grid.Column="1" Grid.Row="3" Foreground="#FF000000"><Span><Run Text="02:83:4a:1e:4b:3a"/></Span></TextBlock>
-        <TextBlock x:Name="mtu" TextWrapping="Wrap" Text="2800" HorizontalAlignment="Right"  Grid.Column="1" Grid.Row="4" Foreground="#FF000000"/>
-        <TextBlock x:Name="broadcastEnabled" TextWrapping="Wrap" Text="ENABLED" HorizontalAlignment="Right"  Grid.Column="1" Grid.Row="5" Foreground="#FF000000"/>
-        <TextBlock x:Name="bridgingEnabled" TextWrapping="Wrap" Text="DISABLED" HorizontalAlignment="Right"  Grid.Column="1" Grid.Row="6" Foreground="#FF000000"/>
-        <TextBlock x:Name="deviceName" TextWrapping="Wrap" HorizontalAlignment="Right"  Grid.Column="1" Grid.Row="7" Foreground="#FF000000"><Span><Run Text="ethernet_32771"/></Span></TextBlock>
-        <TextBlock x:Name="managedIps" TextWrapping="Wrap" HorizontalAlignment="Right" TextAlignment="Right"  Grid.Column="1" Grid.Row="8" Foreground="#FF000000"><Span><Run Text="28.2.169.248/7 "/></Span><LineBreak/><Span><Run Text="fd80:56c2:e21c:0000:0199:9383:4a02:a9f8/88"/></Span></TextBlock>
+        <TextBlock x:Name="networkStatus" TextWrapping="Wrap" HorizontalAlignment="Right" Text="OK" TextAlignment="Right"  Grid.Column="2" Grid.Row="1" Foreground="#FF000000"/>
+        <TextBlock x:Name="networkType" TextWrapping="Wrap" Text="PUBLIC" HorizontalAlignment="Right"  Grid.Column="2" Grid.Row="2" Foreground="#FF000000"/>
+        <TextBlock x:Name="macAddress" TextWrapping="Wrap" HorizontalAlignment="Right"  Grid.Column="2" Grid.Row="3" Foreground="#FF000000"><Span><Run Text="02:83:4a:1e:4b:3a"/></Span></TextBlock>
+        <TextBlock x:Name="mtu" TextWrapping="Wrap" Text="2800" HorizontalAlignment="Right"  Grid.Column="2" Grid.Row="4" Foreground="#FF000000"/>
+        <TextBlock x:Name="broadcastEnabled" TextWrapping="Wrap" Text="ENABLED" HorizontalAlignment="Right"  Grid.Column="2" Grid.Row="5" Foreground="#FF000000"/>
+        <TextBlock x:Name="bridgingEnabled" TextWrapping="Wrap" Text="DISABLED" HorizontalAlignment="Right"  Grid.Column="2" Grid.Row="6" Foreground="#FF000000"/>
+        <TextBlock x:Name="deviceName" TextWrapping="Wrap" HorizontalAlignment="Right"  Grid.Column="2" Grid.Row="7" Foreground="#FF000000"><Span><Run Text="ethernet_32771"/></Span></TextBlock>
+        <TextBlock x:Name="managedIps" TextWrapping="Wrap" HorizontalAlignment="Right" TextAlignment="Right"  Grid.Column="2" Grid.Row="8" Foreground="#FF000000"><Span><Run Text="28.2.169.248/7 "/></Span><LineBreak/><Span><Run Text="fd80:56c2:e21c:0000:0199:9383:4a02:a9f8/88"/></Span></TextBlock>
 
-        <Grid Grid.Column="0" Grid.Row="9" Grid.ColumnSpan="2" Background="#FFFFFFFF">
+        <Grid Grid.Column="0" Grid.Row="9" Grid.ColumnSpan="3" Background="#FFFFFFFF">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*"/>
             </Grid.ColumnDefinitions>
             <Button />
-            <Button x:Name="leaveButton" Content="Leave" HorizontalAlignment="Right" VerticalAlignment="Top" Width="75" Background="#FFFFB354"/>
+            <Button x:Name="leaveButton" Content="Leave" HorizontalAlignment="Right" VerticalAlignment="Bottom" Width="75" Background="#FFFFB354" Click="leaveButton_Click"/>
         </Grid>
     </Grid>
 </UserControl>
diff --git a/windows/WinUI/NetworkInfoView.xaml.cs b/windows/WinUI/NetworkInfoView.xaml.cs
index cbc268ca..ccdec288 100644
--- a/windows/WinUI/NetworkInfoView.xaml.cs
+++ b/windows/WinUI/NetworkInfoView.xaml.cs
@@ -20,11 +20,14 @@ namespace WinUI
     /// </summary>
     public partial class NetworkInfoView : UserControl
     {
-        ZeroTierNetwork network;
+        private APIHandler handler;
+        private ZeroTierNetwork network;
 
-        public NetworkInfoView(ZeroTierNetwork network)
+        public NetworkInfoView(APIHandler handler, ZeroTierNetwork network)
         {
             InitializeComponent();
+
+            this.handler = handler;
             this.network = network;
 
             UpdateNetworkData();
@@ -60,5 +63,10 @@ namespace WinUI
 
             return false;
         }
+
+        private void leaveButton_Click(object sender, RoutedEventArgs e)
+        {
+            handler.LeaveNetwork(network.NetworkId);
+        }
     }
 }
diff --git a/windows/WinUI/NetworksPage.xaml.cs b/windows/WinUI/NetworksPage.xaml.cs
index 60ae0b88..9ded9970 100644
--- a/windows/WinUI/NetworksPage.xaml.cs
+++ b/windows/WinUI/NetworksPage.xaml.cs
@@ -20,11 +20,18 @@ namespace WinUI
     /// </summary>
     public partial class NetworksPage : UserControl
     {
+        private APIHandler handler;
+
         public NetworksPage()
         {
             InitializeComponent();
         }
 
+        public void SetAPIHandler(APIHandler handler)
+        {
+            this.handler = handler;
+        }
+
         public void setNetworks(List<ZeroTierNetwork> networks)
         {
             this.wrapPanel.Children.Clear();
@@ -33,6 +40,7 @@ namespace WinUI
             {
                 this.wrapPanel.Children.Add(
                     new NetworkInfoView(
+                        handler,
                         networks.ElementAt<ZeroTierNetwork>(i)));
             }
         }
-- 
cgit v1.2.3