Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve #1308: Fix E4 editor boolean parameters #1465

Merged
merged 2 commits into from
Nov 27, 2024
Merged

Resolve #1308: Fix E4 editor boolean parameters #1465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e99f87f
Change checkboxes for E4 editor to have consistent placement and add …
stewedbeef Nov 22, 2024
9ba1335
Version bump(s) for 4.34 stream
eclipse-pde-bot Nov 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion e4tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion e4tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<groupId>eclipse.platform.ui</groupId>
<artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
<version>4.8.500-SNAPSHOT</version>
<version>4.8.600-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

<properties>
Expand Down
28 changes: 14 additions & 14 deletions .../org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\:

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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=<None>
MenuItemEditor_AddCoreExpression=VisibleWhen Core Expression
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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=<None>
ToolItemEditor_Menu=Menu
ToolItemEditor_Menu=&Menu\:

TrimBarEditor_TreeLabel=Trim Bar
TrimBarEditor_TreeLabelDescription=Trim Bar
Expand All @@ -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
Expand Down
10 changes: 6 additions & 4 deletions ...ools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,12 +745,14 @@ public static <M> void createCheckBox(Composite parent, String label, IObservabl
public static <M> void createCheckBox(Composite parent, String label, String tooltip, IObservableValue<M> master,
EMFDataBindingContext context, IWidgetValueProperty<Button, Boolean> selectionProp,
IValueProperty<? super M, Boolean> modelProp) {
final Label l = new Label(parent, SWT.NONE);
HannesWell marked this conversation as resolved.
Show resolved Hide resolved
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));
}

Expand Down Expand Up @@ -906,4 +908,4 @@ public static Button createFindButton(Composite parent, IResourcePool resourcePo
return b;
}

}
}
2 changes: 1 addition & 1 deletion features/org.eclipse.e4.core.tools.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.e4.core.tools.feature"
label="%featureName"
version="4.30.300.qualifier"
version="4.30.400.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
Expand Down
Loading