Changeset 13340


Ignore:
Timestamp:
Jun 10, 2012, 2:35:58 AM (9 years ago)
Author:
livings124
Message:

#4749 When accessing images using imageNamed:, don't include the .png. This fixes the app not using the @2x images in HiDPI mode.

Location:
trunk
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/Transmission.xcodeproj/project.pbxproj

    r13338 r13340  
    330330                A2DC49A415842F9E00758FF1 /* RevealOn@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A2DC49A115842F9D00758FF1 /* RevealOn@2x.png */; };
    331331                A2DC49A815842FC300758FF1 /* ToolbarCreateTemplate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A2DC49A515842FC300758FF1 /* ToolbarCreateTemplate@2x.png */; };
    332                 A2DC49A915842FC300758FF1 /* ToolbarFiltertemplate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A2DC49A615842FC300758FF1 /* ToolbarFiltertemplate@2x.png */; };
     332                A2DC49A915842FC300758FF1 /* ToolbarFilterTemplate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A2DC49A615842FC300758FF1 /* ToolbarFilterTemplate@2x.png */; };
    333333                A2DC49AA15842FC300758FF1 /* ToolbarInfoTemplate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A2DC49A715842FC300758FF1 /* ToolbarInfoTemplate@2x.png */; };
    334334                A2DC49AD15842FF200758FF1 /* ToolbarOpenTemplate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A2DC49AB15842FF200758FF1 /* ToolbarOpenTemplate@2x.png */; };
    … …  
    10061006                A2DC49A115842F9D00758FF1 /* RevealOn@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "RevealOn@2x.png"; path = "macosx/Images/RevealOn@2x.png"; sourceTree = "<group>"; };
    10071007                A2DC49A515842FC300758FF1 /* ToolbarCreateTemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "ToolbarCreateTemplate@2x.png"; path = "macosx/Images/ToolbarCreateTemplate@2x.png"; sourceTree = "<group>"; };
    1008                 A2DC49A615842FC300758FF1 /* ToolbarFiltertemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "ToolbarFiltertemplate@2x.png"; path = "macosx/Images/ToolbarFiltertemplate@2x.png"; sourceTree = "<group>"; };
     1008                A2DC49A615842FC300758FF1 /* ToolbarFilterTemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "ToolbarFilterTemplate@2x.png"; path = "macosx/Images/ToolbarFilterTemplate@2x.png"; sourceTree = "<group>"; };
    10091009                A2DC49A715842FC300758FF1 /* ToolbarInfoTemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "ToolbarInfoTemplate@2x.png"; path = "macosx/Images/ToolbarInfoTemplate@2x.png"; sourceTree = "<group>"; };
    10101010                A2DC49AB15842FF200758FF1 /* ToolbarOpenTemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "ToolbarOpenTemplate@2x.png"; path = "macosx/Images/ToolbarOpenTemplate@2x.png"; sourceTree = "<group>"; };
    … …  
    14851485                                A24B655F0D3F30870079EA4D /* QuitBadge.png */,
    14861486                                A232D29D0A70903E00973B12 /* ToolbarFilterTemplate.png */,
    1487                                 A2DC49A615842FC300758FF1 /* ToolbarFiltertemplate@2x.png */,
     1487                                A2DC49A615842FC300758FF1 /* ToolbarFilterTemplate@2x.png */,
    14881488                                4DF7500808A103AD007B0D70 /* ToolbarInfoTemplate.png */,
    14891489                                A2DC49A715842FC300758FF1 /* ToolbarInfoTemplate@2x.png */,
    … …  
    23962396                                A2DC49A415842F9E00758FF1 /* RevealOn@2x.png in Resources */,
    23972397                                A2DC49A815842FC300758FF1 /* ToolbarCreateTemplate@2x.png in Resources */,
    2398                                 A2DC49A915842FC300758FF1 /* ToolbarFiltertemplate@2x.png in Resources */,
     2398                                A2DC49A915842FC300758FF1 /* ToolbarFilterTemplate@2x.png in Resources */,
    23992399                                A2DC49AA15842FC300758FF1 /* ToolbarInfoTemplate@2x.png in Resources */,
    24002400                                A2DC49AD15842FF200758FF1 /* ToolbarOpenTemplate@2x.png in Resources */,

  • trunk/macosx/BadgeView.m

    r13251 r13340  
    7777    if (fQuitting)
    7878    {
    79         NSImage * quitBadge = [NSImage imageNamed: @"QuitBadge.png"];
     79        NSImage * quitBadge = [NSImage imageNamed: @"QuitBadge"];
    8080        [self badge: quitBadge string: NSLocalizedString(@"Quitting", "Dock Badger -> quit")
    8181                atHeight: (NSHeight(rect) - [quitBadge size].height) * 0.5 adjustForQuit: YES];
    … …  
    8888    if (upload)
    8989    {
    90         NSImage * uploadBadge = [NSImage imageNamed: @"UploadBadge.png"];
     90        NSImage * uploadBadge = [NSImage imageNamed: @"UploadBadge"];
    9191        [self badge: uploadBadge string: [NSString stringForSpeedAbbrev: fUploadRate] atHeight: bottom adjustForQuit: NO];
    9292        if (download)
    … …  
    9494    }
    9595    if (download)
    96         [self badge: [NSImage imageNamed: @"DownloadBadge.png"] string: [NSString stringForSpeedAbbrev: fDownloadRate]
     96        [self badge: [NSImage imageNamed: @"DownloadBadge"] string: [NSString stringForSpeedAbbrev: fDownloadRate]
    9797                atHeight: bottom adjustForQuit: NO];
    9898}

  • trunk/macosx/Controller.m

    r13326 r13340  
    28832883        }
    28842884        else if ([ident isEqualToString: @"DL Image"])
    2885             return [NSImage imageNamed: @"DownArrowGroupTemplate.png"];
     2885            return [NSImage imageNamed: @"DownArrowGroupTemplate"];
    28862886        else if ([ident isEqualToString: @"UL Image"])
    28872887            return [NSImage imageNamed: [fDefaults boolForKey: @"DisplayGroupRowRatio"]
    2888                                         ? @"YingYangGroupTemplate.png" : @"UpArrowGroupTemplate.png"];
     2888                                        ? @"YingYangGroupTemplate" : @"UpArrowGroupTemplate"];
    28892889        else
    28902890        {
    … …  
    36043604        [item setPaletteLabel: NSLocalizedString(@"Create Torrent File", "Create toolbar item -> palette label")];
    36053605        [item setToolTip: NSLocalizedString(@"Create torrent file", "Create toolbar item -> tooltip")];
    3606         [item setImage: [NSImage imageNamed: @"ToolbarCreateTemplate.png"]];
     3606        [item setImage: [NSImage imageNamed: @"ToolbarCreateTemplate"]];
    36073607        [item setTarget: self];
    36083608        [item setAction: @selector(createFile:)];
    … …  
    36183618        [item setPaletteLabel: NSLocalizedString(@"Open Torrent Files", "Open toolbar item -> palette label")];
    36193619        [item setToolTip: NSLocalizedString(@"Open torrent files", "Open toolbar item -> tooltip")];
    3620         [item setImage: [NSImage imageNamed: @"ToolbarOpenTemplate.png"]];
     3620        [item setImage: [NSImage imageNamed: @"ToolbarOpenTemplate"]];
    36213621        [item setTarget: self];
    36223622        [item setAction: @selector(openShowSheet:)];
    … …  
    36323632        [item setPaletteLabel: NSLocalizedString(@"Open Torrent Address", "Open address toolbar item -> palette label")];
    36333633        [item setToolTip: NSLocalizedString(@"Open torrent web address", "Open address toolbar item -> tooltip")];
    3634         [item setImage: [NSImage imageNamed: @"ToolbarOpenWebTemplate.png"]];
     3634        [item setImage: [NSImage imageNamed: @"ToolbarOpenWebTemplate"]];
    36353635        [item setTarget: self];
    36363636        [item setAction: @selector(openURLShowSheet:)];
    … …  
    36463646        [item setPaletteLabel: NSLocalizedString(@"Remove Selected", "Remove toolbar item -> palette label")];
    36473647        [item setToolTip: NSLocalizedString(@"Remove selected transfers", "Remove toolbar item -> tooltip")];
    3648         [item setImage: [NSImage imageNamed: @"ToolbarRemoveTemplate.png"]];
     3648        [item setImage: [NSImage imageNamed: @"ToolbarRemoveTemplate"]];
    36493649        [item setTarget: self];
    36503650        [item setAction: @selector(removeNoDelete:)];
    … …  
    36613661        [item setPaletteLabel: NSLocalizedString(@"Toggle Inspector", "Inspector toolbar item -> palette label")];
    36623662        [item setToolTip: NSLocalizedString(@"Toggle the torrent inspector", "Inspector toolbar item -> tooltip")];
    3663         [item setImage: [NSImage imageNamed: @"ToolbarInfoTemplate.png"]];
     3663        [item setImage: [NSImage imageNamed: @"ToolbarInfoTemplate"]];
    36643664        [item setTarget: self];
    36653665        [item setAction: @selector(showInfo:)];
    … …  
    36913691       
    36923692        [segmentedCell setTag: TOOLBAR_PAUSE_TAG forSegment: TOOLBAR_PAUSE_TAG];
    3693         [segmentedControl setImage: [NSImage imageNamed: @"ToolbarPauseAllTemplate.png"] forSegment: TOOLBAR_PAUSE_TAG];
     3693        [segmentedControl setImage: [NSImage imageNamed: @"ToolbarPauseAllTemplate"] forSegment: TOOLBAR_PAUSE_TAG];
    36943694        [segmentedCell setToolTip: NSLocalizedString(@"Pause all transfers",
    36953695                                    "All toolbar item -> tooltip") forSegment: TOOLBAR_PAUSE_TAG];
    36963696       
    36973697        [segmentedCell setTag: TOOLBAR_RESUME_TAG forSegment: TOOLBAR_RESUME_TAG];
    3698         [segmentedControl setImage: [NSImage imageNamed: @"ToolbarResumeAllTemplate.png"] forSegment: TOOLBAR_RESUME_TAG];
     3698        [segmentedControl setImage: [NSImage imageNamed: @"ToolbarResumeAllTemplate"] forSegment: TOOLBAR_RESUME_TAG];
    36993699        [segmentedCell setToolTip: NSLocalizedString(@"Resume all transfers",
    37003700                                    "All toolbar item -> tooltip") forSegment: TOOLBAR_RESUME_TAG];
    … …  
    37333733       
    37343734        [segmentedCell setTag: TOOLBAR_PAUSE_TAG forSegment: TOOLBAR_PAUSE_TAG];
    3735         [segmentedControl setImage: [NSImage imageNamed: @"ToolbarPauseSelectedTemplate.png"] forSegment: TOOLBAR_PAUSE_TAG];
     3735        [segmentedControl setImage: [NSImage imageNamed: @"ToolbarPauseSelectedTemplate"] forSegment: TOOLBAR_PAUSE_TAG];
    37363736        [segmentedCell setToolTip: NSLocalizedString(@"Pause selected transfers",
    37373737                                    "Selected toolbar item -> tooltip") forSegment: TOOLBAR_PAUSE_TAG];
    37383738       
    37393739        [segmentedCell setTag: TOOLBAR_RESUME_TAG forSegment: TOOLBAR_RESUME_TAG];
    3740         [segmentedControl setImage: [NSImage imageNamed: @"ToolbarResumeSelectedTemplate.png"] forSegment: TOOLBAR_RESUME_TAG];
     3740        [segmentedControl setImage: [NSImage imageNamed: @"ToolbarResumeSelectedTemplate"] forSegment: TOOLBAR_RESUME_TAG];
    37413741        [segmentedCell setToolTip: NSLocalizedString(@"Resume selected transfers",
    37423742                                    "Selected toolbar item -> tooltip") forSegment: TOOLBAR_RESUME_TAG];
    … …  
    37593759        [item setPaletteLabel: NSLocalizedString(@"Toggle Filter", "Filter toolbar item -> palette label")];
    37603760        [item setToolTip: NSLocalizedString(@"Toggle the filter bar", "Filter toolbar item -> tooltip")];
    3761         [item setImage: [NSImage imageNamed: @"ToolbarFilterTemplate.png"]];
     3761        [item setImage: [NSImage imageNamed: @"ToolbarFilterTemplate"]];
    37623762        [item setTarget: self];
    37633763        [item setAction: @selector(toggleFilterBar:)];

  • trunk/macosx/DragOverlayWindow.m

    r13251 r13340  
    152152- (void) setFile: (NSString *) file
    153153{
    154     [[self contentView] setOverlay: [NSImage imageNamed: @"CreateLarge.png"]
     154    [[self contentView] setOverlay: [NSImage imageNamed: @"CreateLarge"]
    155155        mainLine: NSLocalizedString(@"Create a Torrent File", "Drag overlay -> file") subLine: file];
    156156    [self fadeIn];
    … …  
    159159- (void) setURL: (NSString *) url
    160160{
    161     [[self contentView] setOverlay: [NSImage imageNamed: @"Globe.png"]
     161    [[self contentView] setOverlay: [NSImage imageNamed: @"Globe"]
    162162        mainLine: NSLocalizedString(@"Web Address", "Drag overlay -> url") subLine: url];
    163163    [self fadeIn];

  • trunk/macosx/FileOutlineController.m

    r13296 r13340  
    565565    [item setTarget: self];
    566566    [item setTag: FILE_PRIORITY_HIGH_TAG];
    567     [item setImage: [NSImage imageNamed: @"PriorityHighTemplate.png"]];
     567    [item setImage: [NSImage imageNamed: @"PriorityHighTemplate"]];
    568568    [priorityMenu addItem: item];
    569569    [item release];
    … …  
    573573    [item setTarget: self];
    574574    [item setTag: FILE_PRIORITY_NORMAL_TAG];
    575     [item setImage: [NSImage imageNamed: @"PriorityNormalTemplate.png"]];
     575    [item setImage: [NSImage imageNamed: @"PriorityNormalTemplate"]];
    576576    [priorityMenu addItem: item];
    577577    [item release];
    … …  
    581581    [item setTarget: self];
    582582    [item setTag: FILE_PRIORITY_LOW_TAG];
    583     [item setImage: [NSImage imageNamed: @"PriorityLowTemplate.png"]];
     583    [item setImage: [NSImage imageNamed: @"PriorityLowTemplate"]];
    584584    [priorityMenu addItem: item];
    585585    [item release];

  • trunk/macosx/FilePriorityCell.m

    r13251 r13340  
    4747        }
    4848       
    49         [self setImage: [NSImage imageNamed: @"PriorityControlLow.png"] forSegment: 0];
    50         [self setImage: [NSImage imageNamed: @"PriorityControlNormal.png"] forSegment: 1];
    51         [self setImage: [NSImage imageNamed: @"PriorityControlHigh.png"] forSegment: 2];
     49        [self setImage: [NSImage imageNamed: @"PriorityControlLow"] forSegment: 0];
     50        [self setImage: [NSImage imageNamed: @"PriorityControlNormal"] forSegment: 1];
     51        [self setImage: [NSImage imageNamed: @"PriorityControlHigh"] forSegment: 2];
    5252       
    5353        fHoverRow = NO;
    … …  
    134134            //if ([self backgroundStyle] != NSBackgroundStyleDark)
    135135            {
    136                 NSImage * image = [[NSImage imageNamed: @"PriorityNormalTemplate.png"] imageWithColor: [NSColor lightGrayColor]];
     136                NSImage * image = [[NSImage imageNamed: @"PriorityNormalTemplate"] imageWithColor: [NSColor lightGrayColor]];
    137137                [images addObject: image];
    138138                totalWidth = [image size].width;
    … …  
    146146            if ([priorities containsObject: [NSNumber numberWithInteger: TR_PRI_LOW]])
    147147            {
    148                 NSImage * image = [[NSImage imageNamed: @"PriorityLowTemplate.png"] imageWithColor: priorityColor];
     148                NSImage * image = [[NSImage imageNamed: @"PriorityLowTemplate"] imageWithColor: priorityColor];
    149149                [images addObject: image];
    150150                totalWidth += [image size].width;
    … …  
    152152            if ([priorities containsObject: [NSNumber numberWithInteger: TR_PRI_NORMAL]])
    153153            {
    154                 NSImage * image = [[NSImage imageNamed: @"PriorityNormalTemplate.png"] imageWithColor: priorityColor];
     154                NSImage * image = [[NSImage imageNamed: @"PriorityNormalTemplate"] imageWithColor: priorityColor];
    155155                [images addObject: image];
    156156                totalWidth += [image size].width;
    … …  
    158158            if ([priorities containsObject: [NSNumber numberWithInteger: TR_PRI_HIGH]])
    159159            {
    160                 NSImage * image = [[NSImage imageNamed: @"PriorityHighTemplate.png"] imageWithColor: priorityColor];
     160                NSImage * image = [[NSImage imageNamed: @"PriorityHighTemplate"] imageWithColor: priorityColor];
    161161                [images addObject: image];
    162162                totalWidth += [image size].width;

  • trunk/macosx/FilterBarController.m

    r13251 r13340  
    375375    if (groupIndex == GROUP_FILTER_ALL_TAG)
    376376    {
    377         icon = [NSImage imageNamed: @"PinTemplate.png"];
     377        icon = [NSImage imageNamed: @"PinTemplate"];
    378378        toolTip = NSLocalizedString(@"All Groups", "Groups -> Button");
    379379    }

  • trunk/macosx/GroupsController.m

    r13251 r13340  
    154154    NSInteger orderIndex = [self rowValueForIndex: index];
    155155    return orderIndex != -1 ? [self imageForGroup: [fGroups objectAtIndex: orderIndex]]
    156                             : [NSImage imageNamed: @"GroupsNoneTemplate.png"];
     156                            : [NSImage imageNamed: @"GroupsNoneTemplate"];
    157157}
    158158
    … …  
    298298    [item setTag: -1];
    299299   
    300     NSImage * icon = [NSImage imageNamed: @"GroupsNoneTemplate.png"];
     300    NSImage * icon = [NSImage imageNamed: @"GroupsNoneTemplate"];
    301301    if (small)
    302302    {

  • trunk/macosx/InfoPeersViewController.m

    r13293 r13340  
    281281       
    282282        if ([ident isEqualToString: @"Encryption"])
    283             return [[peer objectForKey: @"Encryption"] boolValue] ? [NSImage imageNamed: @"Lock.png"] : nil;
     283            return [[peer objectForKey: @"Encryption"] boolValue] ? [NSImage imageNamed: @"Lock"] : nil;
    284284        else if ([ident isEqualToString: @"Client"])
    285285            return [peer objectForKey: @"Client"];

  • trunk/macosx/MessageWindowController.m

    r13318 r13340  
    268268        {
    269269            case TR_MSG_ERR:
    270                 return [NSImage imageNamed: @"RedDot.png"];
     270                return [NSImage imageNamed: @"RedDot"];
    271271            case TR_MSG_INF:
    272                 return [NSImage imageNamed: @"YellowDot.png"];
     272                return [NSImage imageNamed: @"YellowDot"];
    273273            case TR_MSG_DBG:
    274                 return [NSImage imageNamed: @"PurpleDot.png"];
     274                return [NSImage imageNamed: @"PurpleDot"];
    275275            default:
    276276                NSAssert1(NO, @"Unknown message log level: %d", level);

  • trunk/macosx/PeerProgressIndicatorCell.m

    r13253 r13340  
    7575        if (fSeed)
    7676        {
    77             NSImage * checkImage = [NSImage imageNamed: @"CompleteCheck.png"];
     77            NSImage * checkImage = [NSImage imageNamed: @"CompleteCheck"];
    7878           
    7979            const NSSize imageSize = [checkImage size];

  • trunk/macosx/PrefsController.m

    r13337 r13340  
    267267    {
    268268        [item setLabel: NSLocalizedString(@"Transfers", "Preferences -> toolbar item title")];
    269         [item setImage: [NSImage imageNamed: @"Transfers.png"]];
     269        [item setImage: [NSImage imageNamed: @"Transfers"]];
    270270        [item setTarget: self];
    271271        [item setAction: @selector(setPrefView:)];
    … …  
    275275    {
    276276        [item setLabel: NSLocalizedString(@"Groups", "Preferences -> toolbar item title")];
    277         [item setImage: [NSImage imageNamed: @"Groups.png"]];
     277        [item setImage: [NSImage imageNamed: @"Groups"]];
    278278        [item setTarget: self];
    279279        [item setAction: @selector(setPrefView:)];
    … …  
    283283    {
    284284        [item setLabel: NSLocalizedString(@"Bandwidth", "Preferences -> toolbar item title")];
    285         [item setImage: [NSImage imageNamed: @"Bandwidth.png"]];
     285        [item setImage: [NSImage imageNamed: @"Bandwidth"]];
    286286        [item setTarget: self];
    287287        [item setAction: @selector(setPrefView:)];
    … …  
    307307    {
    308308        [item setLabel: NSLocalizedString(@"Remote", "Preferences -> toolbar item title")];
    309         [item setImage: [NSImage imageNamed: @"Remote.png"]];
     309        [item setImage: [NSImage imageNamed: @"Remote"]];
    310310        [item setTarget: self];
    311311        [item setAction: @selector(setPrefView:)];
    … …  
    420420        case PORT_STATUS_OPEN:
    421421            [fPortStatusField setStringValue: NSLocalizedString(@"Port is open", "Preferences -> Network -> port status")];
    422             [fPortStatusImage setImage: [NSImage imageNamed: @"GreenDot.png"]];
     422            [fPortStatusImage setImage: [NSImage imageNamed: @"GreenDot"]];
    423423            break;
    424424        case PORT_STATUS_CLOSED:
    425425            [fPortStatusField setStringValue: NSLocalizedString(@"Port is closed", "Preferences -> Network -> port status")];
    426             [fPortStatusImage setImage: [NSImage imageNamed: @"RedDot.png"]];
     426            [fPortStatusImage setImage: [NSImage imageNamed: @"RedDot"]];
    427427            break;
    428428        case PORT_STATUS_ERROR:
    429429            [fPortStatusField setStringValue: NSLocalizedString(@"Port check site is down", "Preferences -> Network -> port status")];
    430             [fPortStatusImage setImage: [NSImage imageNamed: @"YellowDot.png"]];
     430            [fPortStatusImage setImage: [NSImage imageNamed: @"YellowDot"]];
    431431            break;
    432432        default:

  • trunk/macosx/Torrent.m

    r13335 r13340  
    608608{
    609609    if ([self isMagnet])
    610         return [NSImage imageNamed: @"Magnet.png"];
     610        return [NSImage imageNamed: @"Magnet"];
    611611   
    612612    #warning replace kGenericFolderIcon stuff with NSImageNameFolder on 10.6

  • trunk/macosx/TorrentCell.m

    r13285 r13340  
    422422        NSString * controlImageSuffix;
    423423        if (fMouseDownControlButton)
    424             controlImageSuffix = @"On.png";
     424            controlImageSuffix = @"On";
    425425        else if (!fTracking && fHoverControl)
    426             controlImageSuffix = @"Hover.png";
     426            controlImageSuffix = @"Hover";
    427427        else
    428             controlImageSuffix = @"Off.png";
     428            controlImageSuffix = @"Off";
    429429       
    430430        NSImage * controlImage;
    … …  
    448448        NSString * revealImageString;
    449449        if (fMouseDownRevealButton)
    450             revealImageString = @"RevealOn.png";
     450            revealImageString = @"RevealOn";
    451451        else if (!fTracking && fHoverReveal)
    452             revealImageString = @"RevealHover.png";
     452            revealImageString = @"RevealHover";
    453453        else
    454             revealImageString = @"RevealOff.png";
     454            revealImageString = @"RevealOff";
    455455       
    456456        NSImage * revealImage = [NSImage imageNamed: revealImageString];
    … …  
    462462        if (fMouseDownActionButton)
    463463            #warning we can get rid of this on 10.7
    464             actionImageString = @"ActionOn.png";
     464            actionImageString = @"ActionOn";
    465465        else if (!fTracking && fHoverAction)
    466             actionImageString = @"ActionHover.png";
     466            actionImageString = @"ActionHover";
    467467        else
    468468            actionImageString = nil;
    … …  
    488488       
    489489        NSColor * priorityColor = [self backgroundStyle] == NSBackgroundStyleDark ? [NSColor whiteColor] : [NSColor darkGrayColor];
    490         NSImage * priorityImage = [[NSImage imageNamed: ([torrent priority] == TR_PRI_HIGH ? @"PriorityHighTemplate.png" : @"PriorityLowTemplate.png")] imageWithColor: priorityColor];
     490        NSImage * priorityImage = [[NSImage imageNamed: ([torrent priority] == TR_PRI_HIGH ? @"PriorityHighTemplate" : @"PriorityLowTemplate")] imageWithColor: priorityColor];
    491491        [priorityImage drawInRect: priorityRect fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0 respectFlipped: YES hints: nil];
    492492    }

  • trunk/macosx/TrackerCell.m

    r13251 r13340  
    213213    }
    214214       
    215     return (icon && icon != [NSNull null]) ? icon : [NSImage imageNamed: @"FavIcon.png"];
     215    return (icon && icon != [NSNull null]) ? icon : [NSImage imageNamed: @"FavIcon"];
    216216}
    217217
Note: See TracChangeset for help on using the changeset viewer.