mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Patch from Chris Wiebe to clean out the layout.

Browse source
This commit is contained in:
Alain Magloire 2004-04-07 16:22:31 +00:00
parent 0e140bfac8
commit ba4d459a95
2 changed files with 40 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/org.eclipse.cdt.ui/ChangeLog
View file

@ -1,3 +1,9 @@
2004-04-05 Alain Magloire
From Chris Wiebe
This patch cleans up the layout of the checkboxes on the Open Type dialog.
* browser/org/eclipse/cdt/ui/browser/typeinfo/TypeSelectionDialog.java
2004-04-06 Alain Magloire 2004-04-06 Alain Magloire
This patch provides some improvements to the Open Type action, such as This patch provides some improvements to the Open Type action, such as

50
core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeSelectionDialog.java
View file

@ -29,10 +29,11 @@ import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.layout.RowLayout; import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.dialogs.FilteredList; import org.eclipse.ui.dialogs.FilteredList;
@ -293,7 +294,7 @@ public class TypeSelectionDialog extends TwoPaneElementSelector {
/** /**
* Creates a type filter checkbox. * Creates a type filter checkbox.
*/ */
private Button createTypeCheckbox(Composite parent, Integer typeObject) { private void createTypeCheckbox(Composite parent, Integer typeObject) {
String name; String name;
int type = typeObject.intValue(); int type = typeObject.intValue();
switch (type) { switch (type) {
@ -316,14 +317,18 @@ public class TypeSelectionDialog extends TwoPaneElementSelector {
name = TypeInfoMessages.getString("TypeSelectionDialog.filterUnions"); //$NON-NLS-1$ name = TypeInfoMessages.getString("TypeSelectionDialog.filterUnions"); //$NON-NLS-1$
break; break;
default: default:
return null; return;
}; };
Image icon = TypeInfoLabelProvider.getTypeIcon(type); Image icon = TypeInfoLabelProvider.getTypeIcon(type);
Composite composite = new Composite(parent, SWT.NONE);
GridLayout layout= new GridLayout(2, false);
layout.marginHeight = 0;
composite.setLayout(layout);
final Integer fTypeObject = typeObject; final Integer fTypeObject = typeObject;
Button checkbox = new Button(parent, SWT.CHECK); Button checkbox = new Button(composite, SWT.CHECK);
checkbox.setFont(parent.getFont()); checkbox.setFont(composite.getFont());
checkbox.setText(name);
checkbox.setImage(icon); checkbox.setImage(icon);
checkbox.setSelection(fFilterMatcher.getVisibleTypes().contains(fTypeObject)); checkbox.setSelection(fFilterMatcher.getVisibleTypes().contains(fTypeObject));
checkbox.addSelectionListener(new SelectionAdapter() { checkbox.addSelectionListener(new SelectionAdapter() {
@ -338,7 +343,10 @@ public class TypeSelectionDialog extends TwoPaneElementSelector {
} }
} }
}); });
return checkbox;
Label label = new Label(composite, SWT.LEFT);
label.setFont(composite.getFont());
label.setText(name);
} }
/** /**
@ -350,11 +358,11 @@ public class TypeSelectionDialog extends TwoPaneElementSelector {
createLabel(parent, TypeInfoMessages.getString("TypeSelectionDialog.filterLabel")); //$NON-NLS-1$ createLabel(parent, TypeInfoMessages.getString("TypeSelectionDialog.filterLabel")); //$NON-NLS-1$
Composite upperRow = new Composite(parent, SWT.NONE); Composite upperRow = new Composite(parent, SWT.NONE);
RowLayout layout = new RowLayout(); GridLayout upperLayout = new GridLayout(3, true);
layout.spacing = 10; upperLayout.verticalSpacing = 2;
layout.marginTop = 0; upperLayout.marginHeight = 0;
layout.marginLeft = 0; upperLayout.marginWidth = 0;
upperRow.setLayout(layout); upperRow.setLayout(upperLayout);
// the for loop is here to guarantee we always // the for loop is here to guarantee we always
// create the checkboxes in the same order // create the checkboxes in the same order
@ -363,13 +371,23 @@ public class TypeSelectionDialog extends TwoPaneElementSelector {
if (fKnownTypes.contains(typeObject)) if (fKnownTypes.contains(typeObject))
createTypeCheckbox(upperRow, typeObject); createTypeCheckbox(upperRow, typeObject);
} }
Composite lowerRow = new Composite(parent, SWT.NONE); Composite lowerRow = new Composite(parent, SWT.NONE);
lowerRow.setLayout(layout); GridLayout lowerLayout = new GridLayout(1, true);
lowerLayout.verticalSpacing = 2;
lowerLayout.marginHeight = 0;
upperLayout.marginWidth = 0;
lowerRow.setLayout(lowerLayout);
Composite composite = new Composite(lowerRow, SWT.NONE);
GridLayout layout= new GridLayout(2, false);
layout.marginHeight = 0;
layout.marginWidth = 0;
composite.setLayout(layout);
String name = TypeInfoMessages.getString("TypeSelectionDialog.filterLowLevelTypes"); //$NON-NLS-1$ String name = TypeInfoMessages.getString("TypeSelectionDialog.filterLowLevelTypes"); //$NON-NLS-1$
Button checkbox = new Button(lowerRow, SWT.CHECK); Button checkbox = new Button(composite, SWT.CHECK);
checkbox.setFont(lowerRow.getFont()); checkbox.setFont(composite.getFont());
checkbox.setText(name); checkbox.setText(name);
checkbox.setSelection(fFilterMatcher.getShowLowLevelTypes()); checkbox.setSelection(fFilterMatcher.getShowLowLevelTypes());
checkbox.addSelectionListener(new SelectionAdapter() { checkbox.addSelectionListener(new SelectionAdapter() {