mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-28 19:35:36 +02:00
Code Issues Wiki Activity

applied patch fro Thomasf

Browse source 
- Add Edit buttons for changing the symbol and include paths
  values. 
- Adjusted to use MakeUIPlugin properties instead of CUIPlugin
  properties.
This commit is contained in:
David Inglis 2003-10-27 19:06:42 +00:00
parent de44b4c4a2
commit e7b658fd5f
2 changed files with 52 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeResources.properties
View file

@ -54,12 +54,15 @@ BuildPathInfoBlock.label=Paths and Symbols
BuildPathInfoBlock.paths=Include paths: BuildPathInfoBlock.paths=Include paths:
BuildPathInfoBlock.symbols=Defined symbols: BuildPathInfoBlock.symbols=Defined symbols:
BuildPathInfoBlock.browse.path=New Include Path BuildPathInfoBlock.browse.path=New Include Path
BuildPathInfoBlock.browse.path.edit=Edit Include Path
BuildPathInfoBlock.browse.path.label=Path: BuildPathInfoBlock.browse.path.label=Path:
BuildPathInfoBlock.browse.symbol=New Defined Symbol BuildPathInfoBlock.browse.symbol=New Defined Symbol
BuildPathInfoBlock.browse.symbol.edit=Edit Defined Symbol
BuildPathInfoBlock.browse.symbol.label=Symbol: BuildPathInfoBlock.browse.symbol.label=Symbol:
BuildPropertyCommon.label.title=Enter Value BuildPropertyCommon.label.title=Enter Value
BuildPropertyCommon.label.new=New... BuildPropertyCommon.label.new=New...
BuildPropertyCommon.label.edit=Edit...
BuildPropertyCommon.label.remove=Remove BuildPropertyCommon.label.remove=Remove
BuildPropertyCommon.label.up=Move Up BuildPropertyCommon.label.up=Move Up
BuildPropertyCommon.label.down=Move Down BuildPropertyCommon.label.down=Move Down

67
build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/BuildPathInfoBlock.java
View file

@ -18,8 +18,8 @@ import org.eclipse.cdt.internal.ui.util.SWTUtil;
import org.eclipse.cdt.make.core.MakeCorePlugin; import org.eclipse.cdt.make.core.MakeCorePlugin;
import org.eclipse.cdt.make.core.MakeScannerInfo; import org.eclipse.cdt.make.core.MakeScannerInfo;
import org.eclipse.cdt.make.core.MakeScannerProvider; import org.eclipse.cdt.make.core.MakeScannerProvider;
import org.eclipse.cdt.make.internal.ui.MakeUIPlugin;
import org.eclipse.cdt.make.ui.IMakeHelpContextIds; import org.eclipse.cdt.make.ui.IMakeHelpContextIds;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.dialogs.AbstractCOptionPage; import org.eclipse.cdt.ui.dialogs.AbstractCOptionPage;
import org.eclipse.cdt.utils.ui.controls.ControlFactory; import org.eclipse.cdt.utils.ui.controls.ControlFactory;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
@ -51,10 +51,13 @@ public class BuildPathInfoBlock extends AbstractCOptionPage {
private static final String SYMBOLS = PREFIX + ".symbols"; //$NON-NLS-1$ private static final String SYMBOLS = PREFIX + ".symbols"; //$NON-NLS-1$
private static final String BROWSE = PREFIX + ".browse"; //$NON-NLS-1$ private static final String BROWSE = PREFIX + ".browse"; //$NON-NLS-1$
private static final String PATH_TITLE = BROWSE + ".path"; //$NON-NLS-1$ private static final String PATH_TITLE = BROWSE + ".path"; //$NON-NLS-1$
private static final String EDIT_PATH_TITLE = BROWSE + ".path.edit"; //$NON-NLS-1$
private static final String PATH_LABEL = BROWSE + ".path.label"; //$NON-NLS-1$ private static final String PATH_LABEL = BROWSE + ".path.label"; //$NON-NLS-1$
private static final String SYMBOL_TITLE = BROWSE + ".symbol"; //$NON-NLS-1$ private static final String SYMBOL_TITLE = BROWSE + ".symbol"; //$NON-NLS-1$
private static final String EDIT_SYMBOL_TITLE = BROWSE + ".symbol.edit"; //$NON-NLS-1$
private static final String SYMBOL_LABEL = BROWSE + ".symbol.label"; //$NON-NLS-1$ private static final String SYMBOL_LABEL = BROWSE + ".symbol.label"; //$NON-NLS-1$
private static final String NEW = "BuildPropertyCommon.label.new"; //$NON-NLS-1$ private static final String NEW = "BuildPropertyCommon.label.new"; //$NON-NLS-1$
private static final String EDIT = "BuildPropertyCommon.label.edit"; //$NON-NLS-1$
private static final String REMOVE = "BuildPropertyCommon.label.remove"; //$NON-NLS-1$ private static final String REMOVE = "BuildPropertyCommon.label.remove"; //$NON-NLS-1$
private static final String UP = "BuildPropertyCommon.label.up"; //$NON-NLS-1$ private static final String UP = "BuildPropertyCommon.label.up"; //$NON-NLS-1$
private static final String DOWN = "BuildPropertyCommon.label.down"; //$NON-NLS-1$ private static final String DOWN = "BuildPropertyCommon.label.down"; //$NON-NLS-1$
@ -63,18 +66,20 @@ public class BuildPathInfoBlock extends AbstractCOptionPage {
private List symbolList; private List symbolList;
private Composite pathButtonComp; private Composite pathButtonComp;
private Button addPath; private Button addPath;
private Button editPath;
private Button removePath; private Button removePath;
private Button pathUp; private Button pathUp;
private Button pathDown; private Button pathDown;
private Composite symbolButtonComp; private Composite symbolButtonComp;
private Button addSymbol; private Button addSymbol;
private Button editSymbol;
private Button removeSymbol; private Button removeSymbol;
private Button symbolUp; private Button symbolUp;
private Button symbolDown; private Button symbolDown;
private Shell shell; private Shell shell;
public BuildPathInfoBlock() { public BuildPathInfoBlock() {
super(CUIPlugin.getResourceString(LABEL)); super(MakeUIPlugin.getResourceString(LABEL));
setDescription("Set the include paths and preprocessor symbols for this project"); setDescription("Set the include paths and preprocessor symbols for this project");
} }
@ -84,7 +89,7 @@ public class BuildPathInfoBlock extends AbstractCOptionPage {
pathButtonComp.setFont(parent.getFont()); pathButtonComp.setFont(parent.getFont());
// Add the buttons // Add the buttons
addPath = ControlFactory.createPushButton(pathButtonComp, CUIPlugin.getResourceString(NEW)); addPath = ControlFactory.createPushButton(pathButtonComp, MakeUIPlugin.getResourceString(NEW));
addPath.addSelectionListener(new SelectionAdapter() { addPath.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) { public void widgetSelected(SelectionEvent e) {
handleAddPath(); handleAddPath();
@ -95,7 +100,18 @@ public class BuildPathInfoBlock extends AbstractCOptionPage {
addPath.setLayoutData(new GridData()); addPath.setLayoutData(new GridData());
SWTUtil.setButtonDimensionHint(addPath); SWTUtil.setButtonDimensionHint(addPath);
removePath = ControlFactory.createPushButton(pathButtonComp, CUIPlugin.getResourceString(REMOVE)); editPath = ControlFactory.createPushButton(pathButtonComp, MakeUIPlugin.getResourceString(EDIT));
editPath.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
editPathListItem();
}
});
editPath.setEnabled(true);
editPath.setFont(parent.getFont());
editPath.setLayoutData(new GridData());
SWTUtil.setButtonDimensionHint(editPath);
removePath = ControlFactory.createPushButton(pathButtonComp, MakeUIPlugin.getResourceString(REMOVE));
removePath.addSelectionListener(new SelectionAdapter() { removePath.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) { public void widgetSelected(SelectionEvent e) {
handleRemovePath(); handleRemovePath();
@ -105,7 +121,7 @@ public class BuildPathInfoBlock extends AbstractCOptionPage {
removePath.setLayoutData(new GridData()); removePath.setLayoutData(new GridData());
SWTUtil.setButtonDimensionHint(removePath); SWTUtil.setButtonDimensionHint(removePath);
pathUp = ControlFactory.createPushButton(pathButtonComp, CUIPlugin.getResourceString(UP)); pathUp = ControlFactory.createPushButton(pathButtonComp, MakeUIPlugin.getResourceString(UP));
pathUp.addSelectionListener(new SelectionAdapter() { pathUp.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) { public void widgetSelected(SelectionEvent e) {
handlePathUp(); handlePathUp();
@ -115,7 +131,7 @@ public class BuildPathInfoBlock extends AbstractCOptionPage {
pathUp.setLayoutData(new GridData()); pathUp.setLayoutData(new GridData());
SWTUtil.setButtonDimensionHint(pathUp); SWTUtil.setButtonDimensionHint(pathUp);
pathDown = ControlFactory.createPushButton(pathButtonComp, CUIPlugin.getResourceString(DOWN)); pathDown = ControlFactory.createPushButton(pathButtonComp, MakeUIPlugin.getResourceString(DOWN));
pathDown.addSelectionListener(new SelectionAdapter() { pathDown.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) { public void widgetSelected(SelectionEvent e) {
handlePathDown(); handlePathDown();
@ -154,7 +170,7 @@ public class BuildPathInfoBlock extends AbstractCOptionPage {
symbolButtonComp.setFont(parent.getFont()); symbolButtonComp.setFont(parent.getFont());
// Add the buttons // Add the buttons
addSymbol = ControlFactory.createPushButton(symbolButtonComp, CUIPlugin.getResourceString(NEW)); addSymbol = ControlFactory.createPushButton(symbolButtonComp, MakeUIPlugin.getResourceString(NEW));
addSymbol.addSelectionListener(new SelectionAdapter() { addSymbol.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) { public void widgetSelected(SelectionEvent e) {
handleAddSymbol(); handleAddSymbol();
@ -165,7 +181,18 @@ public class BuildPathInfoBlock extends AbstractCOptionPage {
addSymbol.setLayoutData(new GridData()); addSymbol.setLayoutData(new GridData());
SWTUtil.setButtonDimensionHint(addSymbol); SWTUtil.setButtonDimensionHint(addSymbol);
removeSymbol = ControlFactory.createPushButton(symbolButtonComp, CUIPlugin.getResourceString(REMOVE)); editSymbol = ControlFactory.createPushButton(symbolButtonComp, MakeUIPlugin.getResourceString(EDIT));
editSymbol.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
editSymbolListItem();
}
});
editSymbol.setEnabled(true);
editSymbol.setFont(parent.getFont());
editSymbol.setLayoutData(new GridData());
SWTUtil.setButtonDimensionHint(editSymbol);
removeSymbol = ControlFactory.createPushButton(symbolButtonComp, MakeUIPlugin.getResourceString(REMOVE));
removeSymbol.addSelectionListener(new SelectionAdapter() { removeSymbol.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) { public void widgetSelected(SelectionEvent e) {
handleRemoveSymbol(); handleRemoveSymbol();
@ -175,7 +202,7 @@ public class BuildPathInfoBlock extends AbstractCOptionPage {
removeSymbol.setLayoutData(new GridData()); removeSymbol.setLayoutData(new GridData());
SWTUtil.setButtonDimensionHint(removeSymbol); SWTUtil.setButtonDimensionHint(removeSymbol);
symbolUp = ControlFactory.createPushButton(symbolButtonComp, CUIPlugin.getResourceString(UP)); symbolUp = ControlFactory.createPushButton(symbolButtonComp, MakeUIPlugin.getResourceString(UP));
symbolUp.addSelectionListener(new SelectionAdapter() { symbolUp.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) { public void widgetSelected(SelectionEvent e) {
handleSymbolUp(); handleSymbolUp();
@ -185,7 +212,7 @@ public class BuildPathInfoBlock extends AbstractCOptionPage {
symbolUp.setLayoutData(new GridData()); symbolUp.setLayoutData(new GridData());
SWTUtil.setButtonDimensionHint(symbolUp); SWTUtil.setButtonDimensionHint(symbolUp);
symbolDown = ControlFactory.createPushButton(symbolButtonComp, CUIPlugin.getResourceString(DOWN)); symbolDown = ControlFactory.createPushButton(symbolButtonComp, MakeUIPlugin.getResourceString(DOWN));
symbolDown.addSelectionListener(new SelectionAdapter() { symbolDown.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) { public void widgetSelected(SelectionEvent e) {
handleSymbolDown(); handleSymbolDown();
@ -301,8 +328,8 @@ public class BuildPathInfoBlock extends AbstractCOptionPage {
InputDialog dialog = InputDialog dialog =
new InputDialog( new InputDialog(
shell, shell,
CUIPlugin.getResourceString(PATH_TITLE), MakeUIPlugin.getResourceString(EDIT_PATH_TITLE),
CUIPlugin.getResourceString(PATH_LABEL), MakeUIPlugin.getResourceString(PATH_LABEL),
selItem, selItem,
null); null);
String newItem = null; String newItem = null;
@ -328,8 +355,8 @@ public class BuildPathInfoBlock extends AbstractCOptionPage {
InputDialog dialog = InputDialog dialog =
new InputDialog( new InputDialog(
shell, shell,
CUIPlugin.getResourceString(SYMBOL_TITLE), MakeUIPlugin.getResourceString(EDIT_SYMBOL_TITLE),
CUIPlugin.getResourceString(SYMBOL_LABEL), MakeUIPlugin.getResourceString(SYMBOL_LABEL),
selItem, selItem,
null); null);
String newItem = null; String newItem = null;
@ -350,12 +377,14 @@ public class BuildPathInfoBlock extends AbstractCOptionPage {
// Enable the remove button if there is at least 1 item in the list // Enable the remove button if there is at least 1 item in the list
int items = pathList.getItemCount(); int items = pathList.getItemCount();
if (items > 0) { if (items > 0) {
editPath.setEnabled(true);
removePath.setEnabled(true); removePath.setEnabled(true);
// Enable the up/down buttons depending on what item is selected // Enable the up/down buttons depending on what item is selected
int index = pathList.getSelectionIndex(); int index = pathList.getSelectionIndex();
pathUp.setEnabled(items > 1 && index > 0); pathUp.setEnabled(items > 1 && index > 0);
pathDown.setEnabled(items > 1 && index < (items - 1)); pathDown.setEnabled(items > 1 && index < (items - 1));
} else { } else {
editPath.setEnabled(false);
removePath.setEnabled(false); removePath.setEnabled(false);
pathUp.setEnabled(false); pathUp.setEnabled(false);
pathDown.setEnabled(false); pathDown.setEnabled(false);
@ -366,12 +395,14 @@ public class BuildPathInfoBlock extends AbstractCOptionPage {
// Enable the remove button if there is at least 1 item in the list // Enable the remove button if there is at least 1 item in the list
int items = symbolList.getItemCount(); int items = symbolList.getItemCount();
if (items > 0) { if (items > 0) {
editSymbol.setEnabled(true);
removeSymbol.setEnabled(true); removeSymbol.setEnabled(true);
// Enable the up/down buttons depending on what item is selected // Enable the up/down buttons depending on what item is selected
int index = symbolList.getSelectionIndex(); int index = symbolList.getSelectionIndex();
symbolUp.setEnabled(items > 1 && index > 0); symbolUp.setEnabled(items > 1 && index > 0);
symbolDown.setEnabled(items > 1 && index < (items - 1)); symbolDown.setEnabled(items > 1 && index < (items - 1));
} else { } else {
editSymbol.setEnabled(false);
removeSymbol.setEnabled(false); removeSymbol.setEnabled(false);
symbolUp.setEnabled(false); symbolUp.setEnabled(false);
symbolDown.setEnabled(false); symbolDown.setEnabled(false);
@ -393,7 +424,7 @@ public class BuildPathInfoBlock extends AbstractCOptionPage {
WorkbenchHelp.setHelp(getControl(), IMakeHelpContextIds.MAKE_PATH_SYMBOL_SETTINGS); WorkbenchHelp.setHelp(getControl(), IMakeHelpContextIds.MAKE_PATH_SYMBOL_SETTINGS);
// Create a label for the include paths control // Create a label for the include paths control
Label paths = ControlFactory.createLabel(composite, CUIPlugin.getResourceString(PATHS)); Label paths = ControlFactory.createLabel(composite, MakeUIPlugin.getResourceString(PATHS));
gd = new GridData(GridData.FILL_HORIZONTAL); gd = new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalSpan = tabColumns; gd.horizontalSpan = tabColumns;
paths.setLayoutData(gd); paths.setLayoutData(gd);
@ -405,7 +436,7 @@ public class BuildPathInfoBlock extends AbstractCOptionPage {
enablePathButtons(); enablePathButtons();
// Create a label for the symbols control // Create a label for the symbols control
Label symbols = ControlFactory.createLabel(composite, CUIPlugin.getResourceString(SYMBOLS)); Label symbols = ControlFactory.createLabel(composite, MakeUIPlugin.getResourceString(SYMBOLS));
gd = new GridData(GridData.FILL_HORIZONTAL); gd = new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalSpan = tabColumns; gd.horizontalSpan = tabColumns;
symbols.setLayoutData(gd); symbols.setLayoutData(gd);
@ -434,7 +465,7 @@ public class BuildPathInfoBlock extends AbstractCOptionPage {
protected void handleAddPath() { protected void handleAddPath() {
// Popup an entry dialog // Popup an entry dialog
InputDialog dialog = InputDialog dialog =
new InputDialog(shell, CUIPlugin.getResourceString(PATH_TITLE), CUIPlugin.getResourceString(PATH_LABEL), "", null); //$NON-NLS-1$ new InputDialog(shell, MakeUIPlugin.getResourceString(PATH_TITLE), MakeUIPlugin.getResourceString(PATH_LABEL), "", null); //$NON-NLS-1$
String path = null; String path = null;
if (dialog.open() == InputDialog.OK) { if (dialog.open() == InputDialog.OK) {
path = dialog.getValue(); path = dialog.getValue();
@ -449,7 +480,7 @@ public class BuildPathInfoBlock extends AbstractCOptionPage {
protected void handleAddSymbol() { protected void handleAddSymbol() {
// Popup an entry dialog // Popup an entry dialog
InputDialog dialog = InputDialog dialog =
new InputDialog(shell, CUIPlugin.getResourceString(SYMBOL_TITLE), CUIPlugin.getResourceString(SYMBOL_LABEL), "", null); //$NON-NLS-1$ new InputDialog(shell, MakeUIPlugin.getResourceString(SYMBOL_TITLE), MakeUIPlugin.getResourceString(SYMBOL_LABEL), "", null); //$NON-NLS-1$
String symbol = null; String symbol = null;
if (dialog.open() == InputDialog.OK) { if (dialog.open() == InputDialog.OK) {
symbol = dialog.getValue(); symbol = dialog.getValue();