Changeset 799

Timestamp:

Aug 20, 2006, 6:32:55 PM (17 years ago)

Author:

livings124

Message:

Add individual file sizes to info's file table.

Location:

trunk/macosx

Files:

• English.lproj/InfoWindow.nib/keyedobjects.nib (modified) (previous)
• InfoWindowController.m (modified) (2 diffs)
• Torrent.m (modified) (1 diff)

trunk/macosx/InfoWindowController.m

@@ -470 +470 @@
     else
     {
-        NSString * file = [fFiles objectAtIndex: row];
+        NSDictionary * file = [fFiles objectAtIndex: row];
         if ([ident isEqualToString: @"Icon"])
-            return [[NSWorkspace sharedWorkspace] iconForFileType: [file pathExtension]];
+            return [[NSWorkspace sharedWorkspace] iconForFileType: [[file objectForKey: @"Name"] pathExtension]];
+        else if ([ident isEqualToString: @"Size"])
+            return [NSString stringForFileSize: [[file objectForKey: @"Size"] unsignedIntValue]];
         else
-            return [file lastPathComponent];
+            return [[file objectForKey: @"Name"] lastPathComponent];
     }
 }
@@ -497 +499 @@
         row: (int) row mouseLocation: (NSPoint) mouseLocation
 {
-    return tableView == fFileTable ? [fFiles objectAtIndex: row] : nil;
+    return tableView == fFileTable ? [[fFiles objectAtIndex: row] objectForKey: @"Name"] : nil;
 }
 

trunk/macosx/Torrent.m

@@ -631 +631 @@
 {
     int count = fInfo->fileCount, i;
+    tr_file_t file;
     NSMutableArray * files = [NSMutableArray arrayWithCapacity: count];
+    
     for (i = 0; i < count; i++)
-        [files addObject: [[self downloadFolder] stringByAppendingPathComponent:
-            [NSString stringWithUTF8String: fInfo->files[i].name]]];
+    {
+        file = fInfo->files[i];
+        [files addObject: [NSDictionary dictionaryWithObjectsAndKeys: [[self downloadFolder]
+            stringByAppendingPathComponent: [NSString stringWithUTF8String: file.name]], @"Name",
+            [NSNumber numberWithUnsignedInt: file.length], @"Size", nil]];
+    }
+    
     return files;
 }