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

Methods for controlling grabExcessHorisontalSpace and grapExcessVerticalSpace grid layout attributes.

Browse source
This commit is contained in:
Sergey Prigogin 2011-05-08 22:23:40 +00:00
parent dbf3690c8b
commit 46ac14620b
25 changed files with 56 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/DiscoveredPathContainerPage.java
View file

@ -380,7 +380,7 @@ public class DiscoveredPathContainerPage extends WizardPage implements IPathEntr
Composite composite = new Composite(parent, SWT.NONE); Composite composite = new Composite(parent, SWT.NONE);
LayoutUtil.doDefaultLayout(composite, new DialogField[] { fDiscoveredContainerList }, true); LayoutUtil.doDefaultLayout(composite, new DialogField[] { fDiscoveredContainerList }, true);
LayoutUtil.setHorizontalGrabbing(fDiscoveredContainerList.getTreeControl(null)); LayoutUtil.setHorizontalGrabbing(fDiscoveredContainerList.getTreeControl(null), true);
int buttonBarWidth = converter.convertWidthInCharsToPixels(24); int buttonBarWidth = converter.convertWidthInCharsToPixels(24);
fDiscoveredContainerList.setButtonsMinWidth(buttonBarWidth); fDiscoveredContainerList.setButtonsMinWidth(buttonBarWidth);

2
codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/dialogs/ExclusionInclusionEntryDialog.java
View file

@ -130,7 +130,7 @@ public class ExclusionInclusionEntryDialog extends StatusDialog {
LayoutUtil.setWidthHint(fExclusionPatternDialog.getLabelControl(null), widthHint); LayoutUtil.setWidthHint(fExclusionPatternDialog.getLabelControl(null), widthHint);
LayoutUtil.setHorizontalSpan(fExclusionPatternDialog.getLabelControl(null), 2); LayoutUtil.setHorizontalSpan(fExclusionPatternDialog.getLabelControl(null), 2);
LayoutUtil.setWidthHint(fExclusionPatternDialog.getTextControl(null), widthHint); LayoutUtil.setWidthHint(fExclusionPatternDialog.getTextControl(null), widthHint);
LayoutUtil.setHorizontalGrabbing(fExclusionPatternDialog.getTextControl(null)); LayoutUtil.setHorizontalGrabbing(fExclusionPatternDialog.getTextControl(null), true);
fExclusionPatternDialog.postSetFocusOnDialogField(parent.getDisplay()); fExclusionPatternDialog.postSetFocusOnDialogField(parent.getDisplay());
applyDialogFont(composite); applyDialogFont(composite);
return composite; return composite;

4
codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/FileScopePreferencePage.java
View file

@ -96,10 +96,10 @@ public class FileScopePreferencePage extends PreferencePage {
inner.setLayoutData(new GridData(GridData.FILL_BOTH)); inner.setLayoutData(new GridData(GridData.FILL_BOTH));
fInclusionPatternList.doFillIntoGrid(inner, 3); fInclusionPatternList.doFillIntoGrid(inner, 3);
LayoutUtil.setHorizontalSpan(fInclusionPatternList.getLabelControl(null), 2); LayoutUtil.setHorizontalSpan(fInclusionPatternList.getLabelControl(null), 2);
LayoutUtil.setHorizontalGrabbing(fInclusionPatternList.getListControl(null)); LayoutUtil.setHorizontalGrabbing(fInclusionPatternList.getListControl(null), true);
fExclusionPatternList.doFillIntoGrid(inner, 3); fExclusionPatternList.doFillIntoGrid(inner, 3);
LayoutUtil.setHorizontalSpan(fExclusionPatternList.getLabelControl(null), 2); LayoutUtil.setHorizontalSpan(fExclusionPatternList.getLabelControl(null), 2);
LayoutUtil.setHorizontalGrabbing(fExclusionPatternList.getListControl(null)); LayoutUtil.setHorizontalGrabbing(fExclusionPatternList.getListControl(null), true);
setControl(inner); setControl(inner);
Dialog.applyDialogFont(inner); Dialog.applyDialogFont(inner);
return inner; return inner;

6
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryListAction.java
View file

@ -40,7 +40,6 @@ import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField;
public class CHHistoryListAction extends Action { public class CHHistoryListAction extends Action {
private class HistoryListDialog extends StatusDialog { private class HistoryListDialog extends StatusDialog {
private ListDialogField<ICElement> fHistoryList; private ListDialogField<ICElement> fHistoryList;
private IStatus fHistoryStatus; private IStatus fHistoryStatus;
private ICElement fResult; private ICElement fResult;
@ -82,7 +81,6 @@ public class CHHistoryListAction extends Action {
fHistoryList.selectElements(sel); fHistoryList.selectElements(sel);
} }
/* /*
* @see Dialog#createDialogArea(Composite) * @see Dialog#createDialogArea(Composite)
*/ */
@ -99,7 +97,7 @@ public class CHHistoryListAction extends Action {
LayoutUtil.doDefaultLayout(inner, new DialogField[] { fHistoryList }, true, 0, 0); LayoutUtil.doDefaultLayout(inner, new DialogField[] { fHistoryList }, true, 0, 0);
LayoutUtil.setHeightHint(fHistoryList.getListControl(null), convertHeightInCharsToPixels(12)); LayoutUtil.setHeightHint(fHistoryList.getListControl(null), convertHeightInCharsToPixels(12));
LayoutUtil.setHorizontalGrabbing(fHistoryList.getListControl(null)); LayoutUtil.setHorizontalGrabbing(fHistoryList.getListControl(null), true);
applyDialogFont(composite); applyDialogFont(composite);
return composite; return composite;
@ -118,7 +116,6 @@ public class CHHistoryListAction extends Action {
} }
} }
private void doSelectionChanged() { private void doSelectionChanged() {
StatusInfo status= new StatusInfo(); StatusInfo status= new StatusInfo();
List<ICElement> selected= fHistoryList.getSelectedElements(); List<ICElement> selected= fHistoryList.getSelectedElements();
@ -181,6 +178,5 @@ public class CHHistoryListAction extends Action {
fView.setInput(dialog.getResult()); fView.setInput(dialog.getResult());
} }
} }
} }

3
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDefaultPage.java
View file

@ -37,7 +37,6 @@ import org.eclipse.swt.widgets.Composite;
*/ */
@Deprecated @Deprecated
public class CPathContainerDefaultPage extends NewElementWizardPage implements IPathEntryContainerPage { public class CPathContainerDefaultPage extends NewElementWizardPage implements IPathEntryContainerPage {
private StringDialogField fEntryField; private StringDialogField fEntryField;
private ArrayList<IPath> fUsedPaths; private ArrayList<IPath> fUsedPaths;
@ -90,7 +89,7 @@ public class CPathContainerDefaultPage extends NewElementWizardPage implements I
composite.setLayout(layout); composite.setLayout(layout);
fEntryField.doFillIntoGrid(composite, 2); fEntryField.doFillIntoGrid(composite, 2);
LayoutUtil.setHorizontalGrabbing(fEntryField.getTextControl(null)); LayoutUtil.setHorizontalGrabbing(fEntryField.getTextControl(null), true);
fEntryField.setFocus(); fEntryField.setFocus();

3
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerEntryPage.java
View file

@ -47,7 +47,6 @@ import org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField;
*/ */
@Deprecated @Deprecated
public class CPathContainerEntryPage extends CPathBasePage { public class CPathContainerEntryPage extends CPathBasePage {
private ListDialogField<CPElement> fCPathList; private ListDialogField<CPElement> fCPathList;
private ICProject fCurrCProject; private ICProject fCurrCProject;
@ -115,7 +114,7 @@ public class CPathContainerEntryPage extends CPathBasePage {
Composite composite = new Composite(parent, SWT.NONE); Composite composite = new Composite(parent, SWT.NONE);
LayoutUtil.doDefaultLayout(composite, new DialogField[]{fContainersList}, true); LayoutUtil.doDefaultLayout(composite, new DialogField[]{fContainersList}, true);
LayoutUtil.setHorizontalGrabbing(fContainersList.getTreeControl(null)); LayoutUtil.setHorizontalGrabbing(fContainersList.getTreeControl(null), true);
int buttonBarWidth = converter.convertWidthInCharsToPixels(24); int buttonBarWidth = converter.convertWidthInCharsToPixels(24);
fContainersList.setButtonsMinWidth(buttonBarWidth); fContainersList.setButtonsMinWidth(buttonBarWidth);

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java
View file

@ -76,7 +76,6 @@ import org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField;
*/ */
@Deprecated @Deprecated
public class CPathIncludeSymbolEntryPage extends CPathIncludeSymbolEntryBasePage { public class CPathIncludeSymbolEntryPage extends CPathIncludeSymbolEntryBasePage {
private TreeListDialogField<CPElementGroup> fIncludeSymPathsList; private TreeListDialogField<CPElementGroup> fIncludeSymPathsList;
private SelectionButtonDialogField fShowInheritedPaths; private SelectionButtonDialogField fShowInheritedPaths;
private ICProject fCurrCProject; private ICProject fCurrCProject;
@ -115,7 +114,6 @@ public class CPathIncludeSymbolEntryPage extends CPathIncludeSymbolEntryBasePage
private CPElementGroup fTopGroup; private CPElementGroup fTopGroup;
private class IncludeSymbolAdapter implements IDialogFieldListener, ITreeListAdapter<CPElementGroup> { private class IncludeSymbolAdapter implements IDialogFieldListener, ITreeListAdapter<CPElementGroup> {
private final Object[] EMPTY_ARR = new Object[0]; private final Object[] EMPTY_ARR = new Object[0];
// -------- IListAdapter -------- // -------- IListAdapter --------
@ -210,7 +208,7 @@ public class CPathIncludeSymbolEntryPage extends CPathIncludeSymbolEntryBasePage
composite.setLayoutData(new GridData(GridData.FILL_BOTH)); composite.setLayoutData(new GridData(GridData.FILL_BOTH));
LayoutUtil.doDefaultLayout(composite, new DialogField[]{fIncludeSymPathsList, fShowInheritedPaths}, true); LayoutUtil.doDefaultLayout(composite, new DialogField[]{fIncludeSymPathsList, fShowInheritedPaths}, true);
LayoutUtil.setHorizontalGrabbing(fIncludeSymPathsList.getTreeControl(null)); LayoutUtil.setHorizontalGrabbing(fIncludeSymPathsList.getTreeControl(null), true);
int buttonBarWidth = converter.convertWidthInCharsToPixels(24); int buttonBarWidth = converter.convertWidthInCharsToPixels(24);
fIncludeSymPathsList.setButtonsMinWidth(buttonBarWidth); fIncludeSymPathsList.setButtonsMinWidth(buttonBarWidth);

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPerFilePage.java
View file

@ -257,7 +257,7 @@ public class CPathIncludeSymbolEntryPerFilePage extends CPathIncludeSymbolEntryB
composite.setLayoutData(new GridData(GridData.FILL_BOTH)); composite.setLayoutData(new GridData(GridData.FILL_BOTH));
LayoutUtil.doDefaultLayout(composite, new DialogField[]{fIncludeSymPathsList, fShowInheritedPaths}, true); LayoutUtil.doDefaultLayout(composite, new DialogField[]{fIncludeSymPathsList, fShowInheritedPaths}, true);
LayoutUtil.setHorizontalGrabbing(fIncludeSymPathsList.getTreeControl(null)); LayoutUtil.setHorizontalGrabbing(fIncludeSymPathsList.getTreeControl(null), true);
int buttonBarWidth = converter.convertWidthInCharsToPixels(24); int buttonBarWidth = converter.convertWidthInCharsToPixels(24);
fIncludeSymPathsList.setButtonsMinWidth(buttonBarWidth); fIncludeSymPathsList.setButtonsMinWidth(buttonBarWidth);

5
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathLibraryEntryPage.java
View file

@ -63,7 +63,6 @@ import org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField;
*/ */
@Deprecated @Deprecated
public class CPathLibraryEntryPage extends CPathBasePage { public class CPathLibraryEntryPage extends CPathBasePage {
private ListDialogField<CPElement> fCPathList; private ListDialogField<CPElement> fCPathList;
private ICProject fCurrCProject; private ICProject fCurrCProject;
private IPath fProjPath; private IPath fProjPath;
@ -172,7 +171,7 @@ public class CPathLibraryEntryPage extends CPathBasePage {
Composite composite = new Composite(parent, SWT.NONE); Composite composite = new Composite(parent, SWT.NONE);
LayoutUtil.doDefaultLayout(composite, new DialogField[] {fLibrariesList}, true); LayoutUtil.doDefaultLayout(composite, new DialogField[] {fLibrariesList}, true);
LayoutUtil.setHorizontalGrabbing(fLibrariesList.getTreeControl(null)); LayoutUtil.setHorizontalGrabbing(fLibrariesList.getTreeControl(null), true);
int buttonBarWidth = converter.convertWidthInCharsToPixels(24); int buttonBarWidth = converter.convertWidthInCharsToPixels(24);
fLibrariesList.setButtonsMinWidth(buttonBarWidth); fLibrariesList.setButtonsMinWidth(buttonBarWidth);
@ -185,7 +184,6 @@ public class CPathLibraryEntryPage extends CPathBasePage {
} }
private class LibrariesAdapter implements IDialogFieldListener, ITreeListAdapter<CPElement> { private class LibrariesAdapter implements IDialogFieldListener, ITreeListAdapter<CPElement> {
private final Object[] EMPTY_ARR= new Object[0]; private final Object[] EMPTY_ARR= new Object[0];
// -------- IListAdapter -------- // -------- IListAdapter --------
@ -559,5 +557,4 @@ public class CPathLibraryEntryPage extends CPathBasePage {
} }
return false; return false;
} }
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOrderExportPage.java
View file

@ -56,7 +56,7 @@ public class CPathOrderExportPage extends CPathBasePage {
setControl(composite); setControl(composite);
LayoutUtil.doDefaultLayout(composite, new DialogField[]{fCPathList}, true); LayoutUtil.doDefaultLayout(composite, new DialogField[]{fCPathList}, true);
LayoutUtil.setHorizontalGrabbing(fCPathList.getListControl(null)); LayoutUtil.setHorizontalGrabbing(fCPathList.getListControl(null), true);
int buttonBarWidth = converter.convertWidthInCharsToPixels(24); int buttonBarWidth = converter.convertWidthInCharsToPixels(24);
fCPathList.setButtonsMinWidth(buttonBarWidth); fCPathList.setButtonsMinWidth(buttonBarWidth);

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOutputEntryPage.java
View file

@ -136,7 +136,7 @@ public class CPathOutputEntryPage extends CPathBasePage {
Composite composite = new Composite(parent, SWT.NONE); Composite composite = new Composite(parent, SWT.NONE);
LayoutUtil.doDefaultLayout(composite, new DialogField[]{fOutputList}, true); LayoutUtil.doDefaultLayout(composite, new DialogField[]{fOutputList}, true);
LayoutUtil.setHorizontalGrabbing(fOutputList.getTreeControl(null)); LayoutUtil.setHorizontalGrabbing(fOutputList.getTreeControl(null), true);
int buttonBarWidth = converter.convertWidthInCharsToPixels(24); int buttonBarWidth = converter.convertWidthInCharsToPixels(24);
fOutputList.setButtonsMinWidth(buttonBarWidth); fOutputList.setButtonsMinWidth(buttonBarWidth);

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathProjectsEntryPage.java
View file

@ -106,7 +106,7 @@ public class CPathProjectsEntryPage extends CPathBasePage {
setControl(composite); setControl(composite);
LayoutUtil.doDefaultLayout(composite, new DialogField[] { fProjectsList}, true); LayoutUtil.doDefaultLayout(composite, new DialogField[] { fProjectsList}, true);
LayoutUtil.setHorizontalGrabbing(fProjectsList.getListControl(null)); LayoutUtil.setHorizontalGrabbing(fProjectsList.getListControl(null), true);
int buttonBarWidth = converter.convertWidthInCharsToPixels(24); int buttonBarWidth = converter.convertWidthInCharsToPixels(24);
fProjectsList.setButtonsMinWidth(buttonBarWidth); fProjectsList.setButtonsMinWidth(buttonBarWidth);

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathSourceEntryPage.java
View file

@ -134,7 +134,7 @@ public class CPathSourceEntryPage extends CPathBasePage {
Composite composite = new Composite(parent, SWT.NONE); Composite composite = new Composite(parent, SWT.NONE);
LayoutUtil.doDefaultLayout(composite, new DialogField[]{fFoldersList}, true); LayoutUtil.doDefaultLayout(composite, new DialogField[]{fFoldersList}, true);
LayoutUtil.setHorizontalGrabbing(fFoldersList.getTreeControl(null)); LayoutUtil.setHorizontalGrabbing(fFoldersList.getTreeControl(null), true);
int buttonBarWidth = converter.convertWidthInCharsToPixels(24); int buttonBarWidth = converter.convertWidthInCharsToPixels(24);
fFoldersList.setButtonsMinWidth(buttonBarWidth); fFoldersList.setButtonsMinWidth(buttonBarWidth);

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternEntryDialog.java
View file

@ -124,7 +124,7 @@ public class ExclusionPatternEntryDialog extends StatusDialog {
LayoutUtil.setHorizontalSpan(fExclusionPatternDialog.getLabelControl(null), 2); LayoutUtil.setHorizontalSpan(fExclusionPatternDialog.getLabelControl(null), 2);
LayoutUtil.setWidthHint(fExclusionPatternDialog.getTextControl(null), widthHint); LayoutUtil.setWidthHint(fExclusionPatternDialog.getTextControl(null), widthHint);
LayoutUtil.setHorizontalGrabbing(fExclusionPatternDialog.getTextControl(null)); LayoutUtil.setHorizontalGrabbing(fExclusionPatternDialog.getTextControl(null), true);
fExclusionPatternDialog.postSetFocusOnDialogField(parent.getDisplay()); fExclusionPatternDialog.postSetFocusOnDialogField(parent.getDisplay());
applyDialogFont(composite); applyDialogFont(composite);

5
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentBlock.java
View file

@ -75,7 +75,6 @@ import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringButtonDialogField;
*/ */
@Deprecated @Deprecated
public class SourceAttachmentBlock { public class SourceAttachmentBlock {
private IStatusChangeListener fContext; private IStatusChangeListener fContext;
private StringButtonDialogField fFileNameField; private StringButtonDialogField fFileNameField;
@ -203,7 +202,7 @@ public class SourceAttachmentBlock {
// archive name field // archive name field
fFileNameField.doFillIntoGrid(composite, 4); fFileNameField.doFillIntoGrid(composite, 4);
LayoutUtil.setWidthHint(fFileNameField.getTextControl(null), widthHint); LayoutUtil.setWidthHint(fFileNameField.getTextControl(null), widthHint);
LayoutUtil.setHorizontalGrabbing(fFileNameField.getTextControl(null)); LayoutUtil.setHorizontalGrabbing(fFileNameField.getTextControl(null), true);
// aditional 'browse workspace' button for normal jars // aditional 'browse workspace' button for normal jars
DialogField.createEmptySpace(composite, 3); DialogField.createEmptySpace(composite, 3);
@ -219,7 +218,6 @@ public class SourceAttachmentBlock {
} }
private class SourceAttachmentAdapter implements IStringButtonAdapter, IDialogFieldListener { private class SourceAttachmentAdapter implements IStringButtonAdapter, IDialogFieldListener {
// -------- IStringButtonAdapter -------- // -------- IStringButtonAdapter --------
public void changeControlPressed(DialogField field) { public void changeControlPressed(DialogField field) {
attachmentChangeControlPressed(field); attachmentChangeControlPressed(field);
@ -482,5 +480,4 @@ public class SourceAttachmentBlock {
}); });
return result[0]; return result[0];
} }
} }

7
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryListAction.java
View file

@ -41,7 +41,6 @@ import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField;
public class IBHistoryListAction extends Action { public class IBHistoryListAction extends Action {
private class HistoryListDialog extends StatusDialog { private class HistoryListDialog extends StatusDialog {
private ListDialogField<ITranslationUnit> fHistoryList; private ListDialogField<ITranslationUnit> fHistoryList;
private IStatus fHistoryStatus; private IStatus fHistoryStatus;
private ITranslationUnit fResult; private ITranslationUnit fResult;
@ -83,7 +82,6 @@ public class IBHistoryListAction extends Action {
fHistoryList.selectElements(sel); fHistoryList.selectElements(sel);
} }
/* /*
* @see Dialog#createDialogArea(Composite) * @see Dialog#createDialogArea(Composite)
*/ */
@ -100,7 +98,7 @@ public class IBHistoryListAction extends Action {
LayoutUtil.doDefaultLayout(inner, new DialogField[] { fHistoryList }, true, 0, 0); LayoutUtil.doDefaultLayout(inner, new DialogField[] { fHistoryList }, true, 0, 0);
LayoutUtil.setHeightHint(fHistoryList.getListControl(null), convertHeightInCharsToPixels(12)); LayoutUtil.setHeightHint(fHistoryList.getListControl(null), convertHeightInCharsToPixels(12));
LayoutUtil.setHorizontalGrabbing(fHistoryList.getListControl(null)); LayoutUtil.setHorizontalGrabbing(fHistoryList.getListControl(null), true);
applyDialogFont(composite); applyDialogFont(composite);
return composite; return composite;
@ -119,7 +117,6 @@ public class IBHistoryListAction extends Action {
} }
} }
private void doSelectionChanged() { private void doSelectionChanged() {
StatusInfo status= new StatusInfo(); StatusInfo status= new StatusInfo();
List<ITranslationUnit> selected= fHistoryList.getSelectedElements(); List<ITranslationUnit> selected= fHistoryList.getSelectedElements();
@ -160,7 +157,6 @@ public class IBHistoryListAction extends Action {
setShellStyle(getShellStyle() | SWT.RESIZE); setShellStyle(getShellStyle() | SWT.RESIZE);
super.create(); super.create();
} }
} }
private IBViewPart fView; private IBViewPart fView;
@ -182,6 +178,5 @@ public class IBHistoryListAction extends Action {
fView.setInput(dialog.getResult()); fView.setInput(dialog.getResult());
} }
} }
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PropertyAndPreferencePage.java
View file

@ -111,7 +111,7 @@ public abstract class PropertyAndPreferencePage extends PreferencePage implement
fUseProjectSettings.setDialogFieldListener(listener); fUseProjectSettings.setDialogFieldListener(listener);
fUseProjectSettings.setLabelText(PreferencesMessages.PropertyAndPreferencePage_useprojectsettings_label); fUseProjectSettings.setLabelText(PreferencesMessages.PropertyAndPreferencePage_useprojectsettings_label);
fUseProjectSettings.doFillIntoGrid(composite, 1); fUseProjectSettings.doFillIntoGrid(composite, 1);
LayoutUtil.setHorizontalGrabbing(fUseProjectSettings.getSelectionButton(null)); LayoutUtil.setHorizontalGrabbing(fUseProjectSettings.getSelectionButton(null), true);
if (offerLink()) { if (offerLink()) {
fChangeWorkspaceSettings= createLink(composite, PreferencesMessages.PropertyAndPreferencePage_useworkspacesettings_change); fChangeWorkspaceSettings= createLink(composite, PreferencesMessages.PropertyAndPreferencePage_useworkspacesettings_change);

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskInputDialog.java
View file

@ -128,7 +128,7 @@ public class TodoTaskInputDialog extends StatusDialog {
fNameDialogField.doFillIntoGrid(inner, 2); fNameDialogField.doFillIntoGrid(inner, 2);
fPriorityDialogField.doFillIntoGrid(inner, 2); fPriorityDialogField.doFillIntoGrid(inner, 2);
LayoutUtil.setHorizontalGrabbing(fNameDialogField.getTextControl(null)); LayoutUtil.setHorizontalGrabbing(fNameDialogField.getTextControl(null), true);
LayoutUtil.setWidthHint(fNameDialogField.getTextControl(null), convertWidthInCharsToPixels(45)); LayoutUtil.setWidthHint(fNameDialogField.getTextControl(null), convertWidthInCharsToPixels(45));
fNameDialogField.postSetFocusOnDialogField(parent.getDisplay()); fNameDialogField.postSetFocusOnDialogField(parent.getDisplay());

7
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryListAction.java
View file

@ -40,7 +40,6 @@ import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField;
public class THHistoryListAction extends Action { public class THHistoryListAction extends Action {
private class HistoryListDialog extends StatusDialog { private class HistoryListDialog extends StatusDialog {
private ListDialogField<ICElement> fHistoryList; private ListDialogField<ICElement> fHistoryList;
private IStatus fHistoryStatus; private IStatus fHistoryStatus;
private ICElement fResult; private ICElement fResult;
@ -82,7 +81,6 @@ public class THHistoryListAction extends Action {
fHistoryList.selectElements(sel); fHistoryList.selectElements(sel);
} }
/* /*
* @see Dialog#createDialogArea(Composite) * @see Dialog#createDialogArea(Composite)
*/ */
@ -99,7 +97,7 @@ public class THHistoryListAction extends Action {
LayoutUtil.doDefaultLayout(inner, new DialogField[] { fHistoryList }, true, 0, 0); LayoutUtil.doDefaultLayout(inner, new DialogField[] { fHistoryList }, true, 0, 0);
LayoutUtil.setHeightHint(fHistoryList.getListControl(null), convertHeightInCharsToPixels(12)); LayoutUtil.setHeightHint(fHistoryList.getListControl(null), convertHeightInCharsToPixels(12));
LayoutUtil.setHorizontalGrabbing(fHistoryList.getListControl(null)); LayoutUtil.setHorizontalGrabbing(fHistoryList.getListControl(null), true);
applyDialogFont(composite); applyDialogFont(composite);
return composite; return composite;
@ -118,7 +116,6 @@ public class THHistoryListAction extends Action {
} }
} }
private void doSelectionChanged() { private void doSelectionChanged() {
StatusInfo status= new StatusInfo(); StatusInfo status= new StatusInfo();
List<?> selected= fHistoryList.getSelectedElements(); List<?> selected= fHistoryList.getSelectedElements();
@ -159,7 +156,6 @@ public class THHistoryListAction extends Action {
setShellStyle(getShellStyle() | SWT.RESIZE); setShellStyle(getShellStyle() | SWT.RESIZE);
super.create(); super.create();
} }
} }
private THViewPart fView; private THViewPart fView;
@ -181,6 +177,5 @@ public class THHistoryListAction extends Action {
fView.setInput(dialog.getResult(), null); fView.setInput(dialog.getResult(), null);
} }
} }
} }

25
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/LayoutUtil.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2001, 2008 IBM Corporation and others. * Copyright (c) 2001, 2011 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -8,6 +8,7 @@
* Contributors: * Contributors:
* Rational Software - initial implementation * Rational Software - initial implementation
* Markus Schorn (Wind River Systems) * Markus Schorn (Wind River Systems)
* Sergey Prigogin (Google)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.ui.wizards.dialogfields; package org.eclipse.cdt.internal.ui.wizards.dialogfields;
@ -19,7 +20,6 @@ import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Layout; import org.eclipse.swt.widgets.Layout;
public class LayoutUtil { public class LayoutUtil {
/** /**
* Calculates the number of columns needed by field editors * Calculates the number of columns needed by field editors
*/ */
@ -153,9 +153,28 @@ public class LayoutUtil {
* Makes a control grab all available horizontal space. Assumes that GridData is used. * Makes a control grab all available horizontal space. Assumes that GridData is used.
*/ */
public static void setHorizontalGrabbing(Control control) { public static void setHorizontalGrabbing(Control control) {
setHorizontalGrabbing(control, true);
}
/**
* Makes a control grab all available horizontal space. Assumes that GridData is used.
* @param value <code>true</code> to grab, <code>false</code> not to grab
*/
public static void setHorizontalGrabbing(Control control, boolean value) {
Object ld= control.getLayoutData(); Object ld= control.getLayoutData();
if (ld instanceof GridData) { if (ld instanceof GridData) {
((GridData) ld).grabExcessHorizontalSpace= true; ((GridData) ld).grabExcessHorizontalSpace= value;
}
}
/**
* Makes a control grab all available horizontal space. Assumes that GridData is used.
* @param value <code>true</code> to grab, <code>false</code> not to grab
*/
public static void setVerticalGrabbing(Control control, boolean value) {
Object ld= control.getLayoutData();
if (ld instanceof GridData) {
((GridData) ld).grabExcessVerticalSpace= value;
} }
} }
} }

7
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/folderwizard/NewSourceFolderWizardPage.java
View file

@ -82,7 +82,6 @@ import org.eclipse.cdt.internal.ui.wizards.dialogfields.SelectionButtonDialogFie
import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringButtonDialogField; import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringButtonDialogField;
public class NewSourceFolderWizardPage extends NewElementWizardPage { public class NewSourceFolderWizardPage extends NewElementWizardPage {
private static final String PAGE_NAME= "NewSourceFolderWizardPage"; //$NON-NLS-1$ private static final String PAGE_NAME= "NewSourceFolderWizardPage"; //$NON-NLS-1$
private StringButtonDialogField fProjectField; private StringButtonDialogField fProjectField;
@ -186,7 +185,6 @@ public class NewSourceFolderWizardPage extends NewElementWizardPage {
fRootDialogField.setText(""); //$NON-NLS-1$ fRootDialogField.setText(""); //$NON-NLS-1$
} }
// -------- UI Creation --------- // -------- UI Creation ---------
/* /*
@ -209,7 +207,7 @@ public class NewSourceFolderWizardPage extends NewElementWizardPage {
int maxFieldWidth= convertWidthInCharsToPixels(40); int maxFieldWidth= convertWidthInCharsToPixels(40);
LayoutUtil.setWidthHint(fProjectField.getTextControl(null), maxFieldWidth); LayoutUtil.setWidthHint(fProjectField.getTextControl(null), maxFieldWidth);
LayoutUtil.setHorizontalGrabbing(fProjectField.getTextControl(null)); LayoutUtil.setHorizontalGrabbing(fProjectField.getTextControl(null), true);
LayoutUtil.setWidthHint(fRootDialogField.getTextControl(null), maxFieldWidth); LayoutUtil.setWidthHint(fRootDialogField.getTextControl(null), maxFieldWidth);
// Bug #220003 : consistency between New Source Folder dialog and Source Location Property tab. // Bug #220003 : consistency between New Source Folder dialog and Source Location Property tab.
@ -245,6 +243,7 @@ public class NewSourceFolderWizardPage extends NewElementWizardPage {
packRootDialogFieldChanged(field); packRootDialogFieldChanged(field);
} }
} }
protected void packRootChangeControlPressed(DialogField field) { protected void packRootChangeControlPressed(DialogField field) {
if (field == fRootDialogField) { if (field == fRootDialogField) {
IPath initialPath= new Path(fRootDialogField.getText()); IPath initialPath= new Path(fRootDialogField.getText());
@ -276,7 +275,6 @@ public class NewSourceFolderWizardPage extends NewElementWizardPage {
updateStatus(new IStatus[] { fProjectStatus, fRootStatus }); updateStatus(new IStatus[] { fProjectStatus, fRootStatus });
} }
private void updateProjectStatus() { private void updateProjectStatus() {
fCurrCProject= null; fCurrCProject= null;
fIsProjectAsSourceFolder= false; fIsProjectAsSourceFolder= false;
@ -522,5 +520,4 @@ public class NewSourceFolderWizardPage extends NewElementWizardPage {
} }
return null; return null;
} }
} }

3
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractErrorParserBlock.java
View file

@ -43,7 +43,6 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.PlatformUI; import org.eclipse.ui.PlatformUI;
public abstract class AbstractErrorParserBlock extends AbstractCOptionPage { public abstract class AbstractErrorParserBlock extends AbstractCOptionPage {
private static final String PREFIX = "ErrorParserBlock"; //$NON-NLS-1$ private static final String PREFIX = "ErrorParserBlock"; //$NON-NLS-1$
private static final String LABEL = PREFIX + ".label"; //$NON-NLS-1$ private static final String LABEL = PREFIX + ".label"; //$NON-NLS-1$
private static final String DESC = PREFIX + ".desc"; //$NON-NLS-1$ private static final String DESC = PREFIX + ".desc"; //$NON-NLS-1$
@ -280,7 +279,7 @@ public abstract class AbstractErrorParserBlock extends AbstractCOptionPage {
fErrorParserList.setUncheckAllButtonIndex(4); fErrorParserList.setUncheckAllButtonIndex(4);
LayoutUtil.doDefaultLayout(composite, new DialogField[]{fErrorParserList}, true); LayoutUtil.doDefaultLayout(composite, new DialogField[]{fErrorParserList}, true);
LayoutUtil.setHorizontalGrabbing(fErrorParserList.getListControl(null)); LayoutUtil.setHorizontalGrabbing(fErrorParserList.getListControl(null), true);
initializeValues(); initializeValues();
} }

8
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java
View file

@ -58,7 +58,6 @@ import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField;
*/ */
@Deprecated @Deprecated
public class BinaryParserBlock extends AbstractBinaryParserPage { public class BinaryParserBlock extends AbstractBinaryParserPage {
private static final int DEFAULT_HEIGHT = 160; private static final int DEFAULT_HEIGHT = 160;
private static final String PREFIX = "BinaryParserBlock"; //$NON-NLS-1$ private static final String PREFIX = "BinaryParserBlock"; //$NON-NLS-1$
private static final String LABEL = PREFIX + ".label"; //$NON-NLS-1$ private static final String LABEL = PREFIX + ".label"; //$NON-NLS-1$
@ -75,8 +74,8 @@ public class BinaryParserBlock extends AbstractBinaryParserPage {
protected List<BinaryParserConfiguration> initialSelected; protected List<BinaryParserConfiguration> initialSelected;
protected class BinaryParserConfiguration { protected class BinaryParserConfiguration {
IExtension fExtension; IExtension fExtension;
public BinaryParserConfiguration(IExtension extension) { public BinaryParserConfiguration(IExtension extension) {
fExtension = extension; fExtension = extension;
} }
@ -104,7 +103,6 @@ public class BinaryParserBlock extends AbstractBinaryParserPage {
} }
protected class BinaryParserLabelProvider extends LabelProvider { protected class BinaryParserLabelProvider extends LabelProvider {
@Override @Override
public String getText(Object element) { public String getText(Object element) {
return ((BinaryParserConfiguration) element).getName(); return ((BinaryParserConfiguration) element).getName();
@ -129,7 +127,6 @@ public class BinaryParserBlock extends AbstractBinaryParserPage {
public void doubleClicked(ListDialogField<BinaryParserConfiguration> field) { public void doubleClicked(ListDialogField<BinaryParserConfiguration> field) {
} }
}; };
binaryList = new CheckedListDialogField<BinaryParserConfiguration>(listAdapter, buttonLabels, new BinaryParserLabelProvider()) { binaryList = new CheckedListDialogField<BinaryParserConfiguration>(listAdapter, buttonLabels, new BinaryParserLabelProvider()) {
@ -198,7 +195,7 @@ public class BinaryParserBlock extends AbstractBinaryParserPage {
Composite listComposite = ControlFactory.createComposite(composite, 1); Composite listComposite = ControlFactory.createComposite(composite, 1);
LayoutUtil.doDefaultLayout(listComposite, new DialogField[]{binaryList}, true); LayoutUtil.doDefaultLayout(listComposite, new DialogField[]{binaryList}, true);
LayoutUtil.setHorizontalGrabbing(binaryList.getListControl(null)); LayoutUtil.setHorizontalGrabbing(binaryList.getListControl(null), true);
int buttonBarWidth = converter.convertWidthInCharsToPixels(15); int buttonBarWidth = converter.convertWidthInCharsToPixels(15);
binaryList.setButtonsMinWidth(buttonBarWidth); binaryList.setButtonsMinWidth(buttonBarWidth);
@ -218,7 +215,6 @@ public class BinaryParserBlock extends AbstractBinaryParserPage {
// fire a change event, to quick start. // fire a change event, to quick start.
handleBinaryParserChanged(); handleBinaryParserChanged();
parent.layout(true); parent.layout(true);
} }
@Override @Override

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CHelpConfigurationPropertyPage.java
View file

@ -50,7 +50,6 @@ import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil;
*/ */
public class CHelpConfigurationPropertyPage extends PropertyPage implements public class CHelpConfigurationPropertyPage extends PropertyPage implements
IWorkbenchPreferencePage { IWorkbenchPreferencePage {
private CHelpSettingsDisplay fCHelpSettingsDisplay; private CHelpSettingsDisplay fCHelpSettingsDisplay;
private class CHelpBookListLabelProvider extends LabelProvider { private class CHelpBookListLabelProvider extends LabelProvider {
@ -103,7 +102,7 @@ public class CHelpConfigurationPropertyPage extends PropertyPage implements
Composite composite= new Composite(parent, SWT.NONE); Composite composite= new Composite(parent, SWT.NONE);
LayoutUtil.doDefaultLayout(composite, new DialogField[] { fCHelpBookList }, true); LayoutUtil.doDefaultLayout(composite, new DialogField[] { fCHelpBookList }, true);
LayoutUtil.setHorizontalGrabbing(fCHelpBookList.getListControl(null)); LayoutUtil.setHorizontalGrabbing(fCHelpBookList.getListControl(null), true);
int buttonBarWidth= converter.convertWidthInCharsToPixels(24); int buttonBarWidth= converter.convertWidthInCharsToPixels(24);
fCHelpBookList.setButtonsMinWidth(buttonBarWidth); fCHelpBookList.setButtonsMinWidth(buttonBarWidth);
@ -189,5 +188,4 @@ public class CHelpConfigurationPropertyPage extends PropertyPage implements
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }
} }

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExPatternEntryDialog.java
View file

@ -53,7 +53,6 @@ import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringButtonDialogField;
* @noextend This class is not intended to be subclassed by clients. * @noextend This class is not intended to be subclassed by clients.
*/ */
public class ExPatternEntryDialog extends StatusDialog { public class ExPatternEntryDialog extends StatusDialog {
private StringButtonDialogField fExclusionPatternDialog; private StringButtonDialogField fExclusionPatternDialog;
private StatusInfo fExclusionPatternStatus; private StatusInfo fExclusionPatternStatus;
@ -124,7 +123,7 @@ public class ExPatternEntryDialog extends StatusDialog {
LayoutUtil.setHorizontalSpan(fExclusionPatternDialog.getLabelControl(null), 2); LayoutUtil.setHorizontalSpan(fExclusionPatternDialog.getLabelControl(null), 2);
LayoutUtil.setWidthHint(fExclusionPatternDialog.getTextControl(null), widthHint); LayoutUtil.setWidthHint(fExclusionPatternDialog.getTextControl(null), widthHint);
LayoutUtil.setHorizontalGrabbing(fExclusionPatternDialog.getTextControl(null)); LayoutUtil.setHorizontalGrabbing(fExclusionPatternDialog.getTextControl(null), true);
fExclusionPatternDialog.postSetFocusOnDialogField(parent.getDisplay()); fExclusionPatternDialog.postSetFocusOnDialogField(parent.getDisplay());
applyDialogFont(composite); applyDialogFont(composite);
@ -237,5 +236,4 @@ public class ExPatternEntryDialog extends StatusDialog {
} }
return null; return null;
} }
} }