Changeset 5260

Timestamp:

Mar 16, 2008, 2:24:27 PM (14 years ago)

Author:

livings124

Message:

#792 Allow Option-Command-F to focus the filter field in the main window

Location:

trunk/macosx

Files:

• Controller.h (modified) (1 diff)
• Controller.m (modified) (4 diffs)
• TorrentTableView.m (modified) (1 diff)

trunk/macosx/Controller.h

@@ -242 +242 @@
 - (void) toggleFilterBar: (id) sender;
 - (void) showFilterBar: (BOOL) show animate: (BOOL) animate;
+- (void) focusFilterField;
 
 - (void) allToolbarClicked: (id) sender;

trunk/macosx/Controller.m

@@ -2797 +2797 @@
 }
 
-- (void) toggleStatusBar: (id) sender
-{
-    [self showStatusBar: [fStatusBar isHidden] animate: YES];
-    [fDefaults setBool: ![fStatusBar isHidden] forKey: @"StatusBar"];
-}
-
 - (NSRect) windowFrameByAddingHeight: (float) height checkLimits: (BOOL) check
 {
@@ -2838 +2832 @@
 }
 
+- (void) toggleStatusBar: (id) sender
+{
+    [self showStatusBar: [fStatusBar isHidden] animate: YES];
+    [fDefaults setBool: ![fStatusBar isHidden] forKey: @"StatusBar"];
+}
+
+//doesn't save shown state
 - (void) showStatusBar: (BOOL) show animate: (BOOL) animate
 {
@@ -2908 +2909 @@
 }
 
+//doesn't save shown state
 - (void) showFilterBar: (BOOL) show animate: (BOOL) animate
 {
@@ -2960 +2962 @@
         [fWindow makeFirstResponder: fTableView];
     }
+}
+
+- (void) focusFilterField
+{
+    [fWindow makeFirstResponder: fSearchFilterField];
+    if ([fFilterBar isHidden])
+        [self toggleFilterBar: self];
 }
 

trunk/macosx/TorrentTableView.m

@@ -508 +508 @@
 }
 
+//option-command-f will focus the filter bar's search field
+- (void) keyDown: (NSEvent *) event
+{
+    if ([[event charactersIgnoringModifiers] isEqualToString: @"f"] && [event modifierFlags] & NSAlternateKeyMask
+        && [event modifierFlags] & NSCommandKeyMask)
+        [fController focusFilterField];
+    else
+        [super keyDown: event];
+}
+
 - (void) toggleControlForTorrent: (Torrent *) torrent
 {