Changeset 855 for trunk/macosx

Timestamp:

Sep 11, 2006, 11:52:03 PM (16 years ago)

Author:

livings124

Message:

Use tableView:objectValueForTableColumn:row: instead of tableView:willDisplayCell:...

This required passing in a dictionary of values to display, but should make it 10.5 compatible and potentially a little more efficient. Those using Leopard please report any issues, because I don't have it to test.

Location:

trunk/macosx

Files:

• Controller.m (modified) (1 diff)
• Torrent.h (modified) (1 diff)
• Torrent.m (modified) (1 diff)
• TorrentCell.h (modified) (2 diffs)
• TorrentCell.m (modified) (15 diffs)

trunk/macosx/Controller.m

@@ -1587 +1587 @@
 }
 
-- (void) tableView: (NSTableView *) t willDisplayCell: (id) cell
+/*- (void) tableView: (NSTableView *) t willDisplayCell: (id) cell
     forTableColumn: (NSTableColumn *) tableColumn row: (int) row
 {
     [cell setTorrent: [fDisplayedTorrents objectAtIndex: row]];
+}*/
+
+- (id) tableView: (NSTableView *) tableView objectValueForTableColumn: (NSTableColumn *) tableColumn row: (int) row
+{
+    return [[fDisplayedTorrents objectAtIndex: row] infoForCurrentView];
 }
 

trunk/macosx/Torrent.h

@@ -64 +64 @@
 - (void)       getAvailability: (int8_t *) tab size: (int) size;
 
-- (void)        update;
+- (void)            update;
+- (NSDictionary *)  infoForCurrentView;
+
 - (void)        startTransfer;
 - (void)        stopTransfer;

trunk/macosx/Torrent.m

@@ -272 +272 @@
 }
 
+- (NSDictionary *) infoForCurrentView
+{
+    NSMutableDictionary * info = [NSMutableDictionary dictionaryWithObjectsAndKeys:
+                                    [self name], @"Name",
+                                    [NSNumber numberWithBool: [self isSeeding]], @"Seeding",
+                                    [NSNumber numberWithFloat: [self progress]], @"Progress",
+                                    [NSNumber numberWithBool: [self isActive]], @"Active",
+                                    [NSNumber numberWithBool: [self isError]], @"Error", nil];
+    
+    if (![fDefaults boolForKey: @"SmallView"])
+    {
+        [info setObject: fIconFlipped forKey: @"Icon"];
+        [info setObject: [self progressString] forKey: @"ProgressString"];
+        [info setObject: [self statusString] forKey: @"StatusString"];
+    }
+    else
+    {
+        [info setObject: fIconSmall forKey: @"Icon"];
+        [info setObject: [self remainingTimeString] forKey: @"RemainingTimeString"];
+        [info setObject: [self shortStatusString] forKey: @"ShortStatusString"];
+    }
+    
+    return info;
+}
+
 - (void) startTransfer
 {

trunk/macosx/TorrentCell.h

@@ -31 +31 @@
 @interface TorrentCell : NSCell
 {
-    Torrent * fTorrent;
     BOOL fStatusRegular;
     
@@ -42 +41 @@
 }
 
-- (void) setTorrent: (Torrent *) torrent;
-
 - (void) toggleMinimalStatus;
 

trunk/macosx/TorrentCell.m

@@ -33 +33 @@
 - (void) placeBar: (NSImage *) barImage width: (float) width point: (NSPoint) point;
 - (void) buildSimpleBar: (float) width point: (NSPoint) point;
-- (void) buildAdvancedBar: (float) widthFloat point: (NSPoint) point;
+//- (void) buildAdvancedBar: (float) widthFloat point: (NSPoint) point;
 
 @end
@@ -102 +102 @@
 }
 
-- (void) setTorrent: (Torrent *) torrent
-{
-    fTorrent = torrent;
-}
-
 - (void) placeBar: (NSImage *) barImage width: (float) width point: (NSPoint) point
 {
@@ -117 +112 @@
 - (void) buildSimpleBar: (float) width point: (NSPoint) point
 {
+    NSDictionary * info = [self objectValue];
+
     width -= 2.0;
-    if ([fTorrent isSeeding])
+    if ([[info objectForKey: @"Seeding"] boolValue])
     {
         [fProgressEndGreen compositeToPoint: point operation: NSCompositeSourceOver];
@@ -130 +127 @@
     else
     {
-        float completedWidth = [fTorrent progress] * width,
+        float completedWidth = [[info objectForKey: @"Progress"] floatValue] * width,
                 remainingWidth = width - completedWidth;
-        BOOL isActive = [fTorrent isActive];
+        BOOL isActive = [[info objectForKey: @"Active"] boolValue];
         
         //left end
@@ -167 +164 @@
 }
 
-- (void) buildAdvancedBar: (float) widthFloat point: (NSPoint) point
+/*- (void) buildAdvancedBar: (float) widthFloat point: (NSPoint) point
 {
     //if seeding, there's no need for the advanced bar
@@ -271 +268 @@
     point.x += widthFloat;
     [fProgressEndAdvanced compositeToPoint: point operation: NSCompositeSourceOver];
-}
+}*/
 
 - (void) toggleMinimalStatus
@@ -292 +289 @@
     NSPoint pen = cellFrame.origin;
     const float PADDING = 3.0, LINE_PADDING = 2.0, EXTRA_NAME_SHIFT = 1.0;
-
+    
+    NSDictionary * info = [self objectValue];
+    
     if (![fDefaults boolForKey: @"SmallView"]) //regular size
     {
         //icon
-        NSImage * icon = [fTorrent iconFlipped];
+        NSImage * icon = [info objectForKey: @"Icon"];
         NSSize iconSize = [icon size];
         
@@ -306 +305 @@
         
         //error badge
-        if ([fTorrent isError])
+        if ([[info objectForKey: @"Error"] boolValue])
         {
             NSSize errorIconSize = [fErrorImage size];
@@ -320 +319 @@
         pen.x += iconSize.width + PADDING + EXTRA_NAME_SHIFT;
         pen.y = cellFrame.origin.y + PADDING;
-        NSAttributedString * nameString = [[fTorrent name] attributedStringFittingInWidth: mainWidth
+        NSAttributedString * nameString = [[info objectForKey: @"Name"] attributedStringFittingInWidth: mainWidth
                                                 attributes: nameAttributes];
         [nameString drawAtPoint: pen];
@@ -327 +326 @@
         pen.y += [nameString size].height + LINE_PADDING - 1.0;
         
-        NSAttributedString * progressString = [[fTorrent progressString]
+        NSAttributedString * progressString = [[info objectForKey: @"ProgressString"]
             attributedStringFittingInWidth: mainWidth attributes: statusAttributes];
         [progressString drawAtPoint: pen];
@@ -337 +336 @@
         float barWidth = mainWidth + EXTRA_NAME_SHIFT - BUTTONS_TOTAL_WIDTH + PADDING;
         
-        if ([fDefaults boolForKey: @"UseAdvancedBar"])
+        /*if ([fDefaults boolForKey: @"UseAdvancedBar"])
             [self buildAdvancedBar: barWidth point: pen];
-        else
+        else*/
             [self buildSimpleBar: barWidth point: pen];
 
@@ -345 +344 @@
         pen.x += EXTRA_NAME_SHIFT;
         pen.y += LINE_PADDING;
-        NSAttributedString * statusString = [[fTorrent statusString]
+        NSAttributedString * statusString = [[info objectForKey: @"StatusString"]
             attributedStringFittingInWidth: mainWidth attributes: statusAttributes];
         [statusString drawAtPoint: pen];
@@ -352 +351 @@
     {
         //icon
-        NSImage * icon = ![fTorrent isError] ? [fTorrent iconSmall] : fErrorImage;
+        NSImage * icon = ![[info objectForKey: @"Error"] boolValue] ? [info objectForKey: @"Icon"] : fErrorImage;
         NSSize iconSize = [icon size];
         
@@ -364 +363 @@
         float mainWidth = cellFrame.size.width - iconSize.width - 3.0 * PADDING - EXTRA_NAME_SHIFT;
         
-        NSString * realStatusString = !fStatusRegular && [fTorrent isActive] ? [fTorrent remainingTimeString]
-                                                                            : [fTorrent shortStatusString];
+        NSString * realStatusString = !fStatusRegular && [[info objectForKey: @"Active"] boolValue]
+                                        ? [info objectForKey: @"RemainingTimeString"]
+                                        : [info objectForKey: @"ShortStatusString"];
         
         NSAttributedString * statusString = [[[NSAttributedString alloc] initWithString: realStatusString
                                                     attributes: statusAttributes] autorelease];
-        NSAttributedString * nameString = [[fTorrent name] attributedStringFittingInWidth:
+        NSAttributedString * nameString = [[info objectForKey: @"Name"] attributedStringFittingInWidth:
                                 mainWidth - [statusString size].width - LINE_PADDING attributes: nameAttributes];
                      
@@ -390 +390 @@
         float barWidth = mainWidth + EXTRA_NAME_SHIFT - BUTTONS_TOTAL_WIDTH + PADDING;
         
-        if ([fDefaults boolForKey: @"UseAdvancedBar"])
+        /*if ([fDefaults boolForKey: @"UseAdvancedBar"])
             [self buildAdvancedBar: barWidth point: pen];
-        else
+        else*/
             [self buildSimpleBar: barWidth point: pen];
     }