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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • 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:)];
Note: See TracChangeset for help on using the changeset viewer.