Bug 510341 - [ModelEditor] Should add tooltips on menuContributionI20180430-0715I20180429-2000I20180428-2020I20180428-1500I20180427-2000I20180426-2000I20180426-0500I20180425-2000I20180425-1705I20180425-1650I20180425-1455I20180425-0910I20180425-0725I20180425-0505I20180425-0250I20180424-2000I20180423-2000I20180423-0655I20180423-0640I20180422-2000I20180421-1500I20180420-2000I20180419-2000I20180418-2000I20180417-2000I20180416-2000I20180416-0305I20180415-2000I20180414-1500I20180413-2000I20180412-2000I20180411-2000I20180411-0735I20180411-0530I20180410-2000I20180409-2000I20180408-2000I20180407-1500I20180406-2000I20180405-2000I20180404-2000I20180403-2000I20180402-2000I20180401-2000I20180331-1500I20180330-2235I20180330-2000I20180329-2000I20180329-0000I20180328-2000I20180327-2000I20180327-0805I20180327-0630I20180326-2000I20180325-2000I20180324-1500I20180323-2000I20180323-0355I20180322-2000I20180322-0645I20180322-0225I20180321-2000I20180320-2000I20180319-2000I20180318-2000I20180317-1500I20180316-2000I20180316-0740I20180316-0730I20180316-0525I20180316-0510I20180316-0455I20180315-2000I20180314-2000I20180313-2000I20180312-2000

dialog

Change-Id: Ia0d397e1f81ebb9916866114003493614c88eaf5
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>

4 files changed, 23 insertions, 6 deletions

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 5a8ca3ea..6938dcd7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -381,7 +381,9 @@ public class Messages {
 	public String MenuContributionEditor_Menu;
 	public String MenuContributionEditor_DirectMenuItem;
 	public String MenuContributionEditor_ParentId;
+	public String MenuContributionEditor_ParentIdTooltip;
 	public String MenuContributionEditor_Position;
+	public String MenuContributionEditor_PositionTooltip;
 	public String MenuContributionEditor_TreeLabel;
 	public String MenuContributionEditor_TreeLabelDescription;
 
@@ -448,6 +450,10 @@ public class Messages {
 
 	public String ToolBarContributionEditor_TreeLabel;
 	public String ToolBarContributionEditor_TreeLabelDescription;
+	public String ToolBarContributionEditor_ParentId;
+	public String ToolBarContributionEditor_ParentIdTooltip;
+	public String ToolBarContributionEditor_Position;
+	public String ToolBarContributionEditor_PositionTooltip;
 
 	public String ToolItemEditor_Type;
 	public String ToolItemEditor_Label;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index de985ce9..6dd52c13 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -349,7 +349,9 @@ MenuContributionEditor_Separator=Separator
 MenuContributionEditor_Menu=Menu
 MenuContributionEditor_DirectMenuItem=Direct Menu Item
 MenuContributionEditor_ParentId=Parent-ID
+MenuContributionEditor_ParentIdTooltip=This is the id of the menu or the part into which the contributions should be added. Use 'org.eclipse.ui.main.menu' to contribute to the main menu and use 'popup' to handle contributions which are candidates to appear on any (top level) context menu. 
 MenuContributionEditor_Position=Position
+MenuContributionEditor_PositionTooltip=This is the position of the contribution. It has the form "[placement]=[id]" where placement is one of "before", "after", or "endof" and the id is expected to be the id of something in the menu.
 MenuContributionEditor_TreeLabel=Menu Contribution
 MenuContributionEditor_TreeLabelDescription=Menu Contribution 
 
@@ -421,7 +423,12 @@ RenderedMenuItem_TreeLabelDescription=Rendered Menu Item
 RenderedToolBarEditor_TreeLabel=Rendered ToolBar
 
 ToolBarContributionEditor_TreeLabel=ToolBar Contribution
-ToolBarContributionEditor_TreeLabelDescription=ToolBar Contribution 
+ToolBarContributionEditor_TreeLabelDescription=ToolBar Contribution
+ToolBarContributionEditor_ParentId=Parent-ID
+ToolBarContributionEditor_ParentIdTooltip=This is the id of the toolbar or the part into which the contributions should be added. Use 'org.eclipse.ui.main.toolbar' to contribute to the main toolbar. 
+ToolBarContributionEditor_Position=Position
+ToolBarContributionEditor_PositionTooltip=This is the position of the contribution. It has the form "[placement]=[id]" where placement is one of "before", "after", or "endof" and the id is expected to be the id of something in the toolbar.
+
 
 ToolItemEditor_Type=Type
 ToolItemEditor_Label=Label
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index 3192a178..bae6a1cd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -209,6 +209,7 @@ public class MenuContributionEditor extends AbstractComponentEditor {
 		{
 			final Label l = new Label(parent, SWT.NONE);
 			l.setText(Messages.MenuContributionEditor_ParentId);
+			l.setToolTipText(Messages.MenuContributionEditor_ParentIdTooltip);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			final Text t = new Text(parent, SWT.BORDER);
@@ -235,7 +236,8 @@ public class MenuContributionEditor extends AbstractComponentEditor {
 		}
 
 		ControlFactory
-		.createTextField(parent, Messages.MenuContributionEditor_Position, master, context, textProp,
+				.createTextField(parent, Messages.MenuContributionEditor_Position,
+						Messages.MenuContributionEditor_PositionTooltip, master, context, textProp,
 				EMFEditProperties.value(getEditingDomain(),
 						MenuPackageImpl.Literals.MENU_CONTRIBUTION__POSITION_IN_PARENT));
 
@@ -276,8 +278,8 @@ public class MenuContributionEditor extends AbstractComponentEditor {
 					defaultStruct,
 					new Struct(Messages.MenuContributionEditor_DirectMenuItem, MenuPackageImpl.Literals.DIRECT_MENU_ITEM,
 							false),
-							new Struct(Messages.MenuContributionEditor_DynamicMenuContribution,
-									MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, false) });
+					new Struct(Messages.MenuContributionEditor_DynamicMenuContribution,
+							MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, false) });
 			pickList.setSelection(new StructuredSelection(defaultStruct));
 
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
index bf16bd63..9cddb178 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolBarContributionEditor.java
@@ -211,7 +211,8 @@ public class ToolBarContributionEditor extends AbstractComponentEditor {
 
 		{
 			final Label l = new Label(parent, SWT.NONE);
-			l.setText(Messages.MenuContributionEditor_ParentId);
+			l.setText(Messages.ToolBarContributionEditor_ParentId);
+			l.setToolTipText(Messages.ToolBarContributionEditor_ParentIdTooltip);
 			l.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 
 			final Text t = new Text(parent, SWT.BORDER);
@@ -236,7 +237,8 @@ public class ToolBarContributionEditor extends AbstractComponentEditor {
 			});
 		}
 
-		ControlFactory.createTextField(parent, Messages.MenuContributionEditor_Position, master, context, textProp,
+		ControlFactory.createTextField(parent, Messages.ToolBarContributionEditor_Position,
+				Messages.ToolBarContributionEditor_PositionTooltip, master, context, textProp,
 				EMFEditProperties.value(getEditingDomain(),
 						MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTION__POSITION_IN_PARENT));