statusicon: Fix status message updates on sync
This commit is contained in:
parent
7a32df93ec
commit
f303a1ea8f
|
@ -100,7 +100,6 @@ namespace SparkleShare {
|
||||||
Program.Controller.Invoke (() => {
|
Program.Controller.Invoke (() => {
|
||||||
this.state_item.Title = state_text;
|
this.state_item.Title = state_text;
|
||||||
|
|
||||||
|
|
||||||
if (Controller.Projects.Length == this.state_menu_items.Length) {
|
if (Controller.Projects.Length == this.state_menu_items.Length) {
|
||||||
for (int i = 0; i < Controller.Projects.Length; i++)
|
for (int i = 0; i < Controller.Projects.Length; i++)
|
||||||
this.state_menu_items [i].Title = Controller.Projects [i].StatusMessage;
|
this.state_menu_items [i].Title = Controller.Projects [i].StatusMessage;
|
||||||
|
|
|
@ -46,7 +46,7 @@ namespace SparkleShare {
|
||||||
|
|
||||||
public string StatusMessage {
|
public string StatusMessage {
|
||||||
get {
|
get {
|
||||||
string status_message = "";
|
string status_message = string.Format ("Synced {0}", this.repo.LastSync.ToPrettyDate ());
|
||||||
|
|
||||||
if (this.repo.Status == SyncStatus.SyncUp)
|
if (this.repo.Status == SyncStatus.SyncUp)
|
||||||
status_message = "Sending changes… " + this.repo.ProgressPercentage + "%";
|
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);
|
UpdateIconEvent (CurrentState);
|
||||||
UpdateStatusItemEvent (StateText);
|
UpdateStatusItemEvent (StateText);
|
||||||
|
UpdateQuitItemEvent (QuitItemEnabled);
|
||||||
UpdateMenuEvent (CurrentState);
|
UpdateMenuEvent (CurrentState);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -250,6 +251,7 @@ namespace SparkleShare {
|
||||||
|
|
||||||
UpdateIconEvent (CurrentState);
|
UpdateIconEvent (CurrentState);
|
||||||
UpdateStatusItemEvent (StateText);
|
UpdateStatusItemEvent (StateText);
|
||||||
|
UpdateQuitItemEvent (QuitItemEnabled);
|
||||||
UpdateMenuEvent (CurrentState);
|
UpdateMenuEvent (CurrentState);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue