From c1ac1d629fb63871a721b9421d0ef21c6ef7a881 Mon Sep 17 00:00:00 2001
From: Mitchell Livingston <livings124@transmissionbt.com>
Date: Sun, 20 Feb 2011 04:34:46 +0000
Subject: [PATCH] restore cmd-option-f to select the search filter field when
 the torrent table view is selected

---
 macosx/Controller.m          | 7 +++----
 macosx/FilterBarController.h | 1 +
 macosx/FilterBarController.m | 5 +++++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/macosx/Controller.m b/macosx/Controller.m
index 2c7083f7e..9ef6cca27 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -2978,12 +2978,11 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
     }
 }
 
-#warning fix?
 - (void) focusFilterField
 {
-    /*[fWindow makeFirstResponder: fSearchFilterField];
-    if ([fFilterBar isHidden])
-        [self toggleFilterBar: self];*/
+    if (!fFilterBar)
+        [self toggleFilterBar: self];
+    [fFilterBar focusSearchField];
 }
 
 #warning change from id to QLPreviewPanel
diff --git a/macosx/FilterBarController.h b/macosx/FilterBarController.h
index 6248cec1b..6f29a61db 100644
--- a/macosx/FilterBarController.h
+++ b/macosx/FilterBarController.h
@@ -56,6 +56,7 @@
 - (void) setGroupFilter: (id) sender;
 
 - (NSString *) searchString;
+- (void) focusSearchField;
 
 - (void) setCountAll: (NSUInteger) all active: (NSUInteger) active downloading: (NSUInteger) downloading
         seeding: (NSUInteger) seeding paused: (NSUInteger) paused;
diff --git a/macosx/FilterBarController.m b/macosx/FilterBarController.m
index 98f5ba42d..df16ec341 100644
--- a/macosx/FilterBarController.m
+++ b/macosx/FilterBarController.m
@@ -187,6 +187,11 @@
     [[NSNotificationCenter defaultCenter] postNotificationName: @"ApplyFilter" object: nil];
 }
 
+- (void) focusSearchField
+{
+    [[[self view] window] makeFirstResponder: fSearchField];
+}
+
 - (void) setSearchType: (id) sender
 {
     NSString * oldFilterType = [[NSUserDefaults standardUserDefaults] stringForKey: @"FilterSearchType"];