Index: Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/launchConfigurations/AntPropertiesTab.java =================================================================== RCS file: /home/eclipse/org.eclipse.ui.externaltools/Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/launchConfigurations/AntPropertiesTab.java,v retrieving revision 1.4 diff -u -r1.4 AntPropertiesTab.java --- Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/launchConfigurations/AntPropertiesTab.java 26 Nov 2002 04:25:28 -0000 1.4 +++ Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/launchConfigurations/AntPropertiesTab.java 30 Nov 2002 09:18:13 -0000 @@ -31,6 +31,7 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -127,6 +128,7 @@ GridData data= new GridData(GridData.FILL_BOTH); data.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH; table.setLayoutData(data); + table.setFont(parent.getFont()); propertyTableViewer = new TableViewer(table); propertyTableViewer.setContentProvider(new ExternalToolsContentProvider()); @@ -141,6 +143,7 @@ GridData data= new GridData(GridData.FILL_BOTH); data.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH; table.setLayoutData(data); + table.setFont(parent.getFont()); fileTableViewer = new TableViewer(table); fileTableViewer.setContentProvider(new ExternalToolsContentProvider()); @@ -154,8 +157,11 @@ } public void createControl(Composite parent) { + Font font = parent.getFont(); + fDialogSettings= ExternalToolsPlugin.getDefault().getDialogSettings(); Composite top = new Composite(parent, SWT.NONE); + top.setFont(font); setControl(top); GridLayout layout = new GridLayout(); @@ -170,7 +176,7 @@ GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); gd.horizontalSpan =2; label.setLayoutData(gd); - label.setFont(parent.getFont()); + label.setFont(font); label.setText(AntLaunchConfigurationMessages.getString("AntPropertiesTab.&Properties__6")); //$NON-NLS-1$ createTable(top); @@ -180,7 +186,7 @@ gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); gd.horizontalSpan =2; label.setLayoutData(gd); - label.setFont(parent.getFont()); + label.setFont(font); label.setText(AntLaunchConfigurationMessages.getString("AntPropertiesTab.Property_f&iles__7")); //$NON-NLS-1$ createTable(top); @@ -197,6 +203,7 @@ layout.marginWidth = 0; buttonGroup.setLayout(layout); buttonGroup.setLayoutData(new GridData(GridData.FILL_VERTICAL)); + buttonGroup.setFont(top.getFont()); addButtonsToButtonGroup(buttonGroup); } Index: Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/launchConfigurations/AntTargetsTab.java =================================================================== RCS file: /home/eclipse/org.eclipse.ui.externaltools/Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/launchConfigurations/AntTargetsTab.java,v retrieving revision 1.15 diff -u -r1.15 AntTargetsTab.java --- Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/launchConfigurations/AntTargetsTab.java 26 Nov 2002 04:25:28 -0000 1.15 +++ Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/launchConfigurations/AntTargetsTab.java 30 Nov 2002 09:18:13 -0000 @@ -27,6 +27,7 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -65,6 +66,8 @@ * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite) */ public void createControl(Composite parent) { + Font font = parent.getFont(); + Composite mainComposite = new Composite(parent, SWT.NONE); setControl(mainComposite); GridLayout layout = new GridLayout(); @@ -79,7 +82,8 @@ layout.marginHeight = 0; gridData = new GridData(GridData.FILL_HORIZONTAL); upperComposite.setLayout(layout); - upperComposite.setLayoutData(gridData); + upperComposite.setLayoutData(gridData); + upperComposite.setFont(font); createRunDefaultTargetButton(upperComposite); @@ -91,6 +95,7 @@ gridData = new GridData(GridData.FILL_HORIZONTAL); middleComposite.setLayout(layout); middleComposite.setLayoutData(gridData); + middleComposite.setFont(font); createExecuteTargetsList(middleComposite); createButtonComposite(middleComposite); @@ -101,7 +106,8 @@ layout.marginHeight = 0; gridData = new GridData(GridData.FILL_HORIZONTAL); lowerComposite.setLayout(layout); - lowerComposite.setLayoutData(gridData); + lowerComposite.setLayoutData(gridData); + lowerComposite.setFont(font); createDescriptionField(lowerComposite); } @@ -143,7 +149,8 @@ layout.marginWidth = 0; layout.marginHeight = 0; buttonComposite.setLayout(layout); - + buttonComposite.setFont(parent.getFont()); + new Label(buttonComposite, SWT.NONE); addButton = createPushButton(buttonComposite, AntLaunchConfigurationMessages.getString("AntTargetsTab.&Add..._1"), null); //$NON-NLS-1$ @@ -274,6 +281,8 @@ * Creates the list of targets that will be used when the tool is run. */ private void createExecuteTargetsList(Composite parent) { + Font font = parent.getFont(); + Composite tableComposite = new Composite(parent, SWT.NONE); GridData gridData = new GridData(GridData.FILL_BOTH); @@ -285,6 +294,7 @@ tableComposite.setLayout(layout); executeLabel = new Label(tableComposite, SWT.LEFT); + executeLabel.setFont(font); executeLabel.setText(AntLaunchConfigurationMessages.getString("AntTargetsTab.Targets_to_e&xecute__7")); //$NON-NLS-1$ executeTargetsTable = new TableViewer(tableComposite,SWT.MULTI | SWT.FULL_SELECTION | SWT.BORDER); @@ -296,6 +306,7 @@ executeTargetsTable.setLabelProvider(labelProvider); gridData = new GridData(GridData.FILL_BOTH); executeTargetsTable.getControl().setLayoutData(gridData); + executeTargetsTable.getTable().setFont(font); executeTargetsTable.addSelectionChangedListener(new ISelectionChangedListener() { public void selectionChanged(SelectionChangedEvent event) { @@ -324,12 +335,16 @@ * Creates the text field which displays the descriptionField of the selected target. */ private void createDescriptionField(Composite parent) { + Font font = parent.getFont(); + descriptionLabel = new Label(parent, SWT.NONE); + descriptionLabel.setFont(font); descriptionLabel.setText(AntLaunchConfigurationMessages.getString("AntTargetsTab.Target_description__10")); //$NON-NLS-1$ descriptionField = new Text(parent, SWT.READ_ONLY | SWT.BORDER); GridData data = new GridData(GridData.FILL_HORIZONTAL); descriptionField.setLayoutData(data); + descriptionField.setFont(font); } /** @@ -342,6 +357,7 @@ runDefaultTargetButton.setText(AntLaunchConfigurationMessages.getString("AntTargetsTab.Run_defau<_target_11")); //$NON-NLS-1$ GridData gridData = new GridData(GridData.FILL_HORIZONTAL); runDefaultTargetButton.setLayoutData(gridData); + runDefaultTargetButton.setFont(parent.getFont()); runDefaultTargetButton.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { allowSelectTargets(!runDefaultTargetButton.getSelection(), true); Index: Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AddCustomDialog.java =================================================================== RCS file: /home/eclipse/org.eclipse.ui.externaltools/Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AddCustomDialog.java,v retrieving revision 1.4 diff -u -r1.4 AddCustomDialog.java --- Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AddCustomDialog.java 7 Nov 2002 22:20:35 -0000 1.4 +++ Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AddCustomDialog.java 30 Nov 2002 09:18:14 -0000 @@ -20,6 +20,7 @@ import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.graphics.Font; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; @@ -91,6 +92,8 @@ * Method declared on Dialog. */ protected Control createDialogArea(Composite parent) { + Font font = parent.getFont(); + Composite dialogArea = new Composite(parent, SWT.NONE); GridLayout layout = new GridLayout(); layout.numColumns = 2; @@ -103,13 +106,16 @@ GridData data = new GridData(GridData.FILL_HORIZONTAL); data.horizontalSpan = 2; label.setLayoutData(data); + label.setFont(font); label = new Label(dialogArea, SWT.NONE); + label.setFont(font); label.setText(AntPreferencesMessages.getString("AddCustomDialog.name")); //$NON-NLS-1$; nameField = new Text(dialogArea, SWT.BORDER); data = new GridData(GridData.FILL_HORIZONTAL); data.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH; nameField.setLayoutData(data); + nameField.setFont(font); nameField.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { updateEnablement(); @@ -117,6 +123,7 @@ }); label = new Label(dialogArea, SWT.NONE); + label.setFont(font); if (buttonLabel == null) { label.setText(AntPreferencesMessages.getString("AddCustomDialog.class")); //$NON-NLS-1$; } else { @@ -126,6 +133,7 @@ data = new GridData(GridData.FILL_HORIZONTAL); data.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH; classField.setLayoutData(data); + classField.setFont(font); classField.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { updateEnablement(); @@ -134,12 +142,14 @@ if (showLibraryURLs) { label = new Label(dialogArea, SWT.NONE); + label.setFont(font); label.setText(AntPreferencesMessages.getString("AddCustomDialog.library")); //$NON-NLS-1$; libraryField = new org.eclipse.swt.widgets.List(dialogArea, SWT.READ_ONLY | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL); data = new GridData(GridData.FILL_HORIZONTAL); data.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH; libraryField.setLayoutData(data); + libraryField.setFont(font); libraryField.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { updateEnablement(); Index: Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AntClasspathPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.ui.externaltools/Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AntClasspathPage.java,v retrieving revision 1.14 diff -u -r1.14 AntClasspathPage.java --- Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AntClasspathPage.java 26 Nov 2002 23:06:41 -0000 1.14 +++ Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AntClasspathPage.java 30 Nov 2002 09:18:14 -0000 @@ -36,6 +36,7 @@ import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -316,14 +317,16 @@ * Creates this page's controls */ protected Composite createContents(Composite parent) { + Font font = parent.getFont(); Composite top = new Composite(parent, SWT.NONE); + top.setFont(font); Label label = new Label(top, SWT.NONE); GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); gd.horizontalSpan =2; label.setLayoutData(gd); - label.setFont(parent.getFont()); + label.setFont(font); label.setText(AntPreferencesMessages.getString("AntClasspathPage.Run&time_classpath__8")); //$NON-NLS-1$ super.createContents(top); @@ -343,6 +346,7 @@ antHomeComposite.setLayout(layout); antHomeButton = new Button(antHomeComposite, SWT.CHECK); + antHomeButton.setFont(font); antHomeButton.setText(AntPreferencesMessages.getString("AntClasspathPage.Set_ANT_HO&ME_9")); //$NON-NLS-1$ antHomeButton.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent evt) { @@ -355,6 +359,7 @@ gd.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH; gd.horizontalSpan = 1; antHome.setLayoutData(gd); + antHome.setFont(font); antHome.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { File rootDir= validateAntHome(antHome.getText()); @@ -366,6 +371,7 @@ antHome.setEnabled(false); browseAntHomeButton= new Button(top, SWT.PUSH); + browseAntHomeButton.setFont(font); browseAntHomeButton.setText(AntPreferencesMessages.getString("AntClasspathPage.&Browse..._10")); //$NON-NLS-1$ browseAntHomeButton.setData(new Integer(BROWSE_ANT_HOME)); browseAntHomeButton.addSelectionListener(selectionAdapter); @@ -376,7 +382,7 @@ gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); gd.horizontalSpan =2; label.setLayoutData(gd); - label.setFont(parent.getFont()); + label.setFont(font); label.setText(AntPreferencesMessages.getString("AntClasspathPage.Additional_classpath_entries__11")); //$NON-NLS-1$ createTable(top); @@ -397,6 +403,7 @@ data.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH; data.horizontalSpan= 1; table.setLayoutData(data); + table.setFont(parent.getFont()); userContentProvider = getContentProvider(); userTableViewer = new TableViewer(table); userTableViewer.setContentProvider(userContentProvider); Index: Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AntConsolePreferencePage.java =================================================================== RCS file: /home/eclipse/org.eclipse.ui.externaltools/Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AntConsolePreferencePage.java,v retrieving revision 1.1 diff -u -r1.1 AntConsolePreferencePage.java --- Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AntConsolePreferencePage.java 25 Nov 2002 20:34:49 -0000 1.1 +++ Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AntConsolePreferencePage.java 30 Nov 2002 09:18:13 -0000 @@ -1 +1 @@ -package org.eclipse.ui.externaltools.internal.ant.preferences; /********************************************************************** Copyright (c) 2002 IBM Corp. and others. All rights reserved. This file is made available under the terms of the Common Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/cpl-v10.html   Contributors: **********************************************************************/ import org.eclipse.jface.preference.ColorFieldEditor; import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; import org.eclipse.ui.externaltools.internal.model.ExternalToolsPlugin; import org.eclipse.ui.externaltools.internal.model.IPreferenceConstants; /** * Preference page applicable to all external tools */ public class AntConsolePreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage { public AntConsolePreferencePage() { super(GRID); setPreferenceStore(ExternalToolsPlugin.getDefault().getPreferenceStore()); } /* (non-Javadoc) * Method declared on FieldEditorPreferencePage. */ public void createControl(Composite parent) { super.createControl(parent); // should do something here with the help.. /* FIXME WorkbenchHelp.setHelp( parent, new Object[] { IAntHelpContextIds.ANT_PREFERENCE_PAGE }); */ } /* (non-Javadoc) * Method declared on FieldEditorPreferencePage. */ protected void createFieldEditors() { Label label = new Label(getFieldEditorParent(), SWT.NONE); label.setText("Console text color settings:"); GridData gd = new GridData(GridData.FILL_HORIZONTAL); gd.horizontalSpan = 3; label.setLayoutData(gd); ColorFieldEditor errOut = new ColorFieldEditor( IPreferenceConstants.CONSOLE_ERROR_RGB, "&Error:", getFieldEditorParent()); ColorFieldEditor warnOut = new ColorFieldEditor( IPreferenceConstants.CONSOLE_WARNING_RGB, "&Warning:", getFieldEditorParent()); ColorFieldEditor infoOut = new ColorFieldEditor( IPreferenceConstants.CONSOLE_INFO_RGB, "I&nformation:", getFieldEditorParent()); ColorFieldEditor verbOut = new ColorFieldEditor( IPreferenceConstants.CONSOLE_VERBOSE_RGB, "Ve&rbose:", getFieldEditorParent()); ColorFieldEditor debugOut = new ColorFieldEditor( IPreferenceConstants.CONSOLE_DEBUG_RGB, "Deb&ug:", getFieldEditorParent()); addField(errOut); addField(warnOut); addField(infoOut); addField(verbOut); addField(debugOut); } /* (non-Javadoc) * Method declared on IWorkbenchPreferencePage. */ public void init(IWorkbench workbench) { } } \ No newline at end of file +package org.eclipse.ui.externaltools.internal.ant.preferences; /********************************************************************** Copyright (c) 2002 IBM Corp. and others. All rights reserved. This file is made available under the terms of the Common Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/cpl-v10.html   Contributors: **********************************************************************/ import org.eclipse.jface.preference.ColorFieldEditor; import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; import org.eclipse.ui.externaltools.internal.model.ExternalToolsPlugin; import org.eclipse.ui.externaltools.internal.model.IPreferenceConstants; /** * Preference page applicable to all external tools */ public class AntConsolePreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage { public AntConsolePreferencePage() { super(GRID); setPreferenceStore(ExternalToolsPlugin.getDefault().getPreferenceStore()); } /* (non-Javadoc) * Method declared on FieldEditorPreferencePage. */ public void createControl(Composite parent) { super.createControl(parent); // should do something here with the help.. /* FIXME WorkbenchHelp.setHelp( parent, new Object[] { IAntHelpContextIds.ANT_PREFERENCE_PAGE }); */ } /* (non-Javadoc) * Method declared on FieldEditorPreferencePage. */ protected void createFieldEditors() { Label label = new Label(getFieldEditorParent(), SWT.NONE); label.setText("Console text color settings:"); GridData gd = new GridData(GridData.FILL_HORIZONTAL); gd.horizontalSpan = 3; label.setLayoutData(gd); label.setFont(getFieldEditorParent().getFont()); ColorFieldEditor errOut = new ColorFieldEditor( IPreferenceConstants.CONSOLE_ERROR_RGB, "&Error:", getFieldEditorParent()); ColorFieldEditor warnOut = new ColorFieldEditor( IPreferenceConstants.CONSOLE_WARNING_RGB, "&Warning:", getFieldEditorParent()); ColorFieldEditor infoOut = new ColorFieldEditor( IPreferenceConstants.CONSOLE_INFO_RGB, "I&nformation:", getFieldEditorParent()); ColorFieldEditor verbOut = new ColorFieldEditor( IPreferenceConstants.CONSOLE_VERBOSE_RGB, "Ve&rbose:", getFieldEditorParent()); ColorFieldEditor debugOut = new ColorFieldEditor( IPreferenceConstants.CONSOLE_DEBUG_RGB, "Deb&ug:", getFieldEditorParent()); addField(errOut); addField(warnOut); addField(infoOut); addField(verbOut); addField(debugOut); } /* (non-Javadoc) * Method declared on IWorkbenchPreferencePage. */ public void init(IWorkbench workbench) { } } \ No newline at end of file Index: Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AntPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.ui.externaltools/Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AntPage.java,v retrieving revision 1.7 diff -u -r1.7 AntPage.java --- Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AntPage.java 7 Nov 2002 22:21:16 -0000 1.7 +++ Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AntPage.java 30 Nov 2002 09:18:14 -0000 @@ -88,6 +88,7 @@ */ protected Button createButton(Composite parent, String labelKey, int buttonId) { Button button = new Button(parent, SWT.PUSH); + button.setFont(parent.getFont()); button.setText(AntPreferencesMessages.getString(labelKey)); button.setData(new Integer(buttonId)); button.addSelectionListener(selectionAdapter); @@ -105,7 +106,8 @@ layout.marginWidth = 0; buttonGroup.setLayout(layout); buttonGroup.setLayoutData(new GridData(GridData.FILL_VERTICAL)); - + buttonGroup.setFont(top.getFont()); + addButtonsToButtonGroup(buttonGroup); } @@ -129,6 +131,7 @@ data.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH; data.horizontalSpan= 1; table.setLayoutData(data); + table.setFont(parent.getFont()); contentProvider = getContentProvider(); tableViewer = new TableViewer(table); Index: Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AntPreferencePage.java =================================================================== RCS file: /home/eclipse/org.eclipse.ui.externaltools/Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AntPreferencePage.java,v retrieving revision 1.9 diff -u -r1.9 AntPreferencePage.java --- Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AntPreferencePage.java 27 Nov 2002 02:10:00 -0000 1.9 +++ Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AntPreferencePage.java 30 Nov 2002 09:18:13 -0000 @@ -66,6 +66,7 @@ TabFolder folder = new TabFolder(parent, SWT.NONE); folder.setLayout(new TabFolderLayout()); folder.setLayoutData(new GridData(GridData.FILL_BOTH)); + folder.setFont(parent.getFont()); classpathPage = new AntClasspathPage(this); classpathPage.createTabItem(folder); Index: Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AntPropertiesPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.ui.externaltools/Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AntPropertiesPage.java,v retrieving revision 1.8 diff -u -r1.8 AntPropertiesPage.java --- Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AntPropertiesPage.java 7 Nov 2002 22:21:38 -0000 1.8 +++ Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AntPropertiesPage.java 30 Nov 2002 09:18:14 -0000 @@ -23,6 +23,7 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Font; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; @@ -113,6 +114,7 @@ GridData data= new GridData(GridData.FILL_BOTH); data.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH; table.setLayoutData(data); + table.setFont(parent.getFont()); fileContentProvider = getContentProvider(); fileTableViewer = new TableViewer(table); fileTableViewer.setContentProvider(fileContentProvider); @@ -126,13 +128,16 @@ } protected Composite createContents(Composite parent) { + Font font = parent.getFont(); + Composite top = new Composite(parent, SWT.NONE); + top.setFont(font); Label label = new Label(top, SWT.NONE); GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); gd.horizontalSpan =2; label.setLayoutData(gd); - label.setFont(parent.getFont()); + label.setFont(font); label.setText(AntPreferencesMessages.getString("AntPropertiesPage.&Global_properties__1")); //$NON-NLS-1$ super.createContents(top); @@ -141,7 +146,7 @@ gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); gd.horizontalSpan =2; label.setLayoutData(gd); - label.setFont(parent.getFont()); + label.setFont(font); label.setText(AntPreferencesMessages.getString("AntPropertiesPage.Glo&bal_property_files__2")); //$NON-NLS-1$ createTable(top); Index: Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AntTasksPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.ui.externaltools/Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AntTasksPage.java,v retrieving revision 1.4 diff -u -r1.4 AntTasksPage.java --- Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AntTasksPage.java 4 Nov 2002 13:59:05 -0000 1.4 +++ Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AntTasksPage.java 30 Nov 2002 09:18:14 -0000 @@ -93,6 +93,7 @@ item.setImage(labelProvider.getTaskImage()); item.setData(this); Composite top = new Composite(folder, SWT.NONE); + top.setFont(folder.getFont()); item.setControl(createContents(top)); return item; } Index: Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AntTypesPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.ui.externaltools/Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AntTypesPage.java,v retrieving revision 1.4 diff -u -r1.4 AntTypesPage.java --- Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AntTypesPage.java 4 Nov 2002 13:59:05 -0000 1.4 +++ Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/preferences/AntTypesPage.java 30 Nov 2002 09:18:14 -0000 @@ -94,6 +94,7 @@ item.setImage(labelProvider.getTypeImage()); item.setData(this); Composite top = new Composite(folder, SWT.NONE); + top.setFont(folder.getFont()); item.setControl(createContents(top)); return item; } Index: External Tools Base/org/eclipse/ui/externaltools/internal/dialog/ExternalToolVariableForm.java =================================================================== RCS file: /home/eclipse/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/dialog/ExternalToolVariableForm.java,v retrieving revision 1.7 diff -u -r1.7 ExternalToolVariableForm.java --- External Tools Base/org/eclipse/ui/externaltools/internal/dialog/ExternalToolVariableForm.java 6 Nov 2002 16:23:54 -0000 1.7 +++ External Tools Base/org/eclipse/ui/externaltools/internal/dialog/ExternalToolVariableForm.java 30 Nov 2002 09:18:16 -0000 @@ -13,6 +13,7 @@ import org.eclipse.swt.custom.StackLayout; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -58,6 +59,8 @@ } public Composite createContents(Composite parent, IGroupDialogPage page) { + Font font = parent.getFont(); + this.page = page; Composite mainComposite = new Composite(parent, SWT.NONE); @@ -74,11 +77,13 @@ data = new GridData(GridData.HORIZONTAL_ALIGN_FILL); data.horizontalSpan = 1; variableListLabel.setLayoutData(data); - + variableListLabel.setFont(font); + variableList = new List(mainComposite, SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL); data = new GridData(GridData.FILL_HORIZONTAL); data.heightHint = variableList.getItemHeight() * VISIBLE_ITEM_COUNT; variableList.setLayoutData(data); + variableList.setFont(font); variableComposite = new Composite(mainComposite, SWT.NONE); variableLayout = new StackLayout(); @@ -87,6 +92,7 @@ data = new GridData(GridData.FILL_BOTH); variableComposite.setLayout(variableLayout); variableComposite.setLayoutData(data); + variableComposite.setFont(font); createVariableComponents(data); Index: External Tools Base/org/eclipse/ui/externaltools/internal/registry/ExternalToolVariable.java =================================================================== RCS file: /home/eclipse/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/registry/ExternalToolVariable.java,v retrieving revision 1.4 diff -u -r1.4 ExternalToolVariable.java --- External Tools Base/org/eclipse/ui/externaltools/internal/registry/ExternalToolVariable.java 1 Nov 2002 21:45:33 -0000 1.4 +++ External Tools Base/org/eclipse/ui/externaltools/internal/registry/ExternalToolVariable.java 30 Nov 2002 09:18:16 -0000 @@ -120,6 +120,7 @@ message = new Label(parent, SWT.NONE); GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL); message.setLayoutData(data); + message.setFont(parent.getFont()); message.setText(ToolMessages.getString("ExternalToolVariable.componentErrorMessage")); //$NON-NLS-1$ message.setForeground(JFaceColors.getErrorText(message.getDisplay())); } Index: External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java,v retrieving revision 1.8 diff -u -r1.8 BuilderPropertyPage.java --- External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java 28 Nov 2002 23:42:45 -0000 1.8 +++ External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java 30 Nov 2002 09:18:16 -0000 @@ -49,6 +49,7 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -241,6 +242,7 @@ data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH); data.heightHint = convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT); button.setLayoutData(data); + button.setFont(parent.getFont()); button.setText(label); button.setEnabled(false); button.addSelectionListener(new SelectionAdapter() { @@ -255,6 +257,8 @@ * Method declared on PreferencePage. */ protected Control createContents(Composite parent) { + Font font = parent.getFont(); + debugModelPresentation = DebugUITools.newDebugModelPresentation(); builderImage = ExternalToolsPlugin.getDefault().getImageDescriptor(IMG_BUILDER).createImage(); invalidBuildToolImage = ExternalToolsPlugin.getDefault().getImageDescriptor(IMG_INVALID_BUILD_TOOL).createImage(); @@ -272,6 +276,7 @@ Label description = new Label(topLevel, SWT.WRAP); description.setText(ToolMessages.getString("BuilderPropertyPage.description")); //$NON-NLS-1$ description.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + description.setFont(font); Composite tableAndButtons = new Composite(topLevel, SWT.NONE); tableAndButtons.setLayoutData(new GridData(GridData.FILL_BOTH)); @@ -286,6 +291,7 @@ GridData data = new GridData(GridData.FILL_BOTH); data.widthHint = BUILDER_TABLE_WIDTH; builderTable.setLayoutData(data); + builderTable.setFont(font); builderTable.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { handleTableSelectionChanged(); @@ -298,6 +304,7 @@ layout.marginHeight = 0; layout.marginWidth = 0; buttonArea.setLayout(layout); + buttonArea.setFont(font); buttonArea.setLayoutData(new GridData(GridData.FILL_VERTICAL)); newButton = createButton(buttonArea, ToolMessages.getString("BuilderPropertyPage.newButton")); //$NON-NLS-1$ editButton = createButton(buttonArea, ToolMessages.getString("BuilderPropertyPage.editButton")); //$NON-NLS-1$ Index: External Tools Base/org/eclipse/ui/externaltools/internal/ui/ExternalToolsPreferencePage.java =================================================================== RCS file: /home/eclipse/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/ExternalToolsPreferencePage.java,v retrieving revision 1.1 diff -u -r1.1 ExternalToolsPreferencePage.java --- External Tools Base/org/eclipse/ui/externaltools/internal/ui/ExternalToolsPreferencePage.java 28 Nov 2002 23:42:45 -0000 1.1 +++ External Tools Base/org/eclipse/ui/externaltools/internal/ui/ExternalToolsPreferencePage.java 30 Nov 2002 09:18:16 -0000 @@ -2,6 +2,7 @@ import org.eclipse.jface.preference.PreferencePage; import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Font; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; @@ -29,6 +30,8 @@ * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) */ protected Control createContents(Composite parent) { + Font font = parent.getFont(); + //The main composite Composite composite = new Composite(parent, SWT.NULL); GridLayout layout = new GridLayout(); @@ -47,8 +50,10 @@ group.setLayoutData(data); layout= new GridLayout(); group.setLayout(layout); + group.setFont(font); promptForMigrationButton= new Button(group, SWT.CHECK | SWT.LEFT); + promptForMigrationButton.setFont(font); promptForMigrationButton.setText("Always prompt before migrating project builders"); promptForMigrationButton.setSelection(getPreferenceStore().getBoolean(IPreferenceConstants.PROMPT_FOR_MIGRATION)); return composite; Index: External Tools Base/org/eclipse/ui/externaltools/internal/ui/MessageDialogWithToggle.java =================================================================== RCS file: /home/eclipse/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/MessageDialogWithToggle.java,v retrieving revision 1.1 diff -u -r1.1 MessageDialogWithToggle.java --- External Tools Base/org/eclipse/ui/externaltools/internal/ui/MessageDialogWithToggle.java 28 Nov 2002 23:42:45 -0000 1.1 +++ External Tools Base/org/eclipse/ui/externaltools/internal/ui/MessageDialogWithToggle.java 30 Nov 2002 09:18:16 -0000 @@ -60,6 +60,7 @@ data.horizontalSpan= 2; data.horizontalAlignment= GridData.CENTER; button.setLayoutData(data); + button.setFont(parent.getFont()); return button; } Index: External Tools Base/org/eclipse/ui/externaltools/launchConfigurations/ExternalToolsMainTab.java =================================================================== RCS file: /home/eclipse/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/launchConfigurations/ExternalToolsMainTab.java,v retrieving revision 1.6 diff -u -r1.6 ExternalToolsMainTab.java --- External Tools Base/org/eclipse/ui/externaltools/launchConfigurations/ExternalToolsMainTab.java 26 Nov 2002 04:26:50 -0000 1.6 +++ External Tools Base/org/eclipse/ui/externaltools/launchConfigurations/ExternalToolsMainTab.java 30 Nov 2002 09:18:16 -0000 @@ -24,6 +24,7 @@ import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -68,6 +69,7 @@ GridData gridData = new GridData(GridData.FILL_HORIZONTAL); mainComposite.setLayout(layout); mainComposite.setLayoutData(gridData); + mainComposite.setFont(parent.getFont()); createLocationComponent(mainComposite); createWorkDirectoryComponent(mainComposite); createDescriptionComponent(mainComposite); @@ -80,17 +82,21 @@ * @param parent the composite to create the controls in */ protected void createDescriptionComponent(Composite parent) { + Font font = parent.getFont(); + Label label = new Label(parent, SWT.NONE); label.setText(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsMainTab.Descri&ption__1")); //$NON-NLS-1$ GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL); data.horizontalSpan = 2; label.setLayoutData(data); + label.setFont(font); descriptionField = new Text(parent, SWT.BORDER); data = new GridData(GridData.FILL_HORIZONTAL); data.horizontalSpan = 2; data.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH; descriptionField.setLayoutData(data); + descriptionField.setFont(font); } /** @@ -100,6 +106,8 @@ * @param parent the composite to create the controls in */ protected void createLocationComponent(Composite parent) { + Font font = parent.getFont(); + Composite composite = new Composite(parent, SWT.NONE); GridLayout layout = new GridLayout(); layout.marginWidth = 0; @@ -113,11 +121,13 @@ label.setText(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsMainTab.&Location___2")); //$NON-NLS-1$ GridData data = new GridData(GridData.FILL_HORIZONTAL); label.setLayoutData(data); + label.setFont(font); locationField = new Text(composite, SWT.BORDER); data = new GridData(GridData.FILL_HORIZONTAL); data.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH; locationField.setLayoutData(data); + locationField.setFont(font); Composite buttonComposite = new Composite(parent, SWT.NONE); layout = new GridLayout(); @@ -127,6 +137,7 @@ gridData = new GridData(GridData.FILL_HORIZONTAL); buttonComposite.setLayout(layout); buttonComposite.setLayoutData(gridData); + buttonComposite.setFont(font); createVerticalSpacer(buttonComposite, 1); @@ -151,6 +162,8 @@ * @param parent the composite to create the controls in */ protected void createWorkDirectoryComponent(Composite parent) { + Font font = parent.getFont(); + Composite composite = new Composite(parent, SWT.NONE); GridLayout layout = new GridLayout(); layout.marginWidth = 0; @@ -164,11 +177,13 @@ label.setText(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsMainTab.Working_&Directory__5")); //$NON-NLS-1$ GridData data = new GridData(GridData.FILL_HORIZONTAL); label.setLayoutData(data); + label.setFont(font); workDirectoryField = new Text(composite, SWT.BORDER); data = new GridData(GridData.FILL_HORIZONTAL); data.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH; workDirectoryField.setLayoutData(data); + workDirectoryField.setFont(font); Composite buttonComposite = new Composite(parent, SWT.NONE); layout = new GridLayout(); @@ -178,6 +193,7 @@ gridData = new GridData(GridData.FILL_HORIZONTAL); buttonComposite.setLayout(layout); buttonComposite.setLayoutData(gridData); + buttonComposite.setFont(font); createVerticalSpacer(buttonComposite, 1); workspaceWorkingDirectoryButton= createPushButton(buttonComposite, ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsMainTab.Browse_Wor&kspace..._6"), null); //$NON-NLS-1$ Index: External Tools Base/org/eclipse/ui/externaltools/launchConfigurations/ExternalToolsOptionTab.java =================================================================== RCS file: /home/eclipse/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/launchConfigurations/ExternalToolsOptionTab.java,v retrieving revision 1.14 diff -u -r1.14 ExternalToolsOptionTab.java --- External Tools Base/org/eclipse/ui/externaltools/launchConfigurations/ExternalToolsOptionTab.java 26 Nov 2002 04:26:50 -0000 1.14 +++ External Tools Base/org/eclipse/ui/externaltools/launchConfigurations/ExternalToolsOptionTab.java 30 Nov 2002 09:18:15 -0000 @@ -19,6 +19,7 @@ import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; +import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -57,6 +58,7 @@ GridData gridData = new GridData(GridData.FILL_HORIZONTAL); mainComposite.setLayout(layout); mainComposite.setLayoutData(gridData); + mainComposite.setFont(parent.getFont()); createVerticalSpacer(mainComposite, 1); createRunBackgroundComponent(mainComposite); @@ -72,6 +74,8 @@ * @param parent the composite to create the controls in */ protected void createArgumentComponent(Composite parent) { + Font font = parent.getFont(); + Composite comp = new Composite(parent, SWT.NONE); GridLayout layout = new GridLayout(); layout.marginWidth = 0; @@ -80,17 +84,20 @@ GridData data = new GridData(GridData.FILL_HORIZONTAL); comp.setLayout(layout); comp.setLayoutData(data); + comp.setFont(font); Label label = new Label(comp, SWT.NONE); label.setText(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsOptionTab.&Arguments___1")); //$NON-NLS-1$ data = new GridData(GridData.HORIZONTAL_ALIGN_FILL); data.horizontalSpan = 2; label.setLayoutData(data); + label.setFont(font); argumentField = new Text(comp, SWT.BORDER); data = new GridData(GridData.FILL_HORIZONTAL); data.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH; argumentField.setLayoutData(data); + argumentField.setFont(font); argumentField.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { updateLaunchConfigurationDialog(); @@ -112,6 +119,7 @@ data = new GridData(GridData.HORIZONTAL_ALIGN_FILL); data.horizontalSpan = 2; instruction.setLayoutData(data); + instruction.setFont(font); } /** @@ -129,6 +137,7 @@ // } // GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL); // promptArgButton.setLayoutData(data); +// promptArgButton.setFont(parent.getFont(); // promptArgButton.addSelectionListener(getSelectionAdapter()); } @@ -143,6 +152,7 @@ runBackgroundButton.setText(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsOptionTab.Run_tool_in_bac&kground_4")); //$NON-NLS-1$ GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL); runBackgroundButton.setLayoutData(data); + runBackgroundButton.setFont(parent.getFont()); runBackgroundButton.addSelectionListener(getSelectionAdapter()); } Index: External Tools Base/org/eclipse/ui/externaltools/launchConfigurations/ExternalToolsRefreshTab.java =================================================================== RCS file: /home/eclipse/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/launchConfigurations/ExternalToolsRefreshTab.java,v retrieving revision 1.10 diff -u -r1.10 ExternalToolsRefreshTab.java --- External Tools Base/org/eclipse/ui/externaltools/launchConfigurations/ExternalToolsRefreshTab.java 26 Nov 2002 04:26:50 -0000 1.10 +++ External Tools Base/org/eclipse/ui/externaltools/launchConfigurations/ExternalToolsRefreshTab.java 30 Nov 2002 09:18:15 -0000 @@ -47,6 +47,7 @@ GridData gridData = new GridData(GridData.FILL_HORIZONTAL); mainComposite.setLayout(layout); mainComposite.setLayoutData(gridData); + mainComposite.setFont(parent.getFont()); createVerticalSpacer(mainComposite, 1); createRefreshComponent(mainComposite); createRecursiveComponent(mainComposite); @@ -64,6 +65,7 @@ recursiveField.setText(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsRefreshTab.Recursively_&include_sub-folders_1")); //$NON-NLS-1$ GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL); recursiveField.setLayoutData(data); + recursiveField.setFont(parent.getFont()); recursiveField.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { updateLaunchConfigurationDialog(); @@ -82,6 +84,7 @@ refreshField.setText("R&efresh resources after running tool"); //$NON-NLS-1$ GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL); refreshField.setLayoutData(data); + refreshField.setFont(parent.getFont()); refreshField.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { updateEnabledState(); Index: External Tools Base/org/eclipse/ui/externaltools/variable/ResourceComponent.java =================================================================== RCS file: /home/eclipse/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/variable/ResourceComponent.java,v retrieving revision 1.5 diff -u -r1.5 ResourceComponent.java --- External Tools Base/org/eclipse/ui/externaltools/variable/ResourceComponent.java 1 Nov 2002 21:45:33 -0000 1.5 +++ External Tools Base/org/eclipse/ui/externaltools/variable/ResourceComponent.java 30 Nov 2002 09:18:15 -0000 @@ -72,6 +72,7 @@ GridData gridData = new GridData(GridData.FILL_BOTH); mainGroup.setLayout(layout); mainGroup.setLayoutData(gridData); + mainGroup.setFont(parent.getFont()); mainGroup.setText(ToolUtil.buildVariableTag(varTag, null)); createSelectedResourceOption(); @@ -89,6 +90,7 @@ GridData data = new GridData(GridData.FILL_BOTH); data.heightHint = tree.getItemHeight() * getInitialVisibleItemCount(); tree.setLayoutData(data); + tree.setFont(mainGroup.getFont()); resourceList = new TreeViewer(tree); resourceList.addSelectionChangedListener(new ISelectionChangedListener() { @@ -111,6 +113,7 @@ selectedResourceButton.setText(ToolMessages.getString("ResourceComponent.selectedResLabel")); //$NON-NLS-1$ GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL); selectedResourceButton.setLayoutData(data); + selectedResourceButton.setFont(mainGroup.getFont()); selectedResourceButton.setSelection(true); } @@ -123,6 +126,7 @@ specificResourceButton.setText(ToolMessages.getString("ResourceComponent.specificResLabel")); //$NON-NLS-1$ GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL); specificResourceButton.setLayoutData(data); + specificResourceButton.setFont(mainGroup.getFont()); specificResourceButton.setSelection(false); specificResourceButton.addSelectionListener(new SelectionAdapter() { Index: External Tools Base/org/eclipse/ui/externaltools/variable/SpecificFileResourceComponent.java =================================================================== RCS file: /home/eclipse/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/variable/SpecificFileResourceComponent.java,v retrieving revision 1.4 diff -u -r1.4 SpecificFileResourceComponent.java --- External Tools Base/org/eclipse/ui/externaltools/variable/SpecificFileResourceComponent.java 1 Nov 2002 21:45:33 -0000 1.4 +++ External Tools Base/org/eclipse/ui/externaltools/variable/SpecificFileResourceComponent.java 30 Nov 2002 09:18:15 -0000 @@ -48,6 +48,7 @@ Label label = new Label(mainGroup, SWT.NONE); GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL); label.setLayoutData(data); + label.setFont(mainGroup.getFont()); label.setText(ToolMessages.getString("ResourceComponent.specificResLabel")); //$NON-NLS-1$ } Index: External Tools Base/org/eclipse/ui/externaltools/variable/SpecificFolderResourceComponent.java =================================================================== RCS file: /home/eclipse/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/variable/SpecificFolderResourceComponent.java,v retrieving revision 1.4 diff -u -r1.4 SpecificFolderResourceComponent.java --- External Tools Base/org/eclipse/ui/externaltools/variable/SpecificFolderResourceComponent.java 1 Nov 2002 21:45:33 -0000 1.4 +++ External Tools Base/org/eclipse/ui/externaltools/variable/SpecificFolderResourceComponent.java 30 Nov 2002 09:18:15 -0000 @@ -60,6 +60,7 @@ Label label = new Label(mainGroup, SWT.NONE); GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL); label.setLayoutData(data); + label.setFont(mainGroup.getFont()); label.setText(ToolMessages.getString("ResourceComponent.specificResLabel")); //$NON-NLS-1$ } Index: New Ant View/org/eclipse/ui/externaltools/internal/ant/view/actions/SearchForBuildFilesDialog.java =================================================================== RCS file: /home/eclipse/org.eclipse.ui.externaltools/New Ant View/org/eclipse/ui/externaltools/internal/ant/view/actions/SearchForBuildFilesDialog.java,v retrieving revision 1.3 diff -u -r1.3 SearchForBuildFilesDialog.java --- New Ant View/org/eclipse/ui/externaltools/internal/ant/view/actions/SearchForBuildFilesDialog.java 28 Nov 2002 00:26:28 -0000 1.3 +++ New Ant View/org/eclipse/ui/externaltools/internal/ant/view/actions/SearchForBuildFilesDialog.java 30 Nov 2002 09:18:15 -0000 @@ -21,6 +21,7 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.graphics.Font; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; @@ -86,9 +87,12 @@ * Add the scope selection widgets to the dialog area */ protected Control createDialogArea(Composite parent) { + Font font = parent.getFont(); + Composite composite = (Composite) super.createDialogArea(parent); includeErrorResultButton= new Button(composite, SWT.CHECK); + includeErrorResultButton.setFont(font); includeErrorResultButton.setText("Include build files that contain errors"); includeErrorResultButton.setSelection(false); @@ -98,6 +102,7 @@ scope.setLayoutData(data); GridLayout layout= new GridLayout(3, false); scope.setLayout(layout); + scope.setFont(font); Composite radioComposite= new Composite(scope, SWT.NONE); GridLayout radioLayout= new GridLayout(); @@ -111,11 +116,13 @@ }; Button workspaceScope= new Button(radioComposite, SWT.RADIO); + workspaceScope.setFont(font); workspaceScope.setText("Workspace"); workspaceScope.setSelection(true); workspaceScope.addSelectionListener(selectionListener); workingSetScopeButton=new Button(radioComposite, SWT.RADIO); + workingSetScopeButton.setFont(font); workingSetScopeButton.setText("Working Set:"); workingSetScopeButton.addSelectionListener(selectionListener); @@ -123,10 +130,12 @@ workingSetText.setEditable(false); data= new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_END); workingSetText.setLayoutData(data); + workingSetText.setFont(font); Button button = new Button(scope, SWT.PUSH); data= new GridData(GridData.VERTICAL_ALIGN_END); button.setLayoutData(data); + button.setFont(font); button.setText("Choose..."); button.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent evt) {