macOS: Ability to import tunnels from file
For now, the open panel shows as a separate window. Later, we'll open it as a sheet on the 'Manage tunnels' window. Signed-off-by: Roopesh Chander <roop@roopc.net>
This commit is contained in:
@@ -16,6 +16,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
|
||||
let tunnelsManager: TunnelsManager = result.value!
|
||||
let statusMenu = StatusMenu(tunnelsManager: tunnelsManager)
|
||||
self.statusItem = createStatusBarItem(with: statusMenu)
|
||||
|
||||
tunnelsManager.tunnelsListDelegate = statusMenu
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
// SPDX-License-Identifier: MIT
|
||||
// Copyright © 2018 WireGuard LLC. All Rights Reserved.
|
||||
|
||||
import Cocoa
|
||||
|
||||
class ErrorPresenter: ErrorPresenterProtocol {
|
||||
static func showErrorAlert(title: String, message: String, from sourceVC: AnyObject?, onPresented: (() -> Void)?, onDismissal: (() -> Void)?) {
|
||||
let alert = NSAlert()
|
||||
alert.messageText = title
|
||||
alert.informativeText = message
|
||||
onPresented?()
|
||||
alert.runModal()
|
||||
onDismissal?()
|
||||
}
|
||||
}
|
||||
@@ -6,12 +6,16 @@ import Cocoa
|
||||
class StatusMenu: NSMenu {
|
||||
|
||||
let tunnelsManager: TunnelsManager
|
||||
var firstTunnelMenuItemIndex: Int = 0
|
||||
|
||||
init(tunnelsManager: TunnelsManager) {
|
||||
self.tunnelsManager = tunnelsManager
|
||||
super.init(title: "WireGuard Status Bar Menu")
|
||||
addTunnelMenuItems()
|
||||
addItem(NSMenuItem.separator())
|
||||
firstTunnelMenuItemIndex = numberOfItems
|
||||
let isAdded = addTunnelMenuItems()
|
||||
if isAdded {
|
||||
addItem(NSMenuItem.separator())
|
||||
}
|
||||
addTunnelManagementItems()
|
||||
}
|
||||
|
||||
@@ -19,14 +23,21 @@ class StatusMenu: NSMenu {
|
||||
fatalError("init(coder:) has not been implemented")
|
||||
}
|
||||
|
||||
func addTunnelMenuItems() {
|
||||
func addTunnelMenuItems() -> Bool {
|
||||
let numberOfTunnels = tunnelsManager.numberOfTunnels()
|
||||
for index in 0 ..< tunnelsManager.numberOfTunnels() {
|
||||
let tunnel = tunnelsManager.tunnel(at: index)
|
||||
let menuItem = NSMenuItem(title: tunnel.name, action: #selector(tunnelClicked(sender:)), keyEquivalent: "")
|
||||
menuItem.target = self
|
||||
menuItem.representedObject = tunnel
|
||||
let menuItem = createTunnelMenuItem(for: tunnel)
|
||||
addItem(menuItem)
|
||||
}
|
||||
return numberOfTunnels > 0
|
||||
}
|
||||
|
||||
func createTunnelMenuItem(for tunnel: TunnelContainer) -> NSMenuItem {
|
||||
let menuItem = NSMenuItem(title: tunnel.name, action: #selector(tunnelClicked(sender:)), keyEquivalent: "")
|
||||
menuItem.target = self
|
||||
menuItem.representedObject = tunnel
|
||||
return menuItem
|
||||
}
|
||||
|
||||
@objc func tunnelClicked(sender: AnyObject) {
|
||||
@@ -48,6 +59,47 @@ class StatusMenu: NSMenu {
|
||||
}
|
||||
|
||||
@objc func importTunnelsClicked() {
|
||||
print("Unimplemented")
|
||||
let openPanel = NSOpenPanel()
|
||||
openPanel.allowedFileTypes = ["conf", "zip"]
|
||||
openPanel.begin { [weak tunnelsManager] response in
|
||||
guard let tunnelsManager = tunnelsManager else { return }
|
||||
guard response == .OK else { return }
|
||||
guard let url = openPanel.url else { return }
|
||||
TunnelImporter.importFromFile(url: url, into: tunnelsManager, sourceVC: nil, errorPresenterType: ErrorPresenter.self)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extension StatusMenu: TunnelsManagerListDelegate {
|
||||
func tunnelAdded(at index: Int) {
|
||||
let tunnel = tunnelsManager.tunnel(at: index)
|
||||
let menuItem = createTunnelMenuItem(for: tunnel)
|
||||
if tunnelsManager.numberOfTunnels() == 1 {
|
||||
insertItem(NSMenuItem.separator(), at: firstTunnelMenuItemIndex + index)
|
||||
}
|
||||
insertItem(menuItem, at: firstTunnelMenuItemIndex + index)
|
||||
}
|
||||
|
||||
func tunnelModified(at index: Int) {
|
||||
let tunnel = tunnelsManager.tunnel(at: index)
|
||||
if let menuItem = item(at: firstTunnelMenuItemIndex + index) {
|
||||
menuItem.title = tunnel.name
|
||||
}
|
||||
}
|
||||
|
||||
func tunnelMoved(from oldIndex: Int, to newIndex: Int) {
|
||||
let tunnel = tunnelsManager.tunnel(at: oldIndex)
|
||||
let menuItem = createTunnelMenuItem(for: tunnel)
|
||||
removeItem(at: firstTunnelMenuItemIndex + oldIndex)
|
||||
insertItem(menuItem, at: firstTunnelMenuItemIndex + newIndex)
|
||||
}
|
||||
|
||||
func tunnelRemoved(at index: Int) {
|
||||
removeItem(at: firstTunnelMenuItemIndex + index)
|
||||
if tunnelsManager.numberOfTunnels() == 0 {
|
||||
if let firstItem = item(at: firstTunnelMenuItemIndex), firstItem.isSeparatorItem {
|
||||
removeItem(at: firstTunnelMenuItemIndex)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user