Changeset 697

Timestamp:

Jul 25, 2006, 2:12:18 AM (16 years ago)

Author:

livings124

Message:

When filtering transfers,the amount in the status bar shows how many transfers are actually visible and the total amount.

Location:

trunk/macosx

Files:

• Controller.h (modified) (1 diff)
• Controller.m (modified) (7 diffs)
• English.lproj/MainMenu.nib/info.nib (modified) (1 diff)
• English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)

trunk/macosx/Controller.h

@@ -100 +100 @@
 
 - (NSArray *) torrentsAtIndexes: (NSIndexSet *) indexSet;
-- (void) torrentNumberChanged;
 
 - (void) resumeSelectedTorrents:    (id) sender;

trunk/macosx/Controller.m

@@ -213 +213 @@
         }
     
-    [self torrentNumberChanged];
-    
     //set sort
     fSortType = [[fDefaults stringForKey: @"Sort"] retain];
@@ -494 +492 @@
     }
 
-    [self torrentNumberChanged];
-
     [self updateUI: nil];
     [self applyFilter: nil];
@@ -515 +511 @@
         return torrents;
     }
-}
-
-- (void) torrentNumberChanged
-{
-    int count = [fTorrents count];
-    [fTotalTorrentsField setStringValue: [NSString stringWithFormat:
-        @"%d Transfer%s", count, count == 1 ? "" : "s"]];
 }
 
@@ -722 +711 @@
     }
     
-    [self torrentNumberChanged];
+    [fTableView deselectAll: nil];
     
     [self updateUI: nil];
-    [self setWindowSizeToFit];
-    
-    [fTableView deselectAll: nil];
+    [self applyFilter: nil];
     
     [self updateTorrentHistory];
@@ -1066 +1053 @@
     NSMutableArray * tempTorrents = [[NSMutableArray alloc] initWithCapacity: [fTorrents count]];
 
+    BOOL filtering = YES;
     if ([fFilterType isEqualToString: @"Pause"])
     {
@@ -1091 +1079 @@
     }
     else
+    {
+        filtering = NO;
         [tempTorrents setArray: fTorrents];
+    }
     
     NSString * searchString = [fSearchFilterField stringValue];
@@ -1123 +1114 @@
     }
     
+    //set status bar torrents
+    NSMutableString * totalTorrentsString = [NSMutableString stringWithString: @""];
+    if (filtering)
+        [totalTorrentsString appendFormat: @"%d/", [fFilteredTorrents count]];
+    
+    int totalCount = [fTorrents count];
+    [totalTorrentsString appendFormat: @"%d Transfer%s", totalCount, totalCount == 1 ? "" : "s"];
+    
+    [fTotalTorrentsField setStringValue: totalTorrentsString];
+
     [self setWindowSizeToFit];
 }

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

@@ -30 +30 @@
         <key>IBOldestOS</key>
         <integer>3</integer>
+        <key>IBOpenObjects</key>
+        <array>
+                <integer>21</integer>
+        </array>
         <key>IBSystem Version</key>
         <string>8J135</string>