Changeset 553 for trunk/Cocoa

Timestamp:

07/18/09 05:59:36 (15 years ago)

Author:

Nicholas Riley

Message:

No longer need special code to scale icons (it had issues, anyway).

Location:

trunk/Cocoa/Pester/Source

Files:

• NJRFSObjectSelector.m (modified) (3 diffs)
• NSImage-NJRExtensions.h (deleted)
• NSImage-NJRExtensions.m (deleted)
• Pester.xcodeproj/project.pbxproj (modified) (4 diffs)

trunk/Cocoa/Pester/Source/NJRFSObjectSelector.m

@@ -1 +1 @@
 #import "NJRFSObjectSelector.h"
 #import "NSMenuItem-NJRExtensions.h"
-#import "NSImage-NJRExtensions.h"
 #import "NSString-NJRExtensions.h"
 #include <Carbon/Carbon.h>
@@ -81 +80 @@
     }
     return NO;
-}
-
-- (void)setImage:(NSImage *)image;
-{
-    // XXX change to use IconRef; see ICeCoffEELabeledIconCell and Google
-    [super setImage: [image bestFitImageForSize: [[self cell] cellSize]]];
 }
 
@@ -139 +132 @@
         NSMenuItem *item;
         if (path != nil) { // can resolve alias
-            [self setImage: [[NSWorkspace sharedWorkspace] iconForFile: path]];
+            [self setImage: [[NSWorkspace sharedWorkspace] iconForFile: path]];
             {   // set image first so titleRectForBounds: returns the correct value
                 NSMutableString *title = [[fmgr displayNameAtPath: path] mutableCopy];

trunk/Cocoa/Pester/Source/Pester.xcodeproj/project.pbxproj

@@ -109 +109 @@
                 E1B11F840CF5F30F004975AA /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E18DAAEE0442D02500050002 /* CoreAudio.framework */; };
                 E1B121970CF62FD1004975AA /* NSMenuItem-NJRExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = E1B121960CF62FD1004975AA /* NSMenuItem-NJRExtensions.m */; };
-                E1B1219E0CF63858004975AA /* NSImage-NJRExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = E1B1219C0CF63858004975AA /* NSImage-NJRExtensions.m */; };
                 E1B121B40CF639A1004975AA /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E1B121B30CF639A1004975AA /* QTKit.framework */; };
 /* End PBXBuildFile section */
@@ -232 +231 @@
                 E1B121950CF62FD1004975AA /* NSMenuItem-NJRExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMenuItem-NJRExtensions.h"; sourceTree = "<group>"; };
                 E1B121960CF62FD1004975AA /* NSMenuItem-NJRExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMenuItem-NJRExtensions.m"; sourceTree = "<group>"; };
-                E1B1219C0CF63858004975AA /* NSImage-NJRExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSImage-NJRExtensions.m"; sourceTree = "<group>"; };
-                E1B1219D0CF63858004975AA /* NSImage-NJRExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSImage-NJRExtensions.h"; sourceTree = "<group>"; };
                 E1B121B30CF639A1004975AA /* QTKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = /System/Library/Frameworks/QTKit.framework; sourceTree = "<absolute>"; };
                 E1B46FE804057E3400050002 /* NJRSplitView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NJRSplitView.h; sourceTree = "<group>"; };
@@ -486 +483 @@
                                 E16959290437A4A400050002 /* NSFont-NJRExtensions.h */,
                                 E169592A0437A4A400050002 /* NSFont-NJRExtensions.m */,
-                                E1B1219C0CF63858004975AA /* NSImage-NJRExtensions.m */,
-                                E1B1219D0CF63858004975AA /* NSImage-NJRExtensions.h */,
                                 F59E4C0E036B43D2016B311C /* QTMovie-NJRExtensions.h */,
                                 F59E4C0D036B43D2016B311C /* QTMovie-NJRExtensions.m */,
@@ -909 +904 @@
                                 E1B11F7D0CF5F30F004975AA /* NJRNonCenteringWindow.m in Sources */,
                                 E1B121970CF62FD1004975AA /* NSMenuItem-NJRExtensions.m in Sources */,
-                                E1B1219E0CF63858004975AA /* NSImage-NJRExtensions.m in Sources */,
                                 E15044670CFCDC7E00DE47E9 /* NJRValidatingField.m in Sources */,
                         );