From 225c2b095b03e4b0383a99863349fc28b6a3f893 Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Sat, 14 May 2016 15:42:45 -0700
Subject: [PATCH] Initial start of the menu bar app.

Has menu items to join/leave networks which currently displays an empty popover from the icon (icon needs to be made still)
---
 ZeroTier One.xcodeproj/project.pbxproj        |  16 +++++
 .../xcdebugger/Breakpoints_v2.xcbkptlist      |   5 ++
 ZeroTier One/AppDelegate.swift                |  64 +++++++++++++++++-
 ZeroTier One/Assets.xcassets/Contents.json    |   6 ++
 .../MenuBarIconMac.imageset/Contents.json     |  21 ++++++
 .../MenuBarIconMac.png                        | Bin 0 -> 3810 bytes
 .../MenuBarIconMac@2x.png                     | Bin 0 -> 5444 bytes
 ZeroTier One/Base.lproj/MainMenu.xib          |  11 +--
 ZeroTier One/Info.plist                       |   2 +
 ZeroTier One/JoinNetworkViewController.swift  |  18 +++++
 ZeroTier One/JoinNetworkViewController.xib    |  20 ++++++
 ZeroTier One/ShowNetworksViewController.swift |  18 +++++
 ZeroTier One/ShowNetworksViewController.xib   |  20 ++++++
 13 files changed, 195 insertions(+), 6 deletions(-)
 create mode 100644 ZeroTier One.xcodeproj/xcuserdata/grant.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
 create mode 100644 ZeroTier One/Assets.xcassets/Contents.json
 create mode 100644 ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json
 create mode 100644 ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBarIconMac.png
 create mode 100644 ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBarIconMac@2x.png
 create mode 100644 ZeroTier One/JoinNetworkViewController.swift
 create mode 100644 ZeroTier One/JoinNetworkViewController.xib
 create mode 100644 ZeroTier One/ShowNetworksViewController.swift
 create mode 100644 ZeroTier One/ShowNetworksViewController.xib

diff --git a/ZeroTier One.xcodeproj/project.pbxproj b/ZeroTier One.xcodeproj/project.pbxproj
index 107870671..2730b9873 100644
--- a/ZeroTier One.xcodeproj/project.pbxproj	
+++ b/ZeroTier One.xcodeproj/project.pbxproj	
@@ -10,6 +10,10 @@
 		93326BDC1CE7C816005CA2AC /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93326BDB1CE7C816005CA2AC /* AppDelegate.swift */; };
 		93326BDE1CE7C816005CA2AC /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 93326BDD1CE7C816005CA2AC /* Assets.xcassets */; };
 		93326BE11CE7C816005CA2AC /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 93326BDF1CE7C816005CA2AC /* MainMenu.xib */; };
+		93326BEA1CE7D9B9005CA2AC /* JoinNetworkViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93326BE81CE7D9B9005CA2AC /* JoinNetworkViewController.swift */; };
+		93326BEB1CE7D9B9005CA2AC /* JoinNetworkViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 93326BE91CE7D9B9005CA2AC /* JoinNetworkViewController.xib */; };
+		93326BEE1CE7DA30005CA2AC /* ShowNetworksViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93326BEC1CE7DA30005CA2AC /* ShowNetworksViewController.swift */; };
+		93326BEF1CE7DA30005CA2AC /* ShowNetworksViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 93326BED1CE7DA30005CA2AC /* ShowNetworksViewController.xib */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -18,6 +22,10 @@
 		93326BDD1CE7C816005CA2AC /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		93326BE01CE7C816005CA2AC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
 		93326BE21CE7C816005CA2AC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		93326BE81CE7D9B9005CA2AC /* JoinNetworkViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JoinNetworkViewController.swift; sourceTree = "<group>"; };
+		93326BE91CE7D9B9005CA2AC /* JoinNetworkViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = JoinNetworkViewController.xib; sourceTree = "<group>"; };
+		93326BEC1CE7DA30005CA2AC /* ShowNetworksViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShowNetworksViewController.swift; sourceTree = "<group>"; };
+		93326BED1CE7DA30005CA2AC /* ShowNetworksViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ShowNetworksViewController.xib; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -51,9 +59,13 @@
 			isa = PBXGroup;
 			children = (
 				93326BDB1CE7C816005CA2AC /* AppDelegate.swift */,
+				93326BE81CE7D9B9005CA2AC /* JoinNetworkViewController.swift */,
+				93326BEC1CE7DA30005CA2AC /* ShowNetworksViewController.swift */,
 				93326BDD1CE7C816005CA2AC /* Assets.xcassets */,
 				93326BDF1CE7C816005CA2AC /* MainMenu.xib */,
 				93326BE21CE7C816005CA2AC /* Info.plist */,
+				93326BE91CE7D9B9005CA2AC /* JoinNetworkViewController.xib */,
+				93326BED1CE7DA30005CA2AC /* ShowNetworksViewController.xib */,
 			);
 			path = "ZeroTier One";
 			sourceTree = "<group>";
@@ -116,6 +128,8 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				93326BEF1CE7DA30005CA2AC /* ShowNetworksViewController.xib in Resources */,
+				93326BEB1CE7D9B9005CA2AC /* JoinNetworkViewController.xib in Resources */,
 				93326BDE1CE7C816005CA2AC /* Assets.xcassets in Resources */,
 				93326BE11CE7C816005CA2AC /* MainMenu.xib in Resources */,
 			);
@@ -129,6 +143,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				93326BDC1CE7C816005CA2AC /* AppDelegate.swift in Sources */,
+				93326BEA1CE7D9B9005CA2AC /* JoinNetworkViewController.swift in Sources */,
+				93326BEE1CE7DA30005CA2AC /* ShowNetworksViewController.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/ZeroTier One.xcodeproj/xcuserdata/grant.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/ZeroTier One.xcodeproj/xcuserdata/grant.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
new file mode 100644
index 000000000..fe2b45415
--- /dev/null
+++ b/ZeroTier One.xcodeproj/xcuserdata/grant.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist	
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   type = "1"
+   version = "2.0">
+</Bucket>
diff --git a/ZeroTier One/AppDelegate.swift b/ZeroTier One/AppDelegate.swift
index 6ac5a5c14..e5932f5f5 100644
--- a/ZeroTier One/AppDelegate.swift	
+++ b/ZeroTier One/AppDelegate.swift	
@@ -14,8 +14,34 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     @IBOutlet weak var window: NSWindow!
 
 
+    let statusItem = NSStatusBar.systemStatusBar().statusItemWithLength(-2.0)
+
+    let networkListPopover = NSPopover()
+    let joinNetworkPopover = NSPopover()
+
+    var transientMonitor: AnyObject? = nil
+
     func applicationDidFinishLaunching(aNotification: NSNotification) {
-        // Insert code here to initialize your application
+
+
+        statusItem.image = NSImage(named: "MenuBarIconMac")
+
+        let menu = NSMenu()
+
+        menu.addItem(NSMenuItem(title: "Show Networks", action: #selector(AppDelegate.showNetworks), keyEquivalent: "n"))
+        menu.addItem(NSMenuItem(title: "Join Network", action: #selector(AppDelegate.joinNetwork), keyEquivalent: "j"))
+        menu.addItem(NSMenuItem.separatorItem())
+        menu.addItem(NSMenuItem(title: "Quit ZeroTier One", action: #selector(AppDelegate.quit), keyEquivalent: "q"))
+
+        statusItem.menu = menu
+
+        joinNetworkPopover.contentViewController = JoinNetworkViewController(
+            nibName: "JoinNetworkViewController", bundle: nil)
+        joinNetworkPopover.behavior = .Transient
+
+        networkListPopover.contentViewController = ShowNetworksViewController(
+            nibName: "ShowNetworksViewController", bundle: nil)
+        networkListPopover.behavior = .Transient
     }
 
     func applicationWillTerminate(aNotification: NSNotification) {
@@ -23,5 +49,41 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     }
 
 
+    func showNetworks() {
+        if let button = statusItem.button {
+            networkListPopover.showRelativeToRect(button.bounds, ofView: button, preferredEdge: .MinY)
+
+            if transientMonitor == nil {
+                transientMonitor = NSEvent.addGlobalMonitorForEventsMatchingMask(
+                    [.LeftMouseDownMask, .RightMouseDownMask, .OtherMouseDownMask]) { (event: NSEvent) -> Void in
+
+                        NSEvent.removeMonitor(self.transientMonitor!)
+                        self.transientMonitor = nil
+                        self.networkListPopover.close()
+                }
+            }
+        }
+    }
+
+    func joinNetwork() {
+        if let button = statusItem.button {
+            joinNetworkPopover.showRelativeToRect(button.bounds, ofView: button, preferredEdge: .MinY)
+
+            if transientMonitor == nil {
+                transientMonitor = NSEvent.addGlobalMonitorForEventsMatchingMask(
+                    [.LeftMouseDownMask, .RightMouseDownMask, .OtherMouseDownMask]) { (event: NSEvent) -> Void in
+
+                        NSEvent.removeMonitor(self.transientMonitor!)
+                        self.transientMonitor = nil
+                        self.joinNetworkPopover.close()
+
+                }
+            }
+        }
+    }
+
+    func quit() {
+        NSApp.performSelector(#selector(NSApp.terminate(_:)), withObject: nil, afterDelay: 0.0)
+    }
 }
 
diff --git a/ZeroTier One/Assets.xcassets/Contents.json b/ZeroTier One/Assets.xcassets/Contents.json
new file mode 100644
index 000000000..da4a164c9
--- /dev/null
+++ b/ZeroTier One/Assets.xcassets/Contents.json	
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json b/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json
new file mode 100644
index 000000000..ab75ef9a7
--- /dev/null
+++ b/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/Contents.json	
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "mac",
+      "filename" : "MenuBarIconMac.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "filename" : "MenuBarIconMac@2x.png",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
\ No newline at end of file
diff --git a/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBarIconMac.png b/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBarIconMac.png
new file mode 100644
index 0000000000000000000000000000000000000000..74e59fe79bd676b378d66de2d12d05dfa26e3746
GIT binary patch
literal 3810
zcmeAS@N?(olHy`uVBq!ia0y~yU=Rag4mJh`h9g^YtQi;>SkfJR9T^xl_H+M9WMyDr
zP)PO&@?~JCQe$9fXklRZ#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7&r?&B8wRq
z#8g3;(KATp0|Nt>VP;4~NrbPDRdRl=USdjqQmS4>ZUF-b*i=|m<QC+nmLw`v<mTiR
zTUFR9fmK-L6<dLX^_3LBN=mYAl_Got6rA&mQWZ?~O!N$t?6?#Z6l{u8(yW49+@RWv
zQqpXdGD=Dctn~HE%ggo3jrH=2()A53EiLs8jP#9+bc<5bbc-wVN)jt{^NN)rhQQ2m
zNi9w;$}A|!%+FH*nVXoDUs__Tqy(}^0R|xMEXhnm*pycc^;U9zu0BXc-%!s$ADgy<
zjQo=P;*9(PxGPcg!liK<kXn(6!(NaKPHid4a0?4ci*mq$l9H^Snv<HFnpaY+Z>VR8
z)x8zDI9ythSb)>AirfNUU$}iJ9)xMj&Bbb6afxeL34Wc$A(aKG`a!A1`K3k4sjg+I
zc_oNg1Vtn${H;LpIi;Y849&|du`{v(M+>?zB3^C4y8MeWQ}ap^LE7vLp<0l|kkrFt
z%F5H(IiM&%Ei)(8t~kiuNx{?A+04+=%uLrv&(KC6t2(UaIOpf&7y0I=q}mxHYeNVl
z=>o;IRX}D%YEFbpW^QU;ab|v=ow=EfK2`~IjbI~#3lfu4LB0fQK@vh&4Yno{mo-Qd
zNE%a;t<v&~auZAJGIJBtQ}qk-(rxq+f=DVWato|{Q%e$45=#<Y5=&C;j0_CTbPWu3
z4NXG~Ev$@;tc=Zd4J@n-3~cl<)S{W=T$Gwvl1hvzNGj3H@Xb%jOsgcu3?!9kW`Ir4
zFAB-e&#`j^6?X~&uxzj3?5tp9U}&nK5uTZsl3!k|3Go)P7F5%GeXTq)i%as0D#7I)
ztQ3M2e8H)OsG^_@04lk1GQkB{L1IyHDk#I)DuHqYD96A{Jh(|9J>ZOIRh*wzQl40p
z>X@FIS3-=_v1vm%A8vyUL|u7CY97A$MN);^kj%W|lEl2^R8JSXirfOd%*+%kOXIYp
zBqI}JT@xdtB;6zflVshbWRo;q<0Nw<qtql*%Vbki8-0lBNZN7Rk(dlF0+PY$DFvn#
zDvGYnMjsO3LntDWGZORCQ&a5pVP1m?p!*GxG-wrfMybXYmWCF|x+a#EDY}UkCPum-
zzOF%Ha*CNjs)dP#kqOL|q{LluVp%GAF$alH)SLy*q*!yJ4Y;zi^2AJ)#Q6+EJ0c38
zM*A0Krf23Q=D6f1mx3y5Xu?k+I^jdCz+w!BRY+Dq8eu8<$(bouh&n7S*~l=>FeObl
zDJjid*U&K4RM#@eBvscUIVCkEDb3J4$ub!hR!D|HErNtBQX>nTWgwzKE^c;QHu~VU
z9;n@C$5mAzBhJ9UBJJto7-At<8hSoIBvj<zxmx>Y<?T+VLo`|(oODcDCY(65_Q;VX
zM=}x~`<3g(B;DD-Q1(H6#tLrXUPDDjVe`BzJ3fkU<({44U~<H7V$`z3Tk@a%-BI)0
z@BZw}i?`2Jf4^IPu6*C`xy9#&3wZYJ_|SLqiS5QnXN8%qrb@rko^SZ|LT^v^4$1Y`
z{&q`fZ<0G4w{p(^KhB+b@q0pMeOSNPfA@a|?FHNilAhk|yv5?MCG-BIFV~K)<6QDD
zVe$NRW$bYeI#pYfG>T(6Y97DyT$NJVtLD`r{LpDm)XdyzkHd_4E@}J?K3m&y@NnFl
zyF33&e4V7OId=~K-%BRWnqNNr-CJr>G2hyvv2M<x?>*e>e#rIC{}Mc<|2=n<uwu_v
z-zFvJIS<bim(H=gb7$G38irN8ZEl-;n7ea*!fejS&u23G<uHlS?QlN--D3??9`$5#
z*XS9?A5rGsSJ3anwzw#Yw;+FO`_lR0AKrda4smX_zhygT-rNHVPjcn-uUwSRx4uD7
z;%Z=md5F4rgTIe{&e7w?yR|dcyIa(+YSn$WD)3XmlF-BM_J4aPvrAR{JyPc}<qgC6
zi)~IXCmV%)y0g%z_J2G344t1lO5SPAQ$JB+d&FmP%TH(Dn7W@5O7GrHUb=1b(i!J_
z1PwUTS82}tcS41YXH!8HTV#9Hq);E<WHq7alpDPtkKK&?<Ggly_%4BWF0sem8P~k7
z)Z4fFx4zi3Wizv~R%n_Zn<|lhPUGsyu%2-LcgM~5uiv>TVdAUXNg@aQxRlCYBuLbC
zopEgATVs*uZ11kHG2^OJPN8}2sYgQL2aM|M%0ITX^7YTtoB8gkfYo;CyK7g+*GjME
z`y%^1hQYdAD&v{5QSTPNtwCio_!EnTY;SE?y+E#F-Lttr%bo}t80H)cKIS#!X7I7~
z{Z$S(-4E&Rwz^YxA$pag=2ao#@|<1I_yWKEmlBS2{wBP~=>DPQ``0Ww?JRulMyN!<
z-x%SC>zt<DeKnbJ-=ADw{j(ocg3_0NoFT@Vyy3rQo?F}GDUZ)?W-t7@dUr(JZI#^&
ziZ`eK2wv9xRxhunRz81!g+%B#N!{RG?<A7)<8P=aollqR^HgwNsKUQk!u<V~gO~gF
z@5r^iR9!h`^_4HC*M7*&|9ZMB!Sq@4-iBi{-)a=}9|#S9n4H+jyO>wQ;6>o1*>A+p
zZfY-HbGJ*ayJ6RE!vNOvjq=&+6P`aQ<q6T{*_<0GTQ*_Av3F*!vEPH*xXLHx@koS}
zHEZPr7T2Yz8mb)le2(XUbm;Yf;_GId`_{`XaQkL+ov%c^UvY&8PkfV(+wm_)<D8pk
ze&?+={u<bOtnSP<g^iyM<pld}`QiEG&f1sLj=ix6zsY3qk-6@B%!3a3%Lg9Cep<Pj
zM`q5uM<%D<UQpVfHTi-)-?pEAIcKh(I+QMN!x}HVFi!B`iQk}}q^GN&%Q~loCII<U
BDCqzI

literal 0
HcmV?d00001

diff --git a/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBarIconMac@2x.png b/ZeroTier One/Assets.xcassets/MenuBarIconMac.imageset/MenuBarIconMac@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c99f851f4019b99d756e617bb59e1f973f16850
GIT binary patch
literal 5444
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
G5}E+O`c%CD

literal 0
HcmV?d00001

diff --git a/ZeroTier One/Base.lproj/MainMenu.xib b/ZeroTier One/Base.lproj/MainMenu.xib
index 3bcfb090a..4722fac25 100644
--- a/ZeroTier One/Base.lproj/MainMenu.xib	
+++ b/ZeroTier One/Base.lproj/MainMenu.xib	
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6233" systemVersion="14A329f" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6233"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10116"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -11,7 +12,7 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModuleProvider="target">
+        <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="ZeroTier_One" customModuleProvider="target">
             <connections>
                 <outlet property="window" destination="QvC-M9-y7g" id="gIp-Ho-8D9"/>
             </connections>
@@ -666,11 +667,11 @@
                 </menuItem>
             </items>
         </menu>
-        <window title="ZeroTier One" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="QvC-M9-y7g">
+        <window title="ZeroTier One" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="QvC-M9-y7g">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="335" y="390" width="480" height="360"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1177"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1716" height="1024"/>
             <view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
                 <rect key="frame" x="0.0" y="0.0" width="480" height="360"/>
                 <autoresizingMask key="autoresizingMask"/>
diff --git a/ZeroTier One/Info.plist b/ZeroTier One/Info.plist
index d5b744c6a..f5d0dc948 100644
--- a/ZeroTier One/Info.plist	
+++ b/ZeroTier One/Info.plist	
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>LSUIElement</key>
+	<true/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
diff --git a/ZeroTier One/JoinNetworkViewController.swift b/ZeroTier One/JoinNetworkViewController.swift
new file mode 100644
index 000000000..d071ce912
--- /dev/null
+++ b/ZeroTier One/JoinNetworkViewController.swift	
@@ -0,0 +1,18 @@
+//
+//  JoinNetworkViewController.swift
+//  ZeroTier One
+//
+//  Created by Grant Limberg on 5/14/16.
+//  Copyright © 2016 ZeroTier, Inc. All rights reserved.
+//
+
+import Cocoa
+
+class JoinNetworkViewController: NSViewController {
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        // Do view setup here.
+    }
+    
+}
diff --git a/ZeroTier One/JoinNetworkViewController.xib b/ZeroTier One/JoinNetworkViewController.xib
new file mode 100644
index 000000000..7f3f13297
--- /dev/null
+++ b/ZeroTier One/JoinNetworkViewController.xib	
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10116"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="JoinNetworkViewController" customModule="ZeroTier_One" customModuleProvider="target">
+            <connections>
+                <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customView id="Hz6-mo-xeY">
+            <rect key="frame" x="0.0" y="0.0" width="480" height="272"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+        </customView>
+    </objects>
+</document>
diff --git a/ZeroTier One/ShowNetworksViewController.swift b/ZeroTier One/ShowNetworksViewController.swift
new file mode 100644
index 000000000..0ecb38f53
--- /dev/null
+++ b/ZeroTier One/ShowNetworksViewController.swift	
@@ -0,0 +1,18 @@
+//
+//  ShowNetworksViewController.swift
+//  ZeroTier One
+//
+//  Created by Grant Limberg on 5/14/16.
+//  Copyright © 2016 ZeroTier, Inc. All rights reserved.
+//
+
+import Cocoa
+
+class ShowNetworksViewController: NSViewController {
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        // Do view setup here.
+    }
+    
+}
diff --git a/ZeroTier One/ShowNetworksViewController.xib b/ZeroTier One/ShowNetworksViewController.xib
new file mode 100644
index 000000000..2fe5f22f3
--- /dev/null
+++ b/ZeroTier One/ShowNetworksViewController.xib	
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10116"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="ShowNetworksViewController" customModule="ZeroTier_One" customModuleProvider="target">
+            <connections>
+                <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customView id="Hz6-mo-xeY">
+            <rect key="frame" x="0.0" y="0.0" width="480" height="272"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+        </customView>
+    </objects>
+</document>