Replace Mark Older as Read with Mark Above and Mark Below.

This commit is contained in:
Maurice Parker
2020-03-08 16:15:17 -07:00
parent fc447121d6
commit d94e090094
4 changed files with 71 additions and 59 deletions

View File

@@ -198,8 +198,12 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
return validateToggleStarred(item)
}
if item.action == #selector(markOlderArticlesAsRead(_:)) {
return canMarkOlderArticlesAsRead()
if item.action == #selector(markAboveArticlesAsRead(_:)) {
return canMarkAboveArticlesAsRead()
}
if item.action == #selector(markBelowArticlesAsRead(_:)) {
return canMarkBelowArticlesAsRead()
}
if item.action == #selector(toggleArticleExtractor(_:)) {
@@ -360,8 +364,12 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
splitViewController!.toggleSidebar(sender)
}
@IBAction func markOlderArticlesAsRead(_ sender: Any?) {
currentTimelineViewController?.markOlderArticlesRead()
@IBAction func markAboveArticlesAsRead(_ sender: Any?) {
currentTimelineViewController?.markAboveArticlesRead()
}
@IBAction func markBelowArticlesAsRead(_ sender: Any?) {
currentTimelineViewController?.markBelowArticlesRead()
}
@IBAction func navigateToTimeline(_ sender: Any?) {
@@ -808,11 +816,14 @@ private extension MainWindowController {
return true
}
func canMarkOlderArticlesAsRead() -> Bool {
return currentTimelineViewController?.canMarkOlderArticlesAsRead() ?? false
func canMarkAboveArticlesAsRead() -> Bool {
return currentTimelineViewController?.canMarkAboveArticlesAsRead() ?? false
}
func canMarkBelowArticlesAsRead() -> Bool {
return currentTimelineViewController?.canMarkBelowArticlesAsRead() ?? false
}
func canShowShareMenu() -> Bool {
guard let selectedArticles = selectedArticles else {