[statusicon] update icons and add icons for pressed state syncing animation
|
@ -86,7 +86,7 @@ namespace SparkleLib {
|
||||||
public static string SparkleTmpPath = Path.Combine (SparklePath, ".tmp");
|
public static string SparkleTmpPath = Path.Combine (SparklePath, ".tmp");
|
||||||
public static string SparkleConfigPath = SparkleHelpers.CombineMore (HomePath, ".config", "sparkleshare");
|
public static string SparkleConfigPath = SparkleHelpers.CombineMore (HomePath, ".config", "sparkleshare");
|
||||||
public static string SparkleKeysPath = 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 SparkleLocalIconPath = SparkleHelpers.CombineMore (SparkleConfigPath, "icons", "hicolor");
|
||||||
public static string SparkleIconPath = SparkleHelpers.CombineMore (Defines.DATAROOTDIR, "sparkleshare", "icons");
|
public static string SparkleIconPath = SparkleHelpers.CombineMore (Defines.DATAROOTDIR, "sparkleshare", "icons");
|
||||||
|
|
||||||
|
|
|
@ -50,14 +50,9 @@ namespace SparkleShare {
|
||||||
};
|
};
|
||||||
|
|
||||||
Buttons [1].Activated += delegate {
|
Buttons [1].Activated += delegate {
|
||||||
|
|
||||||
(Window as NSWindow).OrderOut (this);
|
|
||||||
Environment.Exit (-1);
|
Environment.Exit (-1);
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
RunModal ();
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -134,25 +134,34 @@
|
||||||
<Content Include="..\..\data\sparkleshare.icns">
|
<Content Include="..\..\data\sparkleshare.icns">
|
||||||
<Link>sparkleshare.icns</Link>
|
<Link>sparkleshare.icns</Link>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\data\idle-active.png">
|
<Content Include="..\..\data\icons\idle0-active.png">
|
||||||
<Link>Pixmaps\idle-active.png</Link>
|
<Link>Pixmaps\idle0-active.png</Link>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\data\idle.png">
|
<Content Include="..\..\data\icons\idle0.png">
|
||||||
<Link>Pixmaps\idle.png</Link>
|
|
||||||
</Content>
|
|
||||||
<Content Include="..\..\data\idle0.png">
|
|
||||||
<Link>Pixmaps\idle0.png</Link>
|
<Link>Pixmaps\idle0.png</Link>
|
||||||
</Content>
|
</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>
|
<Link>Pixmaps\idle1.png</Link>
|
||||||
</Content>
|
</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>
|
<Link>Pixmaps\idle2.png</Link>
|
||||||
</Content>
|
</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>
|
<Link>Pixmaps\idle3.png</Link>
|
||||||
</Content>
|
</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>
|
<Link>Pixmaps\idle4.png</Link>
|
||||||
</Content>
|
</Content>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
|
@ -138,7 +138,7 @@ namespace SparkleShare {
|
||||||
|
|
||||||
string alternate_image_path =
|
string alternate_image_path =
|
||||||
Path.Combine (NSBundle.MainBundle.ResourcePath,
|
Path.Combine (NSBundle.MainBundle.ResourcePath,
|
||||||
"Pixmaps", "idle" + FrameNumber + ".png");
|
"Pixmaps", "idle" + FrameNumber + "-active.png");
|
||||||
|
|
||||||
StatusItem.AlternateImage = new NSImage (alternate_image_path);
|
StatusItem.AlternateImage = new NSImage (alternate_image_path);
|
||||||
StatusItem.AlternateImage.Size = new SizeF (16, 16);
|
StatusItem.AlternateImage.Size = new SizeF (16, 16);
|
||||||
|
@ -360,10 +360,10 @@ namespace SparkleShare {
|
||||||
StateText = _("Welcome to SparkleShare!");
|
StateText = _("Welcome to SparkleShare!");
|
||||||
InvokeOnMainThread (delegate {
|
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.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);
|
StatusItem.AlternateImage.Size = new SizeF (16, 16);
|
||||||
|
|
||||||
});
|
});
|
||||||
|
@ -382,10 +382,10 @@ namespace SparkleShare {
|
||||||
StateText = _("Up to date") + " (" + SparkleShare.Controller.FolderSize + ")";
|
StateText = _("Up to date") + " (" + SparkleShare.Controller.FolderSize + ")";
|
||||||
InvokeOnMainThread (delegate {
|
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.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);
|
StatusItem.AlternateImage.Size = new SizeF (16, 16);
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -60,6 +60,7 @@ namespace SparkleShare {
|
||||||
if (!SparkleShare.Controller.BackendIsPresent) {
|
if (!SparkleShare.Controller.BackendIsPresent) {
|
||||||
|
|
||||||
Alert = new SparkleAlert ();
|
Alert = new SparkleAlert ();
|
||||||
|
Alert.RunModal ();
|
||||||
return;
|
return;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -159,6 +160,7 @@ namespace SparkleShare {
|
||||||
|
|
||||||
// FIXME: Doesn't work
|
// FIXME: Doesn't work
|
||||||
About = new SparkleAbout ();
|
About = new SparkleAbout ();
|
||||||
|
About.Update ();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
BIN
data/icons/idle0-active.png
Normal file
After Width: | Height: | Size: 622 B |
BIN
data/icons/idle0.png
Normal file
After Width: | Height: | Size: 639 B |
BIN
data/icons/idle1-active.png
Normal file
After Width: | Height: | Size: 643 B |
BIN
data/icons/idle1.png
Normal file
After Width: | Height: | Size: 641 B |
BIN
data/icons/idle2-active.png
Normal file
After Width: | Height: | Size: 637 B |
BIN
data/icons/idle2.png
Normal file
After Width: | Height: | Size: 646 B |
BIN
data/icons/idle3-active.png
Normal file
After Width: | Height: | Size: 646 B |
BIN
data/icons/idle3.png
Normal file
After Width: | Height: | Size: 652 B |
BIN
data/icons/idle4-active.png
Normal file
After Width: | Height: | Size: 652 B |
BIN
data/icons/idle4.png
Normal file
After Width: | Height: | Size: 662 B |
Before Width: | Height: | Size: 732 B |
BIN
data/idle.png
Before Width: | Height: | Size: 797 B |
BIN
data/idle0.png
Before Width: | Height: | Size: 803 B |
BIN
data/idle1.png
Before Width: | Height: | Size: 822 B |
BIN
data/idle2.png
Before Width: | Height: | Size: 818 B |
BIN
data/idle3.png
Before Width: | Height: | Size: 831 B |
BIN
data/idle4.png
Before Width: | Height: | Size: 826 B |
Before Width: | Height: | Size: 283 B |
Before Width: | Height: | Size: 216 B |