Changeset 1533

Timestamp:

Mar 5, 2007, 4:51:32 PM (15 years ago)

Author:

livings124

Message:

avoid retaining tons of copies of the folder icon

Location:

trunk/macosx

Files:

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

trunk/macosx/InfoWindowController.h

@@ -30 +30 @@
 @interface InfoWindowController : NSWindowController
 {
-    NSArray * fTorrents;
-    NSArray * fPeers, * fFiles;
-    NSImage * fAppIcon, * fDotGreen, * fDotRed;
+    NSArray * fTorrents, * fPeers, * fFiles;
+    NSImage * fAppIcon, * fDotGreen, * fDotRed, * fFolderIcon;
     
     IBOutlet NSTabView * fTabView;

trunk/macosx/InfoWindowController.m

@@ -75 +75 @@
         fDotGreen = [NSImage imageNamed: @"GreenDot.tiff"];
         fDotRed = [NSImage imageNamed: @"RedDot.tiff"];
+        
+        fFolderIcon = [[[NSWorkspace sharedWorkspace] iconForFileType: NSFileTypeForHFSTypeCode('fldr')] copy];
     }
     return self;
@@ -119 +121 @@
 
     [fAppIcon release];
+    [fFolderIcon release];
     [super dealloc];
 }
@@ -716 +719 @@
             return;
         
-        [cell setImage: [item objectForKey: @"Icon"]];
+        [cell setImage: [[item objectForKey: @"IsFolder"] boolValue] ? fFolderIcon : [item objectForKey: @"Icon"]];
     }
     else if ([[tableColumn identifier] isEqualToString: @"Check"])

trunk/macosx/Torrent.m

@@ -1335 +1335 @@
             [dict setObject: [NSMutableArray array] forKey: @"Children"];
             [dict setObject: [NSNumber numberWithInt: 1] forKey: @"Remaining"];
-            [dict setObject: [[NSWorkspace sharedWorkspace] iconForFileType: NSFileTypeForHFSTypeCode('fldr')] forKey: @"Icon"];
         }
         else