[statusicon] update icons and add icons for pressed state syncing animation

SparkleLib/SparklePaths.cs

@@ -86,7 +86,7 @@ namespace SparkleLib {
 		public static string SparkleTmpPath       = Path.Combine (SparklePath, ".tmp");
 		public static string SparkleConfigPath    = SparkleHelpers.CombineMore (HomePath, ".config", "sparkleshare");
 		public static string SparkleKeysPath      = SparkleHelpers.CombineMore (HomePath, ".config", "sparkleshare");
-		public static string SparkleInstallPath   = SparkleHelpers.CombineMore (Defines.PREFIX, "sparkleshare");
+		public static string SparkleInstallPath   = Path.Combine (Defines.PREFIX, "sparkleshare");
 		public static string SparkleLocalIconPath = SparkleHelpers.CombineMore (SparkleConfigPath, "icons", "hicolor");
 		public static string SparkleIconPath      = SparkleHelpers.CombineMore (Defines.DATAROOTDIR, "sparkleshare", "icons");
 

SparkleShare/Mac/SparkleAlert.cs

@@ -50,14 +50,9 @@ namespace SparkleShare {
             };
 
             Buttons [1].Activated += delegate {
-
-                (Window as NSWindow).OrderOut (this);
                 Environment.Exit (-1);
-
             };
 
-            RunModal ();
-
         }
 
     }

SparkleShare/Mac/SparkleShare.csproj

@@ -134,25 +134,34 @@
     <Content Include="..\..\data\sparkleshare.icns">
       <Link>sparkleshare.icns</Link>
     </Content>
-    <Content Include="..\..\data\idle-active.png">
-      <Link>Pixmaps\idle-active.png</Link>
+    <Content Include="..\..\data\icons\idle0-active.png">
+      <Link>Pixmaps\idle0-active.png</Link>
     </Content>
-    <Content Include="..\..\data\idle.png">
-      <Link>Pixmaps\idle.png</Link>
-    </Content>
-    <Content Include="..\..\data\idle0.png">
+    <Content Include="..\..\data\icons\idle0.png">
       <Link>Pixmaps\idle0.png</Link>
     </Content>
-    <Content Include="..\..\data\idle1.png">
+    <Content Include="..\..\data\icons\idle1-active.png">
+      <Link>Pixmaps\idle1-active.png</Link>
+    </Content>
+    <Content Include="..\..\data\icons\idle1.png">
       <Link>Pixmaps\idle1.png</Link>
     </Content>
-    <Content Include="..\..\data\idle2.png">
+    <Content Include="..\..\data\icons\idle2-active.png">
+      <Link>Pixmaps\idle2-active.png</Link>
+    </Content>
+    <Content Include="..\..\data\icons\idle2.png">
       <Link>Pixmaps\idle2.png</Link>
     </Content>
-    <Content Include="..\..\data\idle3.png">
+    <Content Include="..\..\data\icons\idle3-active.png">
+      <Link>Pixmaps\idle3-active.png</Link>
+    </Content>
+    <Content Include="..\..\data\icons\idle3.png">
       <Link>Pixmaps\idle3.png</Link>
     </Content>
-    <Content Include="..\..\data\idle4.png">
+    <Content Include="..\..\data\icons\idle4-active.png">
+      <Link>Pixmaps\idle4-active.png</Link>
+    </Content>
+    <Content Include="..\..\data\icons\idle4.png">
       <Link>Pixmaps\idle4.png</Link>
     </Content>
   </ItemGroup>

SparkleShare/Mac/SparkleStatusIcon.cs

@@ -138,7 +138,7 @@ namespace SparkleShare {
 					
 					string alternate_image_path =
 						Path.Combine (NSBundle.MainBundle.ResourcePath,
-							"Pixmaps", "idle" + FrameNumber + ".png");
+							"Pixmaps", "idle" + FrameNumber + "-active.png");
 					
 					StatusItem.AlternateImage      = new NSImage (alternate_image_path);
 					StatusItem.AlternateImage.Size = new SizeF (16, 16);
@@ -360,10 +360,10 @@ namespace SparkleShare {
 				StateText = _("Welcome to SparkleShare!");
 				InvokeOnMainThread (delegate {
 
-					StatusItem.Image      = new NSImage (NSBundle.MainBundle.ResourcePath + "/Pixmaps/idle.png");
+					StatusItem.Image      = new NSImage (NSBundle.MainBundle.ResourcePath + "/Pixmaps/idle0.png");
 					StatusItem.Image.Size = new SizeF (16, 16);
 						
-					StatusItem.AlternateImage      = new NSImage (NSBundle.MainBundle.ResourcePath + "/Pixmaps/idle-active.png");
+					StatusItem.AlternateImage      = new NSImage (NSBundle.MainBundle.ResourcePath + "/Pixmaps/idle0-active.png");
 					StatusItem.AlternateImage.Size = new SizeF (16, 16);
 					
 				});
@@ -382,10 +382,10 @@ namespace SparkleShare {
 					StateText = _("Up to date") + " (" + SparkleShare.Controller.FolderSize + ")";
 					InvokeOnMainThread (delegate {
 						
-						StatusItem.Image      = new NSImage (NSBundle.MainBundle.ResourcePath + "/Pixmaps/idle.png");
+						StatusItem.Image      = new NSImage (NSBundle.MainBundle.ResourcePath + "/Pixmaps/idle0.png");
 						StatusItem.Image.Size = new SizeF (16, 16);
 						
-						StatusItem.AlternateImage      = new NSImage (NSBundle.MainBundle.ResourcePath + "/Pixmaps/idle-active.png");
+						StatusItem.AlternateImage      = new NSImage (NSBundle.MainBundle.ResourcePath + "/Pixmaps/idle0-active.png");
 						StatusItem.AlternateImage.Size = new SizeF (16, 16);
 						
 					});

SparkleShare/Mac/SparkleUI.cs

@@ -60,6 +60,7 @@ namespace SparkleShare {
             if (!SparkleShare.Controller.BackendIsPresent) {
 
                 Alert = new SparkleAlert ();
+                Alert.RunModal ();
                 return;
 
             }
@@ -159,6 +160,7 @@ namespace SparkleShare {
 
             // FIXME: Doesn't work
             About = new SparkleAbout ();
+            About.Update ();
 
         }