diff options
author | Doug Schaefer | 2017-12-01 21:28:29 +0000 |
---|---|---|
committer | Doug Schaefer | 2017-12-01 21:28:29 +0000 |
commit | 6a12755a4e5c8e6c1a0ec162460f7191a0546202 (patch) | |
tree | fdfbba4a497a8a09043e73f05145dc198424d84b | |
parent | d6a1c13e5c70cd73c5b764ba18f341d883099fd2 (diff) | |
download | org.eclipse.cdt-6a12755a4e5c8e6c1a0ec162460f7191a0546202.tar.gz org.eclipse.cdt-6a12755a4e5c8e6c1a0ec162460f7191a0546202.tar.xz org.eclipse.cdt-6a12755a4e5c8e6c1a0ec162460f7191a0546202.zip |
Fixes for ESP32.CDT_9_4_branch
In the new toolchain wizard, the select button wasn't hooked up.
So I turned it off. Also, we had no build settings tab on the serial
launch.
Change-Id: I811f579334889085f49d298878589109c5e4a228
-rw-r--r-- | build/org.eclipse.cdt.build.gcc.ui/src/org/eclipse/cdt/build/gcc/ui/internal/NewEnvVarDialog.java | 9 | ||||
-rw-r--r-- | cross/org.eclipse.cdt.launch.serial.ui/plugin.xml | 8 |
2 files changed, 14 insertions, 3 deletions
diff --git a/build/org.eclipse.cdt.build.gcc.ui/src/org/eclipse/cdt/build/gcc/ui/internal/NewEnvVarDialog.java b/build/org.eclipse.cdt.build.gcc.ui/src/org/eclipse/cdt/build/gcc/ui/internal/NewEnvVarDialog.java index c1348b1c781..ad8033555a3 100644 --- a/build/org.eclipse.cdt.build.gcc.ui/src/org/eclipse/cdt/build/gcc/ui/internal/NewEnvVarDialog.java +++ b/build/org.eclipse.cdt.build.gcc.ui/src/org/eclipse/cdt/build/gcc/ui/internal/NewEnvVarDialog.java @@ -124,13 +124,16 @@ public class NewEnvVarDialog extends Dialog { label.setText(Messages.NewEnvVarDialog_Name); nameText = new Text(comp, SWT.BORDER); - nameText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); + layoutData = new GridData(SWT.FILL, SWT.CENTER, true, false); + layoutData.horizontalSpan = 2; + nameText.setLayoutData(layoutData); if (envvar != null) { nameText.setText(envvar.getName()); } - Button selectButton = new Button(comp, SWT.PUSH); - selectButton.setText(Messages.NewEnvVarDialog_Select); + // TODO + // Button selectButton = new Button(comp, SWT.PUSH); + // selectButton.setText(Messages.NewEnvVarDialog_Select); valueLabel = new Label(comp, SWT.NONE); valueLabel.setText(Messages.NewEnvVarDialog_Value); diff --git a/cross/org.eclipse.cdt.launch.serial.ui/plugin.xml b/cross/org.eclipse.cdt.launch.serial.ui/plugin.xml index 9067c806bdb..ae904e80c65 100644 --- a/cross/org.eclipse.cdt.launch.serial.ui/plugin.xml +++ b/cross/org.eclipse.cdt.launch.serial.ui/plugin.xml @@ -22,5 +22,13 @@ type="org.eclipse.cdt.launch.serial.launchConfigurationType">
</launchConfigurationTabGroup>
</extension>
+ <extension
+ point="org.eclipse.launchbar.ui.launchBarUIContributions">
+ <buildTabGroup
+ launchConfigType="org.eclipse.cdt.launch.serial.launchConfigurationType"
+ launchDescriptorType="org.eclipse.cdt.debug.core.coreBuildDescriptorType"
+ tabGroup="org.eclipse.cdt.launch.internal.corebuild.CoreBuildTabGroup">
+ </buildTabGroup>
+ </extension>
</plugin>
|