diff --git a/SparkleShare/Mac/Resources/process-syncing-active.png b/SparkleShare/Mac/Resources/process-syncing-active.png deleted file mode 100644 index 2edc5148..00000000 Binary files a/SparkleShare/Mac/Resources/process-syncing-active.png and /dev/null differ diff --git a/SparkleShare/Mac/Resources/process-syncing-active@2x.png b/SparkleShare/Mac/Resources/process-syncing-active@2x.png deleted file mode 100644 index 85b9aa67..00000000 Binary files a/SparkleShare/Mac/Resources/process-syncing-active@2x.png and /dev/null differ diff --git a/SparkleShare/Mac/Resources/process-syncing-down-active.png b/SparkleShare/Mac/Resources/process-syncing-down-active.png deleted file mode 100644 index be3d449d..00000000 Binary files a/SparkleShare/Mac/Resources/process-syncing-down-active.png and /dev/null differ diff --git a/SparkleShare/Mac/Resources/process-syncing-down-active@2x.png b/SparkleShare/Mac/Resources/process-syncing-down-active@2x.png deleted file mode 100644 index 9223350d..00000000 Binary files a/SparkleShare/Mac/Resources/process-syncing-down-active@2x.png and /dev/null differ diff --git a/SparkleShare/Mac/Resources/process-syncing-error-active.png b/SparkleShare/Mac/Resources/process-syncing-error-active.png deleted file mode 100755 index 9e93fdd2..00000000 Binary files a/SparkleShare/Mac/Resources/process-syncing-error-active.png and /dev/null differ diff --git a/SparkleShare/Mac/Resources/process-syncing-error-active@2x.png b/SparkleShare/Mac/Resources/process-syncing-error-active@2x.png deleted file mode 100644 index c47de7f8..00000000 Binary files a/SparkleShare/Mac/Resources/process-syncing-error-active@2x.png and /dev/null differ diff --git a/SparkleShare/Mac/Resources/process-syncing-idle-active.png b/SparkleShare/Mac/Resources/process-syncing-idle-active.png deleted file mode 100755 index a6b7f96e..00000000 Binary files a/SparkleShare/Mac/Resources/process-syncing-idle-active.png and /dev/null differ diff --git a/SparkleShare/Mac/Resources/process-syncing-idle-active@2x.png b/SparkleShare/Mac/Resources/process-syncing-idle-active@2x.png deleted file mode 100644 index a2caad28..00000000 Binary files a/SparkleShare/Mac/Resources/process-syncing-idle-active@2x.png and /dev/null differ diff --git a/SparkleShare/Mac/Resources/process-syncing-up-active.png b/SparkleShare/Mac/Resources/process-syncing-up-active.png deleted file mode 100644 index d80b0898..00000000 Binary files a/SparkleShare/Mac/Resources/process-syncing-up-active.png and /dev/null differ diff --git a/SparkleShare/Mac/Resources/process-syncing-up-active@2x.png b/SparkleShare/Mac/Resources/process-syncing-up-active@2x.png deleted file mode 100644 index 3d39fd77..00000000 Binary files a/SparkleShare/Mac/Resources/process-syncing-up-active@2x.png and /dev/null differ diff --git a/SparkleShare/Mac/SparkleShare.csproj b/SparkleShare/Mac/SparkleShare.csproj index f01ce8ad..f46eabf5 100644 --- a/SparkleShare/Mac/SparkleShare.csproj +++ b/SparkleShare/Mac/SparkleShare.csproj @@ -170,14 +170,9 @@ Resources\tutorial-slide-3.png - - - - - @@ -186,14 +181,9 @@ Resources\side-splash%402x.png - - - - - diff --git a/SparkleShare/Mac/SparkleStatusIcon.cs b/SparkleShare/Mac/SparkleStatusIcon.cs index dcc4909c..74bc6db5 100755 --- a/SparkleShare/Mac/SparkleStatusIcon.cs +++ b/SparkleShare/Mac/SparkleStatusIcon.cs @@ -45,12 +45,6 @@ namespace SparkleShare { private NSImage syncing_image = NSImage.ImageNamed ("process-syncing"); private NSImage syncing_error_image = NSImage.ImageNamed ("process-syncing-error"); - 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"); private NSImage sparkleshare_image = NSImage.ImageNamed ("sparkleshare-folder"); @@ -60,39 +54,22 @@ namespace SparkleShare { { this.status_item.HighlightMode = true; this.status_item.Image = this.syncing_idle_image; - this.status_item.AlternateImage = this.syncing_idle_image_active; + this.status_item.Image.Template = true; + CreateMenu (); Controller.UpdateIconEvent += delegate (IconState state) { Program.Controller.Invoke (() => { switch (state) { - case IconState.Idle: { - this.status_item.Image = this.syncing_idle_image; - this.status_item.AlternateImage = this.syncing_idle_image_active; - break; - } - case IconState.SyncingUp: { - this.status_item.Image = this.syncing_up_image; - this.status_item.AlternateImage = this.syncing_up_image_active; - break; - } - case IconState.SyncingDown: { - this.status_item.Image = this.syncing_down_image; - this.status_item.AlternateImage = this.syncing_down_image_active; - break; - } - case IconState.Syncing: { - this.status_item.Image = this.syncing_image; - this.status_item.AlternateImage = this.syncing_image_active; - break; - } - case IconState.Error: { - this.status_item.Image = this.syncing_error_image; - this.status_item.AlternateImage = this.syncing_error_image_active; - break; - } + case IconState.Idle: { this.status_item.Image = this.syncing_idle_image; break; } + case IconState.SyncingUp: { this.status_item.Image = this.syncing_up_image; break; } + case IconState.SyncingDown: { this.status_item.Image = this.syncing_down_image; break; } + case IconState.Syncing: { this.status_item.Image = this.syncing_image; break; } + case IconState.Error: { this.status_item.Image = this.syncing_error_image; break; } } + + this.status_item.Image.Template = true; }); };