xuemingqiang/ShadowsocksX-NG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pr/54' into develop

Browse Source 
# Conflicts:
#	ShadowsocksX-NG/AppDelegate.swift

Update to swift 3 syntax
This commit is contained in:
Charlie Qiu
2016-10-02 01:34:48 +08:00
parent 07532daac2 ff0ab584e9
commit cd5c724bb7
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ShadowsocksX-NG/AppDelegate.swift
View File

@ -310,6 +310,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
updateServersMenu() updateServersMenu()
SyncSSLocal() SyncSSLocal()
} }
updateRunningModeMenu()
} }
@IBAction func showLogs(_ sender: NSMenuItem) { @IBAction func showLogs(_ sender: NSMenuItem) {
@ -341,6 +342,20 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
func updateRunningModeMenu() { func updateRunningModeMenu() {
let defaults = UserDefaults.standard let defaults = UserDefaults.standard
let mode = defaults.string(forKey: "ShadowsocksRunningMode") let mode = defaults.string(forKey: "ShadowsocksRunningMode")
var serverMenuText = "Servers".localized
for v in defaults.array(forKey: "ServerProfiles")! {
let profile = v as! [String:Any]
if profile["Id"] as! String == defaults.string(forKey: "ActiveServerProfileId")! {
if profile["Remark"] as! String != "" {
serverMenuText = profile["Remark"] as! String
} else {
serverMenuText = profile["ServerHost"] as! String
}
}
}
serversMenuItem.title = serverMenuText
if mode == "auto" { if mode == "auto" {
proxyMenuItem.title = "Proxy - Auto By PAC".localized proxyMenuItem.title = "Proxy - Auto By PAC".localized
autoModeMenuItem.state = 1 autoModeMenuItem.state = 1