diff options
author | iain holmes <iain@xamarin.com> | 2017-02-24 21:19:43 +0300 |
---|---|---|
committer | iain holmes <iain@xamarin.com> | 2017-02-24 21:19:43 +0300 |
commit | d3c53466f6cbd9ffa7566e778283573eaa0552f2 (patch) | |
tree | 69fc35644fd0a77f3ae34c4bf5d8409c88d5b90f /main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar | |
parent | 0856f02dc669dff3c77ca120bf73be54dcbc9031 (diff) | |
parent | 441f99e5e80d320af2828db788b5d347935aa8ab (diff) |
Merge remote-tracking branch 'upstream/master' into a11y
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar')
-rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarController.cs | 16 | ||||
-rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarModels.cs | 12 |
2 files changed, 26 insertions, 2 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarController.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarController.cs index 941a70df66..020c87f6c5 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarController.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarController.cs @@ -472,7 +472,7 @@ namespace MonoDevelop.Components.MainToolbar } var target = item.ExecutionTarget; - if (target == null || !target.Enabled || item.Project != project) + if (target == null || item.Project != project) continue; if (target is ExecutionTargetGroup) @@ -989,6 +989,18 @@ namespace MonoDevelop.Components.MainToolbar public SolutionItem Project { get; } + public string Image { + get { + return ExecutionTarget?.Image; + } + } + + public string Tooltip { + get { + return ExecutionTarget?.Tooltip; + } + } + public IRuntimeMutableModel GetMutableModel () { if (Command != null) @@ -1018,7 +1030,7 @@ namespace MonoDevelop.Components.MainToolbar public RuntimeMutableModel (ExecutionTarget target, bool fullName) { - Enabled = !(target is ExecutionTargetGroup); + Enabled = !(target is ExecutionTargetGroup) && target.Enabled; Visible = true; if (target == null) DisplayString = FullDisplayString = string.Empty; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarModels.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarModels.cs index 280e33fdac..3330c0f5d0 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarModels.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarModels.cs @@ -84,6 +84,18 @@ namespace MonoDevelop.Components.MainToolbar bool Notable { get; } /// <summary> + /// Gets the menu item's image. + /// </summary> + /// <value>The image name.</value> + string Image { get; } + + /// <summary> + /// Gets the menu item's tooltip. + /// </summary> + /// <value>The tooltip text</value> + string Tooltip { get; } + + /// <summary> /// Gets the project to which this runtime belongs. /// </summary> /// <value>The project.</value> |