diff options
author | Marius Ungureanu <teromario@yahoo.com> | 2017-02-24 20:48:35 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-24 20:48:35 +0300 |
commit | 0edeb661461429612943c59d83f04f72c17c05b9 (patch) | |
tree | 62864528c36aa980a8d49f04a07f6b353e8251f7 /main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar | |
parent | 3883523c7e6c2fe5082b05b987a937fb43594f62 (diff) |
Toolbar requests (#1809)
* [Ide] Added ExecutionTarget.Greyed
This disables an ExecutionTarget's selection in the toolbar.
* [Ide] Add ExecutionTarget.Image
This should be used by the toolbars to draw an icon in the device selector.
* [Mac] Implement ExecutionTarget.Image usage.
* [Ide] Add ExecutionTarget.Tooltip
This should be used by the toolbars to display a tooltip for an execution target
* [Mac] Use ExecutionTarget.Tooltip
* [Ide] Make ExecutionTarget.Enabled behave properly.
* [Mac] Fix wrong disabling of cell image in selector view.
* [Mac] Implement last device icon used in the toolbar selector.
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 a356ab36fe..5b1bc7cce5 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) @@ -977,6 +977,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) @@ -1006,7 +1018,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> |