passepartoutvpn/passepartout-apple
1
0
Fork 0
mirror of https://github.com/passepartoutvpn/passepartout-apple.git synced 2025-02-08 00:42:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle pool group hierarchy in menu

Browse Source
This commit is contained in:
Davide De Rosa 2021-01-03 15:19:39 +01:00
parent e8c91fe00c
commit 9b50c8dc45
1 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Passepartout/App/macOS/Menu/StatusMenu.swift
View File

@ -314,17 +314,31 @@ class StatusMenu: NSObject {
for group in category.groups.sorted() { for group in category.groups.sorted() {
let title = group.localizedCountry let title = group.localizedCountry
let itemGroup = NSMenuItem(title: title, action: #selector(connectToPool(_:)), keyEquivalent: "") let itemGroup = NSMenuItem(title: title, action: #selector(connectToGroup(_:)), keyEquivalent: "")
itemGroup.image = group.logo itemGroup.image = group.logo
itemGroup.target = self itemGroup.target = self
itemGroup.representedObject = group itemGroup.representedObject = group
let submenuGroup = NSMenu()
for pool in group.pools { for pool in group.pools {
if pool.id == providerProfile.poolId { if pool.id == providerProfile.poolId {
itemGroup.state = .on itemGroup.state = .on
break
} }
let title = !pool.secondaryId.isEmpty ? pool.secondaryId : "Default"
let item = NSMenuItem(title: title, action: #selector(connectToPool(_:)), keyEquivalent: "")
if let extraCountry = pool.extraCountries?.first {
item.image = extraCountry.image
} }
item.target = self
item.representedObject = pool
submenuGroup.addItem(item)
}
if submenuGroup.numberOfItems > 1 {
itemGroup.action = nil
itemGroup.submenu = submenuGroup
}
submenu.addItem(itemGroup) submenu.addItem(itemGroup)
} }
menu.setSubmenu(submenu, for: item) menu.setSubmenu(submenu, for: item)
@ -405,7 +419,7 @@ class StatusMenu: NSObject {
vpn.reconnect(completionHandler: nil) vpn.reconnect(completionHandler: nil)
} }
@objc private func connectToPool(_ sender: Any?) { @objc private func connectToGroup(_ sender: Any?) {
guard let item = sender as? NSMenuItem else { guard let item = sender as? NSMenuItem else {
return return
} }
@ -423,6 +437,23 @@ class StatusMenu: NSObject {
setActiveProfile(profile) setActiveProfile(profile)
} }
@objc private func connectToPool(_ sender: Any?) {
guard let item = sender as? NSMenuItem else {
return
}
guard let pool = item.representedObject as? Pool else {
return
}
guard let profile = service.activeProfile as? ProviderConnectionProfile else {
return
}
service.setPoolId(pool.id, forProviderProfile: profile)
vpn.reconnect(completionHandler: nil)
// update menu
setActiveProfile(profile)
}
@objc private func connectToEndpoint(_ sender: Any?) { @objc private func connectToEndpoint(_ sender: Any?) {
guard let item = sender as? NSMenuItem else { guard let item = sender as? NSMenuItem else {
return return