macOS: Manage tunnels: Keyboard shortcuts

Signed-off-by: Roopesh Chander <roop@roopc.net>

diff --git a/WireGuard/WireGuard/UI/macOS/ViewController/ManageTunnelsRootViewController.swift b/WireGuard/WireGuard/UI/macOS/ViewController/ManageTunnelsRootViewController.swift
index 1b1dc731091741986330dd7fb628b0c21674ead4..d8e9cfe0e1065358e864cb0b4451e5ef528329f0 100644 (file)
--- a/WireGuard/WireGuard/UI/macOS/ViewController/ManageTunnelsRootViewController.swift
+++ b/WireGuard/WireGuard/UI/macOS/ViewController/ManageTunnelsRootViewController.swift
@@ -7,6 +7,7 @@ class ManageTunnelsRootViewController: NSViewController {
 
     let tunnelsManager: TunnelsManager
     var tunnelsListVC: TunnelsListTableViewController?
+    var tunnelDetailVC: TunnelDetailTableViewController?
     let tunnelDetailContainerView = NSView()
     var tunnelDetailContentVC: NSViewController?
 
@@ -80,10 +81,36 @@ extension ManageTunnelsRootViewController: TunnelsListTableViewControllerDelegat
     func tunnelSelected(tunnel: TunnelContainer) {
         let tunnelDetailVC = TunnelDetailTableViewController(tunnelsManager: tunnelsManager, tunnel: tunnel)
         setTunnelDetailContentVC(tunnelDetailVC)
+        self.tunnelDetailVC = tunnelDetailVC
     }
 
     func tunnelsListEmpty() {
         let noTunnelsVC = NoTunnelsDetailViewController(tunnelsManager: tunnelsManager)
         setTunnelDetailContentVC(noTunnelsVC)
+        self.tunnelDetailVC = nil
+    }
+}
+
+extension ManageTunnelsRootViewController {
+    override func keyDown(with event: NSEvent) {
+        let modifierFlags = event.modifierFlags.rawValue & NSEvent.ModifierFlags.deviceIndependentFlagsMask.rawValue
+        let isCmdOrCmdShiftDown = (modifierFlags == NSEvent.ModifierFlags.command.rawValue || modifierFlags == NSEvent.ModifierFlags.command.rawValue | NSEvent.ModifierFlags.shift.rawValue)
+
+        if event.specialKey == .delete {
+            tunnelsListVC?.handleRemoveTunnelAction()
+        } else if isCmdOrCmdShiftDown {
+            switch event.charactersIgnoringModifiers {
+            case "n":
+                tunnelsListVC?.handleAddEmptyTunnelAction()
+            case "i":
+                tunnelsListVC?.handleImportTunnelAction()
+            case "t":
+                tunnelDetailVC?.handleToggleActiveStatusAction()
+            case "e":
+                tunnelDetailVC?.handleEditTunnelAction()
+            default:
+                break
+            }
+        }
     }
 }

diff --git a/WireGuard/WireGuard/UI/macOS/ViewController/TunnelDetailTableViewController.swift b/WireGuard/WireGuard/UI/macOS/ViewController/TunnelDetailTableViewController.swift
index 2c7f25adb8ddaa17e044528ad349c0a44d6c8710..adb32aa44186372ea8c3bb08214cbdcedeb5cd4c 100644 (file)
--- a/WireGuard/WireGuard/UI/macOS/ViewController/TunnelDetailTableViewController.swift
+++ b/WireGuard/WireGuard/UI/macOS/ViewController/TunnelDetailTableViewController.swift
@@ -201,6 +201,14 @@ class TunnelDetailTableViewController: NSViewController {
         presentAsSheet(tunnelEditVC)
     }
 
+    @objc func handleToggleActiveStatusAction() {
+        if tunnel.status == .inactive {
+            tunnelsManager.startActivation(of: tunnel)
+        } else if tunnel.status == .active {
+            tunnelsManager.startDeactivation(of: tunnel)
+        }
+    }
+
     @objc func statusCheckboxToggled(sender: AnyObject?) {
         guard let statusCheckbox = sender as? NSButton else { return }
         if statusCheckbox.state == .on {