linux: fix build and clean up
This commit is contained in:
parent
676a3c2c45
commit
38b4fd8e81
|
@ -130,9 +130,7 @@ namespace SparkleShare {
|
|||
};
|
||||
|
||||
Controller.UpdateMenuEvent += delegate (IconState state) {
|
||||
Application.Invoke (delegate {
|
||||
CreateMenu ();
|
||||
});
|
||||
Application.Invoke (delegate { CreateMenu (); });
|
||||
};
|
||||
}
|
||||
|
||||
|
@ -140,18 +138,13 @@ namespace SparkleShare {
|
|||
public void CreateMenu ()
|
||||
{
|
||||
this.menu = new Menu ();
|
||||
this.state_item = new MenuItem (Controller.StateText) { Sensitive = false };
|
||||
|
||||
this.state_item = new MenuItem (Controller.StateText) {
|
||||
Sensitive = false
|
||||
};
|
||||
ImageMenuItem folder_item = new SparkleMenuItem ("SparkleShare");
|
||||
folder_item.Image = new Image (SparkleUIHelpers.GetIcon ("sparkleshare", 16));
|
||||
|
||||
this.menu.Add (this.state_item);
|
||||
this.menu.Add (new SeparatorMenuItem ());
|
||||
|
||||
ImageMenuItem folder_item = new SparkleMenuItem ("SparkleShare"){
|
||||
Image = new Image (SparkleUIHelpers.GetIcon ("sparkleshare", 16))
|
||||
};
|
||||
|
||||
this.menu.Add (folder_item);
|
||||
|
||||
if (Program.Controller.Folders.Count > 0) {
|
||||
|
@ -164,10 +157,7 @@ namespace SparkleShare {
|
|||
folder_icon = IconTheme.Default.LoadIcon ("dialog-warning", 16, IconLookupFlags.GenericFallback);
|
||||
item.Submenu = new Menu ();
|
||||
|
||||
MenuItem error_item = new MenuItem (Controller.FolderErrors [i]) {
|
||||
Sensitive = false
|
||||
};
|
||||
|
||||
MenuItem error_item = new MenuItem (Controller.FolderErrors [i]) { Sensitive = false };
|
||||
MenuItem try_again_item = new MenuItem ("Try Again");
|
||||
try_again_item.Activated += Controller.TryAgainDelegate (folder_name);
|
||||
|
||||
|
@ -180,36 +170,20 @@ namespace SparkleShare {
|
|||
item.Activated += Controller.OpenFolderDelegate (folder_name);
|
||||
}
|
||||
|
||||
item.Image = new Image (folder_icon);
|
||||
(item.Child as Label).UseUnderline = false;
|
||||
|
||||
item.Image = new Image (folder_icon);
|
||||
this.menu.Add (item);
|
||||
|
||||
i++;
|
||||
}
|
||||
|
||||
Menu submenu = new Menu ();
|
||||
}
|
||||
|
||||
this.menu.Add (new SeparatorMenuItem ());
|
||||
|
||||
this.recent_events_item = new MenuItem ("Recent Changes…");
|
||||
|
||||
this.recent_events_item.Sensitive = Controller.RecentEventsItemEnabled;
|
||||
this.recent_events_item.Activated += Controller.RecentEventsClicked;
|
||||
|
||||
this.recent_events_item.Activated += delegate {
|
||||
Controller.RecentEventsClicked ();
|
||||
};
|
||||
|
||||
|
||||
|
||||
MenuItem sync_item = new MenuItem ("Add Hosted Project…");
|
||||
|
||||
sync_item.Activated += delegate {
|
||||
Controller.AddHostedProjectClicked ();
|
||||
};
|
||||
|
||||
|
||||
MenuItem add_item = new MenuItem ("Add Hosted Project…");
|
||||
add_item.Activated += Controller.AddHostedProjectClicked;
|
||||
|
||||
MenuItem notify_item;
|
||||
|
||||
|
@ -219,9 +193,9 @@ namespace SparkleShare {
|
|||
notify_item = new MenuItem ("Turn Notifications On");
|
||||
|
||||
notify_item.Activated += delegate {
|
||||
Application.Invoke (delegate {
|
||||
Program.Controller.ToggleNotifications ();
|
||||
|
||||
Application.Invoke (delegate {
|
||||
if (Program.Controller.NotificationsEnabled)
|
||||
(notify_item.Child as Label).Text = "Turn Notifications Off";
|
||||
else
|
||||
|
@ -229,25 +203,15 @@ namespace SparkleShare {
|
|||
});
|
||||
};
|
||||
|
||||
|
||||
MenuItem about_item = new MenuItem ("About SparkleShare");
|
||||
about_item.Activated += Controller.AboutClicked;
|
||||
|
||||
about_item.Activated += delegate {
|
||||
Controller.AboutClicked ();
|
||||
};
|
||||
|
||||
|
||||
this.quit_item = new MenuItem ("Quit") {
|
||||
Sensitive = Controller.QuitItemEnabled
|
||||
};
|
||||
|
||||
this.quit_item.Activated += delegate {
|
||||
Controller.QuitClicked ();
|
||||
};
|
||||
this.quit_item = new MenuItem ("Quit") { Sensitive = Controller.QuitItemEnabled };
|
||||
this.quit_item.Activated += Controller.QuitClicked;
|
||||
|
||||
folder_item.Submenu = new Menu ();
|
||||
(folder_item.Submenu as Menu).Add (this.recent_events_item);
|
||||
(folder_item.Submenu as Menu).Add (sync_item);
|
||||
(folder_item.Submenu as Menu).Add (add_item);
|
||||
(folder_item.Submenu as Menu).Add (new SeparatorMenuItem ());
|
||||
(folder_item.Submenu as Menu).Add (notify_item);
|
||||
(folder_item.Submenu as Menu).Add (new SeparatorMenuItem ());
|
||||
|
|
Loading…
Reference in a new issue