Changeset 728 for trunk

Timestamp:

Aug 6, 2006, 8:18:00 PM (16 years ago)

Author:

livings124

Message:

number of torrents shown in status bar now changes if filtering just by using filter text field

File:

• trunk/macosx/Controller.m (modified) (6 diffs)

trunk/macosx/Controller.m

@@ -655 +655 @@
                 title = [NSString stringWithFormat: @"Comfirm Removal of %d Transfers", selected];
                 if (selected == active)
-                    message = [NSString stringWithFormat:
-                        @"There are %d active transfers.", active];
+                    message = [NSString stringWithFormat: @"There are %d active transfers.", active];
                 else
-                    message = [NSString stringWithFormat:
-                        @"There are %d transfers (%d active).", selected, active];
+                    message = [NSString stringWithFormat: @"There are %d transfers (%d active).", selected, active];
                 message = [message stringByAppendingString:
                     @" Once removed, continuing the transfers will require the torrent files."
@@ -1105 +1103 @@
     
     NSString * searchString = [fSearchFilterField stringValue];
-    if (![searchString isEqualToString: @""])
-    {
+    if ([searchString length] > 0)
+    {
+        filtering = YES;
+        
         int i;
         for (i = [tempTorrents count] - 1; i >= 0; i--)
@@ -2084 +2084 @@
     //enable copy torrent file item
     if (action == @selector(copyTorrentFile:))
-    {
         return canUseMenu && [fTableView numberOfSelectedRows] > 0;
-    }
 
     return YES;
@@ -2189 +2187 @@
     frame.origin.y -= (newHeight - frame.size.height);
     frame.size.height = newHeight;
-    
     return frame;
 }
@@ -2210 +2207 @@
 - (NSSize) windowWillResize: (NSWindow *) sender toSize: (NSSize) proposedFrameSize
 {
+    //only resize horizontally if autosize is enabled
     if ([fDefaults boolForKey: @"AutoSize"])
         proposedFrameSize.height = [fWindow frame].size.height;
@@ -2218 +2216 @@
 {
     //hide search filter if it overlaps filter buttons
-    NSRect buttonFrame = [fPauseFilterButton frame];
-    [fSearchFilterField setHidden: NSMaxX(buttonFrame) + 2.0 > [fSearchFilterField frame].origin.x];
+    [fSearchFilterField setHidden: NSMaxX([fPauseFilterButton frame]) + 2.0 > [fSearchFilterField frame].origin.x];
 }