From 3bb2cc03f723b4d698738ae52a41d8354fcaf9aa Mon Sep 17 00:00:00 2001 From: Aaron Bockover Date: Mon, 10 Dec 2012 11:40:23 -0500 Subject: [PATCH] [mac] use NSImage.ImageNamed for retina support Avoid using the full path to images and instead allow NSImage.ImageNamed to pick the right image from the main bundle. On Retina displays this means NSImage will pick an @2x named image if it exists. --- SparkleShare/Mac/SparkleAbout.cs | 4 ++-- SparkleShare/Mac/SparkleSetupWindow.cs | 4 ++-- SparkleShare/Mac/SparkleStatusIcon.cs | 20 ++++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/SparkleShare/Mac/SparkleAbout.cs b/SparkleShare/Mac/SparkleAbout.cs index 583357f2..15047b6f 100755 --- a/SparkleShare/Mac/SparkleAbout.cs +++ b/SparkleShare/Mac/SparkleAbout.cs @@ -80,8 +80,8 @@ namespace SparkleShare { private void CreateAbout () { - string about_image_path = Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "about.png"); - this.about_image = new NSImage (about_image_path) { Size = new SizeF (640, 260) }; + this.about_image = NSImage.ImageNamed ("about"); + this.about_image.Size = new SizeF (640, 260); this.about_image_view = new NSImageView () { Image = this.about_image, diff --git a/SparkleShare/Mac/SparkleSetupWindow.cs b/SparkleShare/Mac/SparkleSetupWindow.cs index 0ea7a8ce..f04f32f8 100755 --- a/SparkleShare/Mac/SparkleSetupWindow.cs +++ b/SparkleShare/Mac/SparkleSetupWindow.cs @@ -50,8 +50,8 @@ namespace SparkleShare { Center (); - string side_splash_path = Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "side-splash.png"); - this.side_splash = new NSImage (side_splash_path) { Size = new SizeF (150, 482) }; + this.side_splash = NSImage.ImageNamed ("side-splash"); + this.side_splash.Size = new SizeF (150, 482); this.side_splash_view = new NSImageView () { Image = this.side_splash, diff --git a/SparkleShare/Mac/SparkleStatusIcon.cs b/SparkleShare/Mac/SparkleStatusIcon.cs index 71034a29..1f2ec1d1 100755 --- a/SparkleShare/Mac/SparkleStatusIcon.cs +++ b/SparkleShare/Mac/SparkleStatusIcon.cs @@ -34,17 +34,17 @@ namespace SparkleShare { private NSMenuItem state_item, folder_item, add_item, about_item, recent_events_item, quit_item; private NSMenuItem [] folder_menu_items, error_menu_items, try_again_menu_items; - private NSImage syncing_idle_image = new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "process-syncing-idle.png")); - private NSImage syncing_up_image = new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "process-syncing-up.png")); - private NSImage syncing_down_image = new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "process-syncing-down.png")); - private NSImage syncing_image = new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "process-syncing.png")); - private NSImage syncing_error_image = new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "process-syncing-error.png")); + private NSImage syncing_idle_image = NSImage.ImageNamed ("process-syncing-idle"); + private NSImage syncing_up_image = NSImage.ImageNamed ("process-syncing-up"); + private NSImage syncing_down_image = NSImage.ImageNamed ("process-syncing-down"); + private NSImage syncing_image = NSImage.ImageNamed ("process-syncing"); + private NSImage syncing_error_image = NSImage.ImageNamed ("process-syncing-error"); - private NSImage syncing_idle_image_active = new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "process-syncing-idle-active.png")); - private NSImage syncing_up_image_active = new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "process-syncing-up-active.png")); - private NSImage syncing_down_image_active = new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "process-syncing-down-active.png")); - private NSImage syncing_image_active = new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "process-syncing-active.png")); - private NSImage syncing_error_image_active = new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "process-syncing-error-active.png")); + private NSImage syncing_idle_image_active = NSImage.ImageNamed ("process-syncing-idle-active"); + private NSImage syncing_up_image_active = NSImage.ImageNamed ("process-syncing-up-active"); + private NSImage syncing_down_image_active = NSImage.ImageNamed ("process-syncing-down-active"); + private NSImage syncing_image_active = NSImage.ImageNamed ("process-syncing-active"); + private NSImage syncing_error_image_active = NSImage.ImageNamed ("process-syncing-error-active"); private NSImage folder_image = NSImage.ImageNamed ("NSFolder"); private NSImage caution_image = NSImage.ImageNamed ("NSCaution");