diff --git a/SparkleLib/SparklePaths.cs b/SparkleLib/SparklePaths.cs
index 18de28f1..c9e7d285 100644
--- a/SparkleLib/SparklePaths.cs
+++ b/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");
diff --git a/SparkleShare/Mac/SparkleAlert.cs b/SparkleShare/Mac/SparkleAlert.cs
index e01ef38c..cbc3e0d2 100644
--- a/SparkleShare/Mac/SparkleAlert.cs
+++ b/SparkleShare/Mac/SparkleAlert.cs
@@ -50,14 +50,9 @@ namespace SparkleShare {
};
Buttons [1].Activated += delegate {
-
- (Window as NSWindow).OrderOut (this);
Environment.Exit (-1);
-
};
- RunModal ();
-
}
}
diff --git a/SparkleShare/Mac/SparkleShare.csproj b/SparkleShare/Mac/SparkleShare.csproj
index 7ac1927c..4029c4b4 100644
--- a/SparkleShare/Mac/SparkleShare.csproj
+++ b/SparkleShare/Mac/SparkleShare.csproj
@@ -134,25 +134,34 @@
sparkleshare.icns
-
- Pixmaps\idle-active.png
+
+ Pixmaps\idle0-active.png
-
- Pixmaps\idle.png
-
-
+
Pixmaps\idle0.png
-
+
+ Pixmaps\idle1-active.png
+
+
Pixmaps\idle1.png
-
+
+ Pixmaps\idle2-active.png
+
+
Pixmaps\idle2.png
-
+
+ Pixmaps\idle3-active.png
+
+
Pixmaps\idle3.png
-
+
+ Pixmaps\idle4-active.png
+
+
Pixmaps\idle4.png
diff --git a/SparkleShare/Mac/SparkleStatusIcon.cs b/SparkleShare/Mac/SparkleStatusIcon.cs
index 356f2b17..09db659a 100644
--- a/SparkleShare/Mac/SparkleStatusIcon.cs
+++ b/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);
});
diff --git a/SparkleShare/Mac/SparkleUI.cs b/SparkleShare/Mac/SparkleUI.cs
index d86b42c9..41bf899a 100644
--- a/SparkleShare/Mac/SparkleUI.cs
+++ b/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 ();
}
diff --git a/data/icons/idle0-active.png b/data/icons/idle0-active.png
new file mode 100644
index 00000000..be43fe8a
Binary files /dev/null and b/data/icons/idle0-active.png differ
diff --git a/data/icons/idle0.png b/data/icons/idle0.png
new file mode 100644
index 00000000..6ce31935
Binary files /dev/null and b/data/icons/idle0.png differ
diff --git a/data/icons/idle1-active.png b/data/icons/idle1-active.png
new file mode 100644
index 00000000..ea414c06
Binary files /dev/null and b/data/icons/idle1-active.png differ
diff --git a/data/icons/idle1.png b/data/icons/idle1.png
new file mode 100644
index 00000000..ae01c63f
Binary files /dev/null and b/data/icons/idle1.png differ
diff --git a/data/icons/idle2-active.png b/data/icons/idle2-active.png
new file mode 100644
index 00000000..6016bce6
Binary files /dev/null and b/data/icons/idle2-active.png differ
diff --git a/data/icons/idle2.png b/data/icons/idle2.png
new file mode 100644
index 00000000..84ee5840
Binary files /dev/null and b/data/icons/idle2.png differ
diff --git a/data/icons/idle3-active.png b/data/icons/idle3-active.png
new file mode 100644
index 00000000..8b2f18a2
Binary files /dev/null and b/data/icons/idle3-active.png differ
diff --git a/data/icons/idle3.png b/data/icons/idle3.png
new file mode 100644
index 00000000..20190c28
Binary files /dev/null and b/data/icons/idle3.png differ
diff --git a/data/icons/idle4-active.png b/data/icons/idle4-active.png
new file mode 100644
index 00000000..e6a933db
Binary files /dev/null and b/data/icons/idle4-active.png differ
diff --git a/data/icons/idle4.png b/data/icons/idle4.png
new file mode 100644
index 00000000..6324bfd3
Binary files /dev/null and b/data/icons/idle4.png differ
diff --git a/data/idle-active.png b/data/idle-active.png
deleted file mode 100644
index ca826a08..00000000
Binary files a/data/idle-active.png and /dev/null differ
diff --git a/data/idle.png b/data/idle.png
deleted file mode 100644
index ebb7f00b..00000000
Binary files a/data/idle.png and /dev/null differ
diff --git a/data/idle0.png b/data/idle0.png
deleted file mode 100644
index 0070a165..00000000
Binary files a/data/idle0.png and /dev/null differ
diff --git a/data/idle1.png b/data/idle1.png
deleted file mode 100644
index 863cc299..00000000
Binary files a/data/idle1.png and /dev/null differ
diff --git a/data/idle2.png b/data/idle2.png
deleted file mode 100644
index 7b8cdcfc..00000000
Binary files a/data/idle2.png and /dev/null differ
diff --git a/data/idle3.png b/data/idle3.png
deleted file mode 100644
index c4eaa098..00000000
Binary files a/data/idle3.png and /dev/null differ
diff --git a/data/idle4.png b/data/idle4.png
deleted file mode 100644
index a53e2261..00000000
Binary files a/data/idle4.png and /dev/null differ
diff --git a/data/sparkleshare-idle-focus.png b/data/sparkleshare-idle-focus.png
deleted file mode 100644
index 879ac049..00000000
Binary files a/data/sparkleshare-idle-focus.png and /dev/null differ
diff --git a/data/sparkleshare-idle.png b/data/sparkleshare-idle.png
deleted file mode 100644
index d9762e20..00000000
Binary files a/data/sparkleshare-idle.png and /dev/null differ