From 0ea3ca075b0903eaa8ab571f36f2ceb1dab03285 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Sun, 29 May 2016 20:15:48 -0700 Subject: [PATCH] statusicon: Rename some labels --- SparkleShare/Linux/StatusIcon.cs | 11 ++++++----- SparkleShare/Mac/UserInterface/StatusIcon.cs | 2 +- SparkleShare/Windows/SparkleStatusIcon.cs | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/SparkleShare/Linux/StatusIcon.cs b/SparkleShare/Linux/StatusIcon.cs index 19fd8412..710b59d2 100644 --- a/SparkleShare/Linux/StatusIcon.cs +++ b/SparkleShare/Linux/StatusIcon.cs @@ -143,7 +143,7 @@ namespace SparkleShare { SparkleMenuItem item = new SparkleMenuItem (project.Name); Gdk.Pixbuf folder_icon; - folder_icon = IconTheme.Default.LoadIcon ("folder", 16, IconLookupFlags.GenericFallback); + folder_icon = UserInterfaceHelpers.GetIcon ("folders", 16); item.Submenu = new Menu (); @@ -187,7 +187,7 @@ namespace SparkleShare { if (Controller.Projects [i].HasError) { folder_icon = IconTheme.Default.LoadIcon ("dialog-warning", 16, IconLookupFlags.GenericFallback); - MenuItem try_again_item = new MenuItem ("Try Again"); + MenuItem try_again_item = new MenuItem ("Retry Sync"); try_again_item.Activated += Controller.TryAgainDelegate (project.Name); (item.Submenu as Menu).Add (try_again_item); @@ -206,13 +206,13 @@ namespace SparkleShare { }; } - this.recent_events_item = new MenuItem ("Recent Changes…"); + this.recent_events_item = new MenuItem ("History…"); this.recent_events_item.Sensitive = Controller.RecentEventsItemEnabled; this.quit_item = new MenuItem ("Quit") { Sensitive = Controller.QuitItemEnabled }; MenuItem add_item = new MenuItem ("Sync Remote Project…"); - MenuItem link_code_item = new MenuItem ("Client ID"); - + MenuItem link_code_item = new MenuItem ("Computer ID"); + if (Controller.LinkCodeItemEnabled) { link_code_item.Submenu = new Menu (); @@ -265,6 +265,7 @@ namespace SparkleShare { (folder_item.Submenu as Menu).Add (new SeparatorMenuItem ()); (folder_item.Submenu as Menu).Add (about_item); + this.menu.Add (new SeparatorMenuItem ()); this.menu.Add (add_item); this.menu.Add (new SeparatorMenuItem ()); this.menu.Add (this.quit_item); diff --git a/SparkleShare/Mac/UserInterface/StatusIcon.cs b/SparkleShare/Mac/UserInterface/StatusIcon.cs index bd28a7e0..f6abbe43 100644 --- a/SparkleShare/Mac/UserInterface/StatusIcon.cs +++ b/SparkleShare/Mac/UserInterface/StatusIcon.cs @@ -201,7 +201,7 @@ namespace SparkleShare { item.Image = this.caution_image; this.try_again_menu_items [i] = new NSMenuItem (); - this.try_again_menu_items [i].Title = "Try Again"; + this.try_again_menu_items [i].Title = "Retry Sync"; this.try_again_menu_items [i].Activated += Controller.TryAgainDelegate (project.Name); item.Submenu.AddItem (this.try_again_menu_items [i]); diff --git a/SparkleShare/Windows/SparkleStatusIcon.cs b/SparkleShare/Windows/SparkleStatusIcon.cs index 7ba4552e..2f0bdbb8 100644 --- a/SparkleShare/Windows/SparkleStatusIcon.cs +++ b/SparkleShare/Windows/SparkleStatusIcon.cs @@ -284,7 +284,7 @@ namespace SparkleShare { }; SparkleMenuItem try_again_item = new SparkleMenuItem { - Header = "Try Again" + Header = "Retry Sync" }; try_again_item.Click += (sender, e) => Controller.TryAgainDelegate(project.Name)(sender, e); subfolder_item.Items.Add(try_again_item);