Merge branch 'display-server-in-menu' into develop

2026-10-20 06:24:32 +00:00 · 2016-09-08 18:49:07 +08:00
parent f338698043 9aaf6940e2
commit f956740150
1 changed files with 11 additions and 0 deletions
@@ -388,6 +388,17 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
    func updateRunningModeMenu() {
        let defaults = NSUserDefaults.standardUserDefaults()
        let mode = defaults.stringForKey("ShadowsocksRunningMode")
+        var serverMenuText = "Servers".localized
+        for i in defaults.arrayForKey("ServerProfiles")! {
+            if i["Id"] as! String == defaults.stringForKey("ActiveServerProfileId")! {
+                if i["Remark"] as! String != "" {
+                    serverMenuText = i["Remark"] as! String
+                } else {
+                    serverMenuText = i["ServerHost"] as! String
+                }
+            }
+        }
+        serversMenuItem.title = serverMenuText
        if mode == "auto" {
            proxyMenuItem.title = "Proxy - Auto By PAC".localized
            autoModeMenuItem.state = 1