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

Also mark currently selected category in menu

This commit is contained in:
Davide De Rosa 2021-01-26 19:16:52 +01:00
parent 98a8f84ad0
commit 88115e10b1
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -305,8 +305,8 @@ class StatusMenu: NSObject {
for category in infrastructure.categories { for category in infrastructure.categories {
let title = category.name.isEmpty ? L10n.Core.Global.Values.default : category.name.capitalized let title = category.name.isEmpty ? L10n.Core.Global.Values.default : category.name.capitalized
let submenu = NSMenu() let submenu = NSMenu()
let item = NSMenuItem(title: title, action: nil, keyEquivalent: "") let itemCategory = NSMenuItem(title: title, action: nil, keyEquivalent: "")
item.indentationLevel = 1 itemCategory.indentationLevel = 1
for group in category.groups.sorted() { for group in category.groups.sorted() {
let title = group.localizedCountry let title = group.localizedCountry
@ -328,6 +328,7 @@ class StatusMenu: NSObject {
submenuGroup.addItem(item) submenuGroup.addItem(item)
if pool.id == providerProfile.poolId { if pool.id == providerProfile.poolId {
itemCategory.state = .on
itemGroup.state = .on itemGroup.state = .on
item.state = .on item.state = .on
} }
@ -339,10 +340,10 @@ class StatusMenu: NSObject {
submenu.addItem(itemGroup) submenu.addItem(itemGroup)
} }
menu.setSubmenu(submenu, for: item) menu.setSubmenu(submenu, for: itemCategory)
menu.insertItem(item, at: i) menu.insertItem(itemCategory, at: i)
i += 1 i += 1
itemsProfile.append(item) itemsProfile.append(itemCategory)
} }
} else { } else {