mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 09:46:02 +02:00
Code Issues Wiki Activity

Improve CMake Build Settings labels - fixes #1120 (#1163)

Browse source 
The "Build all target" label was renamed to "Build target" to better
reflect what the control does.

Also added tooltips to the tab's controls.
This commit is contained in:
John Moule 2025-05-22 16:47:06 +01:00 • committed by GitHub
parent 9b6fded373
commit 2c82545ba0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cmake/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/CMakeBuildTab.java
View file

@ -90,10 +90,11 @@ public class CMakeBuildTab extends CommonBuildTab {
generatorLabel = new Label(cmakeGroup, SWT.NONE); generatorLabel = new Label(cmakeGroup, SWT.NONE);
generatorLabel.setText(Messages.CMakeBuildTab_Generator); generatorLabel.setText(Messages.CMakeBuildTab_Generator);
generatorLabel.setToolTipText(Messages.CMakeBuildTab_GeneratorTooltip);
CMakeGenerator[] generators = CMakeGenerator.values(); CMakeGenerator[] generators = CMakeGenerator.values();
String[] generatorNames = Arrays.stream(generators).map(CMakeGenerator::getCMakeName).toArray(String[]::new); String[] generatorNames = Arrays.stream(generators).map(CMakeGenerator::getCMakeName).toArray(String[]::new);
generatorCombo = new Combo(cmakeGroup, SWT.DROP_DOWN); generatorCombo = new Combo(cmakeGroup, SWT.DROP_DOWN);
generatorCombo.setToolTipText(Messages.CMakeBuildTab_GeneratorComboTooltip);
generatorCombo.setItems(generatorNames); generatorCombo.setItems(generatorNames);
generatorCombo.select(0); generatorCombo.select(0);
generatorCombo.addModifyListener(e -> updateLaunchConfigurationDialog()); generatorCombo.addModifyListener(e -> updateLaunchConfigurationDialog());
@ -106,29 +107,37 @@ public class CMakeBuildTab extends CommonBuildTab {
cmakeArgsLabel = new Label(cmakeGroup, SWT.NONE); cmakeArgsLabel = new Label(cmakeGroup, SWT.NONE);
cmakeArgsLabel.setText(Messages.CMakeBuildTab_CMakeArgs); cmakeArgsLabel.setText(Messages.CMakeBuildTab_CMakeArgs);
cmakeArgsLabel.setToolTipText(Messages.CMakeBuildTab_cmakeArgsTooltip);
cmakeArgsText = new Text(cmakeGroup, SWT.BORDER); cmakeArgsText = new Text(cmakeGroup, SWT.BORDER);
cmakeArgsText.setToolTipText(Messages.CMakeBuildTab_cmakeArgsTooltip);
cmakeArgsText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); cmakeArgsText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
cmakeArgsText.addModifyListener(e -> updateLaunchConfigurationDialog()); cmakeArgsText.addModifyListener(e -> updateLaunchConfigurationDialog());
buildCommandLabel = new Label(cmakeGroup, SWT.NONE); buildCommandLabel = new Label(cmakeGroup, SWT.NONE);
buildCommandLabel.setText(Messages.CMakeBuildTab_BuildCommand); buildCommandLabel.setText(Messages.CMakeBuildTab_BuildCommand);
buildCommandLabel.setToolTipText(Messages.CMakeBuildTab_buildCommandTooltip);
buildCommandText = new Text(cmakeGroup, SWT.BORDER); buildCommandText = new Text(cmakeGroup, SWT.BORDER);
buildCommandText.setToolTipText(Messages.CMakeBuildTab_buildCommandTooltip);
buildCommandText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); buildCommandText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
buildCommandText.addModifyListener(e -> updateLaunchConfigurationDialog()); buildCommandText.addModifyListener(e -> updateLaunchConfigurationDialog());
allTargetLabel = new Label(cmakeGroup, SWT.NONE); allTargetLabel = new Label(cmakeGroup, SWT.NONE);
allTargetLabel.setText(Messages.CMakeBuildTab_AllTarget); allTargetLabel.setText(Messages.CMakeBuildTab_AllTarget);
allTargetLabel.setToolTipText(Messages.CMakeBuildTab_allTargetTooltip);
allTargetText = new Text(cmakeGroup, SWT.BORDER); allTargetText = new Text(cmakeGroup, SWT.BORDER);
allTargetText.setToolTipText(Messages.CMakeBuildTab_allTargetTooltip);
allTargetText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); allTargetText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
allTargetText.addModifyListener(e -> updateLaunchConfigurationDialog()); allTargetText.addModifyListener(e -> updateLaunchConfigurationDialog());
cleanTargetLabel = new Label(cmakeGroup, SWT.NONE); cleanTargetLabel = new Label(cmakeGroup, SWT.NONE);
cleanTargetLabel.setText(Messages.CMakeBuildTab_CleanTarget); cleanTargetLabel.setText(Messages.CMakeBuildTab_CleanTarget);
cleanTargetLabel.setToolTipText(Messages.CMakeBuildTab_cleanTargetTooltip);
cleanTargetText = new Text(cmakeGroup, SWT.BORDER); cleanTargetText = new Text(cmakeGroup, SWT.BORDER);
cleanTargetText.setToolTipText(Messages.CMakeBuildTab_cleanTargetTooltip);
cleanTargetText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); cleanTargetText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
cleanTargetText.addModifyListener(e -> updateLaunchConfigurationDialog()); cleanTargetText.addModifyListener(e -> updateLaunchConfigurationDialog());

6
cmake/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/Messages.java
View file

@ -19,10 +19,16 @@ public class Messages extends NLS {
public static String CMakeBuildTab_BuildType_Tooltip; public static String CMakeBuildTab_BuildType_Tooltip;
public static String CMakeBuildTab_BuildTypeCombo_Tooltip; public static String CMakeBuildTab_BuildTypeCombo_Tooltip;
public static String CMakeBuildTab_AllTarget; public static String CMakeBuildTab_AllTarget;
public static String CMakeBuildTab_allTargetTooltip;
public static String CMakeBuildTab_buildCommandTooltip;
public static String CMakeBuildTab_CleanTarget; public static String CMakeBuildTab_CleanTarget;
public static String CMakeBuildTab_Cmake; public static String CMakeBuildTab_Cmake;
public static String CMakeBuildTab_CMakeArgs; public static String CMakeBuildTab_CMakeArgs;
public static String CMakeBuildTab_cleanTargetTooltip;
public static String CMakeBuildTab_cmakeArgsTooltip;
public static String CMakeBuildTab_Generator; public static String CMakeBuildTab_Generator;
public static String CMakeBuildTab_GeneratorComboTooltip;
public static String CMakeBuildTab_GeneratorTooltip;
public static String CMakeBuildTab_NoneAvailable; public static String CMakeBuildTab_NoneAvailable;
public static String CMakeBuildTab_Settings; public static String CMakeBuildTab_Settings;
public static String CMakeBuildTab_Toolchain; public static String CMakeBuildTab_Toolchain;

18
cmake/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/messages.properties
View file

@ -1,12 +1,18 @@
CMakeBuildTab_BuildCommand=Build command CMakeBuildTab_BuildCommand=Build command:
CMakeBuildTab_BuildType=Build type: CMakeBuildTab_BuildType=Build type:
CMakeBuildTab_BuildType_Tooltip=The build type (CMAKE_BUILD_TYPE) used by the generator. CMakeBuildTab_BuildType_Tooltip=The build type (CMAKE_BUILD_TYPE) used by the generator
CMakeBuildTab_BuildTypeCombo_Tooltip=Typical build types (CMAKE_BUILD_TYPE) are listed. A custom build type can be entered. CMakeBuildTab_BuildTypeCombo_Tooltip=Typical build types (CMAKE_BUILD_TYPE) are listed. A custom build type can be entered
CMakeBuildTab_AllTarget=Build all target CMakeBuildTab_AllTarget=Build target:
CMakeBuildTab_CleanTarget=Clean target CMakeBuildTab_allTargetTooltip=Target to pass to --target CMake command line option, when user performs a project build
CMakeBuildTab_buildCommandTooltip=The CMake executable to use. Maybe an absolute path to use a specific version
CMakeBuildTab_CleanTarget=Clean target:
CMakeBuildTab_cleanTargetTooltip=Target to pass to --target CMake command line option, when user performs a project clean
CMakeBuildTab_cmakeArgsTooltip=-D <var>=<value> defines the value of a cache variable. Space separate multiple values
CMakeBuildTab_Cmake=CMake CMakeBuildTab_Cmake=CMake
CMakeBuildTab_CMakeArgs=Additional CMake arguments: CMakeBuildTab_CMakeArgs=Additional CMake arguments:
CMakeBuildTab_Generator=Generator CMakeBuildTab_Generator=Generator:
CMakeBuildTab_GeneratorComboTooltip=The kind of buildsystem to generate (-G). A custom generator can be entered
CMakeBuildTab_GeneratorTooltip=The kind of buildsystem to generate (-G)
CMakeBuildTab_NoneAvailable=No Toolchains Available for this Target CMakeBuildTab_NoneAvailable=No Toolchains Available for this Target
CMakeBuildTab_Settings=CMake Settings CMakeBuildTab_Settings=CMake Settings
CMakeBuildTab_Toolchain=Toolchain CMakeBuildTab_Toolchain=Toolchain