From 0000e403df0af650ec77f8d1f6f66f5970405991 Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Tue, 14 Nov 2017 13:10:22 -0800
Subject: [PATCH 1/2] Change New Folder shortcut to shift-cmd-N to match
 Finder.

---
 Evergreen/Base.lproj/Main.storyboard | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Evergreen/Base.lproj/Main.storyboard b/Evergreen/Base.lproj/Main.storyboard
index 12414fd00..6b9aeb3f0 100644
--- a/Evergreen/Base.lproj/Main.storyboard
+++ b/Evergreen/Base.lproj/Main.storyboard
@@ -73,8 +73,7 @@
                                                 <action selector="showAddFeedWindow:" target="Ady-hI-5gd" id="LkT-kx-aCR"/>
                                             </connections>
                                         </menuItem>
-                                        <menuItem title="New Folder" keyEquivalent="n" id="wkh-LX-Xp1">
-                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                        <menuItem title="New Folder" keyEquivalent="N" id="wkh-LX-Xp1">
                                             <connections>
                                                 <action selector="showAddFolderWindow:" target="Ady-hI-5gd" id="GIi-wc-uYk"/>
                                             </connections>

From c228c34b001e5a826e64a80c3220d78b8a04dd37 Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Tue, 14 Nov 2017 13:18:25 -0800
Subject: [PATCH 2/2] =?UTF-8?q?Add=20New=20Window=20command=20to=20File=20?=
 =?UTF-8?q?menu=20=E2=80=94=20it=20creates=20a=20new=20reader=20window.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Evergreen/AppDelegate.swift          | 16 +++++++++++++++-
 Evergreen/Base.lproj/Main.storyboard |  6 ++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/Evergreen/AppDelegate.swift b/Evergreen/AppDelegate.swift
index ca5508ef8..5c2b2741e 100644
--- a/Evergreen/AppDelegate.swift
+++ b/Evergreen/AppDelegate.swift
@@ -24,6 +24,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations {
 	let windowControllers = NSMutableArray()
 	var preferencesWindowController: NSWindowController?
 	var mainWindowController: NSWindowController?
+	var readerWindows = [NSWindowController]()
 	var feedListWindowController: NSWindowController?
 	var dinosaursWindowController: DinosaursWindowController?
 	var addFeedController: AddFeedController?
@@ -131,7 +132,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations {
 	func createAndShowMainWindow() {
 
 		if mainWindowController == nil {
-			mainWindowController = windowControllerWithName("MainWindow")
+			mainWindowController = createReaderWindow()
 		}
 
 		mainWindowController!.showWindow(self)
@@ -162,6 +163,13 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations {
 
 	// MARK: - Actions
 
+	@IBAction func newReaderWindow(_ sender: Any?) {
+
+		let readerWindow = createReaderWindow()
+		readerWindows += [readerWindow]
+		readerWindow.showWindow(self)
+	}
+
 	@IBAction func showPreferences(_ sender: AnyObject) {
 
 		if preferencesWindowController == nil {
@@ -304,4 +312,10 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations {
 	}
 }
 
+private extension AppDelegate {
 
+	func createReaderWindow() -> NSWindowController {
+
+		return windowControllerWithName("MainWindow")
+	}
+}
diff --git a/Evergreen/Base.lproj/Main.storyboard b/Evergreen/Base.lproj/Main.storyboard
index 6b9aeb3f0..de7304ceb 100644
--- a/Evergreen/Base.lproj/Main.storyboard
+++ b/Evergreen/Base.lproj/Main.storyboard
@@ -78,6 +78,12 @@
                                                 <action selector="showAddFolderWindow:" target="Ady-hI-5gd" id="GIi-wc-uYk"/>
                                             </connections>
                                         </menuItem>
+                                        <menuItem title="New Window" keyEquivalent="n" id="J9a-dk-nAT">
+                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="newReaderWindow:" target="Ady-hI-5gd" id="XtC-K9-1Np"/>
+                                            </connections>
+                                        </menuItem>
                                         <menuItem isSeparatorItem="YES" id="m54-Is-iLE"/>
                                         <menuItem title="Refresh" keyEquivalent="r" id="Veh-SV-KWy">
                                             <connections>