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

Add a currentLinks property

Browse Source
This commit is contained in:
Nate Weaver
2022-10-07 21:41:02 -05:00
parent 48c5afffcd
commit 49e8b921ba
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Mac/MainWindow/MainWindowController.swift
View File

@@ -329,8 +329,8 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
}
@IBAction func copyArticleURL(_ sender: Any?) {
if let links = selectedArticles?.compactMap({ $0.preferredLink }) {
URLPasteboardWriter.write(urlStrings: links, to: .general)
if let currentLinks {
URLPasteboardWriter.write(urlStrings: currentLinks, to: .general)
}
}
@@ -340,14 +340,14 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
}
}
func openArticleURLs(_ urlStrings: [String]) {
func openArticleURLs(_ urlStrings: [String], invertPreference: Bool = false) {
if urlStrings.count > 500 {
return
}
func doOpenURLs() {
for urlString in urlStrings {
Browser.open(urlString, inBackground: false)
Browser.open(urlString, invertPreference: invertPreference)
}
}
@@ -373,7 +373,7 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
@IBAction func openArticleInBrowser(_ sender: Any?) {
guard let selectedArticles else { return }
let urlStrings = selectedArticles.compactMap { $0.preferredLink }
openArticleURLs(urlStrings)
openArticleURLs(urlStrings, invertPreference: NSApp.currentEvent?.modifierFlags.contains(.shift) ?? false)
}
@IBAction func openInBrowser(_ sender: Any?) {
@@ -1101,6 +1101,10 @@ private extension MainWindowController {
return selectedArticles?.first { $0.preferredLink != nil }?.preferredLink
}
var currentLinks: [String]? {
return selectedArticles?.compactMap { $0.preferredLink }
}
// MARK: - State Restoration
func savableState() -> [AnyHashable : Any] {
@@ -1136,7 +1140,7 @@ private extension MainWindowController {
// MARK: - Command Validation
func canCopyArticleURL() -> Bool {
return currentLink != nil
return currentLinks != nil
}
func canCopyExternalURL() -> Bool {