passepartoutvpn
/
wireguard-apple
mirror of https://github.com/passepartoutvpn/wireguard-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UI: macOS: Tunnel list: Incorporate on-demand-ness in the status circle 

Signed-off-by: Roopesh Chander <roop@roopc.net>
This commit is contained in:
Roopesh Chander 2021-07-29 11:12:30 +05:30
parent 2c2c53b1f8
commit 95e1409bfb
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Sources/WireGuardApp/UI/macOS/View/TunnelListRow.swift
View File

@ -12,9 +12,12 @@ class TunnelListRow: NSView {
self?.nameLabel.stringValue = tunnel.name self?.nameLabel.stringValue = tunnel.name
} }
// Bind to the tunnel's status // Bind to the tunnel's status
statusImageView.image = TunnelListRow.image(for: tunnel?.status) statusImageView.image = TunnelListRow.image(for: tunnel)
statusObservationToken = tunnel?.observe(\TunnelContainer.status) { [weak self] tunnel, _ in statusObservationToken = tunnel?.observe(\TunnelContainer.status) { [weak self] tunnel, _ in
self?.statusImageView.image = TunnelListRow.image(for: tunnel.status) self?.statusImageView.image = TunnelListRow.image(for: tunnel)
}
isOnDemandEnabledObservationToken = tunnel?.observe(\TunnelContainer.isActivateOnDemandEnabled) { [weak self] tunnel, _ in
self?.statusImageView.image = TunnelListRow.image(for: tunnel)
} }
} }
} }
@ -33,6 +36,7 @@ class TunnelListRow: NSView {
private var statusObservationToken: AnyObject? private var statusObservationToken: AnyObject?
private var nameObservationToken: AnyObject? private var nameObservationToken: AnyObject?
private var isOnDemandEnabledObservationToken: AnyObject?
init() { init() {
super.init(frame: CGRect.zero) super.init(frame: CGRect.zero)
@ -56,15 +60,19 @@ class TunnelListRow: NSView {
fatalError("init(coder:) has not been implemented") fatalError("init(coder:) has not been implemented")
} }
static func image(for status: TunnelStatus?) -> NSImage? { static func image(for tunnel: TunnelContainer?) -> NSImage? {
guard let status = status else { return nil } guard let tunnel = tunnel else { return nil }
switch status { switch tunnel.status {
case .active, .restarting, .reasserting: case .active, .restarting, .reasserting:
return NSImage(named: NSImage.statusAvailableName) return NSImage(named: NSImage.statusAvailableName)
case .activating, .waiting, .deactivating: case .activating, .waiting, .deactivating:
return NSImage(named: NSImage.statusPartiallyAvailableName) return NSImage(named: NSImage.statusPartiallyAvailableName)
case .inactive: case .inactive:
return NSImage(named: NSImage.statusNoneName) if tunnel.isActivateOnDemandEnabled {
return NSImage(named: NSImage.Name.statusOnDemandEnabled)
} else {
return NSImage(named: NSImage.statusNoneName)
}
} }
} }
@ -73,3 +81,7 @@ class TunnelListRow: NSView {
statusImageView.image = nil statusImageView.image = nil
} }
} }
extension NSImage.Name {
static let statusOnDemandEnabled = NSImage.Name("StatusCircleYellow")
}