- Convert all old .tiff resource images to .png format

 - Recompress all pngs losslessly to reduce disk use slightly
 - Remove old unused images
 - Switch some code over to imageNamed: to allow easier Retina additions in future

3 files changed, 14 insertions, 14 deletions

diff --git a/Source/SPEditorPreferencePane.m b/Source/SPEditorPreferencePane.m
index 697c4495..b9df9845 100644
--- a/Source/SPEditorPreferencePane.m
+++ b/Source/SPEditorPreferencePane.m
@@ -726,7 +726,7 @@ static NSString *SPCustomColorSchemeNameLC       = @"user-defined";
 
 - (NSImage *)preferencePaneIcon
 {
-	return [NSImage imageNamed:@"toolbar-preferences-queryeditor"];
+	return [NSImage imageNamed:@"toolbar-switch-to-sql"];
 }
 
 - (NSString *)preferencePaneName
diff --git a/Source/SPNarrowDownCompletion.m b/Source/SPNarrowDownCompletion.m
index a1ba5808..c808f220 100644
--- a/Source/SPNarrowDownCompletion.m
+++ b/Source/SPNarrowDownCompletion.m
@@ -144,12 +144,12 @@
 		[self setupInterface];
 
 		syncArrowImages = [[NSArray alloc] initWithObjects:
-			[[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"sync_arrows_01" ofType:@"tiff"]] autorelease],
-			[[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"sync_arrows_02" ofType:@"tiff"]] autorelease],
-			[[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"sync_arrows_03" ofType:@"tiff"]] autorelease],
-			[[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"sync_arrows_04" ofType:@"tiff"]] autorelease],
-			[[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"sync_arrows_05" ofType:@"tiff"]] autorelease],
-			[[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"sync_arrows_06" ofType:@"tiff"]] autorelease],
+			[NSImage imageNamed:@"sync_arrows_01"],
+			[NSImage imageNamed:@"sync_arrows_02"],
+			[NSImage imageNamed:@"sync_arrows_03"],
+			[NSImage imageNamed:@"sync_arrows_04"],
+			[NSImage imageNamed:@"sync_arrows_05"],
+			[NSImage imageNamed:@"sync_arrows_06"],
 			nil];
 		
 	}
diff --git a/Source/SPNavigatorController.m b/Source/SPNavigatorController.m
index 7cceefd2..9977773c 100644
--- a/Source/SPNavigatorController.m
+++ b/Source/SPNavigatorController.m
@@ -161,13 +161,13 @@ static NSComparisonResult compareStrings(NSString *s1, NSString *s2, void* conte
 	[outlineSchema2 setDraggingSourceOperationMask:NSDragOperationEvery forLocal:YES];
 	[outlineSchema2 setDraggingSourceOperationMask:NSDragOperationEvery forLocal:NO];
 
-	connectionIcon = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"network-small" ofType:@"tif"]];
-	databaseIcon = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"database-small" ofType:@"png"]];
-	tableIcon = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"table-small-square" ofType:@"png"]];
-	viewIcon = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"table-view-small-square" ofType:@"tiff"]];
-	procedureIcon = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"proc-small" ofType:@"png"]];
-	functionIcon = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"func-small" ofType:@"png"]];
-	fieldIcon = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"field-small-square" ofType:@"tiff"]];
+	connectionIcon = [[NSImage imageNamed:@"network-small"] retain];
+	databaseIcon = [[NSImage imageNamed:@"database-small"] retain];
+	tableIcon = [[NSImage imageNamed:@"table-small-square"] retain];
+	viewIcon = [[NSImage imageNamed:@"table-view-small-square"] retain];
+	procedureIcon = [[NSImage imageNamed:@"proc-small"] retain];
+	functionIcon = [[NSImage imageNamed:@"func-small"] retain];
+	fieldIcon = [[NSImage imageNamed:@"field-small-square"] retain];
 
 	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateNavigator:)
 												 name:@"SPDBStructureWasUpdated" object:nil];