From e0c7f8737bd44296f9e55a2ded1b90bc3f954aac Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Sun, 24 Feb 2019 23:03:32 -0800
Subject: [PATCH] Add menu command and keyboard shortcut to move focus to the
 search field.

---
 NetNewsWire/Base.lproj/Main.storyboard            | 14 ++++++++------
 NetNewsWire/MainWindow/MainWindowController.swift | 11 ++++++++++-
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/NetNewsWire/Base.lproj/Main.storyboard b/NetNewsWire/Base.lproj/Main.storyboard
index 8043ab3cc..94caf875c 100644
--- a/NetNewsWire/Base.lproj/Main.storyboard
+++ b/NetNewsWire/Base.lproj/Main.storyboard
@@ -157,17 +157,18 @@
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <menu key="submenu" title="Find" id="1b7-l0-nxx">
                                                 <items>
+                                                    <menuItem title="Article Search" keyEquivalent="f" id="nB2-mv-2i5">
+                                                        <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                                        <connections>
+                                                            <action selector="moveFocusToSearchField:" target="Ady-hI-5gd" id="MhU-Pb-Po8"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem isSeparatorItem="YES" id="QuB-t0-74E"/>
                                                     <menuItem title="Find…" tag="1" keyEquivalent="f" id="Xz5-n4-O0W">
                                                         <connections>
                                                             <action selector="performFindPanelAction:" target="Ady-hI-5gd" id="cD7-Qs-BN4"/>
                                                         </connections>
                                                     </menuItem>
-                                                    <menuItem title="Find and Replace…" tag="12" keyEquivalent="f" id="YEy-JH-Tfz">
-                                                        <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                                        <connections>
-                                                            <action selector="performFindPanelAction:" target="Ady-hI-5gd" id="WD3-Gg-5AJ"/>
-                                                        </connections>
-                                                    </menuItem>
                                                     <menuItem title="Find Next" tag="2" keyEquivalent="g" id="q09-fT-Sye">
                                                         <connections>
                                                             <action selector="performFindPanelAction:" target="Ady-hI-5gd" id="NDo-RZ-v9R"/>
@@ -178,6 +179,7 @@
                                                             <action selector="performFindPanelAction:" target="Ady-hI-5gd" id="HOh-sY-3ay"/>
                                                         </connections>
                                                     </menuItem>
+                                                    <menuItem isSeparatorItem="YES" id="fQa-bL-eze"/>
                                                     <menuItem title="Use Selection for Find" tag="7" keyEquivalent="e" id="buJ-ug-pKt">
                                                         <connections>
                                                             <action selector="performFindPanelAction:" target="Ady-hI-5gd" id="U76-nv-p5D"/>
diff --git a/NetNewsWire/MainWindow/MainWindowController.swift b/NetNewsWire/MainWindow/MainWindowController.swift
index a8aa71b29..6ddc8dfe3 100644
--- a/NetNewsWire/MainWindow/MainWindowController.swift
+++ b/NetNewsWire/MainWindow/MainWindowController.swift
@@ -195,8 +195,11 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations, NSW
 			return canShowShareMenu()
 		}
 
-		if item.action == #selector(toggleSidebar(_:)) {
+		if item.action == #selector(moveFocusToSearchField(_:)) {
+			return currentSearchField != nil
+		}
 
+		if item.action == #selector(toggleSidebar(_:)) {
 			guard let splitViewItem = sidebarSplitViewItem else {
 				return false
 			}
@@ -354,6 +357,12 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations, NSW
 		sharingServicePicker.show(relativeTo: view.bounds, of: view, preferredEdge: .minY)
 	}
 
+	@IBAction func moveFocusToSearchField(_ sender: Any?) {
+		guard let searchField = currentSearchField else {
+			return
+		}
+		window?.makeFirstResponder(searchField)
+	}
 }
 
 // MARK: - SidebarDelegate