beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

statusicon: Fix status message updates on sync

Browse source
This commit is contained in:
Hylke Bons 2014-10-31 11:43:23 +00:00
parent 7a32df93ec
commit f303a1ea8f
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
SparkleShare/Mac/SparkleStatusIcon.cs
View file

@ -100,7 +100,6 @@ namespace SparkleShare {
Program.Controller.Invoke (() => {
this.state_item.Title = state_text;
if (Controller.Projects.Length == this.state_menu_items.Length) {
for (int i = 0; i < Controller.Projects.Length; i++)
this.state_menu_items [i].Title = Controller.Projects [i].StatusMessage;

6
SparkleShare/SparkleStatusIconController.cs
View file

@ -46,7 +46,7 @@ namespace SparkleShare {
public string StatusMessage {
get {
string status_message = "";
string status_message = string.Format ("Synced {0}", this.repo.LastSync.ToPrettyDate ());
if (this.repo.Status == SyncStatus.SyncUp)
status_message = "Sending changes… " + this.repo.ProgressPercentage + "%";
@ -74,7 +74,7 @@ namespace SparkleShare {
}
}
return string.Format ("Synced {0}", this.repo.LastSync.ToPrettyDate ());
return status_message;
}
}
@ -204,6 +204,7 @@ namespace SparkleShare {
UpdateIconEvent (CurrentState);
UpdateStatusItemEvent (StateText);
UpdateQuitItemEvent (QuitItemEnabled);
UpdateMenuEvent (CurrentState);
};
@ -250,6 +251,7 @@ namespace SparkleShare {
UpdateIconEvent (CurrentState);
UpdateStatusItemEvent (StateText);
UpdateQuitItemEvent (QuitItemEnabled);
UpdateMenuEvent (CurrentState);
};