diff --git a/SparkleShare/Mac/SparkleShare/SparkleLog.cs b/SparkleShare/Mac/SparkleShare/SparkleLog.cs index c24fe9f1..a4956fac 100644 --- a/SparkleShare/Mac/SparkleShare/SparkleLog.cs +++ b/SparkleShare/Mac/SparkleShare/SparkleLog.cs @@ -110,6 +110,8 @@ namespace SparkleShare { html = html.Replace ("", "#0085cf"); WebView.MainFrame.LoadHtmlString (html, new NSUrl ("")); + + Update (); } diff --git a/SparkleShare/Mac/SparkleShare/SparkleUI.cs b/SparkleShare/Mac/SparkleShare/SparkleUI.cs index ea6cbc82..83b0d557 100644 --- a/SparkleShare/Mac/SparkleShare/SparkleUI.cs +++ b/SparkleShare/Mac/SparkleShare/SparkleUI.cs @@ -63,9 +63,24 @@ namespace SparkleShare { NewEvents++; NSApplication.SharedApplication.DockTile.BadgeLabel = NewEvents.ToString (); + foreach (SparkleLog log in SparkleUI.OpenLogs) + log.UpdateEventLog (); + }); }; + + + SparkleShare.Controller.AvatarFetched += delegate { + + InvokeOnMainThread (delegate { + + foreach (SparkleLog log in SparkleUI.OpenLogs) + log.UpdateEventLog (); + + }); + + }; } diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs index c81e033d..e0642136 100644 --- a/SparkleShare/SparkleController.cs +++ b/SparkleShare/SparkleController.cs @@ -52,6 +52,9 @@ namespace SparkleShare { public event FolderSizeChangedEventHandler FolderSizeChanged; public delegate void FolderSizeChangedEventHandler (string folder_size); + + public event AvatarFetchedEventHandler AvatarFetched; + public delegate void AvatarFetchedEventHandler (); public event OnIdleEventHandler OnIdle; public delegate void OnIdleEventHandler (); @@ -999,7 +1002,7 @@ namespace SparkleShare { // Gets the avatar for a specific email address and size - public static string GetAvatar (string email, int size) + public string GetAvatar (string email, int size) { string avatar_path = SparkleHelpers.CombineMore (SparklePaths.SparkleLocalIconPath, @@ -1040,6 +1043,9 @@ namespace SparkleShare { if (tmp_file_info.Length > 255) File.Move (tmp_file_path, avatar_file_path); + + if (AvatarFetched != null) + AvatarFetched (); }; diff --git a/data/html/event-log.html b/data/html/event-log.html index 9b1afc4c..e8aebd06 100644 --- a/data/html/event-log.html +++ b/data/html/event-log.html @@ -66,7 +66,10 @@ } img { - margin-right: 12px; + margin-right: 12px; + width: 36px; + height: 36px; + background-color: ; }