From 1135516798e7d17496be5ac051e147f3b05c598b Mon Sep 17 00:00:00 2001 From: Hylke Date: Sun, 12 Jun 2011 14:49:37 -0700 Subject: [PATCH] Fix icon names --- SparkleShare/SparkleStatusIcon.cs | 32 +++++++++++------- data/icons/Makefile.am | 7 +++- .../process-syncing-sparkleshare-i-24.png | Bin 0 -> 994 bytes .../process-syncing-sparkleshare-ii-24.png | Bin 0 -> 1002 bytes .../process-syncing-sparkleshare-iii-24.png | Bin 0 -> 990 bytes .../process-syncing-sparkleshare-iiii-24.png | Bin 0 -> 989 bytes .../process-syncing-sparkleshare-iiiii-24.png | Bin 0 -> 993 bytes 7 files changed, 26 insertions(+), 13 deletions(-) create mode 100644 data/icons/process-syncing-sparkleshare-i-24.png create mode 100644 data/icons/process-syncing-sparkleshare-ii-24.png create mode 100644 data/icons/process-syncing-sparkleshare-iii-24.png create mode 100644 data/icons/process-syncing-sparkleshare-iiii-24.png create mode 100644 data/icons/process-syncing-sparkleshare-iiiii-24.png diff --git a/SparkleShare/SparkleStatusIcon.cs b/SparkleShare/SparkleStatusIcon.cs index 34c74886..b577eabe 100644 --- a/SparkleShare/SparkleStatusIcon.cs +++ b/SparkleShare/SparkleStatusIcon.cs @@ -19,10 +19,11 @@ using System; using System.IO; using System.Timers; -using AppIndicator; using Gtk; using Mono.Unix; +using AppIndicator; + namespace SparkleShare { // The statusicon that stays in the @@ -36,9 +37,10 @@ namespace SparkleShare { private int FrameNumber; private string StateText; private Menu Menu; + private StatusIcon status_icon; - private ApplicationIndicator indicator; -private Menu menu; + private ApplicationIndicator indicator; + // Short alias for the translations public static string _ (string s) { @@ -53,9 +55,10 @@ private Menu menu; if (UseIndicator) { this.indicator = new ApplicationIndicator ("sparkleshare", - "folder", Category.ApplicationStatus); + "process-syncing-sparkleshare-i", Category.ApplicationStatus) { - indicator.Status = Status.Attention; + Status = Status.Attention + }; } else { this.status_icon = new StatusIcon (); @@ -135,11 +138,17 @@ private Menu menu; else FrameNumber = 0; + string icon_name = "process-syncing-sparkleshare-"; + + for (int i = 0; i <= FrameNumber; i++) + icon_name += "i"; + Application.Invoke (delegate { if (UseIndicator) { - this.indicator.IconName = "folder-videos"; + this.indicator.IconName = icon_name; + Console.WriteLine (icon_name); } else { - this.status_icon.Pixbuf = AnimationFrames [FrameNumber]; + this.status_icon.Pixbuf = SparkleUIHelpers.GetIcon (icon_name, 24); } }); }; @@ -176,7 +185,6 @@ private Menu menu; // Creates a menu item for each repository with a link to their logs foreach (string folder_name in SparkleShare.Controller.Folders) { - Gdk.Pixbuf folder_icon; if (SparkleShare.Controller.UnsyncedFolders.Contains (folder_name)) { @@ -309,7 +317,6 @@ private Menu menu; Menu.Add (status_menu_item); Menu.ReorderChild (status_menu_item, 0); - Menu.ShowAll (); } @@ -345,18 +352,19 @@ private Menu menu; Application.Invoke (delegate { if (UseIndicator) { - this.indicator.IconName = "folder-pictures"; + this.indicator.IconName = "process-syncing-sparkleshare-i"; } else { this.status_icon.Pixbuf = AnimationFrames [0]; } }); + } else { if (error) { StateText = _("Not everything is synced"); Application.Invoke (delegate { if (UseIndicator) { - this.indicator.IconName = "folder-music"; + this.indicator.IconName = "sparkleshare-syncing-error"; } else { this.status_icon.Pixbuf = SparkleUIHelpers.GetIcon ("sparkleshare-syncing-error", 24); } @@ -365,7 +373,7 @@ private Menu menu; StateText = _("Up to date") + " (" + SparkleShare.Controller.FolderSize + ")"; Application.Invoke (delegate { if (UseIndicator) { - this.indicator.IconName = "folder-pictures"; + this.indicator.IconName = "process-syncing-sparkleshare-i"; } else { this.status_icon.Pixbuf = AnimationFrames [0]; } diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index f23af747..79026af3 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -8,7 +8,12 @@ system_theme_icons = \ apps,folder-sparkleshare-24.png \ apps,folder-sparkleshare-256.png \ apps,folder-sparkleshare-32.png \ - apps,folder-sparkleshare-48.png + apps,folder-sparkleshare-48.png \ + status,process-syncing-sparkleshare-i-24.png \ + status,process-syncing-sparkleshare-ii-24.png \ + status,process-syncing-sparkleshare-iii-24.png \ + status,process-syncing-sparkleshare-iiii-24.png \ + status,process-syncing-sparkleshare-iiiii-24.png app_theme_icons = \ animations,process-syncing-sparkleshare-24.png \ diff --git a/data/icons/process-syncing-sparkleshare-i-24.png b/data/icons/process-syncing-sparkleshare-i-24.png new file mode 100644 index 0000000000000000000000000000000000000000..286e79d6fcebefbcdf3e15315075b95064206304 GIT binary patch literal 994 zcmV<810DQ{P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2ipb= z6$c}RaEf{W00Ux4L_t(Y$F-GDXk1kk#((F%H~-R1{?te^)HcSX4bp0xM5)ChRIEtR zRdH1tLBXveZi?<)SP@q$DyR@#NTCY@7B_05D-}aZY#XW2PE(Uknwd;8O{O#R-o3}g zjBO_K3e}jiIq%QC_q*r&zH_grDw`P&n;e@C;H`Z*`=Y!m;=Zd$tYM_uykcJ&7}3-J z20+$o@Y}Fkc<|}xlb&P124H*J5D&1A`+v^`9y*hJ>pn%(>BqfswXu zw(aUmT%Eo+ad!Al%xY1DxAuI5C` z9MT%Uy9(3+)&cbPrC2P@v6`J@OM5qT?4_9gg}4e`%>|m9Ti4mhsnQ*$fw%(Ec!M)q zc07iOM36^LP{~~)ao`}L%6t`bzR;uP!d0}=6zNOpBG2X06OUXJ;(_vz_L&_B>iv@prc zH*XSkZmhFtl+}D5gDi-M2jGc_0I_S!X6)P#Kfkbl|4vuXx@L>xaer3|ik4utNV^-S zeOn5a$^?{d9T&!AnVOh2v&-gtASNQl0|anC{+-h=+sqT`bf#w`H`v@NS3a5I>#AW9 zsR2ZRdw~90-bmzuX&?twL{$+HrzUu`2Dp(>paKM{YHwYcH7)+P(AvU(0~hdsj2jTm Q*Z=?k07*qoM6N<$f;f`bxBvhE literal 0 HcmV?d00001 diff --git a/data/icons/process-syncing-sparkleshare-ii-24.png b/data/icons/process-syncing-sparkleshare-ii-24.png new file mode 100644 index 0000000000000000000000000000000000000000..83dd2cf25aed748726a033c703b286f22f05a6b5 GIT binary patch literal 1002 zcmVPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2ipb= z6$l1O>_YMY00U}CL_t(Y$F-G9Xk1ko$A90wcOID}lbggeNo!gY(w9Y>#7YpY(1q@b zO3{tB0fnL~7lJEsts6HYcBi3;6bh29V10lnrAgbQwOVaS(l(toiIdk%X6D{=J{L1> zb2Fo;As-yheVlWC=l?y<5mjX~&0&*m(*fSvmkUGkwut+oB8jSzYO{(x-ao9T{|i9Y z#^BsBcWLkQFE@IQ0ULr1z=U8!iiHA`qi6G>37#4l*75(Pz!>UWEnqHn zVE_2K=JwrvN6=b9E*jbgj=Tzqrpk^gyHkTMPGhIP$7yKAJNyY!mnOJ-5iKlKr=>t> zY5+nDl5E0UJ{484=LNij@1l1mAmKB2`5T&c9Yj+tIJQu;bOT!h5Sa2$iAQT})%9_g zvn*d5!%c4`KYEge9eu?6hT!H8Xy#(MUhXMa2e_Zmfdz3CNhBg|VeAwd6sb!$voiV_ zTel>b9(kXI%yneoE!+cdM#kfoy;0jmj#Me=?2NNCca212CtY2w0Cewt6xnkKON_Z+ ze`L#=Isd3Y9Uz{FG^cGh>77rrJarc5vDXp53)y~%?A4!`IPnUJ+;7o2u2Xh*tr&Vk&2TKf00G=jCpi6v%{)6fnd#oh4K|Zw z>clu-0dA$R5g-n<0=p~yMl1_l0p@{{s461jRN@h@05@U^lz>oG?folL*5}(sDV2r) Y0=Eo=$s#$xH2?qr07*qoM6N<$f;_^=5C8xG literal 0 HcmV?d00001 diff --git a/data/icons/process-syncing-sparkleshare-iii-24.png b/data/icons/process-syncing-sparkleshare-iii-24.png new file mode 100644 index 0000000000000000000000000000000000000000..6f6b9e5858ec13ec6aef92dea2fb23588577b2b1 GIT binary patch literal 990 zcmV<410np0P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2ipb= z6$lnrTT+$)00Ul0L_t(Y$F-HuYg|Xm+sn5%&W{f{LAL^NM}*M7Q?* z8vxnN!Hsk7;$ts&rai}ijlhOrBCrv~LV?k~-&P|NK6|oT2mVt8#!%yG0W;WJu`$u` zCsNf>HtQSwfqdG6hAwPAioSIH~vquQrmx4awjfpQw2a|l;yc8wD{LItFXET zP0zeUZDTX21r$|XU#kMTuGON&W$s+>ZLEl(|E%O1l6d*KrFb2C2@W1_C$lGo8Tt~` zB7O?QMT?6S?z_j%pw&n&8X8ZYc^!iKvPWg_)ZjEdft?*el65!@hwx5cLQRqIN@rzR z3Ph#~Kx9FZ^_Zcrwz%Zuo_Y)8)ZxGS3b+AN{oj&lc^c18R&CwTRsjgj`cLuWJ!Vyz zAG%IBGt9!ZKQK{|rlY4QOpTECEBjHl1+XBFB0=291z4LT+uA{L@&}v*6lZUdJ>G?z z2{40~p|lh;h-{Tv6j=~Q5I=}L&f{HV4!_9VA3r8tpCXk>k@Sj;U;PxbuN^ts8Mpbn z2-E?#gdJv|M2(^4wU1zF3_J7%bgD0=CL7mTPj@vA#1+^=+~_y& z;bsm{TAZP+>k`hP(=3e-a__r$NhCe?AKZs*vJppODcS%~aaO~yP@AYtv$>U<+xD=w zlE;6jmgyTk?0?~HN_|&2(%x33f)bRX5>}km7zZNa8IjqQ`8jao5hVNsnQWS5O@K51 z3%7eNQoQs1Hn)qKMKN}{TWh*KuqF9YsG6et0as@jb!v&_Z+CR#rDPb*7*b%7 M07*qoM6N<$fPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2ipb= z6$m7si~|+`00Uh~L_t(Y$F-GTY|~W~$3N%y>pyC{Hf=(2bKnSLTX;~0LQIT4!Lx`a zMjbww?3Kj$=qm{(z8GWlb>RU?FmaDYMH6ErvIR1kTZqgxFxIWCWvuPm{(ko!A6lTL zg{X5U`Q`q8zkBZep6~gdbFZi>+i4ElY}*bHX#KeQo}3bKKUO5%;iw)pX`qZjb7N>u!_{Mu_bV6tT69Z$|;c69gZL-5LnA}6( z{(U=c&Rw6rdh&6Z)rtroJvX7Bbp`MYcz0JZUYE7`EWu>I>^-nAp!Pn)#;Dc@R_I)Upz~pZJldMFqj7jd`S>4qE;2Wj1wu06k{<8{|P1yC~ zQKFdvPzxxk+IUw5v@xnhYb6$bn#^=CxH2ZWWQ0I*ZKJ)813{j7{t$`&J@_-{z~6jg z`0jxdXg85-hRo=RcOaZ-M%0W>4fr+O!{f-ntN7o3fCQtsBd=rgbJ*<9?PV$8n=Syp z1&Jguv*$aasz0?Gr*MnPt$9+%Cy;OquUvri5VCx^qjf#o1;8_nNeOl9u_}>NAG!16 ztS?-qyt2U1*r((!eMRph{_k~<-k(S$PBImzUi^!~?DzB>JB>t>?Q5RIKpmi! zvcmki56KK4CiTMGu=*=fEf61kgW%c{#QM<8D3YIQVc;~<-Aw~=1wxTF#!tr!Z2a*x zmAk8?_Z}kDf0XQZpW`|nbi{Df2{ zNg|yfl}SEQq9Mw~A_mEeNB|%pA_9b$*UgXDE?#=~$dN%;(Dr6S39CbItVYC1;IEV) z&fh;KP>i|5%=D63S~oucVG%I_KmhlP-?{L<&Aqa?m>by24R*Us_RAT*X%s9XO@I)P z28NpBR;&oj0c${AR230%nu3R#fLk#I>VU7R_Q93e)Z%|LZEpNGr&WO1p2d9R00000 LNkvXXu0mjfURl~v literal 0 HcmV?d00001 diff --git a/data/icons/process-syncing-sparkleshare-iiiii-24.png b/data/icons/process-syncing-sparkleshare-iiiii-24.png new file mode 100644 index 0000000000000000000000000000000000000000..a0e2476aad315141a0dafa9e2ac96edb6b1d9357 GIT binary patch literal 993 zcmV<710MW|P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2ipb= z6$mzLHF91600Uu3L_t(Y$F-GDXk1kk#((F%H*fx!Oealj23u27n%bC!ZB+)PRS*>v zTopwyjSI2hLb`KRH@Z;}H-gR5;6e&Tj4lKr_y<9$2`yu!;zB2;F;nC4l4df=%zO79 z7c<7Z&IHt$1BZLxpymMOE2NbJ%6ubpUVc$JOWMoQV6TBFVN$wSi*K9-q)l z{{}#|_F#I(sa9^F^}qjFh1xpg z?|+O;{~)LZRTSOagEm*SXuZnMUrhG5F}QL@%DEI?P+5)7v6tY$v3tq(b%Ru~rLWLx zdE4^ck<)0WCf5!9Cr*z-GTW?dvnqqG%!BLW7GAw?HG(d$TyH9#X+H*<4q=2ir!NYQ`L0}(j# z40XB@Zy&ecag0WAoy0Bi;y9fpQgLcwV;a9MvB*mqygUic^aLh=}*WQ|=#Y%aws#t_Rd2i41rdNZf`nNgiG^#YkPecSrF0Po*XQ#d$Efj`aA%6WqxqGl5#}Ul* zMGT6l#j0XA;}l~J#hC@Ouwtfwq=*==IsLd7zUR^lw){}3R36;P3-;R@bK^xm0$iG% zLjWJ>1@3CCJFx(`22_BCs461jwEE$<0C!>vG=NA|?dFr&>c#(N+B*18ikgZaIsqT_ P00000NkvXXu0mjfoe9~H literal 0 HcmV?d00001