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

Merge branch 'pr/41' into develop

Browse Source
This commit is contained in:
Charlie Qiu
2016-08-23 17:34:19 +08:00
parent f9f342d7cf 671816b592
commit 9c0c8e219a
3 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ShadowsocksX-NG/AppDelegate.swift
View File

@ -78,6 +78,13 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
notifyCenter.addObserverForName(NOTIFY_SERVER_PROFILES_CHANGED, object: nil, queue: nil
, usingBlock: {
(note) in
let profileMgr = ServerProfileManager.instance
if profileMgr.activeProfileId == nil &&
profileMgr.profiles.count > 0{
if profileMgr.profiles[0].isValid(){
profileMgr.setActiveProfiledId(profileMgr.profiles[0].uuid)
}
}
self.updateServersMenu()
SyncSSLocal()
}

1
ShadowsocksX-NG/Base.lproj/PreferencesWindowController.xib
View File

@ -16,6 +16,7 @@
<outlet property="profileBox" destination="oZ5-85-pwY" id="D19-PQ-X7E"/>
<outlet property="profilesTableView" destination="r91-ho-Lum" id="TNk-f6-Vgo"/>
<outlet property="remarkTextField" destination="q3C-S0-iNn" id="DSv-lV-PX7"/>
<outlet property="removeButton" destination="3ei-2f-kHB" id="DdP-dA-coT"/>
<outlet property="window" destination="F0z-JX-Cv5" id="gIp-Ho-8D9"/>
</connections>
</customObject>

34
ShadowsocksX-NG/PreferencesWindowController.swift
View File

@ -26,6 +26,7 @@ class PreferencesWindowController: NSWindowController
@IBOutlet weak var copyURLBtn: NSButton!
@IBOutlet weak var removeButton: NSButton!
let tableViewDragType: String = "ss.server.profile.data"
var defaults: NSUserDefaults!
@ -33,6 +34,7 @@ class PreferencesWindowController: NSWindowController
var editingProfile: ServerProfile!
override func windowDidLoad() {
super.windowDidLoad()
@ -64,6 +66,7 @@ class PreferencesWindowController: NSWindowController
@IBAction func addProfile(sender: NSButton) {
if editingProfile != nil && !editingProfile.isValid(){
shakeWindows()
return
}
profilesTableView.beginUpdates()
@ -95,11 +98,13 @@ class PreferencesWindowController: NSWindowController
if editingProfile != nil {
if !editingProfile.isValid() {
// TODO Shake window?
shakeWindows()
return
}
}
profileMgr.save()
window?.performClose(nil)
NSNotificationCenter.defaultCenter()
.postNotificationName(NOTIFY_SERVER_PROFILES_CHANGED, object: nil)
@ -130,6 +135,12 @@ class PreferencesWindowController: NSWindowController
}
func updateProfileBoxVisible() {
if profileMgr.profiles.count <= 1 {
removeButton.enabled = false
}else{
removeButton.enabled = true
}
if profileMgr.profiles.isEmpty {
profileBox.hidden = true
} else {
@ -293,4 +304,27 @@ class PreferencesWindowController: NSWindowController
}
}
}
func shakeWindows(){
let numberOfShakes:Int = 8
let durationOfShake:Float = 0.5
let vigourOfShake:Float = 0.05
let frame:CGRect = (window?.frame)!
let shakeAnimation = CAKeyframeAnimation()
let shakePath = CGPathCreateMutable()
CGPathMoveToPoint(shakePath, nil, NSMinX(frame), NSMinY(frame))
for _ in 1...numberOfShakes{
CGPathAddLineToPoint(shakePath, nil, NSMinX(frame) - frame.size.width * CGFloat(vigourOfShake), NSMinY(frame))
CGPathAddLineToPoint(shakePath, nil, NSMinX(frame) + frame.size.width * CGFloat(vigourOfShake), NSMinY(frame))
}
CGPathCloseSubpath(shakePath)
shakeAnimation.path = shakePath
shakeAnimation.duration = CFTimeInterval(durationOfShake)
window?.animations = ["frameOrigin":shakeAnimation]
window?.animator().setFrameOrigin(window!.frame.origin)
}
}