Convert network ip string to submenu list
cover Convert network ip string to submenu list
Hi,
Wireguard been a great help to me for working from home, many thanks to wiredguard team.
In my situation, allowedIPs contains many IP addresses, and as a string is too long in menu title, maybe convert it to submenu list is better.
https://imgur.com/a/bKdxeG8
Sincerely
Brook Q (1):
UI: macOS: move tunnel peers ip to submenus
Sources/WireGuardApp/Base.lproj/Localizable.strings | 1 + Sources/WireGuardApp/UI/macOS/StatusMenu.swift | 13 ++++++++++--- Sources/WireGuardApp/de.lproj/Localizable.strings | 1 + Sources/WireGuardApp/fa.lproj/Localizable.strings | 1 + Sources/WireGuardApp/fi.lproj/Localizable.strings | 1 + Sources/WireGuardApp/fr.lproj/Localizable.strings | 1 + Sources/WireGuardApp/it.lproj/Localizable.strings | 1 + Sources/WireGuardApp/ja.lproj/Localizable.strings | 1 + Sources/WireGuardApp/pa.lproj/Localizable.strings | 1 + Sources/WireGuardApp/pl.lproj/Localizable.strings | 1 + Sources/WireGuardApp/ro.lproj/Localizable.strings | 1 + Sources/WireGuardApp/ru.lproj/Localizable.strings | 1 + Sources/WireGuardApp/sl.lproj/Localizable.strings | 1 + Sources/WireGuardApp/tr.lproj/Localizable.strings | 1 + .../WireGuardApp/zh-Hans.lproj/Localizable.strings | 1 + .../WireGuardApp/zh-Hant.lproj/Localizable.strings | 1 + 16 files changed, 25 insertions(+), 3 deletions(-)
Signature · 1 line
2.32.0 (Apple Git-132)
PATCH 1/1 UI: macOS: move tunnel peers ip to submenus
Sometimes allowdIPs as a string is too long as menu title, maybe convert to submenu list is better.
--- Sources/WireGuardApp/Base.lproj/Localizable.strings | 1 + Sources/WireGuardApp/UI/macOS/StatusMenu.swift | 13 ++++++++++--- Sources/WireGuardApp/de.lproj/Localizable.strings | 1 + Sources/WireGuardApp/fa.lproj/Localizable.strings | 1 + Sources/WireGuardApp/fi.lproj/Localizable.strings | 1 + Sources/WireGuardApp/fr.lproj/Localizable.strings | 1 + Sources/WireGuardApp/it.lproj/Localizable.strings | 1 + Sources/WireGuardApp/ja.lproj/Localizable.strings | 1 + Sources/WireGuardApp/pa.lproj/Localizable.strings | 1 + Sources/WireGuardApp/pl.lproj/Localizable.strings | 1 + Sources/WireGuardApp/ro.lproj/Localizable.strings | 1 + Sources/WireGuardApp/ru.lproj/Localizable.strings | 1 + Sources/WireGuardApp/sl.lproj/Localizable.strings | 1 + Sources/WireGuardApp/tr.lproj/Localizable.strings | 1 + .../WireGuardApp/zh-Hans.lproj/Localizable.strings | 1 + .../WireGuardApp/zh-Hant.lproj/Localizable.strings | 1 + 16 files changed, 25 insertions(+), 3 deletions(-)
Sources/WireGuardApp/Base.lproj/Localizable.strings +1 -0
@@ -301,6 +301,7 @@ // Mac status bar menu / pulldown menu / main menu +"macMenuNetworks" = "Networks"; "macMenuNetworks (%@)" = "Networks: %@"; "macMenuNetworksNone" = "Networks: None";
Sources/WireGuardApp/UI/macOS/StatusMenu.swift +10 -3
@@ -107,12 +107,19 @@ class StatusMenu: NSMenu { networksMenuItem.title = "" networksMenuItem.isHidden = true } else { - let allowedIPs = tunnel.tunnelConfiguration?.peers.flatMap { $0.allowedIPs }.map { $0.stringRepresentation }.joined(separator: ", ") ?? "" - if !allowedIPs.isEmpty { - networksMenuItem.title = tr(format: "macMenuNetworks (%@)", allowedIPs) + networksMenuItem.submenu?.items.removeAll() + let allowedIPs = tunnel.tunnelConfiguration?.peers.flatMap { $0.allowedIPs }.map { $0.stringRepresentation } ?? [] + if allowedIPs.count > 0 { + networksMenuItem.title = tr("macMenuNetworks") + allowedIPs.forEach { ip in + let networkSubItem = NSMenuItem(title: ip, action: nil, keyEquivalent: "") + networkSubItem.isEnabled = false + networksMenuItem.submenu?.addItem(networkSubItem) + } } else { networksMenuItem.title = tr("macMenuNetworksNone") } + networksMenuItem.isEnabled = (networksMenuItem.submenu?.items.count ?? 0) > 0 networksMenuItem.isHidden = false } deactivateMenuItem.isHidden = tunnel.status != .active
Sources/WireGuardApp/de.lproj/Localizable.strings +1 -0
@@ -291,6 +291,7 @@ // Mac status bar menu / pulldown menu / main menu +"macMenuNetworks" = "Netzwerke"; "macMenuNetworks (%@)" = "Netzwerke:%@"; "macMenuNetworksNone" = "Keine Netzwerke.";
Sources/WireGuardApp/fa.lproj/Localizable.strings +1 -0
@@ -235,6 +235,7 @@ // Mac status bar menu / pulldown menu / main menu +"macMenuNetworks" = "شبکهها"; "macMenuNetworks (%@)" = "شبکهها: %@"; "macMenuNetworksNone" = "شبکهها: هیچی";
Sources/WireGuardApp/fi.lproj/Localizable.strings +1 -0
@@ -244,6 +244,7 @@ // Mac status bar menu / pulldown menu / main menu +"macMenuNetworks" = "Verkot"; "macMenuNetworks (%@)" = "Verkot: %@"; "macMenuNetworksNone" = "Verkot: Ei mitään";
Sources/WireGuardApp/fr.lproj/Localizable.strings +1 -0
@@ -291,6 +291,7 @@ // Mac status bar menu / pulldown menu / main menu +"macMenuNetworks" = "Réseaux"; "macMenuNetworks (%@)" = "Réseaux: %@"; "macMenuNetworksNone" = "Réseaux: Aucun";
Sources/WireGuardApp/it.lproj/Localizable.strings +1 -0
@@ -291,6 +291,7 @@ // Mac status bar menu / pulldown menu / main menu +"macMenuNetworks" = "Reti"; "macMenuNetworks (%@)" = "Reti: %@"; "macMenuNetworksNone" = "Reti: nessuna";
Sources/WireGuardApp/ja.lproj/Localizable.strings +1 -0
@@ -291,6 +291,7 @@ // Mac status bar menu / pulldown menu / main menu +"macMenuNetworks" = "ネットワーク"; "macMenuNetworks (%@)" = "ネットワーク: %@"; "macMenuNetworksNone" = "ネットワーク: なし";
Sources/WireGuardApp/pa.lproj/Localizable.strings +1 -0
@@ -291,6 +291,7 @@ // Mac status bar menu / pulldown menu / main menu +"macMenuNetworks" = "ਨੈੱਟਵਰਕ"; "macMenuNetworks (%@)" = "ਨੈੱਟਵਰਕ: %@"; "macMenuNetworksNone" = "ਨੈੱਟਵਰਕ: ਕੋਈ ਨਹੀਂ";
Sources/WireGuardApp/pl.lproj/Localizable.strings +1 -0
@@ -291,6 +291,7 @@ // Mac status bar menu / pulldown menu / main menu +"macMenuNetworks" = "Sieci"; "macMenuNetworks (%@)" = "Sieci: %@"; "macMenuNetworksNone" = "Sieci: brak";
Sources/WireGuardApp/ro.lproj/Localizable.strings +1 -0
@@ -291,6 +291,7 @@ // Mac status bar menu / pulldown menu / main menu +"macMenuNetworks" = "Rețele"; "macMenuNetworks (%@)" = "Rețele: %@"; "macMenuNetworksNone" = "Rețele: niciuna";
Sources/WireGuardApp/ru.lproj/Localizable.strings +1 -0
@@ -291,6 +291,7 @@ // Mac status bar menu / pulldown menu / main menu +"macMenuNetworks" = "Сети"; "macMenuNetworks (%@)" = "Сети: %@"; "macMenuNetworksNone" = "Сети отсутствуют";
Sources/WireGuardApp/sl.lproj/Localizable.strings +1 -0
@@ -291,6 +291,7 @@ // Mac status bar menu / pulldown menu / main menu +"macMenuNetworks" = "Omrežja"; "macMenuNetworks (%@)" = "Omrežja: %@"; "macMenuNetworksNone" = "Ni omrežij";
Sources/WireGuardApp/tr.lproj/Localizable.strings +1 -0
@@ -291,6 +291,7 @@ // Mac status bar menu / pulldown menu / main menu +"macMenuNetworks" = "Ağlar"; "macMenuNetworks (%@)" = "Ağlar: %@"; "macMenuNetworksNone" = "Ağlar: Yok";
Sources/WireGuardApp/zh-Hans.lproj/Localizable.strings +1 -0
@@ -291,6 +291,7 @@ // Mac status bar menu / pulldown menu / main menu +"macMenuNetworks" = "网络"; "macMenuNetworks (%@)" = "网络:%@"; "macMenuNetworksNone" = "网络:无";
Sources/WireGuardApp/zh-Hant.lproj/Localizable.strings +1 -0
@@ -176,6 +176,7 @@ "alertUnableToWriteLogTitle" = "Log export failed"; "alertInvalidPeerMessagePublicKeyRequired" = "Peer’s public key is required"; "macMenuNetworksNone" = "Networks: None"; +"macMenuNetworks" = "Networks"; "tunnelOnDemandSSIDsKey" = "SSIDs"; "alertCantOpenOutputZipFileForWritingMessage" = "Could not open zip file for writing."; "logViewTitle" = "Log";
Signature · 1 line
2.32.0 (Apple Git-132)