Merge remote branch 'origin/about' into about
Conflicts: SparkleShare/SparkleAbout.cs
This commit is contained in:
commit
6ac2ef8f2c
|
@ -55,10 +55,8 @@ namespace SparkleShare {
|
||||||
SparkleShare.Controller.NewVersionAvailable += delegate (string new_version) {
|
SparkleShare.Controller.NewVersionAvailable += delegate (string new_version) {
|
||||||
|
|
||||||
Application.Invoke (delegate {
|
Application.Invoke (delegate {
|
||||||
|
|
||||||
Version.Markup = "<small><span fgcolor='#f57900'>A newer version (" + new_version + ") is available!</span></small>";
|
Version.Markup = "<small><span fgcolor='#f57900'>A newer version (" + new_version + ") is available!</span></small>";
|
||||||
Version.ShowAll ();
|
Version.ShowAll ();
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
};
|
};
|
||||||
|
@ -97,6 +95,7 @@ namespace SparkleShare {
|
||||||
|
|
||||||
box.Add (header);
|
box.Add (header);
|
||||||
|
|
||||||
|
|
||||||
Version = new Label () {
|
Version = new Label () {
|
||||||
Markup = "<small>Checking for updates...</small>",
|
Markup = "<small>Checking for updates...</small>",
|
||||||
Xalign = 0,
|
Xalign = 0,
|
||||||
|
|
Loading…
Reference in a new issue