#4749 When accessing images using imageNamed:, don't include the .png. This fixes...

diff --git a/Transmission.xcodeproj/project.pbxproj b/Transmission.xcodeproj/project.pbxproj
index 53b3ee3f9c397ae72e209a1fb492b7f4fd46e764..e2c6513c202118484ce8c37d25c950dcbb582767 100644 (file)
--- a/Transmission.xcodeproj/project.pbxproj
+++ b/Transmission.xcodeproj/project.pbxproj
@@ -329,7 +329,7 @@
                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 */; };
                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 */; };
                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 */; };
@@ -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>"; };
                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>"; };
-               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>"; };
                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>"; };
@@ -1484,7 +1484,7 @@
                                4DDFDD21099A5D8E00189D81 /* UploadBadge.png */,
                                A24B655F0D3F30870079EA4D /* QuitBadge.png */,
                                A232D29D0A70903E00973B12 /* ToolbarFilterTemplate.png */,
-                               A2DC49A615842FC300758FF1 /* ToolbarFiltertemplate@2x.png */,
+                               A2DC49A615842FC300758FF1 /* ToolbarFilterTemplate@2x.png */,
                                4DF7500808A103AD007B0D70 /* ToolbarInfoTemplate.png */,
                                A2DC49A715842FC300758FF1 /* ToolbarInfoTemplate@2x.png */,
                                4DF7500708A103AD007B0D70 /* ToolbarOpenTemplate.png */,
@@ -2395,7 +2395,7 @@
                                A2DC49A315842F9E00758FF1 /* RevealOff@2x.png in Resources */,
                                A2DC49A415842F9E00758FF1 /* RevealOn@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 */,
                                A2DC49AD15842FF200758FF1 /* ToolbarOpenTemplate@2x.png in Resources */,
                                A2DC49AE15842FF200758FF1 /* ToolbarOpenWebTemplate@2x.png in Resources */,

diff --git a/macosx/BadgeView.m b/macosx/BadgeView.m
index 368c8767ead1142a4ba7cab26c700daddffcab92..80aa966fce9c274e2a56cf4bc9e025b4a8e0ebd6 100644 (file)
--- a/macosx/BadgeView.m
+++ b/macosx/BadgeView.m
@@ -76,7 +76,7 @@
     
     if (fQuitting)
     {
-        NSImage * quitBadge = [NSImage imageNamed: @"QuitBadge.png"];
+        NSImage * quitBadge = [NSImage imageNamed: @"QuitBadge"];
         [self badge: quitBadge string: NSLocalizedString(@"Quitting", "Dock Badger -> quit")
                 atHeight: (NSHeight(rect) - [quitBadge size].height) * 0.5 adjustForQuit: YES];
         return;
@@ -87,13 +87,13 @@
     CGFloat bottom = 0.0;
     if (upload)
     {
-        NSImage * uploadBadge = [NSImage imageNamed: @"UploadBadge.png"];
+        NSImage * uploadBadge = [NSImage imageNamed: @"UploadBadge"];
         [self badge: uploadBadge string: [NSString stringForSpeedAbbrev: fUploadRate] atHeight: bottom adjustForQuit: NO];
         if (download)
             bottom += [uploadBadge size].height + BETWEEN_PADDING; //download rate above upload rate
     }
     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];
 }
 

diff --git a/macosx/Controller.m b/macosx/Controller.m
index 78e8260ff15326eba307a1de5bb836821e0ac554..ee457f4af4d16f112b4768c066431b125744111f 100644 (file)
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -2882,10 +2882,10 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
             return [[GroupsController groups] imageForIndex: group];
         }
         else if ([ident isEqualToString: @"DL Image"])
-            return [NSImage imageNamed: @"DownArrowGroupTemplate.png"];
+            return [NSImage imageNamed: @"DownArrowGroupTemplate"];
         else if ([ident isEqualToString: @"UL Image"])
             return [NSImage imageNamed: [fDefaults boolForKey: @"DisplayGroupRowRatio"]
-                                        ? @"YingYangGroupTemplate.png" : @"UpArrowGroupTemplate.png"];
+                                        ? @"YingYangGroupTemplate" : @"UpArrowGroupTemplate"];
         else
         {
             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 setPaletteLabel: NSLocalizedString(@"Create Torrent File", "Create toolbar item -> palette label")];
         [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 setAction: @selector(createFile:)];
         [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 setPaletteLabel: NSLocalizedString(@"Open Torrent Files", "Open toolbar item -> palette label")];
         [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 setAction: @selector(openShowSheet:)];
         [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 setPaletteLabel: NSLocalizedString(@"Open Torrent Address", "Open address toolbar item -> palette label")];
         [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 setAction: @selector(openURLShowSheet:)];
         [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 setPaletteLabel: NSLocalizedString(@"Remove Selected", "Remove toolbar item -> palette label")];
         [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 setAction: @selector(removeNoDelete:)];
         [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 setPaletteLabel: NSLocalizedString(@"Toggle Inspector", "Inspector toolbar item -> palette label")];
         [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 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]];
         
         [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",
                                     "All toolbar item -> tooltip") forSegment: TOOLBAR_PAUSE_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",
                                     "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]];
         
         [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",
                                     "Selected toolbar item -> tooltip") forSegment: TOOLBAR_PAUSE_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",
                                     "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 setPaletteLabel: NSLocalizedString(@"Toggle Filter", "Filter toolbar item -> palette label")];
         [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 setAction: @selector(toggleFilterBar:)];
         

diff --git a/macosx/DragOverlayWindow.m b/macosx/DragOverlayWindow.m
index 86e5b062b16082765097bf19d60c34c3ef1d0379..f1e5f5953d60929c120d0837a93fce5aa12ce812 100644 (file)
--- a/macosx/DragOverlayWindow.m
+++ b/macosx/DragOverlayWindow.m
@@ -151,14 +151,14 @@
 
 - (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];
     [self fadeIn];
 }
 
 - (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];
     [self fadeIn];
 }

diff --git a/macosx/FileOutlineController.m b/macosx/FileOutlineController.m
index 805860356d17d2338ee19e60ad25fda262390ae2..163144e9f392bda2109ce59df9e9fa5ec6161722 100644 (file)
--- a/macosx/FileOutlineController.m
+++ b/macosx/FileOutlineController.m
@@ -564,7 +564,7 @@ typedef enum
             action: @selector(setPriority:) keyEquivalent: @""];
     [item setTarget: self];
     [item setTag: FILE_PRIORITY_HIGH_TAG];
-    [item setImage: [NSImage imageNamed: @"PriorityHighTemplate.png"]];
+    [item setImage: [NSImage imageNamed: @"PriorityHighTemplate"]];
     [priorityMenu addItem: item];
     [item release];
     
@@ -572,7 +572,7 @@ typedef enum
             action: @selector(setPriority:) keyEquivalent: @""];
     [item setTarget: self];
     [item setTag: FILE_PRIORITY_NORMAL_TAG];
-    [item setImage: [NSImage imageNamed: @"PriorityNormalTemplate.png"]];
+    [item setImage: [NSImage imageNamed: @"PriorityNormalTemplate"]];
     [priorityMenu addItem: item];
     [item release];
     
@@ -580,7 +580,7 @@ typedef enum
             action: @selector(setPriority:) keyEquivalent: @""];
     [item setTarget: self];
     [item setTag: FILE_PRIORITY_LOW_TAG];
-    [item setImage: [NSImage imageNamed: @"PriorityLowTemplate.png"]];
+    [item setImage: [NSImage imageNamed: @"PriorityLowTemplate"]];
     [priorityMenu addItem: item];
     [item release];
     

diff --git a/macosx/FilePriorityCell.m b/macosx/FilePriorityCell.m
index eb26f61a0174609fc49cd6a148fea0c9158de426..015619c610b89e92b4e51bc115af5125248a7eee 100644 (file)
--- a/macosx/FilePriorityCell.m
+++ b/macosx/FilePriorityCell.m
@@ -46,9 +46,9 @@
             [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: @"PriorityControlNormal.png"] forSegment: 1];
-        [self setImage: [NSImage imageNamed: @"PriorityControlHigh.png"] forSegment: 2];
+        [self setImage: [NSImage imageNamed: @"PriorityControlLow"] forSegment: 0];
+        [self setImage: [NSImage imageNamed: @"PriorityControlNormal"] forSegment: 1];
+        [self setImage: [NSImage imageNamed: @"PriorityControlHigh"] forSegment: 2];
         
         fHoverRow = NO;
     }
@@ -133,7 +133,7 @@
         {
             //if ([self backgroundStyle] != NSBackgroundStyleDark)
             {
-                NSImage * image = [[NSImage imageNamed: @"PriorityNormalTemplate.png"] imageWithColor: [NSColor lightGrayColor]];
+                NSImage * image = [[NSImage imageNamed: @"PriorityNormalTemplate"] imageWithColor: [NSColor lightGrayColor]];
                 [images addObject: image];
                 totalWidth = [image size].width;
             }
@@ -145,19 +145,19 @@
             totalWidth = 0.0;
             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];
                 totalWidth += [image size].width;
             }
             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];
                 totalWidth += [image size].width;
             }
             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];
                 totalWidth += [image size].width;
             }

diff --git a/macosx/FilterBarController.m b/macosx/FilterBarController.m
index 5fe59812ef57da4c1ccf3126fbab7d22dfd164de..82fd0ae3f99f5666433a1bcfd3d97faea27034a0 100644 (file)
--- a/macosx/FilterBarController.m
+++ b/macosx/FilterBarController.m
@@ -374,7 +374,7 @@
     NSString * toolTip;
     if (groupIndex == GROUP_FILTER_ALL_TAG)
     {
-        icon = [NSImage imageNamed: @"PinTemplate.png"];
+        icon = [NSImage imageNamed: @"PinTemplate"];
         toolTip = NSLocalizedString(@"All Groups", "Groups -> Button");
     }
     else

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

diff --git a/macosx/InfoPeersViewController.m b/macosx/InfoPeersViewController.m
index 3b905c05acc4c19771f2209458758c1706475d91..e5b54f2d47da6b8a84cff153b5e4c380c4eb19f6 100644 (file)
--- a/macosx/InfoPeersViewController.m
+++ b/macosx/InfoPeersViewController.m
@@ -280,7 +280,7 @@
         NSDictionary * peer = [fPeers objectAtIndex: row];
         
         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"])
             return [peer objectForKey: @"Client"];
         else if  ([ident isEqualToString: @"Progress"])

diff --git a/macosx/MessageWindowController.m b/macosx/MessageWindowController.m
index a2570fdba069ebf46904ff78915a66f6b3c36cf3..c5f0ee08f97ed11e77056bc3a462a0cd9d1f72a3 100644 (file)
--- a/macosx/MessageWindowController.m
+++ b/macosx/MessageWindowController.m
@@ -267,11 +267,11 @@
         switch (level)
         {
             case TR_MSG_ERR:
-                return [NSImage imageNamed: @"RedDot.png"];
+                return [NSImage imageNamed: @"RedDot"];
             case TR_MSG_INF:
-                return [NSImage imageNamed: @"YellowDot.png"];
+                return [NSImage imageNamed: @"YellowDot"];
             case TR_MSG_DBG:
-                return [NSImage imageNamed: @"PurpleDot.png"];
+                return [NSImage imageNamed: @"PurpleDot"];
             default:
                 NSAssert1(NO, @"Unknown message log level: %d", level);
                 return nil;

diff --git a/macosx/PeerProgressIndicatorCell.m b/macosx/PeerProgressIndicatorCell.m
index b37fa88ffe8021904f991699c1378697d98aaca7..3abbae600d49e62bd270fa33a7e9154846b769e5 100644 (file)
--- a/macosx/PeerProgressIndicatorCell.m
+++ b/macosx/PeerProgressIndicatorCell.m
@@ -74,7 +74,7 @@
         [super drawWithFrame: cellFrame inView: controlView];
         if (fSeed)
         {
-            NSImage * checkImage = [NSImage imageNamed: @"CompleteCheck.png"];
+            NSImage * checkImage = [NSImage imageNamed: @"CompleteCheck"];
             
             const NSSize imageSize = [checkImage size];
             const NSRect rect = NSMakeRect(floor(NSMidX(cellFrame) - imageSize.width * 0.5),

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

diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index 34fc5f7f6d42a07645e730964a4409d1ab1f0784..99c1cce87d8f57ae79035761dfc7d2ae46749d0e 100644 (file)
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -607,7 +607,7 @@ int trashDataFile(const char * filename)
 - (NSImage *) icon
 {
     if ([self isMagnet])
-        return [NSImage imageNamed: @"Magnet.png"];
+        return [NSImage imageNamed: @"Magnet"];
     
     #warning replace kGenericFolderIcon stuff with NSImageNameFolder on 10.6
     if (!fIcon)

diff --git a/macosx/TorrentCell.m b/macosx/TorrentCell.m
index dc8637c70db368ae4827e74f7fd155e5361e3ab8..a226c71bc399a1b4dac10b8c5f0a3a87e2a0d593 100644 (file)
--- a/macosx/TorrentCell.m
+++ b/macosx/TorrentCell.m
@@ -421,11 +421,11 @@
         //control button
         NSString * controlImageSuffix;
         if (fMouseDownControlButton)
-            controlImageSuffix = @"On.png";
+            controlImageSuffix = @"On";
         else if (!fTracking && fHoverControl)
-            controlImageSuffix = @"Hover.png";
+            controlImageSuffix = @"Hover";
         else
-            controlImageSuffix = @"Off.png";
+            controlImageSuffix = @"Off";
         
         NSImage * controlImage;
         if ([torrent isActive])
@@ -447,11 +447,11 @@
         //reveal button
         NSString * revealImageString;
         if (fMouseDownRevealButton)
-            revealImageString = @"RevealOn.png";
+            revealImageString = @"RevealOn";
         else if (!fTracking && fHoverReveal)
-            revealImageString = @"RevealHover.png";
+            revealImageString = @"RevealHover";
         else
-            revealImageString = @"RevealOff.png";
+            revealImageString = @"RevealOff";
         
         NSImage * revealImage = [NSImage imageNamed: revealImageString];
         [revealImage drawInRect: [self revealButtonRectForBounds: cellFrame] fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0 respectFlipped: YES hints: nil];
@@ -461,9 +461,9 @@
         NSString * actionImageString;
         if (fMouseDownActionButton)
             #warning we can get rid of this on 10.7
-            actionImageString = @"ActionOn.png";
+            actionImageString = @"ActionOn";
         else if (!fTracking && fHoverAction)
-            actionImageString = @"ActionHover.png";
+            actionImageString = @"ActionHover";
         else
             actionImageString = nil;
         
@@ -487,7 +487,7 @@
                                                PRIORITY_ICON_WIDTH, PRIORITY_ICON_HEIGHT);
         
         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];
     }
     

diff --git a/macosx/TrackerCell.m b/macosx/TrackerCell.m
index ad0a33102617d73e6f4a677407a7dbb60663ec4c..dbbf0d1d8362936aa1d9623866dc507408fa972f 100644 (file)
--- a/macosx/TrackerCell.m
+++ b/macosx/TrackerCell.m
@@ -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