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

Merge pull request #564 from timothyqiu/state-value

Browse Source 
Use StateValue constants instead of raw value
This commit is contained in:
Qiu Yuzhou
2017-10-22 02:14:21 -05:00
committed by GitHub
parent 591169d722 d50565f859
commit 617b41e720
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ShadowsocksX-NG/AppDelegate.swift
View File

@ -411,17 +411,17 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
serversMenuItem.title = serverMenuText
if mode == "auto" {
autoModeMenuItem.state = NSControl.StateValue(rawValue: 1)
globalModeMenuItem.state = NSControl.StateValue(rawValue: 0)
manualModeMenuItem.state = NSControl.StateValue(rawValue: 0)
autoModeMenuItem.state = .on
globalModeMenuItem.state = .off
manualModeMenuItem.state = .off
} else if mode == "global" {
autoModeMenuItem.state = NSControl.StateValue(rawValue: 0)
globalModeMenuItem.state = NSControl.StateValue(rawValue: 1)
manualModeMenuItem.state = NSControl.StateValue(rawValue: 0)
autoModeMenuItem.state = .off
globalModeMenuItem.state = .on
manualModeMenuItem.state = .off
} else if mode == "manual" {
autoModeMenuItem.state = NSControl.StateValue(rawValue: 0)
globalModeMenuItem.state = NSControl.StateValue(rawValue: 0)
manualModeMenuItem.state = NSControl.StateValue(rawValue: 1)
autoModeMenuItem.state = .off
globalModeMenuItem.state = .off
manualModeMenuItem.state = .on
}
updateStatusMenuImage()
}
@ -493,7 +493,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
let item = NSMenuItem()
item.tag = i + kProfileMenuItemIndexBase
item.title = profile.title()
item.state = NSControl.StateValue(rawValue: (mgr.activeProfileId == profile.uuid) ? 1 : 0)
item.state = (mgr.activeProfileId == profile.uuid) ? .on : .off
item.isEnabled = profile.isValid()
item.action = #selector(AppDelegate.selectServer)

4
ShadowsocksX-NG/ProxyInterfacesViewCtrl.swift
View File

@ -48,9 +48,9 @@ class ProxyInterfacesViewCtrl: NSViewController, NSTableViewDataSource, NSTableV
let networkService = networkServices[row] as! [String: Any]
let key = networkService["key"] as! String
if selectedNetworkServices.contains(key) {
cell.state = NSControl.StateValue(rawValue: 1)
cell.state = .on
} else {
cell.state = NSControl.StateValue(rawValue: 0)
cell.state = .off
}
let userDefinedName = networkService["userDefinedName"] as! String
cell.title = userDefinedName