diff --git a/ZeroTier One/NetworkInfoCell.swift b/ZeroTier One/NetworkInfoCell.swift index 694eded50..038507cac 100644 --- a/ZeroTier One/NetworkInfoCell.swift +++ b/ZeroTier One/NetworkInfoCell.swift @@ -13,6 +13,15 @@ class NetworkInfoCell: NSTableCellView { @IBOutlet var networkIdField: NSTextField! @IBOutlet var networkNameField: NSTextField! + @IBOutlet var statusField: NSTextField! + @IBOutlet var typeField: NSTextField! + @IBOutlet var macField: NSTextField! + @IBOutlet var mtuField: NSTextField! + @IBOutlet var broadcastField: NSTextField! + @IBOutlet var bridgingField: NSTextField! + @IBOutlet var deviceField: NSTextField! + @IBOutlet var addressesField: NSTextField! + override func drawRect(dirtyRect: NSRect) { super.drawRect(dirtyRect) diff --git a/ZeroTier One/ShowNetworksViewController.swift b/ZeroTier One/ShowNetworksViewController.swift index 53f2e0f4f..a12e07430 100644 --- a/ZeroTier One/ShowNetworksViewController.swift +++ b/ZeroTier One/ShowNetworksViewController.swift @@ -49,6 +49,23 @@ class ShowNetworksViewController: NSViewController, NSTableViewDelegate, NSTable cell.networkIdField.stringValue = String(network.nwid, radix: 16) cell.networkNameField.stringValue = network.name + cell.statusField.stringValue = network.status.description + cell.typeField.stringValue = network.type.description + cell.macField.stringValue = network.mac + cell.mtuField.stringValue = String(network.mtu) + cell.broadcastField.stringValue = network.broadcastEnabled ? "ENABLED" : "DISABLED" + cell.bridgingField.stringValue = network.bridge ? "ENABLED" : "DISABLED" + cell.deviceField.stringValue = network.portDeviceName + + + cell.addressesField.stringValue = "" + + for nw in network.assignedAddresses { + cell.addressesField.stringValue += nw + cell.addressesField.stringValue += "\n" + } + + return cell } diff --git a/ZeroTier One/ShowNetworksViewController.xib b/ZeroTier One/ShowNetworksViewController.xib index 85dee589c..93286f864 100644 --- a/ZeroTier One/ShowNetworksViewController.xib +++ b/ZeroTier One/ShowNetworksViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -17,14 +17,14 @@ - + - - + + @@ -44,11 +44,11 @@ - + - + @@ -56,7 +56,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -72,7 +72,7 @@ - + @@ -80,7 +80,7 @@ - + @@ -88,7 +88,7 @@ - + @@ -96,7 +96,7 @@ - + @@ -104,7 +104,7 @@ - + @@ -112,7 +112,7 @@ - + @@ -120,7 +120,7 @@ - + @@ -128,8 +128,64 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -137,33 +193,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +