Changeset 5149

Timestamp:

Feb 27, 2008, 7:34:55 PM (14 years ago)

Author:

livings124

Message:

show amount selected in open window

Location:

trunk/macosx

Files:

• AddWindowController.h (modified) (1 diff)
• AddWindowController.m (modified) (3 diffs)
• Torrent.h (modified) (1 diff)
• Torrent.m (modified) (4 diffs)

trunk/macosx/AddWindowController.h

@@ -61 +61 @@
 - (void) verifyLocalData: (id) sender;
 
+- (void) updateStatusField: (NSNotification *) notification;
+
 - (void) updateGroupMenu: (NSNotification *) notification;
 - (void) showGroupsWindow: (id) sender;

trunk/macosx/AddWindowController.m

@@ -70 +70 @@
 - (void) awakeFromNib
 {
+    [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(updateStatusField:)
+        name: @"TorrentFileCheckChange" object: fTorrent];
+    
     [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(updateGroupMenu:)
         name: @"UpdateGroups" object: nil];
@@ -84 +87 @@
     [icon release];
     
-    NSString * statusString = [NSString stringForFileSize: [fTorrent size]];
-    if ([fTorrent folder])
-    {
-        NSString * fileString;
-        int count = [fTorrent fileCount];
-        if (count != 1)
-            fileString = [NSString stringWithFormat: NSLocalizedString(@"%d Files, ", "Add torrent -> info"), count];
-        else
-            fileString = NSLocalizedString(@"1 File, ", "Add torrent -> info");
-        statusString = [fileString stringByAppendingString: statusString];
-    }
-    [fStatusField setStringValue: statusString];
+    [self updateStatusField: nil];
     
     [self setGroupsMenu];
@@ -213 +205 @@
 }
 
+- (void) updateStatusField: (NSNotification *) notification
+{
+    NSString * statusString = [NSString stringForFileSize: [fTorrent size]];
+    if ([fTorrent folder])
+        statusString = [statusString stringByAppendingFormat: NSLocalizedString(@" (%@ selected)", "Add torrent -> info"),
+                        [NSString stringForFileSize: [fTorrent totalSizeSelected]]];
+    
+    if ([fTorrent folder])
+    {
+        NSString * fileString;
+        int count = [fTorrent fileCount];
+        if (count != 1)
+            fileString = [NSString stringWithFormat: NSLocalizedString(@"%d Files, ", "Add torrent -> info"), count];
+        else
+            fileString = NSLocalizedString(@"1 File, ", "Add torrent -> info");
+        statusString = [fileString stringByAppendingString: statusString];
+    }
+    
+    [fStatusField setStringValue: statusString];
+}
+
 - (void) updateGroupMenu: (NSNotification *) notification
 {

trunk/macosx/Torrent.h

@@ -217 +217 @@
 - (uint64_t) haveVerified;
 - (uint64_t) haveTotal;
+- (uint64_t) totalSizeSelected;
 - (uint64_t) downloadedTotal;
 - (uint64_t) uploadedTotal;

trunk/macosx/Torrent.m

@@ -810 +810 @@
 {
     return fStat->percentComplete;
-    //return (float)[self haveTotal] / [self size];
 }
 
@@ -940 +939 @@
         if ([fDefaults boolForKey: @"DisplayStatusProgressSelected"])
         {
-            uint64_t have = [self haveTotal];
             string = [NSString stringWithFormat: NSLocalizedString(@"%@ of %@ selected (%.2f%%)", "Torrent -> progress string"),
-                            [NSString stringForFileSize: have], [NSString stringForFileSize: have + [self sizeLeft]],
+                            [NSString stringForFileSize: [self haveTotal]], [NSString stringForFileSize: [self totalSizeSelected]],
                             100.0 * [self progressDone]];
         }
@@ -1221 +1219 @@
 }
 
+- (uint64_t) totalSizeSelected
+{
+    return [self haveTotal] + [self sizeLeft];
+}
+
 - (uint64_t) downloadedTotal
 {
@@ -1353 +1356 @@
     
     [self update];
+    [[NSNotificationCenter defaultCenter] postNotificationName: @"TorrentFileCheckChange" object: self];
 }