macOS: Manage tunnels: Tunnel detail view
Signed-off-by: Roopesh Chander <roop@roopc.net>
This commit is contained in:
Roopesh Chander
@@ -230,3 +230,7 @@
|
||||
|
||||
"macMenuManageTunnels" = "Manage tunnels";
|
||||
"macMenuImportTunnels" = "Import tunnel(s) from file...";
|
||||
|
||||
// Mac detail view fields
|
||||
|
||||
"macDetailFieldKey (%@)" = "%@:";
|
||||
|
||||
@@ -0,0 +1,76 @@
|
||||
// SPDX-License-Identifier: MIT
|
||||
// Copyright © 2018 WireGuard LLC. All Rights Reserved.
|
||||
|
||||
import Cocoa
|
||||
|
||||
class KeyValueCell: NSView {
|
||||
let keyLabel: NSTextField = {
|
||||
let keyLabel = NSTextField()
|
||||
keyLabel.isEditable = false
|
||||
keyLabel.isSelectable = false
|
||||
keyLabel.isBordered = false
|
||||
keyLabel.alignment = .right
|
||||
keyLabel.maximumNumberOfLines = 1
|
||||
keyLabel.lineBreakMode = .byTruncatingTail
|
||||
keyLabel.backgroundColor = .clear
|
||||
return keyLabel
|
||||
}()
|
||||
|
||||
let valueLabel: NSTextField = {
|
||||
let valueLabel = NSTextField()
|
||||
valueLabel.isEditable = false
|
||||
valueLabel.isSelectable = true
|
||||
valueLabel.isBordered = false
|
||||
valueLabel.maximumNumberOfLines = 1
|
||||
valueLabel.lineBreakMode = .byTruncatingTail
|
||||
valueLabel.backgroundColor = .clear
|
||||
return valueLabel
|
||||
}()
|
||||
|
||||
var key: String {
|
||||
get { return keyLabel.stringValue }
|
||||
set(value) { keyLabel.stringValue = value }
|
||||
}
|
||||
var value: String {
|
||||
get { return valueLabel.stringValue }
|
||||
set(value) { valueLabel.stringValue = value }
|
||||
}
|
||||
var isKeyInBold: Bool {
|
||||
get { return keyLabel.font == NSFont.boldSystemFont(ofSize: 0) }
|
||||
set(value) {
|
||||
if value {
|
||||
keyLabel.font = NSFont.boldSystemFont(ofSize: 0)
|
||||
} else {
|
||||
keyLabel.font = NSFont.systemFont(ofSize: 0)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
init() {
|
||||
super.init(frame: CGRect.zero)
|
||||
|
||||
addSubview(keyLabel)
|
||||
addSubview(valueLabel)
|
||||
keyLabel.translatesAutoresizingMaskIntoConstraints = false
|
||||
valueLabel.translatesAutoresizingMaskIntoConstraints = false
|
||||
|
||||
NSLayoutConstraint.activate([
|
||||
keyLabel.centerYAnchor.constraint(equalTo: self.centerYAnchor),
|
||||
keyLabel.firstBaselineAnchor.constraint(equalTo: valueLabel.firstBaselineAnchor),
|
||||
self.leadingAnchor.constraint(equalTo: keyLabel.leadingAnchor),
|
||||
keyLabel.trailingAnchor.constraint(equalTo: valueLabel.leadingAnchor, constant: -5),
|
||||
valueLabel.trailingAnchor.constraint(equalTo: self.trailingAnchor),
|
||||
keyLabel.widthAnchor.constraint(equalToConstant: 120)
|
||||
])
|
||||
}
|
||||
|
||||
required init?(coder decoder: NSCoder) {
|
||||
fatalError("init(coder:) has not been implemented")
|
||||
}
|
||||
|
||||
override func prepareForReuse() {
|
||||
key = ""
|
||||
value = ""
|
||||
isKeyInBold = false
|
||||
}
|
||||
}
|
||||
@@ -6,6 +6,8 @@ import Cocoa
|
||||
class ManageTunnelsRootViewController: NSViewController {
|
||||
|
||||
let tunnelsManager: TunnelsManager
|
||||
let tunnelDetailContainerView = NSView()
|
||||
var tunnelDetailContentVC: NSViewController?
|
||||
|
||||
init(tunnelsManager: TunnelsManager) {
|
||||
self.tunnelsManager = tunnelsManager
|
||||
@@ -32,25 +34,53 @@ class ManageTunnelsRootViewController: NSViewController {
|
||||
])
|
||||
|
||||
let tunnelsListVC = TunnelsListTableViewController(tunnelsManager: tunnelsManager)
|
||||
tunnelsListVC.delegate = self
|
||||
let tunnelsListView = tunnelsListVC.view
|
||||
let tunnelDetailView = NSView()
|
||||
tunnelDetailView.wantsLayer = true
|
||||
tunnelDetailView.layer?.backgroundColor = NSColor.gray.cgColor
|
||||
|
||||
addChild(tunnelsListVC)
|
||||
view.addSubview(tunnelsListView)
|
||||
view.addSubview(tunnelDetailView)
|
||||
view.addSubview(tunnelDetailContainerView)
|
||||
|
||||
tunnelsListView.translatesAutoresizingMaskIntoConstraints = false
|
||||
tunnelDetailView.translatesAutoresizingMaskIntoConstraints = false
|
||||
tunnelDetailContainerView.translatesAutoresizingMaskIntoConstraints = false
|
||||
|
||||
NSLayoutConstraint.activate([
|
||||
tunnelsListView.topAnchor.constraint(equalTo: container.topAnchor),
|
||||
tunnelsListView.bottomAnchor.constraint(equalTo: container.bottomAnchor),
|
||||
tunnelsListView.leadingAnchor.constraint(equalTo: container.leadingAnchor),
|
||||
tunnelDetailView.leadingAnchor.constraint(equalTo: tunnelsListView.trailingAnchor, constant: horizontalSpacing),
|
||||
tunnelDetailView.trailingAnchor.constraint(equalTo: container.trailingAnchor),
|
||||
tunnelDetailContainerView.topAnchor.constraint(equalTo: container.topAnchor),
|
||||
tunnelDetailContainerView.bottomAnchor.constraint(equalTo: container.bottomAnchor),
|
||||
tunnelDetailContainerView.leadingAnchor.constraint(equalTo: tunnelsListView.trailingAnchor, constant: horizontalSpacing),
|
||||
tunnelDetailContainerView.trailingAnchor.constraint(equalTo: container.trailingAnchor),
|
||||
tunnelsListView.widthAnchor.constraint(equalTo: container.widthAnchor, multiplier: 0.3)
|
||||
])
|
||||
}
|
||||
|
||||
private func setTunnelDetailContentVC(_ contentVC: NSViewController) {
|
||||
if let currentContentVC = tunnelDetailContentVC {
|
||||
currentContentVC.view.removeFromSuperview()
|
||||
currentContentVC.removeFromParent()
|
||||
}
|
||||
addChild(contentVC)
|
||||
tunnelDetailContainerView.addSubview(contentVC.view)
|
||||
contentVC.view.translatesAutoresizingMaskIntoConstraints = false
|
||||
NSLayoutConstraint.activate([
|
||||
tunnelDetailContainerView.topAnchor.constraint(equalTo: contentVC.view.topAnchor),
|
||||
tunnelDetailContainerView.bottomAnchor.constraint(equalTo: contentVC.view.bottomAnchor),
|
||||
tunnelDetailContainerView.leadingAnchor.constraint(equalTo: contentVC.view.leadingAnchor),
|
||||
tunnelDetailContainerView.trailingAnchor.constraint(equalTo: contentVC.view.trailingAnchor)
|
||||
])
|
||||
tunnelDetailContentVC = contentVC
|
||||
}
|
||||
}
|
||||
|
||||
extension ManageTunnelsRootViewController: TunnelsListTableViewControllerDelegate {
|
||||
func tunnelSelected(tunnel: TunnelContainer) {
|
||||
let tunnelDetailVC = TunnelDetailTableViewController(tunnelsManager: tunnelsManager, tunnel: tunnel)
|
||||
setTunnelDetailContentVC(tunnelDetailVC)
|
||||
}
|
||||
|
||||
func tunnelListEmpty() {
|
||||
// TODO
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,129 @@
|
||||
// SPDX-License-Identifier: MIT
|
||||
// Copyright © 2018 WireGuard LLC. All Rights Reserved.
|
||||
|
||||
import Cocoa
|
||||
|
||||
class TunnelDetailTableViewController: NSViewController {
|
||||
|
||||
private enum TableViewModelRow {
|
||||
case interfaceFieldRow(TunnelViewModel.InterfaceField)
|
||||
case peerFieldRow(peer: TunnelViewModel.PeerData, field: TunnelViewModel.PeerField)
|
||||
case spacerRow
|
||||
|
||||
func localizedSectionKeyString() -> String {
|
||||
switch self {
|
||||
case .interfaceFieldRow: return tr("tunnelSectionTitleInterface")
|
||||
case .peerFieldRow: return tr("tunnelSectionTitlePeer")
|
||||
case .spacerRow: return ""
|
||||
}
|
||||
}
|
||||
|
||||
func isTitleRow() -> Bool {
|
||||
switch self {
|
||||
case .interfaceFieldRow(let field): return field == .name
|
||||
case .peerFieldRow(_, let field): return field == .publicKey
|
||||
case .spacerRow: return false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let interfaceFields: [TunnelViewModel.InterfaceField] = [
|
||||
.name, .publicKey, .addresses,
|
||||
.listenPort, .mtu, .dns
|
||||
]
|
||||
|
||||
let peerFields: [TunnelViewModel.PeerField] = [
|
||||
.publicKey, .preSharedKey, .endpoint,
|
||||
.allowedIPs, .persistentKeepAlive
|
||||
]
|
||||
|
||||
let tableView: NSTableView = {
|
||||
let tableView = NSTableView()
|
||||
tableView.addTableColumn(NSTableColumn(identifier: NSUserInterfaceItemIdentifier("TunnelDetail")))
|
||||
tableView.headerView = nil
|
||||
tableView.rowSizeStyle = .medium
|
||||
tableView.backgroundColor = .clear
|
||||
tableView.selectionHighlightStyle = .none
|
||||
return tableView
|
||||
}()
|
||||
|
||||
let tunnelsManager: TunnelsManager
|
||||
let tunnel: TunnelContainer
|
||||
var tunnelViewModel: TunnelViewModel {
|
||||
didSet {
|
||||
updateTableViewModelRows()
|
||||
}
|
||||
}
|
||||
private var tableViewModelRows = [TableViewModelRow]()
|
||||
|
||||
init(tunnelsManager: TunnelsManager, tunnel: TunnelContainer) {
|
||||
self.tunnelsManager = tunnelsManager
|
||||
self.tunnel = tunnel
|
||||
tunnelViewModel = TunnelViewModel(tunnelConfiguration: tunnel.tunnelConfiguration)
|
||||
super.init(nibName: nil, bundle: nil)
|
||||
updateTableViewModelRows()
|
||||
}
|
||||
|
||||
required init?(coder: NSCoder) {
|
||||
fatalError("init(coder:) has not been implemented")
|
||||
}
|
||||
|
||||
override func loadView() {
|
||||
tableView.dataSource = self
|
||||
tableView.delegate = self
|
||||
|
||||
let clipView = NSClipView()
|
||||
clipView.documentView = tableView
|
||||
|
||||
let scrollView = NSScrollView()
|
||||
scrollView.contentView = clipView // Set contentView before setting drawsBackground
|
||||
scrollView.drawsBackground = false
|
||||
scrollView.hasVerticalScroller = true
|
||||
scrollView.autohidesScrollers = true
|
||||
|
||||
view = scrollView
|
||||
}
|
||||
|
||||
func updateTableViewModelRows() {
|
||||
tableViewModelRows = []
|
||||
for field in interfaceFields where !tunnelViewModel.interfaceData[field].isEmpty {
|
||||
tableViewModelRows.append(.interfaceFieldRow(field))
|
||||
}
|
||||
for peerData in tunnelViewModel.peersData {
|
||||
tableViewModelRows.append(.spacerRow)
|
||||
for field in peerFields where !peerData[field].isEmpty {
|
||||
tableViewModelRows.append(.peerFieldRow(peer: peerData, field: field))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extension TunnelDetailTableViewController: NSTableViewDataSource {
|
||||
func numberOfRows(in tableView: NSTableView) -> Int {
|
||||
return tableViewModelRows.count
|
||||
}
|
||||
}
|
||||
|
||||
extension TunnelDetailTableViewController: NSTableViewDelegate {
|
||||
func tableView(_ tableView: NSTableView, viewFor tableColumn: NSTableColumn?, row: Int) -> NSView? {
|
||||
let modelRow = tableViewModelRows[row]
|
||||
switch modelRow {
|
||||
case .interfaceFieldRow(let field):
|
||||
let cell: KeyValueCell = tableView.dequeueReusableCell()
|
||||
let localizedKeyString = modelRow.isTitleRow() ? modelRow.localizedSectionKeyString() : field.localizedUIString
|
||||
cell.key = tr(format: "macDetailFieldKey (%@)", localizedKeyString)
|
||||
cell.value = tunnelViewModel.interfaceData[field]
|
||||
cell.isKeyInBold = modelRow.isTitleRow()
|
||||
return cell
|
||||
case .peerFieldRow(let peerData, let field):
|
||||
let cell: KeyValueCell = tableView.dequeueReusableCell()
|
||||
let localizedKeyString = modelRow.isTitleRow() ? modelRow.localizedSectionKeyString() : field.localizedUIString
|
||||
cell.key = tr(format: "macDetailFieldKey (%@)", localizedKeyString)
|
||||
cell.value = peerData[field]
|
||||
cell.isKeyInBold = modelRow.isTitleRow()
|
||||
return cell
|
||||
case .spacerRow:
|
||||
return NSView()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3,9 +3,15 @@
|
||||
|
||||
import Cocoa
|
||||
|
||||
protocol TunnelsListTableViewControllerDelegate: class {
|
||||
func tunnelSelected(tunnel: TunnelContainer)
|
||||
func tunnelListEmpty()
|
||||
}
|
||||
|
||||
class TunnelsListTableViewController: NSViewController {
|
||||
|
||||
let tunnelsManager: TunnelsManager
|
||||
weak var delegate: TunnelsListTableViewControllerDelegate?
|
||||
|
||||
let tableView: NSTableView = {
|
||||
let tableView = NSTableView()
|
||||
@@ -148,6 +154,17 @@ extension TunnelsListTableViewController: NSTableViewDelegate {
|
||||
cell.tunnel = tunnelsManager.tunnel(at: row)
|
||||
return cell
|
||||
}
|
||||
|
||||
func tableViewSelectionDidChange(_ notification: Notification) {
|
||||
guard tableView.selectedRow >= 0 else {
|
||||
if tunnelsManager.numberOfTunnels() == 0 {
|
||||
delegate?.tunnelListEmpty()
|
||||
}
|
||||
return
|
||||
}
|
||||
let selectedTunnel = tunnelsManager.tunnel(at: tableView.selectedRow)
|
||||
delegate?.tunnelSelected(tunnel: selectedTunnel)
|
||||
}
|
||||
}
|
||||
|
||||
class FillerButton: NSButton {
|
||||
|
||||
Reference in New Issue
Block a user