From e0b622b8ef367400288a97c23865c45190206384 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Fri, 3 Jun 2011 00:34:51 +0100 Subject: [PATCH] mac statusicon: add an icon for the error state --- SparkleShare/Mac/SparkleShare.csproj | 6 +++ SparkleShare/Mac/SparkleStatusIcon.cs | 15 ++++-- data/icons/error-active.png | Bin 0 -> 540 bytes data/icons/error.png | Bin 0 -> 613 bytes data/sparkleshare-gnome.svg | 74 +++++++++++++++----------- 5 files changed, 61 insertions(+), 34 deletions(-) create mode 100644 data/icons/error-active.png create mode 100644 data/icons/error.png diff --git a/SparkleShare/Mac/SparkleShare.csproj b/SparkleShare/Mac/SparkleShare.csproj index ed0e8248..18f20db4 100644 --- a/SparkleShare/Mac/SparkleShare.csproj +++ b/SparkleShare/Mac/SparkleShare.csproj @@ -148,6 +148,12 @@ Pixmaps\idle4.png + + Pixmaps\error.png + + + Pixmaps\error-active.png + diff --git a/SparkleShare/Mac/SparkleStatusIcon.cs b/SparkleShare/Mac/SparkleStatusIcon.cs index 8fc367b2..01a4dd64 100644 --- a/SparkleShare/Mac/SparkleStatusIcon.cs +++ b/SparkleShare/Mac/SparkleStatusIcon.cs @@ -301,21 +301,28 @@ namespace SparkleShare { if (SparkleShare.Controller.Folders.Count == 0) { StateText = _("Welcome to SparkleShare!"); + InvokeOnMainThread (delegate { - StatusItem.Image = new NSImage (NSBundle.MainBundle.ResourcePath + "/Pixmaps/idle0.png"); - StatusItem.Image.Size = new SizeF (16, 16); - + StatusItem.Image = new NSImage (NSBundle.MainBundle.ResourcePath + "/Pixmaps/idle0.png"); StatusItem.AlternateImage = new NSImage (NSBundle.MainBundle.ResourcePath + "/Pixmaps/idle0-active.png"); + StatusItem.Image.Size = new SizeF (16, 16); StatusItem.AlternateImage.Size = new SizeF (16, 16); }); + } else { if (error) { StateText = _("Not everything is synced"); + InvokeOnMainThread (delegate { - // TODO: Pixbuf = SparkleUIHelpers.GetIcon ("sparkleshare-syncing-error", 24); + StatusItem.Image = new NSImage (NSBundle.MainBundle.ResourcePath + "/Pixmaps/error.png"); + StatusItem.AlternateImage = new NSImage (NSBundle.MainBundle.ResourcePath + "/Pixmaps/error-active.png"); + StatusItem.Image.Size = new SizeF (16, 16); + StatusItem.AlternateImage.Size = new SizeF (16, 16); }); + } else { StateText = _("Up to date") + " (" + SparkleShare.Controller.FolderSize + ")"; + InvokeOnMainThread (delegate { StatusItem.Image = new NSImage (NSBundle.MainBundle.ResourcePath + "/Pixmaps/idle0.png"); StatusItem.AlternateImage = new NSImage (NSBundle.MainBundle.ResourcePath + "/Pixmaps/idle0-active.png"); diff --git a/data/icons/error-active.png b/data/icons/error-active.png new file mode 100644 index 0000000000000000000000000000000000000000..c75189665b08c326206fc3f78925e86c56ba2d4f GIT binary patch literal 540 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4sBf%ipdZ&9wFhYWW=|K# z5R2ZWlYO}k83?rQZ*ls#-nQw{xxMP27TGpgAKc3o%hl9%SumsT#zt(_E~=aT|nnEc)I$ztaD0e0s!+Q B!WaMm literal 0 HcmV?d00001 diff --git a/data/icons/error.png b/data/icons/error.png new file mode 100644 index 0000000000000000000000000000000000000000..f9e56b93254e4edfc35ffd5aa5bc0eca3c31c68b GIT binary patch literal 613 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4sBf%ipdZ&9wFhYWA5Ry@ z5R2ZWlMMY12MD;NUw7+k{3Fw-C)=WQET%ELK-8uE$iyJGLJbco6|Pkronnd#oBs2$ z`m+4tZPNVzZqH2pwG)oiPhmb#SX!0$U@Jpna+&|bo0~G_Y#Nvt62;@sFc^rO__AT$ zaXAN%q>!uc8M==2F=o_P)JL63XW!|5KjWvY-i!a+4u(~EZQGN%%hhm{C4>>2A%fieqATEprA?Dv)+j>n3HE& z61@CimEru8pa12}Ecz^bz}^0c;KrbZK0=Ry7W3$@&)3|~r7pE{I>Wnv6Y8}q%f2#B YT^8o_QGf9QU^p;%y85}Sb4q9e040>=4gdfE literal 0 HcmV?d00001 diff --git a/data/sparkleshare-gnome.svg b/data/sparkleshare-gnome.svg index a7d050e3..77504040 100644 --- a/data/sparkleshare-gnome.svg +++ b/data/sparkleshare-gnome.svg @@ -31,8 +31,8 @@ height="300px" id="base" inkscape:current-layer="layer20" - inkscape:cx="363.28616" - inkscape:cy="119.67008" + inkscape:cx="464.56664" + inkscape:cy="123.20561" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:pageopacity="0.0" @@ -40,14 +40,14 @@ inkscape:showpageshadow="false" inkscape:snap-bbox="true" inkscape:snap-nodes="false" - inkscape:window-height="778" + inkscape:window-height="756" inkscape:window-width="1280" inkscape:window-x="0" inkscape:window-y="0" - inkscape:zoom="1" + inkscape:zoom="8" objecttolerance="10000" pagecolor="#ffffff" - showgrid="false" + showgrid="true" stroke="#ef2929" width="400px" showguides="false" @@ -2565,9 +2565,7 @@ y="-31" x="354" id="image6006" - xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAB1JREFU -OI1jfK+p+Z+BAsBEieZRA0YNGDVgMBkAAGPfAmCG9D3bAAAAAElFTkSuQmCC -" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAB1JREFU OI1jfK+p+Z+BAsBEieZRA0YNGDVgMBkAAGPfAmCG9D3bAAAAAElFTkSuQmCC " height="16" width="16" style="opacity:0" @@ -3403,9 +3401,7 @@ OI1jfK+p+Z+BAsBEieZRA0YNGDVgMBkAAGPfAmCG9D3bAAAAAElFTkSuQmCC style="opacity:0" width="16" height="16" - xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAB1JREFU -OI1jfK+p+Z+BAsBEieZRA0YNGDVgMBkAAGPfAmCG9D3bAAAAAElFTkSuQmCC -" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAB1JREFU OI1jfK+p+Z+BAsBEieZRA0YNGDVgMBkAAGPfAmCG9D3bAAAAAElFTkSuQmCC " id="image6043" x="374" y="-31" /> @@ -3449,9 +3445,7 @@ OI1jfK+p+Z+BAsBEieZRA0YNGDVgMBkAAGPfAmCG9D3bAAAAAElFTkSuQmCC y="-31" x="394" id="image6055" - xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAB1JREFU -OI1jfK+p+Z+BAsBEieZRA0YNGDVgMBkAAGPfAmCG9D3bAAAAAElFTkSuQmCC -" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAB1JREFU OI1jfK+p+Z+BAsBEieZRA0YNGDVgMBkAAGPfAmCG9D3bAAAAAElFTkSuQmCC " height="16" width="16" style="opacity:0" @@ -3501,9 +3495,7 @@ OI1jfK+p+Z+BAsBEieZRA0YNGDVgMBkAAGPfAmCG9D3bAAAAAElFTkSuQmCC style="opacity:0" width="16" height="16" - xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAB1JREFU -OI1jfK+p+Z+BAsBEieZRA0YNGDVgMBkAAGPfAmCG9D3bAAAAAElFTkSuQmCC -" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAB1JREFU OI1jfK+p+Z+BAsBEieZRA0YNGDVgMBkAAGPfAmCG9D3bAAAAAElFTkSuQmCC " id="image6067" x="414" y="-31" /> @@ -3547,9 +3539,7 @@ OI1jfK+p+Z+BAsBEieZRA0YNGDVgMBkAAGPfAmCG9D3bAAAAAElFTkSuQmCC y="-31" x="434" id="image6079" - xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAB1JREFU -OI1jfK+p+Z+BAsBEieZRA0YNGDVgMBkAAGPfAmCG9D3bAAAAAElFTkSuQmCC -" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAB1JREFU OI1jfK+p+Z+BAsBEieZRA0YNGDVgMBkAAGPfAmCG9D3bAAAAAElFTkSuQmCC " height="16" width="16" style="opacity:0" @@ -3662,6 +3652,30 @@ OI1jfK+p+Z+BAsBEieZRA0YNGDVgMBkAAGPfAmCG9D3bAAAAAElFTkSuQmCC width="1" id="rect6111" style="fill:#fef0f0;fill-opacity:1;stroke:none" /> + + + + + d="m 244,51 c 0,2.761424 -2.23858,5 -5,5 -2.76142,0 -5,-2.238576 -5,-5 0,-2.761424 2.23858,-5 5,-5 2.76142,0 5,2.238576 5,5 z" /> + d="m 244,51 c 0,2.761424 -2.23858,5 -5,5 -2.76142,0 -5,-2.238576 -5,-5 0,-2.761424 2.23858,-5 5,-5 2.76142,0 5,2.238576 5,5 z" /> @@ -3902,7 +3916,7 @@ OI1jfK+p+Z+BAsBEieZRA0YNGDVgMBkAAGPfAmCG9D3bAAAAAElFTkSuQmCC id="g12056-1"> + d="m 244,51 c 0,2.761424 -2.23858,5 -5,5 -2.76142,0 -5,-2.238576 -5,-5 0,-2.761424 2.23858,-5 5,-5 2.76142,0 5,2.238576 5,5 z" /> + d="m 244,51 c 0,2.761424 -2.23858,5 -5,5 -2.76142,0 -5,-2.238576 -5,-5 0,-2.761424 2.23858,-5 5,-5 2.76142,0 5,2.238576 5,5 z" />