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

macOS: Show open panel as sheet on manage window

This commit is contained in:
Roopesh Chander 2019-01-03 19:43:52 +05:30
parent 8a08b9cc2c
commit 79feef3d1d
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
WireGuard/WireGuard/UI/macOS/StatusMenu.swift
View File

@ -13,6 +13,13 @@ class StatusMenu: NSMenu {
var firstTunnelMenuItemIndex: Int = 0 var firstTunnelMenuItemIndex: Int = 0
var numberOfTunnelMenuItems: Int = 0 var numberOfTunnelMenuItems: Int = 0
lazy var manageTunnelsWindow: NSWindow = {
let manageTunnelsRootVC = ManageTunnelsRootViewController(tunnelsManager: tunnelsManager)
let window = NSWindow(contentViewController: manageTunnelsRootVC)
window.setFrameAutosaveName(NSWindow.FrameAutosaveName("ManageTunnelsWindow")) // Auto-save window position and size
return window
}()
init(tunnelsManager: TunnelsManager) { init(tunnelsManager: TunnelsManager) {
self.tunnelsManager = tunnelsManager self.tunnelsManager = tunnelsManager
super.init(title: "WireGuard Status Bar Menu") super.init(title: "WireGuard Status Bar Menu")
@ -116,17 +123,16 @@ class StatusMenu: NSMenu {
} }
@objc func manageTunnelsClicked() { @objc func manageTunnelsClicked() {
let manageTunnelsRootVC = ManageTunnelsRootViewController(tunnelsManager: tunnelsManager)
let window = NSWindow(contentViewController: manageTunnelsRootVC)
window.setFrameAutosaveName(NSWindow.FrameAutosaveName("ManageTunnelsWindow")) // Auto-save window position and size
NSApp.activate(ignoringOtherApps: true) NSApp.activate(ignoringOtherApps: true)
window.makeKeyAndOrderFront(self) manageTunnelsWindow.makeKeyAndOrderFront(self)
} }
@objc func importTunnelsClicked() { @objc func importTunnelsClicked() {
NSApp.activate(ignoringOtherApps: true)
manageTunnelsWindow.makeKeyAndOrderFront(self)
let openPanel = NSOpenPanel() let openPanel = NSOpenPanel()
openPanel.allowedFileTypes = ["conf", "zip"] openPanel.allowedFileTypes = ["conf", "zip"]
openPanel.begin { [weak tunnelsManager] response in openPanel.beginSheetModal(for: manageTunnelsWindow) { [weak tunnelsManager] response in
guard let tunnelsManager = tunnelsManager else { return } guard let tunnelsManager = tunnelsManager else { return }
guard response == .OK else { return } guard response == .OK else { return }
guard let url = openPanel.url else { return } guard let url = openPanel.url else { return }