diff --git a/SparkleShare/Common/Pixmaps/Sources/sparkleshare-gnome.svg b/SparkleShare/Common/Pixmaps/Sources/sparkleshare-gnome.svg
index 9c8e7863..29606809 100755
--- a/SparkleShare/Common/Pixmaps/Sources/sparkleshare-gnome.svg
+++ b/SparkleShare/Common/Pixmaps/Sources/sparkleshare-gnome.svg
@@ -16,7 +16,7 @@
inkscape:export-xdpi="90.000000"
inkscape:export-ydpi="90.000000"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
- inkscape:version="0.48.0 r9654"
+ inkscape:version="0.48.2 r9819"
sodipodi:docname="sparkleshare-gnome.svg"
sodipodi:version="0.32"
style="display:inline;enable-background:new"
@@ -30,18 +30,18 @@
guidetolerance="10000"
height="300px"
id="base"
- inkscape:current-layer="layer17"
- inkscape:cx="583"
- inkscape:cy="159.26777"
+ inkscape:current-layer="g4977"
+ inkscape:cx="704.27914"
+ inkscape:cy="214.01095"
inkscape:document-units="px"
inkscape:grid-bbox="true"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:showpageshadow="false"
- inkscape:snap-bbox="false"
+ inkscape:snap-bbox="true"
inkscape:snap-nodes="false"
- inkscape:window-height="756"
- inkscape:window-width="1276"
+ inkscape:window-height="724"
+ inkscape:window-width="1362"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:zoom="4"
@@ -1321,198 +1321,6 @@
id="radialGradient3401"
xlink:href="#linearGradient4347-6"
inkscape:collect="always" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1569,92 +1367,12 @@
offset="1"
style="stop-color:#ffffff;stop-opacity:0;" />
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+ sodipodi:nodetypes="ccccccccccccccc"
+ inkscape:connector-curvature="0" />
+ sodipodi:nodetypes="cccccccccsssccccccc"
+ inkscape:connector-curvature="0" />
+ style="fill:url(#linearGradient11729);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient11731);stroke-width:0.9999997;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+ inkscape:connector-curvature="0" />
+ transform="translate(-1,40)"
+ inkscape:connector-curvature="0" />
+ style="opacity:0.71595327;fill:url(#radialGradient11735);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4375-3-0);enable-background:new"
+ inkscape:connector-curvature="0" />
+ transform="matrix(1.0414202,0,0,0.9247512,41.22481,-241.96829)">
+ d="M 52.094352,312 C 49.758741,312 48,313.27843 48,315.94967 l 0,167.46562 C 48,487.36726 50.446761,490 53.771787,490 L 243.327,490 c 3.34438,0 4.673,-2.46074 4.673,-5.90535 l 0,-147.52177 c 0,-2.95096 -2.01067,-4.54661 -4.51602,-4.54661 l -93.98741,0 c -1.69284,0 -4.43377,-0.2055 -6.49302,-2.5614 l -13.0712,-14.95423 c -1.75748,-2.01066 -4.22518,-2.51056 -6.08975,-2.51056 L 52.094352,312 z"
+ inkscape:connector-curvature="0" />
+ style="opacity:0.4;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4123);enable-background:new"
+ inkscape:connector-curvature="0" />
+ style="opacity:0.53881279;fill:url(#radialGradient11600);fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline;enable-background:new"
+ inkscape:connector-curvature="0" />
+ d="m 300.33932,53.5 c -0.4788,0 -0.83934,0.267554 -0.83934,0.826598 l 0,34.047697 c 0,0.82708 0.50158,1.378067 1.18321,1.378067 l 38.85883,0 c 0.6856,0 0.95797,-0.51499 0.95797,-1.235889 l 0,-30.09476 c 0,-0.617585 -0.41219,-0.951527 -0.92579,-0.951527 l -19.26742,0 c -0.34703,0 -0.89129,-0.05868 -1.33107,-0.536058 l -2.6796,-2.908694 c -0.37533,-0.40742 -0.86615,-0.525417 -1.24839,-0.525417 L 300.33932,53.5 z"
+ inkscape:connector-curvature="0" />
+ clip-path="none"
+ inkscape:connector-curvature="0" />
+ style="fill:url(#radialGradient11560);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+ inkscape:connector-curvature="0" />
+ style="opacity:0.71984432;fill:url(#radialGradient11562);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4375);enable-background:new"
+ inkscape:connector-curvature="0" />
+ style="fill:none;stroke:url(#linearGradient11566);stroke-width:1.03922105;stroke-miterlimit:4;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+ inkscape:connector-curvature="0" />
+ sodipodi:nodetypes="cccccccccsscc"
+ inkscape:connector-curvature="0" />
+ transform="translate(0,20)"
+ inkscape:connector-curvature="0" />
+ sodipodi:nodetypes="cccccccccccccccccc"
+ inkscape:connector-curvature="0" />
+ sodipodi:nodetypes="cccccccccsscc"
+ inkscape:connector-curvature="0" />
+ inkscape:r_cy="true"
+ inkscape:connector-curvature="0" />
+ sodipodi:nodetypes="ccccccccccccccccc"
+ inkscape:connector-curvature="0" />
+ transform="matrix(1.017001,0,0,4.3339602,-2.4994124,-1619.2922)"
+ inkscape:connector-curvature="0" />
+ style="fill:url(#radialGradient11673);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+ inkscape:connector-curvature="0" />
+ style="fill:url(#radialGradient11675);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+ inkscape:connector-curvature="0" />
+ inkscape:r_cy="true"
+ inkscape:connector-curvature="0" />
+ transform="matrix(0.4665583,0,0,0.7923004,218.99015,-124.99549)">
+ transform="matrix(0.1836956,0,0,0.157768,296.61958,56.633265)"
+ inkscape:connector-curvature="0" />
+ transform="matrix(0.1836956,0,0,0.157768,296.61958,56.633265)"
+ inkscape:connector-curvature="0" />
+ style="fill:url(#linearGradient10672);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient10674);stroke-width:0.99999964;stroke-miterlimit:4;stroke-opacity:1;display:inline;enable-background:new"
+ inkscape:connector-curvature="0" />
+ style="opacity:0.4;fill:none;stroke:url(#radialGradient10676);stroke-width:0.99999964;stroke-miterlimit:4;stroke-opacity:1;display:inline;enable-background:new"
+ inkscape:connector-curvature="0" />
+ style="fill:url(#linearGradient10678);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient10680);stroke-width:0.9999997;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+ inkscape:connector-curvature="0" />
+ style="opacity:0.71595327;fill:url(#radialGradient10682);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4375-3);enable-background:new"
+ inkscape:connector-curvature="0" />
+ style="opacity:0.4;fill:none;stroke:url(#linearGradient10684);stroke-width:0.9999997;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+ inkscape:connector-curvature="0" />
-
+ d="m 366.37623,-24.985396 c -0.1681,0.0217 -0.3164,0.15386 -0.3579,0.31842 l -0.7155,2.14935 c -0.019,0.0382 -0.032,0.0777 -0.039,0.11973 -0.038,-0.0191 -0.078,-0.0318 -0.1196,-0.0395 l -2.1866,0 c -0.1222,0 -0.2415,0.0637 -0.3181,0.15921 -0.1612,0.18061 -0.1208,0.50107 0.079,0.63685 l 1.7891,1.31355 0.038,0.19106 -0.6757,2.10948 c -0.094,0.32925 0.3466,0.66015 0.6361,0.47763 l 1.7889,-1.31343 0.229,0 1.7891,1.31343 c 0.1556,0.1019 0.3785,0.0841 0.5167,-0.0395 0.1171,-0.10827 0.1659,-0.28518 0.1196,-0.4379 l -0.6759,-2.10948 c -0.064,-0.0127 0.025,-0.12737 0.038,-0.19105 l 1.7889,-1.31356 c 0.2004,-0.13577 0.2401,-0.45623 0.079,-0.63684 -0.076,-0.0955 -0.1958,-0.15526 -0.318,-0.15921 l -2.2264,0 c -0.042,0.0127 -0.081,0.0204 -0.1196,0.0395 -0.013,-0.042 -0.02,-0.0815 -0.039,-0.11973 l -0.6759,-2.14934 c -0.02,-0.0752 -0.062,-0.14546 -0.1196,-0.19908 -0.084,-0.0815 -0.2016,-0.1261 -0.318,-0.11973 l 0.014,1.3e-4 -6e-4,10e-6 z"
+ style="fill:none;stroke:#fde8d0;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
+ transform="translate(-1541.6885,-889.09618)">
+ sodipodi:nodetypes="cccsccsccccccccsccccsccsccscc"
+ inkscape:connector-curvature="0" />
+ sodipodi:nodetypes="cccsccsccccccccsccccsccsccscc"
+ inkscape:connector-curvature="0" />
+ transform="matrix(2.2593567,0,0,2.2593567,-3942.3217,-2045.7357)">
+ sodipodi:nodetypes="cccccsccccccccsccccsccccsccc"
+ inkscape:connector-curvature="0" />
+ transform="matrix(2.2593567,0,0,2.2593567,-3942.3217,-2046.7357)">
+ sodipodi:nodetypes="cccccsccccccccsccccsccccsccc"
+ inkscape:connector-curvature="0" />
+ sodipodi:nodetypes="cccccsccccccccsccccsccccsccc"
+ inkscape:connector-curvature="0" />
+ transform="matrix(1.5272842,0,0,1.5272842,-2544.303,-1370.1525)">
+ sodipodi:nodetypes="cccccsccccccccsccccsccccsccc"
+ inkscape:connector-curvature="0" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ sodipodi:nodetypes="ccsccsc"
+ inkscape:connector-curvature="0" />
+ sodipodi:nodetypes="ccsccsc"
+ inkscape:connector-curvature="0" />
+ transform="translate(259,-390)">
+ sodipodi:nodetypes="ccccccccccccccc"
+ inkscape:connector-curvature="0" />
+ sodipodi:nodetypes="cccccccccssscccccc"
+ inkscape:connector-curvature="0" />
+ transform="matrix(0.08661176,0,0,0.263645,301.19179,67.063667)"
+ inkscape:connector-curvature="0" />
-
-
-
-
+ d="m 569.53959,-204.51085 c 0.5327,0 1.21512,-1.08469 1.64776,-1.63322 0.1341,-0.20388 0.34688,-0.35593 0.60228,-0.35593 l 10.06,0 c 0,0 0.65038,-0.0105 0.65038,-0.0105 l 0,9.33354 c 0,3.20283 -1.29007,3.67699 -1.65038,3.67699 l -15.69924,0 c -0.36031,0 -1.65038,-0.40781 -1.65038,-3.67699 l 0,-7.3086 6.03958,-0.0253 z"
+ inkscape:connector-curvature="0" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ inkscape:connector-curvature="0" />
+ sodipodi:nodetypes="ccsccsc"
+ inkscape:connector-curvature="0" />
+ sodipodi:nodetypes="ccsccsc"
+ inkscape:connector-curvature="0" />
+ transform="translate(289,-390)">
+ sodipodi:nodetypes="ccccccccccccccc"
+ inkscape:connector-curvature="0" />
+ sodipodi:nodetypes="cccccccccssscccccc"
+ inkscape:connector-curvature="0" />
+ d="m 305.84985,185.48915 4.68974,0 c 0.5327,0 1.21512,-1.08469 1.64776,-1.63322 0.1341,-0.20388 0.34688,-0.35593 0.60228,-0.35593 3.57008,0.006 7.14057,-0.0156 10.71038,0.0141 l 0,9.30895 c 0,3.20283 -1.29007,3.67699 -1.65038,3.67699 l -15.69924,0 c -0.36031,0 -1.65038,-0.40781 -1.65038,-3.67699 l 0,-7.34245 c 0,0 1.34984,0.009 1.34984,0.009 l 0,0 0,0 0,-3e-5 z"
+ inkscape:connector-curvature="0" />
+ transform="matrix(0.08661176,0,0,0.263645,301.19179,67.063667)"
+ inkscape:connector-curvature="0" />
+ sodipodi:nodetypes="cssccsccccccc"
+ inkscape:connector-curvature="0" />
+ style="fill:none;stroke:#c56b0c;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+ inkscape:connector-curvature="0" />
+ style="fill:none;stroke:#fde8d0;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+ inkscape:connector-curvature="0" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#dfdbd2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999964;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Sans;-inkscape-font-specification:Sans"
+ d="m 594.46875,-63 c -0.82205,0.092 -1.44254,0.79783 -1.4375,1.625 l 0,4.375 -0.5,0 -0.5,0 0,0.5 -0.0312,5.59375 c 0,0.74984 0.1756,1.43685 0.5,1.96875 0.3244,0.5319 0.84196,0.9375 1.46875,0.9375 l 12.0625,0 c 0.62679,0 1.14435,-0.4056 1.46875,-0.9375 0.3244,-0.5319 0.5,-1.21891 0.5,-1.96875 l 0.0625,-7.59375 0,-0.5 -0.5,0 -0.5625,0 0,-0.34375 -0.0312,-1.125 0,-0.5 -0.5,0 -5.71875,0 -2.15625,-1.90625 -0.15625,-0.125 -0.1875,0 -3.5625,0 c -0.01,-4.6e-4 -0.0217,3.1e-4 -0.0312,0 -0.0385,-10e-4 -0.0865,-10e-4 -0.125,0 l -0.0312,0 -0.0312,0 z m 4.53125,5 2,0 -0.25,5 -1.46875,0 L 599,-58 z m 0,6 2,0 0,2 -2,0 0,-2 z"
+ id="path4738" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ id="path4832"
+ d="m 564.46875,-63 c -0.82205,0.092 -1.44254,0.79783 -1.4375,1.625 l 0,4.375 -0.5,0 -0.5,0 0,0.5 -0.0312,5.59375 c 0,0.74984 0.1756,1.43685 0.5,1.96875 0.3244,0.5319 0.84196,0.9375 1.46875,0.9375 l 12.0625,0 c 0.62679,0 1.14435,-0.4056 1.46875,-0.9375 0.3244,-0.5319 0.5,-1.21891 0.5,-1.96875 l 0.0625,-7.59375 0,-0.5 -0.5,0 -0.5625,0 0,-0.34375 -0.0312,-1.125 0,-0.5 -0.5,0 -5.71875,0 -2.15625,-1.90625 -0.15625,-0.125 -0.1875,0 -3.5625,0 c -0.01,-4.6e-4 -0.0217,3.1e-4 -0.0312,0 -0.0385,-10e-4 -0.0865,-10e-4 -0.125,0 l -0.0312,0 -0.0312,0 z m 5.46875,4.5 a 0.50005,0.50005 0 0 1 0.46875,0.28125 L 571.625,-56 l 2.375,0 0,0.28125 c 0.0455,0.0391 0.0849,0.0777 0.125,0.125 0.006,0.008 0.0253,-0.008 0.0312,0 0.34888,0.41718 0.27749,1.01959 -0.15625,1.34375 l 0,0.25 -0.34375,0 -0.6562,0.46875 0,0.53125 -0.5625,0 0.59375,1.8125 c 0.0602,0.19847 0.0404,0.40708 -0.0312,0.59375 l 0,0.59375 -0.71875,0 c -0.0944,0.018 -0.18545,0.0132 -0.28125,0 -0.13075,-0.018 -0.25503,-0.0464 -0.375,-0.125 a 0.50005,0.50005 0 0 1 -0.0312,-0.0312 l -1.125,-0.84375 -0.9375,0 -1.125,0.84375 a 0.50005,0.50005 0 0 1 -0.0312,0.0312 c -0.11895,0.075 -0.25124,0.11247 -0.375,0.125 l -0.1875,0 -0.8125,0 0,-0.59375 c -0.0755,-0.16699 -0.0892,-0.35978 -0.0312,-0.5625 a 0.50005,0.50005 0 0 1 0,-0.0312 L 567.5625,-53 567,-53 567,-53.53125 566.375,-54 566,-54 l 0,-0.25 c -0.4328,-0.32433 -0.50575,-0.92618 -0.15625,-1.34375 l 0.0312,0 c 0.0325,-0.0383 0.0874,-0.0599 0.125,-0.0937 l 0,-0.3125 2.53125,0 0.59375,-1.78125 0,-0.0312 0.0312,0 c 0.10721,-0.35166 0.37967,-0.60844 0.75,-0.65625 a 0.50005,0.50005 0 0 1 0.0312,-0.0312 z m 0,1.46875 -0.5625,1.65625 a 0.50005,0.50005 0 0 1 -0.0312,0.0625 0.50005,0.50005 0 0 1 -0.65625,0.375 l -0.0312,0 -1.65625,0 0,0.1875 1,0.75 0.40625,0.28125 a 0.50005,0.50005 0 0 1 0.1875,0.28125 l 0.0312,0.21875 a 0.50005,0.50005 0 0 1 0,0.25 l -0.625,1.875 1,-0.75 0,-0.15625 0.21875,0 0.375,-0.28125 a 0.50005,0.50005 0 0 1 0.28125,-0.0937 l 0.25,0 a 0.50005,0.50005 0 0 1 0.28125,0.0937 l 0.375,0.28125 0.21875,0 0,0.15625 1,0.75 -0.625,-1.875 0.0312,0 c -0.0259,-0.0661 -0.0605,-0.13944 -0.0625,-0.1875 -0.005,-0.16398 0.0446,-0.20692 0.0625,-0.25 0.005,-0.0129 -0.003,-0.0195 0,-0.0312 a 0.50005,0.50005 0 0 1 0.1875,-0.28125 L 572,-54 l 1,-0.75 0,-0.1875 c -0.56222,-0.0209 -1.05838,-0.056 -1.625,-0.0312 A 0.50005,0.50005 0 0 1 571.15625,-55 L 571,-55 l 0,-0.0937 a 0.50005,0.50005 0 0 1 -0.0937,-0.125 l -0.96875,-1.8125 z"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#dfdbd2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999964;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Sans;-inkscape-font-specification:Sans" />
Ubuntu Mac Windows 7
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Windows
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Status icons GNOME and legacy panels
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ transform="matrix(1,0,0,1.0053576,45,-491.56441)">
+ d="M 52.094352,312 C 49.758741,312 48,313.27843 48,315.94967 l 0,167.46562 C 48,487.36726 50.446761,490 53.771787,490 L 243.327,490 c 3.34438,0 4.673,-2.46074 4.673,-5.90535 l 0,-147.52177 c 0,-2.95096 -2.01067,-4.54661 -4.51602,-4.54661 l -93.98741,0 c -1.69284,0 -4.43377,-0.2055 -6.49302,-2.5614 l -13.0712,-14.95423 c -1.75748,-2.01066 -4.22518,-2.51056 -6.08975,-2.51056 L 52.094352,312 z"
+ inkscape:connector-curvature="0" />
+ style="opacity:0.7123288;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4123);enable-background:new"
+ inkscape:connector-curvature="0" />
+ style="opacity:0.53881279;fill:url(#radialGradient10742);fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline;enable-background:new"
+ inkscape:connector-curvature="0" />
+ d="M 51.094352,311 C 48.758741,311 47,312.27843 47,314.94967 l 0,168.46562 C 47,487.36726 49.446761,490 52.771787,490 L 244.327,490 c 3.34438,0 4.673,-2.46074 4.673,-5.90535 l 0,-148.52177 c 0,-2.95096 -2.01067,-4.54661 -4.51602,-4.54661 l -94.98741,0 c -1.69284,0 -4.43377,-0.2055 -6.49302,-2.5614 l -13.0712,-14.95423 c -1.75748,-2.01066 -4.22518,-2.51056 -6.08975,-2.51056 L 51.094352,311 z"
+ inkscape:connector-curvature="0" />
+ d="M 52.094352,312 C 49.758741,312 48,313.27843 48,315.94967 l 0,167.46562 C 48,487.36726 50.446761,490 53.771787,490 L 243.327,490 c 3.34438,0 4.673,-2.46074 4.673,-5.90535 l 0,-147.52177 c 0,-2.95096 -2.01067,-4.54661 -4.51602,-4.54661 l -93.98741,0 c -1.69284,0 -4.43377,-0.2055 -6.49302,-2.5614 l -13.0712,-14.95423 c -1.75748,-2.01066 -4.22518,-2.51056 -6.08975,-2.51056 L 52.094352,312 z"
+ inkscape:connector-curvature="0" />
+ style="fill:url(#linearGradient10748);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.29999995;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+ inkscape:connector-curvature="0" />
+ transform="translate(0,250)"
+ inkscape:connector-curvature="0" />
+ style="fill:url(#radialGradient10750);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+ inkscape:connector-curvature="0" />
+ style="opacity:0.34188035;fill:url(#radialGradient10752);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4375-19);enable-background:new"
+ inkscape:connector-curvature="0" />
+ sodipodi:nodetypes="csccsccsccscc"
+ inkscape:connector-curvature="0" />
+ id="path10500"
+ inkscape:connector-curvature="0" />
+ style="fill:none;stroke:url(#linearGradient10758);stroke-width:1.99466383;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter11355);enable-background:new"
+ inkscape:connector-curvature="0" />
+ style="opacity:0.3;fill:url(#radialGradient10760);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4375-19);enable-background:new"
+ inkscape:connector-curvature="0" />
+ style="fill:none;stroke:#d77711;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+ inkscape:connector-curvature="0" />
+ style="fill:none;stroke:#fbc98d;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
+ inkscape:connector-curvature="0" />
+ d="m 724.47511,503.36945 a 4.6624851,1.5688932 0 1 1 -9.32497,0 4.6624851,1.5688932 0 1 1 9.32497,0 z"
+ transform="matrix(1.0723917,0,0,0.9560854,-162.92109,-673.76418)" />
+ d="m 609.00541,-202.50021 c -2.48684,0 -4.5,2.01334 -4.5,4.5 0,2.48666 2.01316,4.5 4.5,4.5 1.21264,0 2.31542,-0.4705 3.125,-1.25 0.21559,-0.54791 0.375,-1.33367 0.375,-2.4375 l 0,-3.59375 c -0.82499,-1.03534 -2.0732,-1.71875 -3.5,-1.71875 z"
+ id="path10363-4"
+ inkscape:connector-curvature="0" />
+ transform="matrix(0.5628517,0,0,0.5628102,195.58801,-418.4635)">
none
- false
+ False
bin\Debug
DEBUG
prompt
4
-
+
- false
- false
- false
- true
- false
+ False
+ False
+ False
+ True
+ False
Mac Developer
3rd Party Mac Developer Installer
@@ -120,42 +120,6 @@
sparkleshare-app.icns
-
- Pixmaps\process-syncing-i-active.png
-
-
- Pixmaps\process-syncing-i.png
-
-
- Pixmaps\process-syncing-ii-active.png
-
-
- Pixmaps\process-syncing-ii.png
-
-
- Pixmaps\process-syncing-iii-active.png
-
-
- Pixmaps\process-syncing-iii.png
-
-
- Pixmaps\process-syncing-iiii-active.png
-
-
- Pixmaps\process-syncing-iiii.png
-
-
- Pixmaps\process-syncing-iiiii-active.png
-
-
- Pixmaps\process-syncing-iiiii.png
-
-
- Pixmaps\process-syncing-error.png
-
-
- Pixmaps\process-syncing-error-active.png
-
Pixmaps\document-added-12.png
@@ -256,6 +220,16 @@
Plugins\ssnet.xml
+
+
+
+
+
+
+
+
+
+
diff --git a/SparkleShare/Mac/SparkleStatusIcon.cs b/SparkleShare/Mac/SparkleStatusIcon.cs
index 5c4e69bb..618e02d6 100755
--- a/SparkleShare/Mac/SparkleStatusIcon.cs
+++ b/SparkleShare/Mac/SparkleStatusIcon.cs
@@ -45,11 +45,19 @@ namespace SparkleShare {
private NSMenuItem notify_item;
private NSMenuItem recent_events_item;
private NSMenuItem quit_item;
+
+ private NSImage syncing_idle_image;
+ private NSImage syncing_up_image;
+ private NSImage syncing_down_image;
+ private NSImage syncing_image;
+ private NSImage syncing_error_image;
+
+ private NSImage syncing_idle_image_active;
+ private NSImage syncing_up_image_active;
+ private NSImage syncing_down_image_active;
+ private NSImage syncing_image_active;
+ private NSImage syncing_error_image_active;
- private NSImage [] animation_frames;
- private NSImage [] animation_frames_active;
- private NSImage error_image;
- private NSImage error_image_active;
private NSImage folder_image;
private NSImage caution_image;
private NSImage sparkleshare_image;
@@ -62,15 +70,25 @@ namespace SparkleShare {
{
using (var a = new NSAutoreleasePool ())
{
- CreateAnimationFrames ();
-
this.status_item = NSStatusBar.SystemStatusBar.CreateStatusItem (28);
this.status_item.HighlightMode = true;
- this.status_item.Image = this.animation_frames [0];
- this.status_item.Image = this.animation_frames [0];
- this.status_item.Image.Size = new SizeF (16, 16);
- this.status_item.AlternateImage = this.animation_frames_active [0];
+ this.syncing_idle_image = new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "process-syncing-idle.png"));
+ this.syncing_up_image = new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "process-syncing-up.png"));
+ this.syncing_down_image = new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "process-syncing-down.png"));
+ this.syncing_image = new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "process-syncing.png"));
+ this.syncing_error_image = new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "process-syncing-error.png"));
+
+ this.syncing_idle_image_active = new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "process-syncing-idle-active.png"));
+ this.syncing_up_image_active = new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "process-syncing-up-active.png"));
+ this.syncing_down_image_active = new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "process-syncing-down-active.png"));
+ this.syncing_image_active = new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "process-syncing-active.png"));
+ this.syncing_error_image_active = new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "process-syncing-error-active.png"));
+
+ this.status_item.Image = this.syncing_idle_image;
+ this.status_item.Image.Size = new SizeF (16, 16);
+
+ this.status_item.AlternateImage = this.syncing_idle_image_active;
this.status_item.AlternateImage.Size = new SizeF (16, 16);
this.folder_image = NSImage.ImageNamed ("NSFolder");
@@ -81,22 +99,40 @@ namespace SparkleShare {
}
- Controller.UpdateIconEvent += delegate (int icon_frame) {
+ Controller.UpdateIconEvent += delegate (IconState state) {
using (var a = new NSAutoreleasePool ())
{
InvokeOnMainThread (delegate {
- if (icon_frame > -1) {
- this.status_item.Image = this.animation_frames [icon_frame];
- this.status_item.Image.Size = new SizeF (16, 16);
- this.status_item.AlternateImage = this.animation_frames_active [icon_frame];
- this.status_item.AlternateImage.Size = new SizeF (16, 16);
-
- } else {
- this.status_item.Image = this.error_image;
- this.status_item.AlternateImage = this.error_image_active;
- this.status_item.Image.Size = new SizeF (16, 16);
- this.status_item.AlternateImage.Size = new SizeF (16, 16);
+ 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;
+ }
+ }
+
+ this.status_item.Image.Size = new SizeF (16, 16);
+ this.status_item.AlternateImage.Size = new SizeF (16, 16);
});
}
};
@@ -314,32 +350,6 @@ namespace SparkleShare {
Controller.SubfolderClicked (name);
};
}
-
-
- private void CreateAnimationFrames ()
- {
- this.animation_frames = new NSImage [] {
- new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "process-syncing-i.png")),
- new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "process-syncing-ii.png")),
- new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "process-syncing-iii.png")),
- new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "process-syncing-iiii.png")),
- new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "process-syncing-iiiii.png"))
- };
-
- this.animation_frames_active = new NSImage [] {
- new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "process-syncing-i-active.png")),
- new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "process-syncing-ii-active.png")),
- new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "process-syncing-iii-active.png")),
- new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "process-syncing-iiii-active.png")),
- new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "process-syncing-iiiii-active.png"))
- };
-
- this.error_image = new NSImage (
- Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "process-syncing-error.png"));
-
- this.error_image_active = new NSImage (
- Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "process-syncing-error.png"));
- }
}
diff --git a/SparkleShare/SparkleStatusIconController.cs b/SparkleShare/SparkleStatusIconController.cs
index 3b8b11f4..6277c624 100755
--- a/SparkleShare/SparkleStatusIconController.cs
+++ b/SparkleShare/SparkleStatusIconController.cs
@@ -36,7 +36,7 @@ namespace SparkleShare {
public class SparkleStatusIconController {
public event UpdateIconEventHandler UpdateIconEvent = delegate { };
- public delegate void UpdateIconEventHandler (int icon_frame);
+ public delegate void UpdateIconEventHandler (IconState state);
public event UpdateMenuEventHandler UpdateMenuEvent = delegate { };
public delegate void UpdateMenuEventHandler (IconState state);
@@ -119,14 +119,8 @@ namespace SparkleShare {
}
- private Timer animation;
- private int animation_frame_number;
-
-
public SparkleStatusIconController ()
{
- InitAnimation ();
-
Program.Controller.FolderListChanged += delegate {
if (CurrentState != IconState.Error) {
CurrentState = IconState.Idle;
@@ -155,9 +149,7 @@ namespace SparkleShare {
UpdateQuitItemEvent (QuitItemEnabled);
UpdateStatusItemEvent (StateText);
- this.animation.Stop ();
-
- UpdateIconEvent (0);
+ UpdateIconEvent (CurrentState);
UpdateMenuEvent (CurrentState);
};
@@ -200,11 +192,9 @@ namespace SparkleShare {
StateText += " " + ProgressPercentage + "% " + ProgressSpeed;
+ UpdateIconEvent (CurrentState);
UpdateStatusItemEvent (StateText);
UpdateQuitItemEvent (QuitItemEnabled);
-
- if (!this.animation.Enabled)
- this.animation.Start ();
};
Program.Controller.OnError += delegate {
@@ -213,10 +203,8 @@ namespace SparkleShare {
UpdateQuitItemEvent (QuitItemEnabled);
UpdateStatusItemEvent (StateText);
-
- this.animation.Stop ();
-
- UpdateIconEvent (-1);
+
+ UpdateIconEvent (CurrentState);
};
}
@@ -255,24 +243,5 @@ namespace SparkleShare {
{
Program.Controller.Quit ();
}
-
-
- private void InitAnimation ()
- {
- this.animation_frame_number = 0;
-
- this.animation = new Timer () {
- Interval = 50
- };
-
- this.animation.Elapsed += delegate {
- if (this.animation_frame_number < 4)
- this.animation_frame_number++;
- else
- this.animation_frame_number = 0;
-
- UpdateIconEvent (this.animation_frame_number);
- };
- }
}
}