Alawn/ShadowsocksX-NG-R
1
0
Fork 0
mirror of https://github.com/qinyuhang/ShadowsocksX-NG-R.git synced 2026-10-20 14:34:30 +00:00
Code Releases Activity

[Bug fix] #123

Browse Source
This commit is contained in:
秦宇航
2017-04-05 15:24:21 +08:00
parent badc98b2e7
commit 803d14a33b
1 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ShadowsocksX-NG/AppDelegate.swift
+9 -24
View File
@@ -501,46 +501,28 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
}
serversMenuItem.title = serverMenuText
autoModeMenuItem.state = 0
globalModeMenuItem.state = 0
manualModeMenuItem.state = 0
whiteListModeMenuItem.state = 0
whiteListDomainMenuItem.state = 0
whiteListIPMenuItem.state = 0
if mode == "auto" {
proxyMenuItem.title = "Proxy - Auto By PAC".localized
autoModeMenuItem.state = 1
globalModeMenuItem.state = 0
manualModeMenuItem.state = 0
whiteListModeMenuItem.state = 0
whiteListDomainMenuItem.state = 0
whiteListIPMenuItem.state = 0
} else if mode == "global" {
proxyMenuItem.title = "Proxy - Global".localized
autoModeMenuItem.state = 0
globalModeMenuItem.state = 1
manualModeMenuItem.state = 0
whiteListModeMenuItem.state = 0
whiteListDomainMenuItem.state = 0
whiteListIPMenuItem.state = 0
} else if mode == "manual" {
proxyMenuItem.title = "Proxy - Manual".localized
autoModeMenuItem.state = 0
globalModeMenuItem.state = 0
manualModeMenuItem.state = 1
whiteListModeMenuItem.state = 0
whiteListDomainMenuItem.state = 0
whiteListIPMenuItem.state = 0
} else if mode == "whiteListDomain" {
proxyMenuItem.title = "Proxy - White List Domain".localized
autoModeMenuItem.state = 0
globalModeMenuItem.state = 0
manualModeMenuItem.state = 0
whiteListModeMenuItem.state = 1
whiteListDomainMenuItem.state = 1
whiteListIPMenuItem.state = 0
} else if mode == "whiteListIP" {
proxyMenuItem.title = "Proxy - White List IP".localized
autoModeMenuItem.state = 0
globalModeMenuItem.state = 0
manualModeMenuItem.state = 0
whiteListModeMenuItem.state = 1
whiteListDomainMenuItem.state = 0
whiteListIPMenuItem.state = 1
}
updateStatusItemUI()
@@ -550,6 +532,9 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
var image = NSImage()
let defaults = UserDefaults.standard
let mode = defaults.string(forKey: "ShadowsocksRunningMode")
if !defaults.bool(forKey: "ShadowsocksOn") {
return
}
if mode == "auto" {
image = NSImage(named: "menu_icon_pac")!
//statusItem?.title = "Auto".localized