replace 'fldr' with kGenericFolderIcon

This commit is contained in:
Mitchell Livingston 2011-10-06 03:16:06 +00:00
parent 54fe88ff2b
commit 8abd52938c
5 changed files with 6 additions and 6 deletions

View File

@ -146,7 +146,7 @@
const BOOL multifile = !fInfo->isSingleFile;
NSImage * icon = [[NSWorkspace sharedWorkspace] iconForFileType: multifile
? NSFileTypeForHFSTypeCode('fldr') : [fPath pathExtension]];
? NSFileTypeForHFSTypeCode(kGenericFolderIcon) : [fPath pathExtension]];
[icon setSize: [fIconView frame].size];
[fIconView setImage: icon];

View File

@ -136,7 +136,7 @@
NSImage * icon;
if (count == 1)
icon = [[NSWorkspace sharedWorkspace] iconForFileType: folder ? NSFileTypeForHFSTypeCode('fldr') : [name pathExtension]];
icon = [[NSWorkspace sharedWorkspace] iconForFileType: folder ? NSFileTypeForHFSTypeCode(kGenericFolderIcon) : [name pathExtension]];
else
{
name = [NSString stringWithFormat: NSLocalizedString(@"%@ Torrent Files", "Drag overlay -> torrents"),

View File

@ -45,7 +45,7 @@
NSImage * icon;
//show a folder icon if the folder doesn't exist
if ([[path pathExtension] isEqualToString: @""] && ![[NSFileManager defaultManager] fileExistsAtPath: path])
icon = [[NSWorkspace sharedWorkspace] iconForFileType: NSFileTypeForHFSTypeCode('fldr')];
icon = [[NSWorkspace sharedWorkspace] iconForFileType: NSFileTypeForHFSTypeCode(kGenericFolderIcon)];
else
icon = [[NSWorkspace sharedWorkspace] iconForFile: path];

View File

@ -124,7 +124,7 @@
- (NSImage *) icon
{
if (!fIcon)
fIcon = [[[NSWorkspace sharedWorkspace] iconForFileType: fIsFolder ? NSFileTypeForHFSTypeCode('fldr')
fIcon = [[[NSWorkspace sharedWorkspace] iconForFileType: fIsFolder ? NSFileTypeForHFSTypeCode(kGenericFolderIcon)
: [fName pathExtension]] retain];
return fIcon;
}

View File

@ -604,9 +604,9 @@ int trashDataFile(const char * filename)
if ([self isMagnet])
return [NSImage imageNamed: @"Magnet.png"];
#warning replace 'fldr' stuff with NSImageNameFolder on 10.6
#warning replace kGenericFolderIcon stuff with NSImageNameFolder on 10.6
if (!fIcon)
fIcon = [[[NSWorkspace sharedWorkspace] iconForFileType: [self isFolder] ? NSFileTypeForHFSTypeCode('fldr')
fIcon = [[[NSWorkspace sharedWorkspace] iconForFileType: [self isFolder] ? NSFileTypeForHFSTypeCode(kGenericFolderIcon)
: [[self name] pathExtension]] retain];
return fIcon;
}