FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix keyboard shortcuts in the timeline.

This commit is contained in:
Brent Simmons 2019-02-18 13:10:16 -08:00
parent 19023f9168
commit fd5726b56d
1 changed files with 34 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
NetNewsWire/MainWindow/MainWindowController.swift
View File

@ -36,9 +36,9 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
} }
private static var detailViewMinimumThickness = 384 private static var detailViewMinimumThickness = 384
private var sidebarViewController: SidebarViewController! private var sidebarViewController: SidebarViewController?
private var timelineContainerViewController: TimelineContainerViewController! private var timelineContainerViewController: TimelineContainerViewController?
private var detailViewController: DetailViewController! private var detailViewController: DetailViewController?
// MARK: - NSWindowController // MARK: - NSWindowController
@ -68,10 +68,10 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
restoreSplitViewState() restoreSplitViewState()
sidebarViewController = splitViewController?.splitViewItems[0].viewController as? SidebarViewController sidebarViewController = splitViewController?.splitViewItems[0].viewController as? SidebarViewController
sidebarViewController.delegate = self sidebarViewController!.delegate = self
timelineContainerViewController = splitViewController?.splitViewItems[1].viewController as? TimelineContainerViewController timelineContainerViewController = splitViewController?.splitViewItems[1].viewController as? TimelineContainerViewController
timelineContainerViewController.delegate = self timelineContainerViewController!.delegate = self
detailViewController = splitViewController?.splitViewItems[2].viewController as? DetailViewController detailViewController = splitViewController?.splitViewItems[2].viewController as? DetailViewController
@ -210,43 +210,41 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
// MARK: - Actions // MARK: - Actions
@IBAction func scrollOrGoToNextUnread(_ sender: Any?) { @IBAction func scrollOrGoToNextUnread(_ sender: Any?) {
guard let detailViewController = detailViewController else {
return
}
detailViewController.canScrollDown { (canScroll) in detailViewController.canScrollDown { (canScroll) in
NSCursor.setHiddenUntilMouseMoves(true) NSCursor.setHiddenUntilMouseMoves(true)
canScroll ? self.detailViewController.scrollPageDown(sender) : self.nextUnread(sender) canScroll ? detailViewController.scrollPageDown(sender) : self.nextUnread(sender)
} }
} }
@IBAction func showAddFolderWindow(_ sender: Any?) { @IBAction func showAddFolderWindow(_ sender: Any?) {
appDelegate.showAddFolderSheetOnWindow(window!) appDelegate.showAddFolderSheetOnWindow(window!)
} }
@IBAction func showAddFeedWindow(_ sender: Any?) { @IBAction func showAddFeedWindow(_ sender: Any?) {
appDelegate.showAddFeedSheetOnWindow(window!, urlString: nil, name: nil, folder: nil) appDelegate.showAddFeedSheetOnWindow(window!, urlString: nil, name: nil, folder: nil)
} }
@IBAction func openArticleInBrowser(_ sender: Any?) { @IBAction func openArticleInBrowser(_ sender: Any?) {
if let link = currentLink { if let link = currentLink {
Browser.open(link) Browser.open(link)
} }
} }
@IBAction func openInBrowser(_ sender: Any?) { @IBAction func openInBrowser(_ sender: Any?) {
openArticleInBrowser(sender) openArticleInBrowser(sender)
} }
@IBAction func nextUnread(_ sender: Any?) { @IBAction func nextUnread(_ sender: Any?) {
guard let timelineViewController = currentTimelineViewController, let sidebarViewController = sidebarViewController else {
guard let timelineViewController = timelineViewController, let sidebarViewController = sidebarViewController else {
return return
} }
NSCursor.setHiddenUntilMouseMoves(true) NSCursor.setHiddenUntilMouseMoves(true)
// TODO: handle search mode
if timelineViewController.canGoToNextUnread() { if timelineViewController.canGoToNextUnread() {
goToNextUnreadInTimeline() goToNextUnreadInTimeline()
} }
@ -259,90 +257,77 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
} }
@IBAction func markAllAsRead(_ sender: Any?) { @IBAction func markAllAsRead(_ sender: Any?) {
currentTimelineViewController?.markAllAsRead()
timelineViewController?.markAllAsRead()
} }
@IBAction func toggleRead(_ sender: Any?) { @IBAction func toggleRead(_ sender: Any?) {
currentTimelineViewController?.toggleReadStatusForSelectedArticles()
}
timelineViewController?.toggleReadStatusForSelectedArticles() @IBAction func markRead(_ sender: Any?) {
currentTimelineViewController?.markSelectedArticlesAsRead(sender)
} }
@IBAction func markUnread(_ sender: Any?) { @IBAction func markUnread(_ sender: Any?) {
currentTimelineViewController?.markSelectedArticlesAsUnread(sender)
timelineViewController?.markSelectedArticlesAsUnread(sender)
} }
@IBAction func toggleStarred(_ sender: Any?) { @IBAction func toggleStarred(_ sender: Any?) {
currentTimelineViewController?.toggleStarredStatusForSelectedArticles()
timelineViewController?.toggleStarredStatusForSelectedArticles()
} }
@IBAction func markAllAsReadAndGoToNextUnread(_ sender: Any?) { @IBAction func markAllAsReadAndGoToNextUnread(_ sender: Any?) {
markAllAsRead(sender) markAllAsRead(sender)
nextUnread(sender) nextUnread(sender)
} }
@IBAction func markUnreadAndGoToNextUnread(_ sender: Any?) { @IBAction func markUnreadAndGoToNextUnread(_ sender: Any?) {
markUnread(sender) markUnread(sender)
nextUnread(sender) nextUnread(sender)
} }
@IBAction func markReadAndGoToNextUnread(_ sender: Any?) { @IBAction func markReadAndGoToNextUnread(_ sender: Any?) {
markUnread(sender) markUnread(sender)
nextUnread(sender) nextUnread(sender)
} }
@IBAction func toggleSidebar(_ sender: Any?) { @IBAction func toggleSidebar(_ sender: Any?) {
splitViewController!.toggleSidebar(sender) splitViewController!.toggleSidebar(sender)
} }
@IBAction func markOlderArticlesAsRead(_ sender: Any?) { @IBAction func markOlderArticlesAsRead(_ sender: Any?) {
currentTimelineViewController?.markOlderArticlesRead()
timelineViewController?.markOlderArticlesRead()
} }
@IBAction func navigateToTimeline(_ sender: Any?) { @IBAction func navigateToTimeline(_ sender: Any?) {
currentTimelineViewController?.focus()
timelineViewController?.focus()
} }
@IBAction func navigateToSidebar(_ sender: Any?) { @IBAction func navigateToSidebar(_ sender: Any?) {
sidebarViewController?.focus() sidebarViewController?.focus()
} }
@IBAction func goToPreviousSubscription(_ sender: Any?) { @IBAction func goToPreviousSubscription(_ sender: Any?) {
sidebarViewController?.outlineView.selectPreviousRow(sender) sidebarViewController?.outlineView.selectPreviousRow(sender)
} }
@IBAction func goToNextSubscription(_ sender: Any?) { @IBAction func goToNextSubscription(_ sender: Any?) {
sidebarViewController?.outlineView.selectNextRow(sender) sidebarViewController?.outlineView.selectNextRow(sender)
} }
@IBAction func gotoToday(_ sender: Any?) { @IBAction func gotoToday(_ sender: Any?) {
sidebarViewController?.gotoToday(sender) sidebarViewController?.gotoToday(sender)
} }
@IBAction func gotoAllUnread(_ sender: Any?) { @IBAction func gotoAllUnread(_ sender: Any?) {
sidebarViewController?.gotoAllUnread(sender) sidebarViewController?.gotoAllUnread(sender)
} }
@IBAction func gotoStarred(_ sender: Any?) { @IBAction func gotoStarred(_ sender: Any?) {
sidebarViewController?.gotoStarred(sender) sidebarViewController?.gotoStarred(sender)
} }
@IBAction func toolbarShowShareMenu(_ sender: Any?) { @IBAction func toolbarShowShareMenu(_ sender: Any?) {
guard let selectedArticles = selectedArticles, !selectedArticles.isEmpty else { guard let selectedArticles = selectedArticles, !selectedArticles.isEmpty else {
assertionFailure("Expected toolbarShowShareMenu to be called only when there are selected articles.") assertionFailure("Expected toolbarShowShareMenu to be called only when there are selected articles.")
return return
@ -371,8 +356,8 @@ extension MainWindowController: SidebarDelegate {
func sidebarSelectionDidChange(_: SidebarViewController, selectedObjects: [AnyObject]?) { func sidebarSelectionDidChange(_: SidebarViewController, selectedObjects: [AnyObject]?) {
// TODO: if searching, cancel search // TODO: if searching, cancel search
timelineContainerViewController.setRepresentedObjects(selectedObjects, mode: .regular) timelineContainerViewController?.setRepresentedObjects(selectedObjects, mode: .regular)
timelineContainerViewController.showTimeline(.regular) timelineContainerViewController?.showTimeline(.regular)
updateWindowTitle() updateWindowTitle()
NotificationCenter.default.post(name: .InspectableObjectsDidChange, object: nil) NotificationCenter.default.post(name: .InspectableObjectsDidChange, object: nil)
} }
@ -426,8 +411,8 @@ private extension MainWindowController {
return viewController.children.first as? NSSplitViewController return viewController.children.first as? NSSplitViewController
} }
var timelineViewController: TimelineViewController? { var currentTimelineViewController: TimelineViewController? {
return splitViewController?.splitViewItems[1].viewController as? TimelineViewController return timelineContainerViewController?.currentTimelineViewController
} }
var sidebarSplitViewItem: NSSplitViewItem? { var sidebarSplitViewItem: NSSplitViewItem? {
@ -439,7 +424,7 @@ private extension MainWindowController {
} }
var selectedArticles: [Article]? { var selectedArticles: [Article]? {
return timelineViewController?.selectedArticles return currentTimelineViewController?.selectedArticles
} }
var oneSelectedArticle: Article? { var oneSelectedArticle: Article? {
@ -457,21 +442,21 @@ private extension MainWindowController {
func canGoToNextUnread() -> Bool { func canGoToNextUnread() -> Bool {
guard let timelineViewController = timelineViewController, let sidebarViewController = sidebarViewController else { guard let timelineViewController = currentTimelineViewController, let sidebarViewController = sidebarViewController else {
return false return false
} }
// TODO: handle search mode
return timelineViewController.canGoToNextUnread() || sidebarViewController.canGoToNextUnread() return timelineViewController.canGoToNextUnread() || sidebarViewController.canGoToNextUnread()
} }
func canMarkAllAsRead() -> Bool { func canMarkAllAsRead() -> Bool {
return timelineViewController?.canMarkAllAsRead() ?? false return currentTimelineViewController?.canMarkAllAsRead() ?? false
} }
func validateToggleRead(_ item: NSValidatedUserInterfaceItem) -> Bool { func validateToggleRead(_ item: NSValidatedUserInterfaceItem) -> Bool {
let validationStatus = timelineViewController?.markReadCommandStatus() ?? .canDoNothing let validationStatus = currentTimelineViewController?.markReadCommandStatus() ?? .canDoNothing
let markingRead: Bool let markingRead: Bool
let result: Bool let result: Bool
@ -502,7 +487,7 @@ private extension MainWindowController {
func canMarkOlderArticlesAsRead() -> Bool { func canMarkOlderArticlesAsRead() -> Bool {
return timelineViewController?.canMarkOlderArticlesAsRead() ?? false return currentTimelineViewController?.canMarkOlderArticlesAsRead() ?? false
} }
func canShowShareMenu() -> Bool { func canShowShareMenu() -> Bool {
@ -515,7 +500,7 @@ private extension MainWindowController {
func validateToggleStarred(_ item: NSValidatedUserInterfaceItem) -> Bool { func validateToggleStarred(_ item: NSValidatedUserInterfaceItem) -> Bool {
let validationStatus = timelineViewController?.markStarredCommandStatus() ?? .canDoNothing let validationStatus = currentTimelineViewController?.markStarredCommandStatus() ?? .canDoNothing
let starring: Bool let starring: Bool
let result: Bool let result: Bool
@ -551,7 +536,7 @@ private extension MainWindowController {
func goToNextUnreadInTimeline() { func goToNextUnreadInTimeline() {
guard let timelineViewController = timelineViewController else { guard let timelineViewController = currentTimelineViewController else {
return return
} }
@ -563,7 +548,7 @@ private extension MainWindowController {
func makeTimelineViewFirstResponder() { func makeTimelineViewFirstResponder() {
guard let window = window, let timelineViewController = timelineViewController else { guard let window = window, let timelineViewController = currentTimelineViewController else {
return return
} }
window.makeFirstResponderUnlessDescendantIsFirstResponder(timelineViewController.tableView) window.makeFirstResponderUnlessDescendantIsFirstResponder(timelineViewController.tableView)