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

[statusicon] Update sync status message automatically when the menu is open (fixes regression)

Browse source
This commit is contained in:
Hylke Bons 2010-10-22 00:26:46 +01:00
parent c80ef2b655
commit 99d45f8749
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
SparkleShare/SparkleStatusIcon.cs
View file

@ -25,8 +25,6 @@ using System.Timers;
namespace SparkleShare { namespace SparkleShare {
// TODO: Menu doesn't update anymore
// The statusicon that stays in the // The statusicon that stays in the
// user's notification area // user's notification area
public class SparkleStatusIcon : StatusIcon { public class SparkleStatusIcon : StatusIcon {
@ -55,7 +53,7 @@ namespace SparkleShare {
PopupMenu += ShowMenu; // Secondary mouse button click PopupMenu += ShowMenu; // Secondary mouse button click
SetNormalState (); SetNormalState ();
UpdateMenu (); CreateMenu ();
SparkleShare.Controller.FolderSizeChanged += delegate { SparkleShare.Controller.FolderSizeChanged += delegate {
@ -67,7 +65,7 @@ namespace SparkleShare {
SparkleShare.Controller.RepositoryListChanged += delegate { SparkleShare.Controller.RepositoryListChanged += delegate {
Application.Invoke (delegate { Application.Invoke (delegate {
SetNormalState (); SetNormalState ();
UpdateMenu (); CreateMenu ();
}); });
}; };
@ -139,7 +137,7 @@ namespace SparkleShare {
// Creates the menu that is popped up when the // Creates the menu that is popped up when the
// user clicks the status icon // user clicks the status icon
public void UpdateMenu () public void CreateMenu ()
{ {
Menu = new Menu (); Menu = new Menu ();
@ -286,6 +284,22 @@ namespace SparkleShare {
} }
public void UpdateMenu ()
{
Menu.Remove (Menu.Children [0]);
MenuItem status_menu_item = new MenuItem (StateText) {
Sensitive = false
};
Menu.Add (status_menu_item);
Menu.ReorderChild (status_menu_item, 0);
Menu.ShowAll ();
}
// Makes the menu visible // Makes the menu visible
private void ShowMenu (object o, EventArgs args) private void ShowMenu (object o, EventArgs args)
{ {