Changeset 614

Timestamp:

Jul 16, 2006, 5:59:20 PM (16 years ago)

Author:

livings124

Message:

small search field in filter

Location:

trunk/macosx

Files:

• Controller.h (modified) (2 diffs)
• Controller.m (modified) (14 diffs)
• English.lproj/MainMenu.nib/classes.nib (modified) (2 diffs)
• English.lproj/MainMenu.nib/info.nib (modified) (2 diffs)
• English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
• TorrentCell.m (modified) (1 diff)

trunk/macosx/Controller.h

@@ -70 +70 @@
     IBOutlet BarButton          * fNoFilterButton, * fPauseFilterButton,
                                 * fSeedFilterButton, * fDownloadFilterButton;
+    IBOutlet NSSearchField      * fSearchFilterField;
                                 
     IBOutlet NSMenuItem         * fNextInfoTabItem, * fPrevInfoTabItem;
@@ -134 +135 @@
 - (void) sortTorrentsIgnoreSelected;
 - (void) setSort: (id) sender;
-- (void) applyFilter;
+- (void) applyFilter: (id) sender;
 - (void) setFilter: (id) sender;
 

trunk/macosx/Controller.m

@@ -315 +315 @@
     [[NSRunLoop currentRunLoop] addTimer: fAutoImportTimer forMode: NSDefaultRunLoopMode];
     
-    [self applyFilter];
+    [self applyFilter: nil];
     
     [fWindow makeKeyAndOrderFront: nil];
@@ -475 +475 @@
 
     [self updateUI: nil];
-    [self applyFilter];
+    [self applyFilter: nil];
     [self updateTorrentHistory];
 }
@@ -548 +548 @@
     
     [self updateUI: nil];
-    [self applyFilter];
+    [self applyFilter: nil];
     [fInfoController updateInfoStatsAndSettings];
     [self updateTorrentHistory];
@@ -574 +574 @@
     
     [self updateUI: nil];
-    [self applyFilter];
+    [self applyFilter: nil];
     [fInfoController updateInfoStatsAndSettings];
     [self updateTorrentHistory];
@@ -841 +841 @@
         if ([torrent justFinished])
         {
-            [self applyFilter];
+            [self applyFilter: nil];
             [self checkToStartWaiting: torrent];
         
@@ -992 +992 @@
 }
 
-- (void) applyFilter
+- (void) applyFilter: (id) sender
 {
     //remember selected rows if needed
@@ -1026 +1026 @@
     else
         [tempTorrents setArray: fTorrents];
+    
+    NSString * searchString = [fSearchFilterField stringValue];
+    if (![searchString isEqualToString: @""])
+    {
+        int i;
+        for (i = [tempTorrents count] - 1; i >= 0; i--)
+            if ([[[tempTorrents objectAtIndex: i] name] rangeOfString: searchString
+                                        options: NSCaseInsensitiveSearch].location == NSNotFound)
+                [tempTorrents removeObjectAtIndex: i];
+    }
     
     [fFilteredTorrents setArray: tempTorrents];
@@ -1079 +1089 @@
     }
 
-    [self applyFilter];
+    [self applyFilter: nil];
 }
 
@@ -1199 +1209 @@
         [torrentToStart startTransfer];
         
-        [self applyFilter];
+        [self applyFilter: nil];
         [self updateUI: nil];
         [fInfoController updateInfoStatsAndSettings];
@@ -1210 +1220 @@
     [self attemptToStartMultipleAuto: [notification object]];
 
-    [self applyFilter];
+    [self applyFilter: nil];
     [self updateUI: nil];
     [fInfoController updateInfoStatsAndSettings];
@@ -1220 +1230 @@
     [self attemptToStartMultipleAuto: fTorrents];
     
-    [self applyFilter];
+    [self applyFilter: nil];
     [self updateUI: nil];
     [fInfoController updateInfoStatsAndSettings];
@@ -1228 +1238 @@
 - (void) torrentStoppedForRatio: (NSNotification *) notification
 {
-    [self applyFilter];
+    [self applyFilter: nil];
     [fInfoController updateInfoStatsAndSettings];
     
@@ -1562 +1572 @@
 - (void) toggleFilterBar: (id) sender
 {
+    if (!fFilterBarVisible)
+        [fSearchFilterField setEnabled: YES];
+
     [self showFilterBar: !fFilterBarVisible animate: YES];
     [fDefaults setBool: fFilterBarVisible forKey: @"FilterBar"];
@@ -1567 +1580 @@
     //disable filtering when hiding
     if (!fFilterBarVisible)
+    {
+        [fSearchFilterField setEnabled: NO];
+        [fSearchFilterField setStringValue: @""];
         [self setFilter: fNoFilterButton];
+    }
 }
 

trunk/macosx/English.lproj/MainMenu.nib/classes.nib

@@ -4 +4 @@
         {
             ACTIONS = {
+                applyFilter = id; 
                 checkUpdate = id; 
                 copyTorrentFile = id; 
@@ -55 +56 @@
                 fRatioSetItem = NSMenuItem; 
                 fScrollView = NSScrollView; 
+                fSearchFilterField = NSSearchField; 
                 fSeedFilterButton = BarButton; 
                 fSmallViewItem = NSMenuItem; 

trunk/macosx/English.lproj/MainMenu.nib/info.nib

@@ -12 +12 @@
                 <string>364 490 420 60 0 0 1152 842 </string>
                 <key>1603</key>
-                <string>188 407 477 65 0 0 1152 842 </string>
+                <string>241 540 477 65 0 0 1152 842 </string>
                 <key>29</key>
                 <string>9 780 451 44 0 0 1152 842 </string>
@@ -32 +32 @@
         <key>IBOpenObjects</key>
         <array>
+                <integer>1603</integer>
                 <integer>29</integer>
-                <integer>1603</integer>
         </array>
         <key>IBSystem Version</key>

trunk/macosx/TorrentCell.m

@@ -286 +286 @@
                                                         isEqual: [NSColor alternateSelectedControlColor]];
     NSDictionary * nameAttributes = [[NSDictionary alloc] initWithObjectsAndKeys:
-                    highlighted ? [NSColor whiteColor] : [NSColor blackColor],
-                    NSForegroundColorAttributeName,
+                    highlighted ? [NSColor whiteColor] : [NSColor blackColor], NSForegroundColorAttributeName,
                     [NSFont messageFontOfSize: 12.0], NSFontAttributeName, nil];
     NSDictionary * statusAttributes = [[NSDictionary alloc] initWithObjectsAndKeys:
-                    highlighted ? [NSColor whiteColor] : [NSColor darkGrayColor],
-                    NSForegroundColorAttributeName,
+                    highlighted ? [NSColor whiteColor] : [NSColor darkGrayColor], NSForegroundColorAttributeName,
                     [NSFont messageFontOfSize: 9.0], NSFontAttributeName, nil];