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

Merge branch 'develop' into develop

Browse Source
This commit is contained in:
Qiu Yuzhou
2017-07-20 10:13:45 +08:00
committed by GitHub
parent 0f050f6e44 0cbcbf8e91
commit 10b1423cb9
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ShadowsocksX-NG/PreferencesWindowController.swift
View File

@ -107,6 +107,7 @@ class PreferencesWindowController: NSWindowController
override func awakeFromNib() { override func awakeFromNib() {
profilesTableView.register(forDraggedTypes: [tableViewDragType]) profilesTableView.register(forDraggedTypes: [tableViewDragType])
profilesTableView.allowsMultipleSelection = true
} }
@IBAction func addProfile(_ sender: NSButton) { @IBAction func addProfile(_ sender: NSButton) {
@ -129,13 +130,20 @@ class PreferencesWindowController: NSWindowController
} }
@IBAction func removeProfile(_ sender: NSButton) { @IBAction func removeProfile(_ sender: NSButton) {
let index = profilesTableView.selectedRow let index = Int(profilesTableView.selectedRowIndexes.first!)
var deleteCount = 0
if index >= 0 { if index >= 0 {
profilesTableView.beginUpdates() profilesTableView.beginUpdates()
profileMgr.profiles.remove(at: index) for (_, toDeleteIndex) in profilesTableView.selectedRowIndexes.enumerated() {
profilesTableView.removeRows(at: IndexSet(integer: index), withAnimation: .effectFade) print(profileMgr.profiles.count)
profileMgr.profiles.remove(at: toDeleteIndex - deleteCount)
profilesTableView.removeRows(at: IndexSet(integer: toDeleteIndex - deleteCount), withAnimation: .effectFade)
deleteCount += 1
}
profilesTableView.endUpdates() profilesTableView.endUpdates()
} }
self.profilesTableView.scrollRowToVisible(index-1)
self.profilesTableView.selectRowIndexes(IndexSet(integer: index-1), byExtendingSelection: false)
updateProfileBoxVisible() updateProfileBoxVisible()
} }