renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make single non-local drops work with multiple accounts

Browse Source
This commit is contained in:
Maurice Parker
2019-05-01 17:33:08 -05:00
parent 73f035c5b7
commit 78e98e4c03
6 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Mac/MainWindow/AddFeed/AddFeedWindowController.swift
View File

@@ -29,6 +29,7 @@ class AddFeedWindowController : NSWindowController {
private var urlString: String?
private var initialName: String?
private var initialAccount: Account?
private var initialFolder: Folder?
private weak var delegate: AddFeedWindowControllerDelegate?
private var folderTreeController: TreeController!
@@ -44,10 +45,11 @@ class AddFeedWindowController : NSWindowController {
var hostWindow: NSWindow!
convenience init(urlString: String?, name: String?, folder: Folder?, folderTreeController: TreeController, delegate: AddFeedWindowControllerDelegate?) {
convenience init(urlString: String?, name: String?, account: Account?, folder: Folder?, folderTreeController: TreeController, delegate: AddFeedWindowControllerDelegate?) {
self.init(windowNibName: NSNib.Name("AddFeedSheet"))
self.urlString = urlString
self.initialName = name
self.initialAccount = account
self.initialFolder = folder
self.delegate = delegate
self.folderTreeController = folderTreeController
@@ -67,8 +69,8 @@ class AddFeedWindowController : NSWindowController {
}
folderPopupButton.menu = FolderTreeMenu.createFolderPopupMenu(with: folderTreeController.rootNode)
if let folder = initialFolder {
FolderTreeMenu.select(folder, in: folderPopupButton)
if let account = initialAccount {
FolderTreeMenu.select(account: account, folder: initialFolder, in: folderPopupButton)
}
updateUI()