From f303a1ea8f994177e38c1e6ad7d5ecebce4fd3fb Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Fri, 31 Oct 2014 11:43:23 +0000 Subject: [PATCH] statusicon: Fix status message updates on sync --- SparkleShare/Mac/SparkleStatusIcon.cs | 1 - SparkleShare/SparkleStatusIconController.cs | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/SparkleShare/Mac/SparkleStatusIcon.cs b/SparkleShare/Mac/SparkleStatusIcon.cs index 0d2ba96b..c177e909 100755 --- a/SparkleShare/Mac/SparkleStatusIcon.cs +++ b/SparkleShare/Mac/SparkleStatusIcon.cs @@ -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; diff --git a/SparkleShare/SparkleStatusIconController.cs b/SparkleShare/SparkleStatusIconController.cs index ac06276a..5208f3f1 100755 --- a/SparkleShare/SparkleStatusIconController.cs +++ b/SparkleShare/SparkleStatusIconController.cs @@ -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); };