Convert to swift 3 syntax.

This commit is contained in:
Charlie Qiu
2016-10-02 01:39:21 +08:00
parent 294073011b
commit cb9d2b62ad

View File

@ -376,8 +376,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
} }
func updateStatusItemUI() { func updateStatusItemUI() {
let defaults = NSUserDefaults.standardUserDefaults() let defaults = UserDefaults.standard
let mode = defaults.stringForKey("ShadowsocksRunningMode") let mode = defaults.string(forKey: "ShadowsocksRunningMode")
if mode == "auto" { if mode == "auto" {
statusItem.title = "Auto".localized statusItem.title = "Auto".localized
} else if mode == "global" { } else if mode == "global" {
@ -385,7 +385,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
} else if mode == "manual" { } else if mode == "manual" {
statusItem.title = "Manual".localized statusItem.title = "Manual".localized
} }
let titleWidth = statusItem.title!.sizeWithAttributes([NSFontAttributeName: statusItem.button!.font!]).width let titleWidth = statusItem.title!.size(withAttributes: [NSFontAttributeName: statusItem.button!.font!]).width
let imageWidth:CGFloat = 22 let imageWidth:CGFloat = 22
statusItem.length = titleWidth + imageWidth statusItem.length = titleWidth + imageWidth
} }