mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 14:42:11 +02:00
Code Issues Wiki Activity

Minor improvements: 1. Make expression-based input appear before memory-space based one 2. Remember which input type was selected last and make that the default when opening the dialog 3. Automatically give focus to the appropriate text input widget.

Browse source
This commit is contained in:
John Cortell 2008-03-26 11:49:42 +00:00
parent 7a7592a044
commit 212e5595fb
1 changed files with 39 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/AddMemoryBlockDialog.java
View file

@ -60,6 +60,8 @@ public class AddMemoryBlockDialog extends TrayDialog implements ModifyListener,
private static List<String> sAddressHistory = new ArrayList<String>();
private static List<String> sExpressionHistory = new ArrayList<String>();
private static boolean sDefaultToExpression = true;
public AddMemoryBlockDialog(Shell parentShell,
IMemoryBlockRetrieval memRetrieval) {
@ -97,8 +99,21 @@ public class AddMemoryBlockDialog extends TrayDialog implements ModifyListener,
composite.setLayoutData(gridData);
parent = composite; // for all our widgets, the two-column composite is the real parent
fExpressionRadio = new Button(parent, SWT.RADIO);
final int radioButtonWidth = fExpressionRadio.computeSize(SWT.DEFAULT, SWT.DEFAULT).x;
fExpressionRadio.setText(Messages.AddMemBlockDlg_enterExpression);
gridData = new GridData();
gridData.horizontalSpan = 2;
fExpressionRadio.setLayoutData(gridData);
fExpressionRadio.addSelectionListener(this);
fExpressionInput = new Combo(parent, SWT.BORDER);
gridData = new GridData(GridData.FILL_HORIZONTAL);
gridData.horizontalSpan = 2;
gridData.horizontalIndent = radioButtonWidth;
fExpressionInput.setLayoutData(gridData);
fAddressRadio = new Button(parent, SWT.RADIO);
final int radioButtonWidth = fAddressRadio.computeSize(SWT.DEFAULT, SWT.DEFAULT).x;
fAddressRadio.setText(Messages.AddMemBlockDlg_enterAddrAndMemSpace);
gridData = new GridData(GridData.FILL_HORIZONTAL);
gridData.horizontalSpan = 2;
@ -142,19 +157,6 @@ public class AddMemoryBlockDialog extends TrayDialog implements ModifyListener,
fMemorySpaceInput.select(0);
}
fExpressionRadio = new Button(parent, SWT.RADIO);
fExpressionRadio.setText(Messages.AddMemBlockDlg_enterExpression);
gridData = new GridData();
gridData.horizontalSpan = 2;
fExpressionRadio.setLayoutData(gridData);
fExpressionRadio.addSelectionListener(this);
fExpressionInput = new Combo(parent, SWT.BORDER);
gridData = new GridData(GridData.FILL_HORIZONTAL);
gridData.horizontalSpan = 2;
gridData.horizontalIndent = radioButtonWidth;
fExpressionInput.setLayoutData(gridData);
// add the history into the combo boxes
String[] history = getHistory(sExpressionHistory);
for (int i = 0; i < history.length; i++)
@ -166,6 +168,17 @@ public class AddMemoryBlockDialog extends TrayDialog implements ModifyListener,
fExpressionInput.addModifyListener(this);
if (sDefaultToExpression) {
fExpressionRadio.setSelection(true);
fAddressRadio.setSelection(false);
fExpressionInput.setFocus();
}
else {
fAddressRadio.setSelection(false);
fAddressRadio.setSelection(true);
fAddressInput.setFocus();
}
return parent;
}
@ -210,6 +223,7 @@ public class AddMemoryBlockDialog extends TrayDialog implements ModifyListener,
fAddressRadio.setSelection(e.widget != fExpressionInput);
fExpressionRadio.setSelection(e.widget == fExpressionInput);
sDefaultToExpression = (e.widget == fExpressionInput);
}
}
@ -263,9 +277,17 @@ public class AddMemoryBlockDialog extends TrayDialog implements ModifyListener,
public void widgetSelected(SelectionEvent e) {
// if user selects a memory space, select its associated radio button (and deselect the
// other, these are mutually exclusive)
if (e.widget == fMemorySpaceInput) {
fAddressRadio.setSelection(true);
fExpressionRadio.setSelection(false);
if (e.widget == fExpressionRadio) {
fExpressionRadio.setSelection(true);
fAddressRadio.setSelection(false);
fExpressionInput.setFocus();
}
else {
fAddressRadio.setSelection(false);
fAddressRadio.setSelection(true);
fAddressInput.setFocus();
}
sDefaultToExpression = (e.widget == fExpressionInput);
}
}