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

linux statusicon: bring in line with new design

Browse source
This commit is contained in:
Hylke Bons 2012-11-22 13:17:04 +00:00
parent 6296a78b26
commit 06c4e9ba12
2 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
SparkleShare/Linux/SparkleStatusIcon.cs
View file

@ -151,10 +151,6 @@ namespace SparkleShare {
ImageMenuItem folder_item = new SparkleMenuItem ("SparkleShare"){ ImageMenuItem folder_item = new SparkleMenuItem ("SparkleShare"){
Image = new Image (SparkleUIHelpers.GetIcon ("sparkleshare", 16)) Image = new Image (SparkleUIHelpers.GetIcon ("sparkleshare", 16))
}; };
folder_item.Activated += delegate {
Controller.SparkleShareClicked ();
};
this.menu.Add (folder_item); this.menu.Add (folder_item);
@ -205,7 +201,6 @@ namespace SparkleShare {
Controller.RecentEventsClicked (); Controller.RecentEventsClicked ();
}; };
this.menu.Add (this.recent_events_item);
MenuItem sync_item = new MenuItem ("Add Hosted Project…"); MenuItem sync_item = new MenuItem ("Add Hosted Project…");
@ -214,8 +209,6 @@ namespace SparkleShare {
Controller.AddHostedProjectClicked (); Controller.AddHostedProjectClicked ();
}; };
this.menu.Add (sync_item);
this.menu.Add (new SeparatorMenuItem ());
MenuItem notify_item; MenuItem notify_item;
@ -236,8 +229,6 @@ namespace SparkleShare {
}); });
}; };
this.menu.Add (notify_item);
this.menu.Add (new SeparatorMenuItem ());
MenuItem about_item = new MenuItem ("About SparkleShare"); MenuItem about_item = new MenuItem ("About SparkleShare");
@ -245,8 +236,6 @@ namespace SparkleShare {
Controller.AboutClicked (); Controller.AboutClicked ();
}; };
this.menu.Add (about_item);
this.menu.Add (new SeparatorMenuItem ());
this.quit_item = new MenuItem ("Quit") { this.quit_item = new MenuItem ("Quit") {
Sensitive = Controller.QuitItemEnabled Sensitive = Controller.QuitItemEnabled
@ -256,6 +245,14 @@ namespace SparkleShare {
Controller.QuitClicked (); 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 (new SeparatorMenuItem ());
(folder_item.Submenu as Menu).Add (notify_item);
(folder_item.Submenu as Menu).Add (new SeparatorMenuItem ());
(folder_item.Submenu as Menu).Add (about_item);
this.menu.Add (this.quit_item); this.menu.Add (this.quit_item);
this.menu.ShowAll (); this.menu.ShowAll ();

4
SparkleShare/SparkleStatusIconController.cs
View file

@ -117,7 +117,7 @@ namespace SparkleShare {
if (Program.Controller.Folders.Count == 0) if (Program.Controller.Folders.Count == 0)
StateText = "Welcome to SparkleShare!"; StateText = "Welcome to SparkleShare!";
else else
StateText = "Files up to date " + FolderSize; StateText = "Projects up to date " + FolderSize;
} }
UpdateFolders (); UpdateFolders ();
@ -135,7 +135,7 @@ namespace SparkleShare {
if (Program.Controller.Folders.Count == 0) if (Program.Controller.Folders.Count == 0)
StateText = "Welcome to SparkleShare!"; StateText = "Welcome to SparkleShare!";
else else
StateText = "Files up to date " + FolderSize; StateText = "Projects up to date " + FolderSize;
} }
UpdateQuitItemEvent (QuitItemEnabled); UpdateQuitItemEvent (QuitItemEnabled);