From 75cfac4667c694697db547a4e3a61d2b795cde3d Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Thu, 6 Nov 2014 18:39:31 +0000 Subject: [PATCH] mac statusicon: Let the toolkit colour the icon --- .../Mac/Resources/process-syncing-active.png | Bin 221 -> 0 bytes .../Resources/process-syncing-active@2x.png | Bin 291 -> 0 bytes .../Resources/process-syncing-down-active.png | Bin 218 -> 0 bytes .../process-syncing-down-active@2x.png | Bin 312 -> 0 bytes .../process-syncing-error-active.png | Bin 214 -> 0 bytes .../process-syncing-error-active@2x.png | Bin 306 -> 0 bytes .../Resources/process-syncing-idle-active.png | Bin 264 -> 0 bytes .../process-syncing-idle-active@2x.png | Bin 541 -> 0 bytes .../Resources/process-syncing-up-active.png | Bin 220 -> 0 bytes .../process-syncing-up-active@2x.png | Bin 316 -> 0 bytes SparkleShare/Mac/SparkleShare.csproj | 10 ----- SparkleShare/Mac/SparkleStatusIcon.cs | 41 ++++-------------- 12 files changed, 9 insertions(+), 42 deletions(-) delete mode 100644 SparkleShare/Mac/Resources/process-syncing-active.png delete mode 100644 SparkleShare/Mac/Resources/process-syncing-active@2x.png delete mode 100644 SparkleShare/Mac/Resources/process-syncing-down-active.png delete mode 100644 SparkleShare/Mac/Resources/process-syncing-down-active@2x.png delete mode 100755 SparkleShare/Mac/Resources/process-syncing-error-active.png delete mode 100644 SparkleShare/Mac/Resources/process-syncing-error-active@2x.png delete mode 100755 SparkleShare/Mac/Resources/process-syncing-idle-active.png delete mode 100644 SparkleShare/Mac/Resources/process-syncing-idle-active@2x.png delete mode 100644 SparkleShare/Mac/Resources/process-syncing-up-active.png delete mode 100644 SparkleShare/Mac/Resources/process-syncing-up-active@2x.png diff --git a/SparkleShare/Mac/Resources/process-syncing-active.png b/SparkleShare/Mac/Resources/process-syncing-active.png deleted file mode 100644 index 2edc5148f9e2127c0cf3279cb55a66af9885b71d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 221 zcmV<303!d1P){9l94UbZ2U=m6k?tMv@!g^2 z;f|C!>5PFJ4^Lt6oj|liw)XG>-; X=b5(^Qm#rn00000NkvXXu0mjf1Lj|X 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 85b9aa67f8d71c158e7872a97dfbca39b829a107..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 291 zcmV+;0o?wHP)Ei&Nb4oUBcw><0R%BIqO4e~nPi612fqo-{I`%m zHUVIopA*O^8^pO&78(L`@K{kMk^%+ztSM6|fjx$?rOYG*4j4}3=NZ|>1@x({1zKwX z7z+gcUcgxjxNdF)BTt?f2!wJ;f#dM zqAcLPEo&78T%ToEB>~rW*$o14%fpZu{POS_ioh@T-F~Qq3=VwCa38Rt=&oaSWUm(| pHz?2Fe@auzl2SpR>e-e0?gyyx-&KdnAVvTH002ovPDHLkV1fc(cH;m5 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 be3d449d9f8180ac4a12a753b20fd19d88527f4d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 218 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`3q4&NLo7}w|M>sko>^7mm4he?Mm;7My zo=0FaqoKXP{i6$?Dep_+VG?evkd^znT7h}mA9Z;jM#%-7N3Nf^P$SnN%CP>?uD9Fv S+Rgwvmci52&t;ucLK6Uhd{d49 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 9223350dccb10836d70ac0db1ed648f779d586be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 312 zcmV-80muG{P)U)xTlbPoLQ1$BqN_2!^uC(!vfHGvXX)MZsKI9B(Dyo1b>=@H*6agOW*;7y8 zLKYA`8|{FTb^ufZOny4RG5y^DbNFuq*4hCZ?SP$jfUg~}M>wj2&umQ+a6~w^G#_HT zKz&KT3E`R2WWacuy3$8*hKx=?K+on3Tp*|NV!Up52<=$WoH1UchflwT6PlnII)@!T z1K`4*79GGI*SHU;(7#{D^e8sko>^7mm6_0S4#}a023EK>QyM{s+Vrv~Yk25bp(IO9FZrfw&!rrvWiDH64&ZqTWm( zUI)Zn)N+6;8T$QzcpngpP{RS_2B$d?KL+9tB;bd*5+S*O1Bm%az(Uk^0I7g|pdG+E z&<KsbO8iOoxi13p0GgP%mb$m)59bO}YRBN`sMA@F?w?f(vPz@q_lz$1_YE>O~@_*9I@Ak+rFF3B=*fG?J80}(3dB7q_M z+qdYWhmCFE4wa84N+@8B9r7rm0bd_@K;@x|C2mmNu|gT1KJb+HPUv6`)eLPMO`i}$ zZ;A!>sRgFyJ1|$n1oaeWp6OYB;}Hh9qy`v5FJM4i{F=*vIPmao9-J4SL9}bLw%UpS O00009LDiSG==q$hbZ!(kVdCYdI+Ti^AP<3UAhEb)NVmP3_5r*^FOeg$ok_VbP*v! zp`yZzAVn5h5)mTlw(6#~?e-2nhdIpberFsR-|+fgW>_9^23-}4#Y7#u0ax)3rOM;> zQ4F|-Fb$z1&H4I4fu&Dy}-#h24oPm95Nxi3^ySDmXaRuDd_=U;u`Q2X+-WY z1LhzzjVKikGvG30+7YFE)B(>Sc)dl~4x;|<+aR1rBZM0W+n(!yeQaPAqmUWLFoa6H z4*3J+#F2$xe{d5ukdKS_i%p~;j})451!D+mM;zNF2AqI=)M3tZ?{JB~jI}n@udFzB z5!4`LPGbg(*z&peE9NnR6l8i3R7M;*lxhGnUHFZlexV&Qy(l24P1y&Q>yg7hE;+P9 z<}S*$A$!7Ix(}I;KG$a;GXR&?#c=?ao7L^dZ>Tw2wR~KAbv)8a}3y{Y-j9?Et z7(^Xp&cdY+_C%L0kL$REbii}7g?=>PAzYfZ?*oZ7B#urbQ2|Zj5GE2B@EDQ}sKyhl f;HZ0#2N3iR8O6aCx#(9;00000NkvXXu0mjf6U^%3 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 d80b089884197b5a9c80766b487a1499ceaf8606..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`i#=T&Lo7}w|M>sko>^7mmKg-#j zO>daN+wrsUhaR8len+-HN0b=5f>Kq)r5#D-u4#YN<$V|>7jPcAe&RxnT!$z_cF3-` U!jT4ZfzD;{boFyt=akR{0476L-v9sr 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 3d39fd77ad5bf84e945b6cca5f8b2f2e6be0342f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 316 zcmV-C0mJ@@P)Bh`Qt@t9>S zt#g%tfbz42)r^2Tbh!Z+%EuYDb8Ijj80HROygXp+azjo)q~RBa>Vw>*17hibyL7-q zI)J1DLcxI0z{3>`aFhFh98Pi_lf!&ZpH1J#P9I9k(1IQnj|VMShQ 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; }); };