Merge branch 'pr/75' into develop

This commit is contained in:
Charlie Qiu
2016-10-02 01:36:32 +08:00

View File

@ -372,6 +372,22 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
globalModeMenuItem.state = 0
manualModeMenuItem.state = 1
}
updateStatusItemUI()
}
func updateStatusItemUI() {
let defaults = NSUserDefaults.standardUserDefaults()
let mode = defaults.stringForKey("ShadowsocksRunningMode")
if mode == "auto" {
statusItem.title = "Auto".localized
} else if mode == "global" {
statusItem.title = "Global".localized
} else if mode == "manual" {
statusItem.title = "Manual".localized
}
let titleWidth = statusItem.title!.sizeWithAttributes([NSFontAttributeName: statusItem.button!.font!]).width
let imageWidth:CGFloat = 22
statusItem.length = titleWidth + imageWidth
}
func updateMainMenu() {