Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-20 02:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mitchell Livingston
2012-06-10 02:35:58 +00:00
parent 6b8f4738bf
commit b830e8cba2
15 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Transmission.xcodeproj/project.pbxproj
View File

@@ -329,7 +329,7 @@
A2DC49A315842F9E00758FF1 /* RevealOff@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A2DC49A015842F9D00758FF1 /* RevealOff@2x.png */; }; A2DC49A315842F9E00758FF1 /* RevealOff@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A2DC49A015842F9D00758FF1 /* RevealOff@2x.png */; };
A2DC49A415842F9E00758FF1 /* RevealOn@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A2DC49A115842F9D00758FF1 /* RevealOn@2x.png */; }; A2DC49A415842F9E00758FF1 /* RevealOn@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A2DC49A115842F9D00758FF1 /* RevealOn@2x.png */; };
A2DC49A815842FC300758FF1 /* ToolbarCreateTemplate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A2DC49A515842FC300758FF1 /* ToolbarCreateTemplate@2x.png */; }; A2DC49A815842FC300758FF1 /* ToolbarCreateTemplate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A2DC49A515842FC300758FF1 /* ToolbarCreateTemplate@2x.png */; };
A2DC49A915842FC300758FF1 /* ToolbarFiltertemplate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A2DC49A615842FC300758FF1 /* ToolbarFiltertemplate@2x.png */; }; A2DC49A915842FC300758FF1 /* ToolbarFilterTemplate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A2DC49A615842FC300758FF1 /* ToolbarFilterTemplate@2x.png */; };
A2DC49AA15842FC300758FF1 /* ToolbarInfoTemplate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A2DC49A715842FC300758FF1 /* ToolbarInfoTemplate@2x.png */; }; A2DC49AA15842FC300758FF1 /* ToolbarInfoTemplate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A2DC49A715842FC300758FF1 /* ToolbarInfoTemplate@2x.png */; };
A2DC49AD15842FF200758FF1 /* ToolbarOpenTemplate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A2DC49AB15842FF200758FF1 /* ToolbarOpenTemplate@2x.png */; }; A2DC49AD15842FF200758FF1 /* ToolbarOpenTemplate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A2DC49AB15842FF200758FF1 /* ToolbarOpenTemplate@2x.png */; };
A2DC49AE15842FF200758FF1 /* ToolbarOpenWebTemplate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A2DC49AC15842FF200758FF1 /* ToolbarOpenWebTemplate@2x.png */; }; A2DC49AE15842FF200758FF1 /* ToolbarOpenWebTemplate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A2DC49AC15842FF200758FF1 /* ToolbarOpenWebTemplate@2x.png */; };
@@ -1005,7 +1005,7 @@
A2DC49A015842F9D00758FF1 /* RevealOff@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "RevealOff@2x.png"; path = "macosx/Images/RevealOff@2x.png"; sourceTree = "<group>"; }; A2DC49A015842F9D00758FF1 /* RevealOff@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "RevealOff@2x.png"; path = "macosx/Images/RevealOff@2x.png"; sourceTree = "<group>"; };
A2DC49A115842F9D00758FF1 /* RevealOn@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "RevealOn@2x.png"; path = "macosx/Images/RevealOn@2x.png"; sourceTree = "<group>"; }; A2DC49A115842F9D00758FF1 /* RevealOn@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "RevealOn@2x.png"; path = "macosx/Images/RevealOn@2x.png"; sourceTree = "<group>"; };
A2DC49A515842FC300758FF1 /* ToolbarCreateTemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "ToolbarCreateTemplate@2x.png"; path = "macosx/Images/ToolbarCreateTemplate@2x.png"; sourceTree = "<group>"; }; A2DC49A515842FC300758FF1 /* ToolbarCreateTemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "ToolbarCreateTemplate@2x.png"; path = "macosx/Images/ToolbarCreateTemplate@2x.png"; sourceTree = "<group>"; };
A2DC49A615842FC300758FF1 /* ToolbarFiltertemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "ToolbarFiltertemplate@2x.png"; path = "macosx/Images/ToolbarFiltertemplate@2x.png"; sourceTree = "<group>"; }; A2DC49A615842FC300758FF1 /* ToolbarFilterTemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "ToolbarFilterTemplate@2x.png"; path = "macosx/Images/ToolbarFilterTemplate@2x.png"; sourceTree = "<group>"; };
A2DC49A715842FC300758FF1 /* ToolbarInfoTemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "ToolbarInfoTemplate@2x.png"; path = "macosx/Images/ToolbarInfoTemplate@2x.png"; sourceTree = "<group>"; }; A2DC49A715842FC300758FF1 /* ToolbarInfoTemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "ToolbarInfoTemplate@2x.png"; path = "macosx/Images/ToolbarInfoTemplate@2x.png"; sourceTree = "<group>"; };
A2DC49AB15842FF200758FF1 /* ToolbarOpenTemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "ToolbarOpenTemplate@2x.png"; path = "macosx/Images/ToolbarOpenTemplate@2x.png"; sourceTree = "<group>"; }; A2DC49AB15842FF200758FF1 /* ToolbarOpenTemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "ToolbarOpenTemplate@2x.png"; path = "macosx/Images/ToolbarOpenTemplate@2x.png"; sourceTree = "<group>"; };
A2DC49AC15842FF200758FF1 /* ToolbarOpenWebTemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "ToolbarOpenWebTemplate@2x.png"; path = "macosx/Images/ToolbarOpenWebTemplate@2x.png"; sourceTree = "<group>"; }; A2DC49AC15842FF200758FF1 /* ToolbarOpenWebTemplate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "ToolbarOpenWebTemplate@2x.png"; path = "macosx/Images/ToolbarOpenWebTemplate@2x.png"; sourceTree = "<group>"; };
@@ -1484,7 +1484,7 @@
4DDFDD21099A5D8E00189D81 /* UploadBadge.png */, 4DDFDD21099A5D8E00189D81 /* UploadBadge.png */,
A24B655F0D3F30870079EA4D /* QuitBadge.png */, A24B655F0D3F30870079EA4D /* QuitBadge.png */,
A232D29D0A70903E00973B12 /* ToolbarFilterTemplate.png */, A232D29D0A70903E00973B12 /* ToolbarFilterTemplate.png */,
A2DC49A615842FC300758FF1 /* ToolbarFiltertemplate@2x.png */, A2DC49A615842FC300758FF1 /* ToolbarFilterTemplate@2x.png */,
4DF7500808A103AD007B0D70 /* ToolbarInfoTemplate.png */, 4DF7500808A103AD007B0D70 /* ToolbarInfoTemplate.png */,
A2DC49A715842FC300758FF1 /* ToolbarInfoTemplate@2x.png */, A2DC49A715842FC300758FF1 /* ToolbarInfoTemplate@2x.png */,
4DF7500708A103AD007B0D70 /* ToolbarOpenTemplate.png */, 4DF7500708A103AD007B0D70 /* ToolbarOpenTemplate.png */,
@@ -2395,7 +2395,7 @@
A2DC49A315842F9E00758FF1 /* RevealOff@2x.png in Resources */, A2DC49A315842F9E00758FF1 /* RevealOff@2x.png in Resources */,
A2DC49A415842F9E00758FF1 /* RevealOn@2x.png in Resources */, A2DC49A415842F9E00758FF1 /* RevealOn@2x.png in Resources */,
A2DC49A815842FC300758FF1 /* ToolbarCreateTemplate@2x.png in Resources */, A2DC49A815842FC300758FF1 /* ToolbarCreateTemplate@2x.png in Resources */,
A2DC49A915842FC300758FF1 /* ToolbarFiltertemplate@2x.png in Resources */, A2DC49A915842FC300758FF1 /* ToolbarFilterTemplate@2x.png in Resources */,
A2DC49AA15842FC300758FF1 /* ToolbarInfoTemplate@2x.png in Resources */, A2DC49AA15842FC300758FF1 /* ToolbarInfoTemplate@2x.png in Resources */,
A2DC49AD15842FF200758FF1 /* ToolbarOpenTemplate@2x.png in Resources */, A2DC49AD15842FF200758FF1 /* ToolbarOpenTemplate@2x.png in Resources */,
A2DC49AE15842FF200758FF1 /* ToolbarOpenWebTemplate@2x.png in Resources */, A2DC49AE15842FF200758FF1 /* ToolbarOpenWebTemplate@2x.png in Resources */,

6
macosx/BadgeView.m
View File

@@ -76,7 +76,7 @@
if (fQuitting) if (fQuitting)
{ {
NSImage * quitBadge = [NSImage imageNamed: @"QuitBadge.png"]; NSImage * quitBadge = [NSImage imageNamed: @"QuitBadge"];
[self badge: quitBadge string: NSLocalizedString(@"Quitting", "Dock Badger -> quit") [self badge: quitBadge string: NSLocalizedString(@"Quitting", "Dock Badger -> quit")
atHeight: (NSHeight(rect) - [quitBadge size].height) * 0.5 adjustForQuit: YES]; atHeight: (NSHeight(rect) - [quitBadge size].height) * 0.5 adjustForQuit: YES];
return; return;
@@ -87,13 +87,13 @@
CGFloat bottom = 0.0; CGFloat bottom = 0.0;
if (upload) if (upload)
{ {
NSImage * uploadBadge = [NSImage imageNamed: @"UploadBadge.png"]; NSImage * uploadBadge = [NSImage imageNamed: @"UploadBadge"];
[self badge: uploadBadge string: [NSString stringForSpeedAbbrev: fUploadRate] atHeight: bottom adjustForQuit: NO]; [self badge: uploadBadge string: [NSString stringForSpeedAbbrev: fUploadRate] atHeight: bottom adjustForQuit: NO];
if (download) if (download)
bottom += [uploadBadge size].height + BETWEEN_PADDING; //download rate above upload rate bottom += [uploadBadge size].height + BETWEEN_PADDING; //download rate above upload rate
} }
if (download) if (download)
[self badge: [NSImage imageNamed: @"DownloadBadge.png"] string: [NSString stringForSpeedAbbrev: fDownloadRate] [self badge: [NSImage imageNamed: @"DownloadBadge"] string: [NSString stringForSpeedAbbrev: fDownloadRate]
atHeight: bottom adjustForQuit: NO]; atHeight: bottom adjustForQuit: NO];
} }

24
macosx/Controller.m
View File

@@ -2882,10 +2882,10 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
return [[GroupsController groups] imageForIndex: group]; return [[GroupsController groups] imageForIndex: group];
} }
else if ([ident isEqualToString: @"DL Image"]) else if ([ident isEqualToString: @"DL Image"])
return [NSImage imageNamed: @"DownArrowGroupTemplate.png"]; return [NSImage imageNamed: @"DownArrowGroupTemplate"];
else if ([ident isEqualToString: @"UL Image"]) else if ([ident isEqualToString: @"UL Image"])
return [NSImage imageNamed: [fDefaults boolForKey: @"DisplayGroupRowRatio"] return [NSImage imageNamed: [fDefaults boolForKey: @"DisplayGroupRowRatio"]
? @"YingYangGroupTemplate.png" : @"UpArrowGroupTemplate.png"]; ? @"YingYangGroupTemplate" : @"UpArrowGroupTemplate"];
else else
{ {
TorrentGroup * group = (TorrentGroup *)item; TorrentGroup * group = (TorrentGroup *)item;
@@ -3603,7 +3603,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
[item setLabel: NSLocalizedString(@"Create", "Create toolbar item -> label")]; [item setLabel: NSLocalizedString(@"Create", "Create toolbar item -> label")];
[item setPaletteLabel: NSLocalizedString(@"Create Torrent File", "Create toolbar item -> palette label")]; [item setPaletteLabel: NSLocalizedString(@"Create Torrent File", "Create toolbar item -> palette label")];
[item setToolTip: NSLocalizedString(@"Create torrent file", "Create toolbar item -> tooltip")]; [item setToolTip: NSLocalizedString(@"Create torrent file", "Create toolbar item -> tooltip")];
[item setImage: [NSImage imageNamed: @"ToolbarCreateTemplate.png"]]; [item setImage: [NSImage imageNamed: @"ToolbarCreateTemplate"]];
[item setTarget: self]; [item setTarget: self];
[item setAction: @selector(createFile:)]; [item setAction: @selector(createFile:)];
[item setAutovalidates: NO]; [item setAutovalidates: NO];
@@ -3617,7 +3617,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
[item setLabel: NSLocalizedString(@"Open", "Open toolbar item -> label")]; [item setLabel: NSLocalizedString(@"Open", "Open toolbar item -> label")];
[item setPaletteLabel: NSLocalizedString(@"Open Torrent Files", "Open toolbar item -> palette label")]; [item setPaletteLabel: NSLocalizedString(@"Open Torrent Files", "Open toolbar item -> palette label")];
[item setToolTip: NSLocalizedString(@"Open torrent files", "Open toolbar item -> tooltip")]; [item setToolTip: NSLocalizedString(@"Open torrent files", "Open toolbar item -> tooltip")];
[item setImage: [NSImage imageNamed: @"ToolbarOpenTemplate.png"]]; [item setImage: [NSImage imageNamed: @"ToolbarOpenTemplate"]];
[item setTarget: self]; [item setTarget: self];
[item setAction: @selector(openShowSheet:)]; [item setAction: @selector(openShowSheet:)];
[item setAutovalidates: NO]; [item setAutovalidates: NO];
@@ -3631,7 +3631,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
[item setLabel: NSLocalizedString(@"Open Address", "Open address toolbar item -> label")]; [item setLabel: NSLocalizedString(@"Open Address", "Open address toolbar item -> label")];
[item setPaletteLabel: NSLocalizedString(@"Open Torrent Address", "Open address toolbar item -> palette label")]; [item setPaletteLabel: NSLocalizedString(@"Open Torrent Address", "Open address toolbar item -> palette label")];
[item setToolTip: NSLocalizedString(@"Open torrent web address", "Open address toolbar item -> tooltip")]; [item setToolTip: NSLocalizedString(@"Open torrent web address", "Open address toolbar item -> tooltip")];
[item setImage: [NSImage imageNamed: @"ToolbarOpenWebTemplate.png"]]; [item setImage: [NSImage imageNamed: @"ToolbarOpenWebTemplate"]];
[item setTarget: self]; [item setTarget: self];
[item setAction: @selector(openURLShowSheet:)]; [item setAction: @selector(openURLShowSheet:)];
[item setAutovalidates: NO]; [item setAutovalidates: NO];
@@ -3645,7 +3645,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
[item setLabel: NSLocalizedString(@"Remove", "Remove toolbar item -> label")]; [item setLabel: NSLocalizedString(@"Remove", "Remove toolbar item -> label")];
[item setPaletteLabel: NSLocalizedString(@"Remove Selected", "Remove toolbar item -> palette label")]; [item setPaletteLabel: NSLocalizedString(@"Remove Selected", "Remove toolbar item -> palette label")];
[item setToolTip: NSLocalizedString(@"Remove selected transfers", "Remove toolbar item -> tooltip")]; [item setToolTip: NSLocalizedString(@"Remove selected transfers", "Remove toolbar item -> tooltip")];
[item setImage: [NSImage imageNamed: @"ToolbarRemoveTemplate.png"]]; [item setImage: [NSImage imageNamed: @"ToolbarRemoveTemplate"]];
[item setTarget: self]; [item setTarget: self];
[item setAction: @selector(removeNoDelete:)]; [item setAction: @selector(removeNoDelete:)];
[item setVisibilityPriority: NSToolbarItemVisibilityPriorityHigh]; [item setVisibilityPriority: NSToolbarItemVisibilityPriorityHigh];
@@ -3660,7 +3660,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
[item setLabel: NSLocalizedString(@"Inspector", "Inspector toolbar item -> label")]; [item setLabel: NSLocalizedString(@"Inspector", "Inspector toolbar item -> label")];
[item setPaletteLabel: NSLocalizedString(@"Toggle Inspector", "Inspector toolbar item -> palette label")]; [item setPaletteLabel: NSLocalizedString(@"Toggle Inspector", "Inspector toolbar item -> palette label")];
[item setToolTip: NSLocalizedString(@"Toggle the torrent inspector", "Inspector toolbar item -> tooltip")]; [item setToolTip: NSLocalizedString(@"Toggle the torrent inspector", "Inspector toolbar item -> tooltip")];
[item setImage: [NSImage imageNamed: @"ToolbarInfoTemplate.png"]]; [item setImage: [NSImage imageNamed: @"ToolbarInfoTemplate"]];
[item setTarget: self]; [item setTarget: self];
[item setAction: @selector(showInfo:)]; [item setAction: @selector(showInfo:)];
@@ -3690,12 +3690,12 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
[groupItem setIdentifiers: [NSArray arrayWithObjects: TOOLBAR_PAUSE_ALL, TOOLBAR_RESUME_ALL, nil]]; [groupItem setIdentifiers: [NSArray arrayWithObjects: TOOLBAR_PAUSE_ALL, TOOLBAR_RESUME_ALL, nil]];
[segmentedCell setTag: TOOLBAR_PAUSE_TAG forSegment: TOOLBAR_PAUSE_TAG]; [segmentedCell setTag: TOOLBAR_PAUSE_TAG forSegment: TOOLBAR_PAUSE_TAG];
[segmentedControl setImage: [NSImage imageNamed: @"ToolbarPauseAllTemplate.png"] forSegment: TOOLBAR_PAUSE_TAG]; [segmentedControl setImage: [NSImage imageNamed: @"ToolbarPauseAllTemplate"] forSegment: TOOLBAR_PAUSE_TAG];
[segmentedCell setToolTip: NSLocalizedString(@"Pause all transfers", [segmentedCell setToolTip: NSLocalizedString(@"Pause all transfers",
"All toolbar item -> tooltip") forSegment: TOOLBAR_PAUSE_TAG]; "All toolbar item -> tooltip") forSegment: TOOLBAR_PAUSE_TAG];
[segmentedCell setTag: TOOLBAR_RESUME_TAG forSegment: TOOLBAR_RESUME_TAG]; [segmentedCell setTag: TOOLBAR_RESUME_TAG forSegment: TOOLBAR_RESUME_TAG];
[segmentedControl setImage: [NSImage imageNamed: @"ToolbarResumeAllTemplate.png"] forSegment: TOOLBAR_RESUME_TAG]; [segmentedControl setImage: [NSImage imageNamed: @"ToolbarResumeAllTemplate"] forSegment: TOOLBAR_RESUME_TAG];
[segmentedCell setToolTip: NSLocalizedString(@"Resume all transfers", [segmentedCell setToolTip: NSLocalizedString(@"Resume all transfers",
"All toolbar item -> tooltip") forSegment: TOOLBAR_RESUME_TAG]; "All toolbar item -> tooltip") forSegment: TOOLBAR_RESUME_TAG];
@@ -3732,12 +3732,12 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
[groupItem setIdentifiers: [NSArray arrayWithObjects: TOOLBAR_PAUSE_SELECTED, TOOLBAR_RESUME_SELECTED, nil]]; [groupItem setIdentifiers: [NSArray arrayWithObjects: TOOLBAR_PAUSE_SELECTED, TOOLBAR_RESUME_SELECTED, nil]];
[segmentedCell setTag: TOOLBAR_PAUSE_TAG forSegment: TOOLBAR_PAUSE_TAG]; [segmentedCell setTag: TOOLBAR_PAUSE_TAG forSegment: TOOLBAR_PAUSE_TAG];
[segmentedControl setImage: [NSImage imageNamed: @"ToolbarPauseSelectedTemplate.png"] forSegment: TOOLBAR_PAUSE_TAG]; [segmentedControl setImage: [NSImage imageNamed: @"ToolbarPauseSelectedTemplate"] forSegment: TOOLBAR_PAUSE_TAG];
[segmentedCell setToolTip: NSLocalizedString(@"Pause selected transfers", [segmentedCell setToolTip: NSLocalizedString(@"Pause selected transfers",
"Selected toolbar item -> tooltip") forSegment: TOOLBAR_PAUSE_TAG]; "Selected toolbar item -> tooltip") forSegment: TOOLBAR_PAUSE_TAG];
[segmentedCell setTag: TOOLBAR_RESUME_TAG forSegment: TOOLBAR_RESUME_TAG]; [segmentedCell setTag: TOOLBAR_RESUME_TAG forSegment: TOOLBAR_RESUME_TAG];
[segmentedControl setImage: [NSImage imageNamed: @"ToolbarResumeSelectedTemplate.png"] forSegment: TOOLBAR_RESUME_TAG]; [segmentedControl setImage: [NSImage imageNamed: @"ToolbarResumeSelectedTemplate"] forSegment: TOOLBAR_RESUME_TAG];
[segmentedCell setToolTip: NSLocalizedString(@"Resume selected transfers", [segmentedCell setToolTip: NSLocalizedString(@"Resume selected transfers",
"Selected toolbar item -> tooltip") forSegment: TOOLBAR_RESUME_TAG]; "Selected toolbar item -> tooltip") forSegment: TOOLBAR_RESUME_TAG];
@@ -3758,7 +3758,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
[item setLabel: NSLocalizedString(@"Filter", "Filter toolbar item -> label")]; [item setLabel: NSLocalizedString(@"Filter", "Filter toolbar item -> label")];
[item setPaletteLabel: NSLocalizedString(@"Toggle Filter", "Filter toolbar item -> palette label")]; [item setPaletteLabel: NSLocalizedString(@"Toggle Filter", "Filter toolbar item -> palette label")];
[item setToolTip: NSLocalizedString(@"Toggle the filter bar", "Filter toolbar item -> tooltip")]; [item setToolTip: NSLocalizedString(@"Toggle the filter bar", "Filter toolbar item -> tooltip")];
[item setImage: [NSImage imageNamed: @"ToolbarFilterTemplate.png"]]; [item setImage: [NSImage imageNamed: @"ToolbarFilterTemplate"]];
[item setTarget: self]; [item setTarget: self];
[item setAction: @selector(toggleFilterBar:)]; [item setAction: @selector(toggleFilterBar:)];

4
macosx/DragOverlayWindow.m
View File

@@ -151,14 +151,14 @@
- (void) setFile: (NSString *) file - (void) setFile: (NSString *) file
{ {
[[self contentView] setOverlay: [NSImage imageNamed: @"CreateLarge.png"] [[self contentView] setOverlay: [NSImage imageNamed: @"CreateLarge"]
mainLine: NSLocalizedString(@"Create a Torrent File", "Drag overlay -> file") subLine: file]; mainLine: NSLocalizedString(@"Create a Torrent File", "Drag overlay -> file") subLine: file];
[self fadeIn]; [self fadeIn];
} }
- (void) setURL: (NSString *) url - (void) setURL: (NSString *) url
{ {
[[self contentView] setOverlay: [NSImage imageNamed: @"Globe.png"] [[self contentView] setOverlay: [NSImage imageNamed: @"Globe"]
mainLine: NSLocalizedString(@"Web Address", "Drag overlay -> url") subLine: url]; mainLine: NSLocalizedString(@"Web Address", "Drag overlay -> url") subLine: url];
[self fadeIn]; [self fadeIn];
} }

6
macosx/FileOutlineController.m
View File

@@ -564,7 +564,7 @@ typedef enum
action: @selector(setPriority:) keyEquivalent: @""]; action: @selector(setPriority:) keyEquivalent: @""];
[item setTarget: self]; [item setTarget: self];
[item setTag: FILE_PRIORITY_HIGH_TAG]; [item setTag: FILE_PRIORITY_HIGH_TAG];
[item setImage: [NSImage imageNamed: @"PriorityHighTemplate.png"]]; [item setImage: [NSImage imageNamed: @"PriorityHighTemplate"]];
[priorityMenu addItem: item]; [priorityMenu addItem: item];
[item release]; [item release];
@@ -572,7 +572,7 @@ typedef enum
action: @selector(setPriority:) keyEquivalent: @""]; action: @selector(setPriority:) keyEquivalent: @""];
[item setTarget: self]; [item setTarget: self];
[item setTag: FILE_PRIORITY_NORMAL_TAG]; [item setTag: FILE_PRIORITY_NORMAL_TAG];
[item setImage: [NSImage imageNamed: @"PriorityNormalTemplate.png"]]; [item setImage: [NSImage imageNamed: @"PriorityNormalTemplate"]];
[priorityMenu addItem: item]; [priorityMenu addItem: item];
[item release]; [item release];
@@ -580,7 +580,7 @@ typedef enum
action: @selector(setPriority:) keyEquivalent: @""]; action: @selector(setPriority:) keyEquivalent: @""];
[item setTarget: self]; [item setTarget: self];
[item setTag: FILE_PRIORITY_LOW_TAG]; [item setTag: FILE_PRIORITY_LOW_TAG];
[item setImage: [NSImage imageNamed: @"PriorityLowTemplate.png"]]; [item setImage: [NSImage imageNamed: @"PriorityLowTemplate"]];
[priorityMenu addItem: item]; [priorityMenu addItem: item];
[item release]; [item release];

14
macosx/FilePriorityCell.m
View File

@@ -46,9 +46,9 @@
[self setWidth: 9.0f forSegment: i]; //9 is minimum size to get proper look [self setWidth: 9.0f forSegment: i]; //9 is minimum size to get proper look
} }
[self setImage: [NSImage imageNamed: @"PriorityControlLow.png"] forSegment: 0]; [self setImage: [NSImage imageNamed: @"PriorityControlLow"] forSegment: 0];
[self setImage: [NSImage imageNamed: @"PriorityControlNormal.png"] forSegment: 1]; [self setImage: [NSImage imageNamed: @"PriorityControlNormal"] forSegment: 1];
[self setImage: [NSImage imageNamed: @"PriorityControlHigh.png"] forSegment: 2]; [self setImage: [NSImage imageNamed: @"PriorityControlHigh"] forSegment: 2];
fHoverRow = NO; fHoverRow = NO;
} }
@@ -133,7 +133,7 @@
{ {
//if ([self backgroundStyle] != NSBackgroundStyleDark) //if ([self backgroundStyle] != NSBackgroundStyleDark)
{ {
NSImage * image = [[NSImage imageNamed: @"PriorityNormalTemplate.png"] imageWithColor: [NSColor lightGrayColor]]; NSImage * image = [[NSImage imageNamed: @"PriorityNormalTemplate"] imageWithColor: [NSColor lightGrayColor]];
[images addObject: image]; [images addObject: image];
totalWidth = [image size].width; totalWidth = [image size].width;
} }
@@ -145,19 +145,19 @@
totalWidth = 0.0; totalWidth = 0.0;
if ([priorities containsObject: [NSNumber numberWithInteger: TR_PRI_LOW]]) if ([priorities containsObject: [NSNumber numberWithInteger: TR_PRI_LOW]])
{ {
NSImage * image = [[NSImage imageNamed: @"PriorityLowTemplate.png"] imageWithColor: priorityColor]; NSImage * image = [[NSImage imageNamed: @"PriorityLowTemplate"] imageWithColor: priorityColor];
[images addObject: image]; [images addObject: image];
totalWidth += [image size].width; totalWidth += [image size].width;
} }
if ([priorities containsObject: [NSNumber numberWithInteger: TR_PRI_NORMAL]]) if ([priorities containsObject: [NSNumber numberWithInteger: TR_PRI_NORMAL]])
{ {
NSImage * image = [[NSImage imageNamed: @"PriorityNormalTemplate.png"] imageWithColor: priorityColor]; NSImage * image = [[NSImage imageNamed: @"PriorityNormalTemplate"] imageWithColor: priorityColor];
[images addObject: image]; [images addObject: image];
totalWidth += [image size].width; totalWidth += [image size].width;
} }
if ([priorities containsObject: [NSNumber numberWithInteger: TR_PRI_HIGH]]) if ([priorities containsObject: [NSNumber numberWithInteger: TR_PRI_HIGH]])
{ {
NSImage * image = [[NSImage imageNamed: @"PriorityHighTemplate.png"] imageWithColor: priorityColor]; NSImage * image = [[NSImage imageNamed: @"PriorityHighTemplate"] imageWithColor: priorityColor];
[images addObject: image]; [images addObject: image];
totalWidth += [image size].width; totalWidth += [image size].width;
} }

2
macosx/FilterBarController.m
View File

@@ -374,7 +374,7 @@
NSString * toolTip; NSString * toolTip;
if (groupIndex == GROUP_FILTER_ALL_TAG) if (groupIndex == GROUP_FILTER_ALL_TAG)
{ {
icon = [NSImage imageNamed: @"PinTemplate.png"]; icon = [NSImage imageNamed: @"PinTemplate"];
toolTip = NSLocalizedString(@"All Groups", "Groups -> Button"); toolTip = NSLocalizedString(@"All Groups", "Groups -> Button");
} }
else else

4
macosx/GroupsController.m
View File

@@ -153,7 +153,7 @@ GroupsController * fGroupsInstance = nil;
{ {
NSInteger orderIndex = [self rowValueForIndex: index]; NSInteger orderIndex = [self rowValueForIndex: index];
return orderIndex != -1 ? [self imageForGroup: [fGroups objectAtIndex: orderIndex]] return orderIndex != -1 ? [self imageForGroup: [fGroups objectAtIndex: orderIndex]]
: [NSImage imageNamed: @"GroupsNoneTemplate.png"]; : [NSImage imageNamed: @"GroupsNoneTemplate"];
} }
- (NSColor *) colorForIndex: (NSInteger) index - (NSColor *) colorForIndex: (NSInteger) index
@@ -297,7 +297,7 @@ GroupsController * fGroupsInstance = nil;
[item setTarget: target]; [item setTarget: target];
[item setTag: -1]; [item setTag: -1];
NSImage * icon = [NSImage imageNamed: @"GroupsNoneTemplate.png"]; NSImage * icon = [NSImage imageNamed: @"GroupsNoneTemplate"];
if (small) if (small)
{ {
icon = [icon copy]; icon = [icon copy];

2
macosx/InfoPeersViewController.m
View File

@@ -280,7 +280,7 @@
NSDictionary * peer = [fPeers objectAtIndex: row]; NSDictionary * peer = [fPeers objectAtIndex: row];
if ([ident isEqualToString: @"Encryption"]) if ([ident isEqualToString: @"Encryption"])
return [[peer objectForKey: @"Encryption"] boolValue] ? [NSImage imageNamed: @"Lock.png"] : nil; return [[peer objectForKey: @"Encryption"] boolValue] ? [NSImage imageNamed: @"Lock"] : nil;
else if ([ident isEqualToString: @"Client"]) else if ([ident isEqualToString: @"Client"])
return [peer objectForKey: @"Client"]; return [peer objectForKey: @"Client"];
else if ([ident isEqualToString: @"Progress"]) else if ([ident isEqualToString: @"Progress"])

6
macosx/MessageWindowController.m
View File

@@ -267,11 +267,11 @@
switch (level) switch (level)
{ {
case TR_MSG_ERR: case TR_MSG_ERR:
return [NSImage imageNamed: @"RedDot.png"]; return [NSImage imageNamed: @"RedDot"];
case TR_MSG_INF: case TR_MSG_INF:
return [NSImage imageNamed: @"YellowDot.png"]; return [NSImage imageNamed: @"YellowDot"];
case TR_MSG_DBG: case TR_MSG_DBG:
return [NSImage imageNamed: @"PurpleDot.png"]; return [NSImage imageNamed: @"PurpleDot"];
default: default:
NSAssert1(NO, @"Unknown message log level: %d", level); NSAssert1(NO, @"Unknown message log level: %d", level);
return nil; return nil;

2
macosx/PeerProgressIndicatorCell.m
View File

@@ -74,7 +74,7 @@
[super drawWithFrame: cellFrame inView: controlView]; [super drawWithFrame: cellFrame inView: controlView];
if (fSeed) if (fSeed)
{ {
NSImage * checkImage = [NSImage imageNamed: @"CompleteCheck.png"]; NSImage * checkImage = [NSImage imageNamed: @"CompleteCheck"];
const NSSize imageSize = [checkImage size]; const NSSize imageSize = [checkImage size];
const NSRect rect = NSMakeRect(floor(NSMidX(cellFrame) - imageSize.width * 0.5), const NSRect rect = NSMakeRect(floor(NSMidX(cellFrame) - imageSize.width * 0.5),

14
macosx/PrefsController.m
View File

@@ -266,7 +266,7 @@
else if ([ident isEqualToString: TOOLBAR_TRANSFERS]) else if ([ident isEqualToString: TOOLBAR_TRANSFERS])
{ {
[item setLabel: NSLocalizedString(@"Transfers", "Preferences -> toolbar item title")]; [item setLabel: NSLocalizedString(@"Transfers", "Preferences -> toolbar item title")];
[item setImage: [NSImage imageNamed: @"Transfers.png"]]; [item setImage: [NSImage imageNamed: @"Transfers"]];
[item setTarget: self]; [item setTarget: self];
[item setAction: @selector(setPrefView:)]; [item setAction: @selector(setPrefView:)];
[item setAutovalidates: NO]; [item setAutovalidates: NO];
@@ -274,7 +274,7 @@
else if ([ident isEqualToString: TOOLBAR_GROUPS]) else if ([ident isEqualToString: TOOLBAR_GROUPS])
{ {
[item setLabel: NSLocalizedString(@"Groups", "Preferences -> toolbar item title")]; [item setLabel: NSLocalizedString(@"Groups", "Preferences -> toolbar item title")];
[item setImage: [NSImage imageNamed: @"Groups.png"]]; [item setImage: [NSImage imageNamed: @"Groups"]];
[item setTarget: self]; [item setTarget: self];
[item setAction: @selector(setPrefView:)]; [item setAction: @selector(setPrefView:)];
[item setAutovalidates: NO]; [item setAutovalidates: NO];
@@ -282,7 +282,7 @@
else if ([ident isEqualToString: TOOLBAR_BANDWIDTH]) else if ([ident isEqualToString: TOOLBAR_BANDWIDTH])
{ {
[item setLabel: NSLocalizedString(@"Bandwidth", "Preferences -> toolbar item title")]; [item setLabel: NSLocalizedString(@"Bandwidth", "Preferences -> toolbar item title")];
[item setImage: [NSImage imageNamed: @"Bandwidth.png"]]; [item setImage: [NSImage imageNamed: @"Bandwidth"]];
[item setTarget: self]; [item setTarget: self];
[item setAction: @selector(setPrefView:)]; [item setAction: @selector(setPrefView:)];
[item setAutovalidates: NO]; [item setAutovalidates: NO];
@@ -306,7 +306,7 @@
else if ([ident isEqualToString: TOOLBAR_REMOTE]) else if ([ident isEqualToString: TOOLBAR_REMOTE])
{ {
[item setLabel: NSLocalizedString(@"Remote", "Preferences -> toolbar item title")]; [item setLabel: NSLocalizedString(@"Remote", "Preferences -> toolbar item title")];
[item setImage: [NSImage imageNamed: @"Remote.png"]]; [item setImage: [NSImage imageNamed: @"Remote"]];
[item setTarget: self]; [item setTarget: self];
[item setAction: @selector(setPrefView:)]; [item setAction: @selector(setPrefView:)];
[item setAutovalidates: NO]; [item setAutovalidates: NO];
@@ -419,15 +419,15 @@
{ {
case PORT_STATUS_OPEN: case PORT_STATUS_OPEN:
[fPortStatusField setStringValue: NSLocalizedString(@"Port is open", "Preferences -> Network -> port status")]; [fPortStatusField setStringValue: NSLocalizedString(@"Port is open", "Preferences -> Network -> port status")];
[fPortStatusImage setImage: [NSImage imageNamed: @"GreenDot.png"]]; [fPortStatusImage setImage: [NSImage imageNamed: @"GreenDot"]];
break; break;
case PORT_STATUS_CLOSED: case PORT_STATUS_CLOSED:
[fPortStatusField setStringValue: NSLocalizedString(@"Port is closed", "Preferences -> Network -> port status")]; [fPortStatusField setStringValue: NSLocalizedString(@"Port is closed", "Preferences -> Network -> port status")];
[fPortStatusImage setImage: [NSImage imageNamed: @"RedDot.png"]]; [fPortStatusImage setImage: [NSImage imageNamed: @"RedDot"]];
break; break;
case PORT_STATUS_ERROR: case PORT_STATUS_ERROR:
[fPortStatusField setStringValue: NSLocalizedString(@"Port check site is down", "Preferences -> Network -> port status")]; [fPortStatusField setStringValue: NSLocalizedString(@"Port check site is down", "Preferences -> Network -> port status")];
[fPortStatusImage setImage: [NSImage imageNamed: @"YellowDot.png"]]; [fPortStatusImage setImage: [NSImage imageNamed: @"YellowDot"]];
break; break;
default: default:
NSAssert1(NO, @"Port checker returned invalid status: %d", [fPortChecker status]); NSAssert1(NO, @"Port checker returned invalid status: %d", [fPortChecker status]);

2
macosx/Torrent.m
View File

@@ -607,7 +607,7 @@ int trashDataFile(const char * filename)
- (NSImage *) icon - (NSImage *) icon
{ {
if ([self isMagnet]) if ([self isMagnet])
return [NSImage imageNamed: @"Magnet.png"]; return [NSImage imageNamed: @"Magnet"];
#warning replace kGenericFolderIcon stuff with NSImageNameFolder on 10.6 #warning replace kGenericFolderIcon stuff with NSImageNameFolder on 10.6
if (!fIcon) if (!fIcon)

18
macosx/TorrentCell.m
View File

@@ -421,11 +421,11 @@
//control button //control button
NSString * controlImageSuffix; NSString * controlImageSuffix;
if (fMouseDownControlButton) if (fMouseDownControlButton)
controlImageSuffix = @"On.png"; controlImageSuffix = @"On";
else if (!fTracking && fHoverControl) else if (!fTracking && fHoverControl)
controlImageSuffix = @"Hover.png"; controlImageSuffix = @"Hover";
else else
controlImageSuffix = @"Off.png"; controlImageSuffix = @"Off";
NSImage * controlImage; NSImage * controlImage;
if ([torrent isActive]) if ([torrent isActive])
@@ -447,11 +447,11 @@
//reveal button //reveal button
NSString * revealImageString; NSString * revealImageString;
if (fMouseDownRevealButton) if (fMouseDownRevealButton)
revealImageString = @"RevealOn.png"; revealImageString = @"RevealOn";
else if (!fTracking && fHoverReveal) else if (!fTracking && fHoverReveal)
revealImageString = @"RevealHover.png"; revealImageString = @"RevealHover";
else else
revealImageString = @"RevealOff.png"; revealImageString = @"RevealOff";
NSImage * revealImage = [NSImage imageNamed: revealImageString]; NSImage * revealImage = [NSImage imageNamed: revealImageString];
[revealImage drawInRect: [self revealButtonRectForBounds: cellFrame] fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0 respectFlipped: YES hints: nil]; [revealImage drawInRect: [self revealButtonRectForBounds: cellFrame] fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0 respectFlipped: YES hints: nil];
@@ -461,9 +461,9 @@
NSString * actionImageString; NSString * actionImageString;
if (fMouseDownActionButton) if (fMouseDownActionButton)
#warning we can get rid of this on 10.7 #warning we can get rid of this on 10.7
actionImageString = @"ActionOn.png"; actionImageString = @"ActionOn";
else if (!fTracking && fHoverAction) else if (!fTracking && fHoverAction)
actionImageString = @"ActionHover.png"; actionImageString = @"ActionHover";
else else
actionImageString = nil; actionImageString = nil;
@@ -487,7 +487,7 @@
PRIORITY_ICON_WIDTH, PRIORITY_ICON_HEIGHT); PRIORITY_ICON_WIDTH, PRIORITY_ICON_HEIGHT);
NSColor * priorityColor = [self backgroundStyle] == NSBackgroundStyleDark ? [NSColor whiteColor] : [NSColor darkGrayColor]; NSColor * priorityColor = [self backgroundStyle] == NSBackgroundStyleDark ? [NSColor whiteColor] : [NSColor darkGrayColor];
NSImage * priorityImage = [[NSImage imageNamed: ([torrent priority] == TR_PRI_HIGH ? @"PriorityHighTemplate.png" : @"PriorityLowTemplate.png")] imageWithColor: priorityColor]; NSImage * priorityImage = [[NSImage imageNamed: ([torrent priority] == TR_PRI_HIGH ? @"PriorityHighTemplate" : @"PriorityLowTemplate")] imageWithColor: priorityColor];
[priorityImage drawInRect: priorityRect fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0 respectFlipped: YES hints: nil]; [priorityImage drawInRect: priorityRect fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0 respectFlipped: YES hints: nil];
} }

2
macosx/TrackerCell.m
View File

@@ -212,7 +212,7 @@ NSMutableSet * fTrackerIconLoading;
} }
} }
return (icon && icon != [NSNull null]) ? icon : [NSImage imageNamed: @"FavIcon.png"]; return (icon && icon != [NSNull null]) ? icon : [NSImage imageNamed: @"FavIcon"];
} }
#warning better favicon detection #warning better favicon detection