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

Better QRCode window.

Browse Source
This commit is contained in:
Qiu Yuzhou
2017-03-18 17:56:12 +08:00
parent 9ce64aad56
commit a58993748e
4 changed files with 44 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ShadowsocksX-NG/AppDelegate.swift
View File

@ -261,6 +261,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
}
qrcodeWinCtrl = SWBQRCodeWindowController(windowNibName: "SWBQRCodeWindowController")
qrcodeWinCtrl.qrCode = profile.URL()!.absoluteString
qrcodeWinCtrl.title = profile.title()
qrcodeWinCtrl.showWindow(self)
NSApp.activate(ignoringOtherApps: true)
qrcodeWinCtrl.window?.makeKeyAndOrderFront(nil)
@ -486,11 +487,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
for p in mgr.profiles {
let item = NSMenuItem()
item.tag = i + kProfileMenuItemIndexBase
if p.remark.isEmpty {
item.title = "\(p.serverHost):\(p.serverPort)"
} else {
item.title = "\(p.remark) (\(p.serverHost):\(p.serverPort))"
}
item.title = p.title()
if mgr.activeProfileId == p.uuid {
item.state = 1
}