diff --git a/e4tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF index e93a68e6c9..8c540a8dd6 100644 --- a/e4tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF +++ b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true -Bundle-Version: 4.8.500.qualifier +Bundle-Version: 4.8.600.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/e4tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml index 4216f7c39e..b8db86d28e 100644 --- a/e4tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml +++ b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml @@ -21,7 +21,7 @@ eclipse.platform.ui org.eclipse.e4.tools.emf.ui - 4.8.500-SNAPSHOT + 4.8.600-SNAPSHOT eclipse-plugin diff --git a/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties index 89c17e2eea..173b337c34 100644 --- a/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties +++ b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties @@ -61,8 +61,8 @@ ModelEditor_PasteObjects=Paste Objects ModelTooling_Common_RuntimeContributionInstance=Contrib. Instance ModelTooling_Common_RuntimeWidgetTree=&Widget Tree -ModelTooling_UIElement_ToBeRendered=&To Be Rendered -ModelTooling_UIElement_Visible=&Visible +ModelTooling_UIElement_ToBeRendered=&To Be Rendered\: +ModelTooling_UIElement_Visible=&Visible\: ModelTooling_UIElement_VisibleWhen=&Visible-When Expression\: ModelTooling_UIElement_AccessibilityPhrase=&Accessibility Phrase\: @@ -157,7 +157,7 @@ DynamicMenuContributionEditor_Description=Dynamic Menu Contribution DynamicMenuContributionEditor_ClassURI=Class &URI\: DynamicMenuContributionEditor_LabelLabel=L&abel\: -HandledToolItemEditor_Command=Command +HandledToolItemEditor_Command=&Command\: HandledToolItemEditor_Parameters=Parameters HandledToolItemEditor_Label=Handled Tool Item HandledToolItemEditor_Description=Handled Tool Item @@ -204,8 +204,8 @@ MenuItemEditor_Type=&Type\: MenuItemEditor_Label=L&abel\: MenuItemEditor_Tooltip=T&ooltip\: MenuItemEditor_IconURI=Icon &URI\: -MenuItemEditor_Enabled=Enabled -MenuItemEditor_Selected=Selected +MenuItemEditor_Enabled=&Enabled\: +MenuItemEditor_Selected=&Selected\: MenuItemEditor_Mnemonics=&Mnemonics\: MenuItemEditor_NoExpression= MenuItemEditor_AddCoreExpression=VisibleWhen Core Expression @@ -218,8 +218,8 @@ PartDescriptorEditor_LabelLabel=L&abel\: PartDescriptorEditor_Tooltip=T&ooltip\: PartDescriptorEditor_IconURI=&Icon URI\: PartDescriptorEditor_ClassURI=Class &URI\: -PartDescriptorEditor_Closeable=Closeable -PartDescriptorEditor_Multiple=Multiple +PartDescriptorEditor_Closeable=&Closeable\: +PartDescriptorEditor_Multiple=&Multiple\: PartDescriptorEditor_Category=&Category\: PartDescriptorEditor_Variables=Variables PartDescriptorEditor_Properties=Properties @@ -240,7 +240,7 @@ PartEditor_Closeable_Tooltip=If checked, the part can be closed by the user PartEditor_Menus=Menus PartEditor_Handlers=Handlers PartEditor_ContainerData=Container &Data\: -PartEditor_ToolBar=ToolBar +PartEditor_ToolBar=&ToolBar\: PartEditor_BindingContexts=Binding Contexts PartEditor_Controls=Controls PartEditor_TrimBars=Trim Bars @@ -425,19 +425,19 @@ RenderedToolBarEditor_TreeLabel=Rendered ToolBar ToolBarContributionEditor_TreeLabel=ToolBar Contribution ToolBarContributionEditor_TreeLabelDescription=ToolBar Contribution -ToolBarContributionEditor_ParentId=Parent-ID +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_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=L&abel\: ToolItemEditor_ToolTip=T&ooltip\: ToolItemEditor_IconURI=&Icon URI\: -ToolItemEditor_Enabled=Enabled -ToolItemEditor_Selected=Selected +ToolItemEditor_Enabled=&Enabled\: +ToolItemEditor_Selected=&Selected\: ToolItemEditor_NoExpression= -ToolItemEditor_Menu=Menu +ToolItemEditor_Menu=&Menu\: TrimBarEditor_TreeLabel=Trim Bar TrimBarEditor_TreeLabelDescription=Trim Bar @@ -462,7 +462,7 @@ WindowEditor_Bounds=&Bounds(x,y,w,h)\: WindowEditor_Label=L&abel\: WindowEditor_Tooltip=T&ooltip\: WindowEditor_IconURI=&Icon URI\: -WindowEditor_MainMenu=Main Menu +WindowEditor_MainMenu=&Main Menu\: WindowEditor_SelectedElement=&Selected Element\: WindowEditor_BindingContexts=Binding Contexts WindowEditor_Handlers=Handlers diff --git a/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java index 50efbccffa..9ce6b49b7f 100644 --- a/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java +++ b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java @@ -745,12 +745,14 @@ public static void createCheckBox(Composite parent, String label, IObservabl public static void createCheckBox(Composite parent, String label, String tooltip, IObservableValue master, EMFDataBindingContext context, IWidgetValueProperty selectionProp, IValueProperty modelProp) { + final Label l = new Label(parent, SWT.NONE); + l.setText(label); + l.setLayoutData(new GridData()); final Button checkBox = new Button(parent, SWT.CHECK); - checkBox.setText(label); if (tooltip != null) { - checkBox.setToolTipText(tooltip); + l.setToolTipText(tooltip); } - checkBox.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 3, 1)); + checkBox.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1)); context.bindValue(selectionProp.observe(checkBox), modelProp.observeDetail(master)); } @@ -906,4 +908,4 @@ public static Button createFindButton(Composite parent, IResourcePool resourcePo return b; } -} \ No newline at end of file +} diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml index 5f9b6df946..fe474fda39 100644 --- a/features/org.eclipse.e4.core.tools.feature/feature.xml +++ b/features/org.eclipse.e4.core.tools.feature/feature.xml @@ -2,7 +2,7 @@