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

Fix unsorted areas in macOS menu

This commit is contained in:
Davide De Rosa 2021-09-03 12:07:27 +02:00
parent 5cf593ed2b
commit f9e9df0e3b
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Passepartout/App/macOS/CHANGELOG.md
View File

@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## Unreleased
### Fixed
- Location areas were not sorted in menu.
## 1.16.0 (2021-08-09) ## 1.16.0 (2021-08-09)
### Added ### Added

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

@ -339,7 +339,7 @@ class StatusMenu: NSObject {
itemGroup.representedObject = group itemGroup.representedObject = group
let submenuGroup = NSMenu() let submenuGroup = NSMenu()
for pool in group.pools { for pool in group.pools.sortedPools() {
let title = !pool.secondaryId.isEmpty ? pool.secondaryId : L10n.Global.Values.default let title = !pool.secondaryId.isEmpty ? pool.secondaryId : L10n.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 {