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

Move mark bulk read commands to Panic Buttons submenu.

This commit is contained in:
Brent Simmons 2017-11-19 15:45:20 -08:00
parent 9c571271e6
commit 9c2dd9251f
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Evergreen/AppDelegate.swift
View File

@ -80,7 +80,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations,
addFolderWindowController!.runSheetOnWindow(window) addFolderWindowController!.runSheetOnWindow(window)
} }
func hitPanicButton(with window: NSWindow) { func markOlderArticlesAsRead(with window: NSWindow) {
panicButtonWindowController = PanicButtonWindowController() panicButtonWindowController = PanicButtonWindowController()
panicButtonWindowController!.runSheetOnWindow(window) panicButtonWindowController!.runSheetOnWindow(window)
@ -372,10 +372,10 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations,
Browser.open("https://ranchero.com/evergreen/help/1.0/", inBackground: false) Browser.open("https://ranchero.com/evergreen/help/1.0/", inBackground: false)
} }
@IBAction func hitPanicButton(_ sender: Any?) { @IBAction func markOlderArticlesAsRead(_ sender: Any?) {
createAndShowMainWindow() createAndShowMainWindow()
hitPanicButton(with: mainWindowController!.window!) markOlderArticlesAsRead(with: mainWindowController!.window!)
} }
} }

18
Evergreen/Base.lproj/Main.storyboard
View File

@ -426,11 +426,21 @@
<action selector="markAllAsRead:" target="Ady-hI-5gd" id="154-2D-ONk"/> <action selector="markAllAsRead:" target="Ady-hI-5gd" id="154-2D-ONk"/>
</connections> </connections>
</menuItem> </menuItem>
<menuItem title="Mark Older Articles as Read…" id="ilK-aW-oAO"> <menuItem title="Panic Buttons" id="edg-dV-8eg">
<modifierMask key="keyEquivalentModifierMask"/> <modifierMask key="keyEquivalentModifierMask"/>
<connections> <menu key="submenu" title="Panic Buttons" id="eTY-4t-iyJ">
<action selector="hitPanicButton:" target="Ady-hI-5gd" id="Y12-ll-3qL"/> <items>
</connections> <menuItem title="Mark Older Articles as Read…" id="oGf-d9-ScL">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="markOlderArticlesAsRead:" target="Ady-hI-5gd" id="ANJ-0A-dVY"/>
</connections>
</menuItem>
<menuItem title="Mark All Everywhere as Read…" id="vfn-M4-V9E">
<modifierMask key="keyEquivalentModifierMask"/>
</menuItem>
</items>
</menu>
</menuItem> </menuItem>
<menuItem isSeparatorItem="YES" id="gB0-WX-2Gd"/> <menuItem isSeparatorItem="YES" id="gB0-WX-2Gd"/>
<menuItem title="Mark as Starred" keyEquivalent="L" id="vvo-ZM-8kl"> <menuItem title="Mark as Starred" keyEquivalent="L" id="vvo-ZM-8kl">

4
Evergreen/MainWindow/MainWindowController.swift
View File

@ -160,9 +160,9 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
splitViewController!.toggleSidebar(sender) splitViewController!.toggleSidebar(sender)
} }
@IBAction func hitPanicButton(_ sender: Any?) { @IBAction func markOlderArticlesAsRead(_ sender: Any?) {
appDelegate.hitPanicButton(with: window!) appDelegate.markOlderArticlesAsRead(with: window!)
} }
} }