| [cdt-patch] fix for Bug#: 63973 |
|
The attached patch fixes 63973 (browseType is ignored for string options). With this patch applied, if you have specified the browseType of a string option to be either “file” or “directory”, you will get a browse button to the right of the edit field which will invoke the appropriate type of browse dialog.
Currently browseType is ignored for everything but list options and the various derivatives thereof.
___________________________________________
Chris Recoskie Software Designer IDE Frameworks Group Texas Instruments, Toronto
|
cvs diff (in directory C:\cdt_browse\org.eclipse.cdt-build\org.eclipse.cdt.managedbuilder.ui)
cvs server: Diffing .
cvs server: Diffing icons
cvs server: Diffing icons/full
cvs server: Diffing icons/full/build16
cvs server: Diffing icons/full/list
cvs server: Diffing icons/full/wizban
cvs server: Diffing src
cvs server: Diffing src/org
cvs server: Diffing src/org/eclipse
cvs server: Diffing src/org/eclipse/cdt
cvs server: Diffing src/org/eclipse/cdt/managedbuilder
cvs server: Diffing src/org/eclipse/cdt/managedbuilder/internal
cvs server: Diffing src/org/eclipse/cdt/managedbuilder/internal/ui
cvs server: Diffing src/org/eclipse/cdt/managedbuilder/ui
cvs server: Diffing src/org/eclipse/cdt/managedbuilder/ui/actions
cvs server: Diffing src/org/eclipse/cdt/managedbuilder/ui/properties
Index: src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionSettingsPage.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionSettingsPage.java,v
retrieving revision 1.6
diff -r1.6 BuildOptionSettingsPage.java
23a24,25
> import org.eclipse.jface.preference.DirectoryFieldEditor;
> import org.eclipse.jface.preference.FileFieldEditor;
24a27
> import java.lang.AssertionError;
59,63c62,106
< StringFieldEditor stringField = new StringFieldEditor(opt
< .getId(), opt.getName(), getFieldEditorParent());
< addField(stringField);
< fieldsList.add(stringField);
< break;
---
>
> // fix for PR 63973
> // Check browse type.
> // If browsing is set, use a field editor that has a browse button of
> // the appropriate type.
> // Otherwise, use a regular text field.
> switch(opt.getBrowseType())
> {
> case IOption.BROWSE_DIR :
> DirectoryFieldEditor dirFieldEditor = new DirectoryFieldEditor(opt.getId(),
> opt.getName(), getFieldEditorParent());
>
> addField(dirFieldEditor);
>
> fieldsList.add(dirFieldEditor);
> break;
>
> case IOption.BROWSE_FILE:
>
> FileFieldEditor fileFieldEditor = new FileFieldEditor(opt.getId(),
> opt.getName(), getFieldEditorParent());
>
> addField(fileFieldEditor);
>
> fieldsList.add(fileFieldEditor);
> break;
>
> case IOption.BROWSE_NONE:
> StringFieldEditor stringField = new StringFieldEditor(opt
> .getId(), opt.getName(), getFieldEditorParent());
>
> addField(stringField);
>
> fieldsList.add(stringField);
> break;
>
> default:
> // should not be possible
> throw( new AssertionError());
>
> }
> // end fix for 63973
>
> break;
>
Index: src/org/eclipse/cdt/managedbuilder/ui/properties/BuildSettingsPage.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildSettingsPage.java,v
retrieving revision 1.1
diff -r1.1 BuildSettingsPage.java
25,26c25,34
< // Must be a grid layout and we don't want another set of buttons
< super(GRID);
---
>
> // fix for PR 63973
> // If we use a grid layout then widgets that should be layed out horizontally,
> // e.g. StringButtonFieldEditor, will have their component widgets
> // arranged vertically. This looks terrible when you have for instance
> // a StringButtonFieldEditor, which has a label, an edit box, and a "modify" button
> // to the right because all three will be stacked vertically.
> super(FLAT);
> // end fix for 63973
>
cvs server: Diffing src/org/eclipse/cdt/managedbuilder/ui/wizards
*****CVS exited normally with code 1*****