diff options
| author | Doug Schaefer | 2017-12-01 19:02:47 +0000 |
|---|---|---|
| committer | Doug Schaefer | 2017-12-01 19:04:51 +0000 |
| commit | d6a1c13e5c70cd73c5b764ba18f341d883099fd2 (patch) | |
| tree | e8ec39fedf11f03c8fcc5c79417088a23f419b9a /core/org.eclipse.cdt.ui/src/org/eclipse/cdt | |
| parent | 4eb76a4edeb208ae54b94fcd56734ec90d2db643 (diff) | |
| download | org.eclipse.cdt-d6a1c13e5c70cd73c5b764ba18f341d883099fd2.tar.gz org.eclipse.cdt-d6a1c13e5c70cd73c5b764ba18f341d883099fd2.tar.xz org.eclipse.cdt-d6a1c13e5c70cd73c5b764ba18f341d883099fd2.zip | |
Cleanup Core Build Preference pages.
Move Toolchains directly under C/C++ and rename to Core
Build Toolchains. Add a label describing what the toolchains
are for in hope of avoiding confusion with managed build.
Also move Qt into C/C++.
Change-Id: Ia1d76087c65b26562d1001243ea355c7ac32365e
Diffstat (limited to 'core/org.eclipse.cdt.ui/src/org/eclipse/cdt')
3 files changed, 7 insertions, 1 deletions
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.java index a33b9789ac7..730745f5a61 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.java @@ -69,6 +69,7 @@ public final class CUIMessages extends NLS { public static String ToolChainPreferencePage_Arch; public static String ToolChainPreferencePage_AreYouSure; public static String ToolChainPreferencePage_AvailableToolchains; + public static String ToolChainPreferencePage_Desc; public static String ToolChainPreferencePage_Down; public static String ToolChainPreferencePage_Edit; public static String ToolChainPreferencePage_EditDot; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.properties index 4f9c0203453..a0a6cb3f1ab 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.properties @@ -69,6 +69,7 @@ ToolChainPreferencePage_Add=Add... ToolChainPreferencePage_Arch=Arch ToolChainPreferencePage_AreYouSure=Are you sure you'd like to remove the selected toolchain? ToolChainPreferencePage_AvailableToolchains=Available Toolchains +ToolChainPreferencePage_Desc=Toolchains for use with CMake, Qt, and Core Build Makefile projects. ToolChainPreferencePage_Down=Down ToolChainPreferencePage_Edit=Edit ToolChainPreferencePage_EditDot=Edit... @@ -78,7 +79,7 @@ ToolChainPreferencePage_OS=OS ToolChainPreferencePage_Remove=Remove ToolChainPreferencePage_Remove1=Remove ToolChainPreferencePage_RemoveToolchain=Remove Toolchain -ToolChainPreferencePage_Toolchains=Toolchains +ToolChainPreferencePage_Toolchains=Core Build Toolchains ToolChainPreferencePage_Type=Type ToolChainPreferencePage_Up=Up ToolChainPreferencePage_UserDefinedToolchains=User Defined Toolchains diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/build/ToolChainPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/build/ToolChainPreferencePage.java index 75964cc2bc3..798c1f8fdc7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/build/ToolChainPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/build/ToolChainPreferencePage.java @@ -41,6 +41,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Group; +import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.ui.IWorkbench; @@ -116,6 +117,9 @@ public class ToolChainPreferencePage extends PreferencePage implements IWorkbenc Composite control = new Composite(parent, SWT.NONE); control.setLayout(new GridLayout()); + Label label = new Label(control, SWT.NONE); + label.setText(CUIMessages.ToolChainPreferencePage_Desc); + Group availGroup = new Group(control, SWT.NONE); availGroup.setText(CUIMessages.ToolChainPreferencePage_AvailableToolchains); availGroup.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); |