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

Mark selected pool in status submenus 

Not only country/group.
This commit is contained in:
Davide De Rosa 2021-01-15 00:42:49 +01:00
parent 3b8933a9f2
commit 498e739dae
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -321,10 +321,6 @@ class StatusMenu: NSObject {
let submenuGroup = NSMenu() let submenuGroup = NSMenu()
for pool in group.pools { for pool in group.pools {
if pool.id == providerProfile.poolId {
itemGroup.state = .on
}
let title = !pool.secondaryId.isEmpty ? pool.secondaryId : L10n.Core.Global.Values.default let title = !pool.secondaryId.isEmpty ? pool.secondaryId : L10n.Core.Global.Values.default
let item = NSMenuItem(title: title, action: #selector(connectToPool(_:)), keyEquivalent: "") let item = NSMenuItem(title: title, action: #selector(connectToPool(_:)), keyEquivalent: "")
if let extraCountry = pool.extraCountries?.first { if let extraCountry = pool.extraCountries?.first {
@ -333,6 +329,11 @@ class StatusMenu: NSObject {
item.target = self item.target = self
item.representedObject = pool item.representedObject = pool
submenuGroup.addItem(item) submenuGroup.addItem(item)
if pool.id == providerProfile.poolId {
itemGroup.state = .on
item.state = .on
}
} }
if submenuGroup.numberOfItems > 1 { if submenuGroup.numberOfItems > 1 {
itemGroup.action = nil itemGroup.action = nil