[macdoc] Give focus to toolbar search entry when user switch to search tab

3 files changed, 69 insertions, 80 deletions

diff --git a/MyDocument.cs b/MyDocument.cs
index a52376a..7ee6f1e 100644
--- a/MyDocument.cs
+++ b/MyDocument.cs
@@ -128,6 +128,10 @@ namespace macdoc
 			multipleMatchResults.Source = new MultipleMatchDataSource (this);
 			searchResults.Source = new ResultDataSource ();
 			splitView.Delegate = new SplitViewDelegate ();
+			tabSelector.DidSelect += (sender, e) => {
+				if (e.Item.TabView.IndexOf (e.Item) == 2)
+					WindowForSheet.MakeFirstResponder (toolbarSearchEntry);
+			};
 		}
 		
 		class SplitViewDelegate : NSSplitViewDelegate
diff --git a/MyDocument.xib b/MyDocument.xib
index 4914e79..3d3ab61 100644
--- a/MyDocument.xib
+++ b/MyDocument.xib
@@ -3,7 +3,7 @@
 	<data>
 		<int key="IBDocument.SystemTarget">1070</int>
 		<string key="IBDocument.SystemVersion">11D50b</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2182</string>
 		<string key="IBDocument.AppKitVersion">1138.32</string>
 		<string key="IBDocument.HIToolboxVersion">568.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
@@ -13,10 +13,10 @@
 				<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string>com.apple.WebKitIBPlugin</string>
 			</object>
-			<object class="NSMutableArray" key="dict.values">
+			<object class="NSArray" key="dict.values">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>1938</string>
-				<string>822</string>
+				<string>2182</string>
+				<string>1117</string>
 			</object>
 		</object>
 		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
@@ -103,7 +103,7 @@
 							<string>NSToolbarFlexibleSpaceItem</string>
 							<string>NSToolbarSpaceItem</string>
 						</object>
-						<object class="NSMutableArray" key="dict.values">
+						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<object class="NSToolbarItem" id="886590447">
 								<object class="NSMutableString" key="NSToolbarItemIdentifier">
@@ -113,9 +113,11 @@
 								<string key="NSToolbarItemPaletteLabel">Search</string>
 								<nil key="NSToolbarItemToolTip"/>
 								<object class="NSSearchField" key="NSToolbarItemView" id="551242891">
-									<nil key="NSNextResponder"/>
+									<reference key="NSNextResponder"/>
 									<int key="NSvFlags">268</int>
 									<string key="NSFrame">{{0, 14}, {179, 22}}</string>
+									<reference key="NSSuperview"/>
+									<reference key="NSWindow"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSSearchFieldCell" key="NSCell" id="797323649">
 										<int key="NSCellFlags">343014976</int>
@@ -173,7 +175,7 @@
 														<string>AXDescription</string>
 														<string>NSAccessibilityEncodedAttributesValueType</string>
 													</object>
-													<object class="NSMutableArray" key="dict.values">
+													<object class="NSArray" key="dict.values">
 														<bool key="EncodedWithXMLCoder">YES</bool>
 														<string>cancel</string>
 														<integer value="1"/>
@@ -211,9 +213,11 @@
 								<string key="NSToolbarItemPaletteLabel">Home</string>
 								<nil key="NSToolbarItemToolTip"/>
 								<object class="NSPopUpButton" key="NSToolbarItemView" id="443656448">
-									<nil key="NSNextResponder"/>
+									<reference key="NSNextResponder"/>
 									<int key="NSvFlags">301</int>
 									<string key="NSFrame">{{0, 14}, {42, 25}}</string>
+									<reference key="NSSuperview"/>
+									<reference key="NSWindow"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSPopUpButtonCell" key="NSCell" id="890373045">
 										<int key="NSCellFlags">-2076049856</int>
@@ -277,9 +281,11 @@
 								<string key="NSToolbarItemPaletteLabel"/>
 								<nil key="NSToolbarItemToolTip"/>
 								<object class="NSButton" key="NSToolbarItemView" id="765530566">
-									<nil key="NSNextResponder"/>
+									<reference key="NSNextResponder"/>
 									<int key="NSvFlags">268</int>
 									<string key="NSFrame">{{0, 14}, {24, 24}}</string>
+									<reference key="NSSuperview"/>
+									<reference key="NSWindow"/>
 									<string key="NSReuseIdentifierKey">_NS:2510</string>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSButtonCell" key="NSCell" id="715062556">
@@ -320,9 +326,11 @@
 								<string key="NSToolbarItemPaletteLabel">Bookmarks</string>
 								<nil key="NSToolbarItemToolTip"/>
 								<object class="NSPopUpButton" key="NSToolbarItemView" id="956535447">
-									<nil key="NSNextResponder"/>
+									<reference key="NSNextResponder"/>
 									<int key="NSvFlags">301</int>
 									<string key="NSFrame">{{14, 14}, {40, 25}}</string>
+									<reference key="NSSuperview"/>
+									<reference key="NSWindow"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSPopUpButtonCell" key="NSCell" id="775537188">
 										<int key="NSCellFlags">-2076049856</int>
@@ -380,9 +388,11 @@
 								<string key="NSToolbarItemPaletteLabel">Custom View</string>
 								<nil key="NSToolbarItemToolTip"/>
 								<object class="NSSegmentedControl" key="NSToolbarItemView" id="1045502942">
-									<nil key="NSNextResponder"/>
+									<reference key="NSNextResponder"/>
 									<int key="NSvFlags">268</int>
 									<string key="NSFrame">{{5, 14}, {67, 25}}</string>
+									<reference key="NSSuperview"/>
+									<reference key="NSWindow"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSSegmentedCell" key="NSCell" id="485047982">
 										<int key="NSCellFlags">67239424</int>
@@ -435,9 +445,11 @@
 								<string key="NSToolbarItemPaletteLabel"/>
 								<nil key="NSToolbarItemToolTip"/>
 								<object class="NSButton" key="NSToolbarItemView" id="849608253">
-									<nil key="NSNextResponder"/>
+									<reference key="NSNextResponder"/>
 									<int key="NSvFlags">268</int>
 									<string key="NSFrame">{{0, 14}, {24, 24}}</string>
+									<reference key="NSSuperview"/>
+									<reference key="NSWindow"/>
 									<string key="NSReuseIdentifierKey">_NS:687</string>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSButtonCell" key="NSCell" id="886217048">
@@ -478,9 +490,11 @@
 								<string key="NSToolbarItemPaletteLabel">Custom View</string>
 								<nil key="NSToolbarItemToolTip"/>
 								<object class="NSSegmentedControl" key="NSToolbarItemView" id="595054495">
-									<nil key="NSNextResponder"/>
+									<reference key="NSNextResponder"/>
 									<int key="NSvFlags">268</int>
 									<string key="NSFrame">{{0, 14}, {103, 25}}</string>
+									<reference key="NSSuperview"/>
+									<reference key="NSWindow"/>
 									<string key="NSReuseIdentifierKey">_NS:2177</string>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSSegmentedCell" key="NSCell" id="297413210">
@@ -853,7 +867,7 @@
 																					<string>AXDescription</string>
 																					<string>NSAccessibilityEncodedAttributesValueType</string>
 																				</object>
-																				<object class="NSMutableArray" key="dict.values">
+																				<object class="NSArray" key="dict.values">
 																					<bool key="EncodedWithXMLCoder">YES</bool>
 																					<string>cancel</string>
 																					<integer value="1"/>
@@ -1451,7 +1465,7 @@
 														<string>WebKitDefaultFontSize</string>
 														<string>WebKitMinimumFontSize</string>
 													</object>
-													<object class="NSMutableArray" key="dict.values">
+													<object class="NSArray" key="dict.values">
 														<bool key="EncodedWithXMLCoder">YES</bool>
 														<integer value="12"/>
 														<integer value="12"/>
@@ -1688,6 +1702,14 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
+						<string key="label">toolbarSearchEntry</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="551242891"/>
+					</object>
+					<int key="connectionID">264</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
 						<string key="label">delegate</string>
 						<reference key="source" ref="252265233"/>
 						<reference key="destination" ref="1001"/>
@@ -2419,7 +2441,7 @@
 					<string>95.CustomClassName</string>
 					<string>95.IBPluginDependency</string>
 				</object>
-				<object class="NSMutableArray" key="dict.values">
+				<object class="NSArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2529,7 +2551,7 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">263</int>
+			<int key="maxID">264</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -2537,66 +2559,6 @@
 				<object class="IBPartialClassDescription">
 					<string key="className">MyDocument</string>
 					<string key="superclassName">NSDocument</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>BookmarkToolbarClicked:</string>
-							<string>IndexItemClicked:</string>
-							<string>MultipleMatchItemClicked:</string>
-							<string>SearchItemClicked:</string>
-							<string>StartIndexSearch:</string>
-							<string>StartSearch:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>NSTableView</string>
-							<string>NSTableView</string>
-							<string>NSTableView</string>
-							<string>NSSearchField</string>
-							<string>NSSearchField</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>BookmarkToolbarClicked:</string>
-							<string>IndexItemClicked:</string>
-							<string>MultipleMatchItemClicked:</string>
-							<string>SearchItemClicked:</string>
-							<string>StartIndexSearch:</string>
-							<string>StartSearch:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBActionInfo">
-								<string key="name">BookmarkToolbarClicked:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">IndexItemClicked:</string>
-								<string key="candidateClassName">NSTableView</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">MultipleMatchItemClicked:</string>
-								<string key="candidateClassName">NSTableView</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">SearchItemClicked:</string>
-								<string key="candidateClassName">NSTableView</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">StartIndexSearch:</string>
-								<string key="candidateClassName">NSSearchField</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">StartSearch:</string>
-								<string key="candidateClassName">NSSearchField</string>
-							</object>
-						</object>
-					</object>
 					<object class="NSMutableDictionary" key="outlets">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
@@ -2616,10 +2578,11 @@
 							<string>spinnerWidget</string>
 							<string>splitView</string>
 							<string>tabSelector</string>
+							<string>toolbarSearchEntry</string>
 							<string>viewBookmarksBtn</string>
 							<string>webView</string>
 						</object>
-						<object class="NSMutableArray" key="dict.values">
+						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>NSButton</string>
 							<string>NSPopUpButton</string>
@@ -2636,6 +2599,7 @@
 							<string>NSProgressIndicator</string>
 							<string>NSSplitView</string>
 							<string>NSTabView</string>
+							<string>NSSearchField</string>
 							<string>NSButton</string>
 							<string>WebView</string>
 						</object>
@@ -2659,10 +2623,11 @@
 							<string>spinnerWidget</string>
 							<string>splitView</string>
 							<string>tabSelector</string>
+							<string>toolbarSearchEntry</string>
 							<string>viewBookmarksBtn</string>
 							<string>webView</string>
 						</object>
-						<object class="NSMutableArray" key="dict.values">
+						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<object class="IBToOneOutletInfo">
 								<string key="name">addBookmarkBtn</string>
@@ -2725,6 +2690,10 @@
 								<string key="candidateClassName">NSTabView</string>
 							</object>
 							<object class="IBToOneOutletInfo">
+								<string key="name">toolbarSearchEntry</string>
+								<string key="candidateClassName">NSSearchField</string>
+							</object>
+							<object class="IBToOneOutletInfo">
 								<string key="name">viewBookmarksBtn</string>
 								<string key="candidateClassName">NSButton</string>
 							</object>
@@ -2739,6 +2708,14 @@
 						<string key="minorKey">./Classes/MyDocument.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">WebViewExtraordinaire</string>
+					<string key="superclassName">WebView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/WebViewExtraordinaire.h</string>
+					</object>
+				</object>
 			</object>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
@@ -2761,7 +2738,7 @@
 				<string>NSMenuMixedState</string>
 				<string>NSRemoveTemplate</string>
 			</object>
-			<object class="NSMutableArray" key="dict.values">
+			<object class="NSArray" key="dict.values">
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<string>{15, 15}</string>
 				<string>{8, 8}</string>
diff --git a/MyDocument.xib.designer.cs b/MyDocument.xib.designer.cs
index 520fc13..afafdc7 100644
--- a/MyDocument.xib.designer.cs
+++ b/MyDocument.xib.designer.cs
@@ -62,6 +62,9 @@ namespace macdoc
 		[Outlet]
 		MonoMac.AppKit.NSSearchField indexSearchEntry { get; set; }
 
+		[Outlet]
+		MonoMac.AppKit.NSSearchField toolbarSearchEntry { get; set; }
+		
 		[Action ("IndexItemClicked:")]
 		partial void IndexItemClicked (MonoMac.AppKit.NSTableView sender);
 
@@ -166,6 +169,11 @@ namespace macdoc
 				indexSearchEntry.Dispose ();
 				indexSearchEntry = null;
 			}
+
+			if (toolbarSearchEntry != null) {
+				toolbarSearchEntry.Dispose ();
+				toolbarSearchEntry = null;
+			}
 		}
 	}
 }