mirror of
https://github.com/Ranchero-Software/NetNewsWire.git
synced 2025-02-01 19:46:56 +01:00
refactor open in app browser for mac and iOS
This commit is contained in:
parent
eb7ac0f076
commit
d671029828
@ -273,7 +273,7 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
|
||||
openArticleInBrowser(sender)
|
||||
}
|
||||
|
||||
@objc func openFeedInAppBrowser(_ sender: Any?) {
|
||||
@objc func openInAppBrowser(_ sender: Any?) {
|
||||
// There is no In-App Browser for mac - so we use safari
|
||||
openArticleInBrowser(sender)
|
||||
}
|
||||
|
@ -240,6 +240,14 @@ protocol SidebarDelegate: class {
|
||||
Browser.open(homePageURL, invertPreference: NSApp.currentEvent?.modifierFlags.contains(.shift) ?? false)
|
||||
}
|
||||
|
||||
@objc func openInAppBrowser(_ sender: Any?) {
|
||||
// There is no In-App Browser for mac - so we use safari
|
||||
guard let feed = singleSelectedWebFeed, let homePageURL = feed.homePageURL else {
|
||||
return
|
||||
}
|
||||
Browser.open(homePageURL, invertPreference: NSApp.currentEvent?.modifierFlags.contains(.shift) ?? false)
|
||||
}
|
||||
|
||||
@IBAction func gotoToday(_ sender: Any?) {
|
||||
selectFeed(SmartFeedsController.shared.todayFeed)
|
||||
focus()
|
||||
|
@ -110,7 +110,7 @@
|
||||
<key>key</key>
|
||||
<string>[return]</string>
|
||||
<key>action</key>
|
||||
<string>openFeedInAppBrowser:</string>
|
||||
<string>openInAppBrowser:</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>key</key>
|
||||
|
@ -178,7 +178,7 @@ private extension KeyboardManager {
|
||||
keys.append(KeyboardManager.createKeyCommand(title: openInBrowserTitle, action: "openInBrowser:", input: UIKeyCommand.inputRightArrow, modifiers: [.command]))
|
||||
|
||||
let openInAppBrowserTitle = NSLocalizedString("Open In App Browser", comment: "Open In App Browser")
|
||||
keys.append(KeyboardManager.createKeyCommand(title: openInAppBrowserTitle, action: "openInAppBrowser:", input: "\r", modifiers: []))
|
||||
keys.append(KeyboardManager.createKeyCommand(title: openInAppBrowserTitle, action: "openArticleInAppBrowser:", input: "\r", modifiers: []))
|
||||
|
||||
let toggleReadTitle = NSLocalizedString("Toggle Read Status", comment: "Toggle Read Status")
|
||||
keys.append(KeyboardManager.createKeyCommand(title: toggleReadTitle, action: "toggleRead:", input: "u", modifiers: [.command, .shift]))
|
||||
|
@ -83,11 +83,11 @@ class RootSplitViewController: UISplitViewController {
|
||||
}
|
||||
|
||||
@objc func openInAppBrowser(_ sender: Any?) {
|
||||
coordinator.showInAppBrowserForCurrentArticle()
|
||||
coordinator.showInAppBrowserForCurrentFeed()
|
||||
}
|
||||
|
||||
@objc func openFeedInAppBrowser(_ sender: Any?) {
|
||||
coordinator.showInAppBrowserForCurrentFeed()
|
||||
@objc func openArticleInAppBrowser(_ sender: Any?) {
|
||||
coordinator.showInAppBrowserForCurrentArticle()
|
||||
}
|
||||
|
||||
@objc func articleSearch(_ sender: Any?) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user