Bug 42847 CVS dialogs do not honour dialog font preferences

49 files changed, 100 insertions, 57 deletions

diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AddToVersionControlDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AddToVersionControlDialog.java
index f6a310d44..a6d7d48d3 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AddToVersionControlDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AddToVersionControlDialog.java
@@ -87,7 +87,6 @@ public class AddToVersionControlDialog extends DetailsDialog {
 		layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
 		composite.setLayout(layout);
 		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		composite.setFont(parent.getFont());
 		
 		addUnaddedResourcesArea(composite);
 		
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AlternateUserValidationDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AlternateUserValidationDialog.java
index 520278890..6f4e08eb2 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AlternateUserValidationDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AlternateUserValidationDialog.java
@@ -17,7 +17,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.VerifyEvent;
 import org.eclipse.swt.events.VerifyListener;
-import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.FontData;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
@@ -25,7 +24,6 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Listener;
@@ -36,7 +34,6 @@ public class AlternateUserValidationDialog extends Dialog {
 	String user;
 	String password = ""; //$NON-NLS-1$
 	List numXs = new ArrayList();
-	Font font;
 	Label icon1;
 	Label icon2;
 	Label icon3;
@@ -90,7 +87,6 @@ public class AlternateUserValidationDialog extends Dialog {
 		data.widthHint = 250;
 		passwordText.setLayoutData(data);
 		
-		passwordText.setFont(font);
 		passwordText.addVerifyListener(new VerifyListener() {
 			public void verifyText(VerifyEvent e) {
 				if (inUpdate) return;
@@ -160,13 +156,12 @@ public class AlternateUserValidationDialog extends Dialog {
 				cancelPressed();
 			}
 		});
-		
+        Dialog.applyDialogFont(parent);
 		return main;
 	}
 
 	public boolean close() {
 		boolean result = super.close();
-		if (font != null) font.dispose();
 		if (images != null) {
 			for (int i = 0; i < images.length; i++) {
 				images[i].dispose();
@@ -207,7 +202,6 @@ public class AlternateUserValidationDialog extends Dialog {
 		if (System.getProperty("os.name").indexOf("Windows") != -1) { //$NON-NLS-1$ //$NON-NLS-2$
 			fd.setName("Microsoft Sans Serif"); //$NON-NLS-1$
 		}
-		font = new Font(Display.getDefault(), fd);
 	}
 	void updateImages() {
 		icon1.setImage(getImage());
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/BranchPromptDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/BranchPromptDialog.java
index 8547bc65a..fea313b87 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/BranchPromptDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/BranchPromptDialog.java
@@ -11,6 +11,7 @@
 package org.eclipse.team.internal.ccvs.ui;
 
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
@@ -81,7 +82,6 @@ public class BranchPromptDialog extends DetailsDialog {
 			GridData.VERTICAL_ALIGN_CENTER);
 		data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);;
 		label.setLayoutData(data);
-		label.setFont(composite.getFont());
 		
 		CVSWizardPage.createLabel(composite, Policy.bind("BranchWizardPage.branchName")); //$NON-NLS-1$
 		branchText = CVSWizardPage.createTextField(composite);
@@ -129,7 +129,7 @@ public class BranchPromptDialog extends DetailsDialog {
 
 		// F1 Help
 		WorkbenchHelp.setHelp(composite, IHelpContextIds.BRANCH_DIALOG);
-		
+		Dialog.applyDialogFont(composite);
 		branchText.setFocus();
 	}
 
@@ -156,7 +156,6 @@ public class BranchPromptDialog extends DetailsDialog {
 		layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
 		composite.setLayout(layout);
 		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		composite.setFont(parent.getFont());
 		
 		Label label = new Label(composite, SWT.WRAP);
 		label.setText(Policy.bind("BranchWizardPage.existingVersionsAndBranches")); //$NON-NLS-1$
@@ -167,7 +166,6 @@ public class BranchPromptDialog extends DetailsDialog {
 			GridData.VERTICAL_ALIGN_CENTER);
 		data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);;
 		label.setLayoutData(data);
-		label.setFont(composite.getFont());
 		
 		tagTree = createTree(composite);
 		tagTree.setInput(new ProjectElement(folder, ProjectElement.INCLUDE_BRANCHES | ProjectElement.INCLUDE_VERSIONS));
@@ -184,6 +182,7 @@ public class BranchPromptDialog extends DetailsDialog {
 														  convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT), 
 														  convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH),
 														  refresh, refresh);
+		Dialog.applyDialogFont(parent);
 		return composite;
 	}
 	
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFilePropertiesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFilePropertiesPage.java
index 0c6fd9019..b700f744c 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFilePropertiesPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFilePropertiesPage.java
@@ -16,6 +16,7 @@ import java.util.Date;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -100,6 +101,7 @@ public class CVSFilePropertiesPage extends CVSPropertiesPage {
 			createLabel(composite, ""); //$NON-NLS-1$
 		}
 		WorkbenchHelp.setHelp(getControl(), IHelpContextIds.FILE_PROPERTY_PAGE);
+        Dialog.applyDialogFont(parent);
 		return composite;
 	}
 	/**
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFolderPropertiesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFolderPropertiesPage.java
index 3f373141e..ac4d9c648 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFolderPropertiesPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFolderPropertiesPage.java
@@ -12,6 +12,7 @@ package org.eclipse.team.internal.ccvs.ui;
 
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.SWT;
@@ -111,6 +112,7 @@ public class CVSFolderPropertiesPage extends CVSPropertiesPage {
 			createLabel(composite, Policy.bind("CVSFilePropertiesPage.error"), 2); //$NON-NLS-1$
 		}
 		WorkbenchHelp.setHelp(getControl(), IHelpContextIds.FOLDER_PROPERTY_PAGE);
+        Dialog.applyDialogFont(parent);
 		return composite;
 	}
 
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectPropertiesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectPropertiesPage.java
index cef9cf736..5d6417a08 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectPropertiesPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectPropertiesPage.java
@@ -241,6 +241,7 @@ public class CVSProjectPropertiesPage extends CVSPropertiesPage {
 		
 		initializeValues(oldLocation);
 		WorkbenchHelp.setHelp(getControl(), IHelpContextIds.PROJECT_PROPERTY_PAGE);
+        Dialog.applyDialogFont(parent);
 		return composite;
 	}
 	/**
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java
index 4b52fca16..430c19c53 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java
@@ -63,6 +63,7 @@ public class CommitCommentArea extends DialogArea {
 	 * @see org.eclipse.team.internal.ccvs.ui.DialogArea#createArea(org.eclipse.swt.widgets.Composite)
 	 */
 	public Control createArea(Composite parent) {
+        Dialog.applyDialogFont(parent);
 		Composite composite = createGrabbingComposite(parent, 1);
 		initializeDialogUnits(composite);
 						
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/EditorsDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/EditorsDialog.java
index 25636bd57..cdf63f8fe 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/EditorsDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/EditorsDialog.java
@@ -42,7 +42,6 @@ public class EditorsDialog extends Dialog {
 	public EditorsDialog(Shell shell, EditorsInfo[] infos) {
 		super(shell);
 		editorsInfo = infos;
-		
 	}
 
 	protected Control createDialogArea(Composite container) {
@@ -59,6 +58,8 @@ public class EditorsDialog extends Dialog {
 		// set F1 help
 		WorkbenchHelp.setHelp(parent, IHelpContextIds.EDITORS_DIALOG);
 		
+		Dialog.applyDialogFont(parent);
+
 		return parent;
 	}
 	/**
@@ -67,9 +68,7 @@ public class EditorsDialog extends Dialog {
 	 */
 	private void createMessageArea(Composite parent) {
 		Label label = new Label(parent, SWT.NONE);
-		label.setText(Policy.bind("EditorsDialog.question")); //$NON-NLS-1$
-		label.setFont(parent.getFont());
-		
+		label.setText(Policy.bind("EditorsDialog.question")); //$NON-NLS-1$		
 	}
 	
 }
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryFilterDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryFilterDialog.java
index 089eeb543..892860fd7 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryFilterDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryFilterDialog.java
@@ -60,6 +60,8 @@ public class HistoryFilterDialog extends Dialog {
 		Composite topLevel = new Composite(parent, SWT.NONE);
 		GridLayout layout = new GridLayout();
 		layout.numColumns = 2;
+        layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
+        layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
 		topLevel.setLayout(layout);
 		
 		//"and" and "or" search radio buttons
@@ -158,7 +160,7 @@ public class HistoryFilterDialog extends Dialog {
 		
 		// set F1 help
 		WorkbenchHelp.setHelp(topLevel, IHelpContextIds.HISTORY_FILTER_DIALOG);
-		
+        Dialog.applyDialogFont(parent);
 		return topLevel;
 	}
 	void initializeValues() {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IgnoreResourcesDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IgnoreResourcesDialog.java
index caccc1fe5..a8d331bab 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IgnoreResourcesDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IgnoreResourcesDialog.java
@@ -168,7 +168,7 @@ public class IgnoreResourcesDialog extends Dialog {
 		customEntryText.addListener(SWT.Modify, modifyListener);
 
 		statusMessageLabel = createIndentedLabel(top, "", 0); //$NON-NLS-1$
-		statusMessageLabel.setFont(parent.getFont());
+        Dialog.applyDialogFont(parent);
 		return top;
 	}
 
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ListSelectionArea.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ListSelectionArea.java
index bab62a4dc..5fe2e8595 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ListSelectionArea.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ListSelectionArea.java
@@ -76,6 +76,7 @@ public class ListSelectionArea extends DialogArea {
 	 * @see org.eclipse.team.internal.ccvs.ui.DialogArea#createArea(org.eclipse.swt.widgets.Composite)
 	 */
 	public Control createArea(Composite parent) {
+        Dialog.applyDialogFont(parent);
 		Composite composite = createComposite(parent, 1);
 		initializeDialogUnits(composite);
 
@@ -90,7 +91,6 @@ public class ListSelectionArea extends DialogArea {
 
 		listViewer.setLabelProvider(labelProvider);
 		listViewer.setContentProvider(contentProvider);
-		listViewer.getControl().setFont(composite.getFont());
 		
 		listViewer.addCheckStateListener(new ICheckStateListener() {
 			public void checkStateChanged(CheckStateChangedEvent event) {
@@ -135,7 +135,6 @@ public class ListSelectionArea extends DialogArea {
 	 */
 	private void addSelectionButtons(Composite composite) {
 		Composite buttonComposite = new Composite(composite, SWT.RIGHT);
-		buttonComposite.setFont(composite.getFont());
 		GridLayout layout = new GridLayout();
 		layout.numColumns = 2;
 		buttonComposite.setLayout(layout);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ReleaseCommentDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ReleaseCommentDialog.java
index d7b8c40ac..f870f30d0 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ReleaseCommentDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ReleaseCommentDialog.java
@@ -63,7 +63,8 @@ public class ReleaseCommentDialog extends Dialog {
 		
 		// set F1 help
 		WorkbenchHelp.setHelp(composite, IHelpContextIds.RELEASE_COMMENT_DIALOG);	
-		
+        Dialog.applyDialogFont(parent);
+        
 		return composite;
 	}
 
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourcePropertiesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourcePropertiesPage.java
index f3da7e29b..35c401709 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourcePropertiesPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourcePropertiesPage.java
@@ -13,6 +13,7 @@ package org.eclipse.team.internal.ccvs.ui;
 
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -67,6 +68,7 @@ public class ResourcePropertiesPage extends PropertyPage {
 		} catch (TeamException e) {
 			createPair(composite, Policy.bind("ResourcePropertiesPage.error"), e.getMessage()); //$NON-NLS-1$
 		}
+        Dialog.applyDialogFont(parent);
 		return composite;
 	}
 
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/SynchronizeProjectsDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/SynchronizeProjectsDialog.java
index 9c3465f68..f51e2be75 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/SynchronizeProjectsDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/SynchronizeProjectsDialog.java
@@ -70,9 +70,6 @@ public class SynchronizeProjectsDialog extends Dialog {
 	protected Control createDialogArea(Composite parent) {
 		// page group
 		Composite composite = (Composite)super.createDialogArea(parent);
-	
-		Font font = parent.getFont();
-		composite.setFont(font);
 					
 		workingSetArea = new WorkingSetSelectionArea(this, Policy.bind("SynchronizeProjectsDialog.allSharedProjects"), Policy.bind("SynchronizeProjectsDialog.sharedWorkingSetProjects"), settings); //$NON-NLS-1$ //$NON-NLS-2$
 		setWorkingSet(workingSet);
@@ -97,7 +94,8 @@ public class SynchronizeProjectsDialog extends Dialog {
 		
 		// F1 Help
 		WorkbenchHelp.setHelp(composite, IHelpContextIds.SYNCHRONIZE_PROJECTS_DIALOG);
-		
+        Dialog.applyDialogFont(parent);
+        
 		return composite;
 	}
 
@@ -152,7 +150,6 @@ public class SynchronizeProjectsDialog extends Dialog {
 	protected Button createCheckbox(Composite parent, String label) {
 		Button button = new Button(parent, SWT.CHECK | SWT.LEFT);
 		button.setText(label);
-		button.setFont(parent.getFont());
 		GridData data = new GridData();
 		button.setLayoutData(data);
 		return button;
@@ -163,7 +160,6 @@ public class SynchronizeProjectsDialog extends Dialog {
 		if (text != null) {
 			label.setText(text);
 		} 
-		label.setFont(composite.getFont());
 		return label;
 	}
 	
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagAsVersionDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagAsVersionDialog.java
index 189affb77..778cba445 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagAsVersionDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagAsVersionDialog.java
@@ -11,6 +11,7 @@
 package org.eclipse.team.internal.ccvs.ui;
 
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.viewers.ColumnWeightData;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -89,7 +90,6 @@ public class TagAsVersionDialog extends DetailsDialog {
 			GridData.VERTICAL_ALIGN_CENTER);
 		data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);;
 		label.setLayoutData(data);
-		label.setFont(parent.getFont());
 
 		tagText = new Text(parent, SWT.SINGLE | SWT.BORDER);
 		tagText.setLayoutData(new GridData(
@@ -120,6 +120,7 @@ public class TagAsVersionDialog extends DetailsDialog {
 		
 		// Add F1 help
 		WorkbenchHelp.setHelp(parent, IHelpContextIds.TAG_AS_VERSION_DIALOG);
+		Dialog.applyDialogFont(parent);
 	}
 
 	public boolean shouldMoveTag()  {
@@ -152,7 +153,6 @@ public class TagAsVersionDialog extends DetailsDialog {
 		layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
 		composite.setLayout(layout);
 		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		composite.setFont(parent.getFont());
 		
 		Label label = new Label(composite, SWT.WRAP);
 		label.setText(Policy.bind("TagAction.existingVersions")); //$NON-NLS-1$
@@ -163,7 +163,6 @@ public class TagAsVersionDialog extends DetailsDialog {
 			GridData.VERTICAL_ALIGN_CENTER);
 		data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);;
 		label.setLayoutData(data);
-		label.setFont(composite.getFont());
 		
 		existingVersionTable = createTable(composite);
 		existingVersionTable.setContentProvider(new WorkbenchContentProvider());
@@ -215,7 +214,7 @@ public class TagAsVersionDialog extends DetailsDialog {
 														  afterRefresh, afterConfigure);
 		
 		existingVersionTable.setInput(new TagRootElement(folder, CVSTag.VERSION));
-		
+		Dialog.applyDialogFont(parent);
 		return composite;
 	}
 	
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagConfigurationDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagConfigurationDialog.java
index 9fab2799a..85aa153c4 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagConfigurationDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagConfigurationDialog.java
@@ -160,6 +160,8 @@ public class TagConfigurationDialog extends Dialog {
 		GridLayout gridLayout = new GridLayout();
 		gridLayout.numColumns = 2;
 		gridLayout.makeColumnsEqualWidth = true;
+        gridLayout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
+        gridLayout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);        
 		shell.setLayout (gridLayout);
 		
 		Composite comp = new Composite(shell, SWT.NULL);
@@ -424,6 +426,7 @@ public class TagConfigurationDialog extends Dialog {
 		WorkbenchHelp.setHelp(shell, IHelpContextIds.TAG_CONFIGURATION_OVERVIEW);
 
 		updateEnablements();
+        Dialog.applyDialogFont(parent);
 		return shell;
 	}
 	
@@ -686,8 +689,9 @@ public class TagConfigurationDialog extends Dialog {
 		data = new GridData();
 		if(hHint!=0 && wHint!=0) {
 			data.heightHint = hHint;
-			int widthHint = wHint;
-			data.widthHint = Math.max(widthHint, refreshButton.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
+			//don't crop labels with large font
+			//int widthHint = wHint;
+			//data.widthHint = Math.max(widthHint, refreshButton.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
 		}
 		data.horizontalAlignment = GridData.END;
 		data.horizontalSpan = 1;
@@ -698,8 +702,9 @@ public class TagConfigurationDialog extends Dialog {
 		data = new GridData ();
 		if(hHint!=0 && wHint!=0) {
 			data.heightHint = hHint;
-			int widthHint = wHint;
-			data.widthHint = Math.max(widthHint, addButton.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
+			//don't crop labels with large font
+			//int widthHint = wHint;
+			//data.widthHint = Math.max(widthHint, addButton.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
 		}
 		data.horizontalAlignment = GridData.END;
 		data.horizontalSpan = 1;
@@ -761,8 +766,9 @@ public class TagConfigurationDialog extends Dialog {
 	private GridData getStandardButtonData(Button button) {
 		GridData data = new GridData();
 		data.heightHint = convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT);
-		int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
-		data.widthHint = Math.max(widthHint, button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
+        //don't crop labels with large font
+		//int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
+		//data.widthHint = Math.max(widthHint, button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
 		return data;
 	}
 
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagSelectionDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagSelectionDialog.java
index a57449ee3..109bd5e43 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagSelectionDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagSelectionDialog.java
@@ -225,7 +225,8 @@ public class TagSelectionDialog extends Dialog {
 		seperator.setLayoutData(data);
 
 		updateEnablement();
-		
+        Dialog.applyDialogFont(parent);
+        
 		return top;
 	}
 	
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/UserValidationDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/UserValidationDialog.java
index f449c2583..1d2fad012 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/UserValidationDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/UserValidationDialog.java
@@ -114,6 +114,8 @@ public class UserValidationDialog extends Dialog {
 		createUsernameFields(main);
 		createPasswordFields(main);
 	
+        Dialog.applyDialogFont(parent);
+        
 		return main;
 	}
 	/**
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkingSetSelectionArea.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkingSetSelectionArea.java
index b7dd0f871..1dbfb0f8a 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkingSetSelectionArea.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkingSetSelectionArea.java
@@ -99,6 +99,7 @@ public class WorkingSetSelectionArea extends DialogArea {
 	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(Composite)
 	 */
 	public Control createArea(Composite parent) {
+        Dialog.applyDialogFont(parent);
 		Composite composite = createComposite(parent, 2);
 		initializeDialogUnits(composite);
 		GridData data = new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER);
@@ -129,7 +130,6 @@ public class WorkingSetSelectionArea extends DialogArea {
 		data = new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER);
 		data.horizontalIndent=15;
 		mruList.setLayoutData(data);
-		mruList.setFont(composite.getFont());
 
 		selectButton = createButton(composite, Policy.bind("WorkingSetSelectionArea.workingSetOther"), GridData.HORIZONTAL_ALIGN_FILL); //$NON-NLS-1$
 		selectButton.addSelectionListener(new SelectionAdapter() {
@@ -146,7 +146,7 @@ public class WorkingSetSelectionArea extends DialogArea {
 				handleMruSelection();
 			}
 		});
-
+		
 		return composite;
 	}
 
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
index 6186b8bcf..1434e61ea 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
@@ -743,7 +743,7 @@ TagConfigurationDialog.12=A&dd Selected Files
 TagConfigurationDialog.13=Rem&ove
 TagConfigurationDialog.14=Error fetching tags from remote CVS files
 TagConfigurationDialog.20=&Refresh from Repository
-TagConfigurationDialog.21=&Configure Tags
+TagConfigurationDialog.21=&Configure Tags...
 TagConfigurationDialog.22=Updating Tags
 
 ChangeListener.Deleting_CVS_folders_1=Deleting CVS folders
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSRepositoryPropertiesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSRepositoryPropertiesPage.java
index e1ec233d3..e4dc665cb 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSRepositoryPropertiesPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSRepositoryPropertiesPage.java
@@ -19,6 +19,7 @@ import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.swt.SWT;
@@ -171,6 +172,7 @@ public class CVSRepositoryPropertiesPage extends PropertyPage {
 		});
 		
 		WorkbenchHelp.setHelp(getControl(), IHelpContextIds.REPOSITORY_LOCATION_PROPERTY_PAGE);
+        Dialog.applyDialogFont(parent);
 		return composite;
 	}
 	/**
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSWorkingSetPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSWorkingSetPage.java
index 812182947..f2b225d90 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSWorkingSetPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSWorkingSetPage.java
@@ -21,6 +21,7 @@ import java.util.Map;
 import java.util.Set;
 
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.CheckStateChangedEvent;
@@ -134,6 +135,7 @@ public class CVSWorkingSetPage extends CVSWizardPage implements IWorkingSetPage
 		initializeValues();
 		updateWidgetEnablements();
 		nameField.setFocus();
+        Dialog.applyDialogFont(parent);
 	}
 	/**
 	 * Method handleExpansion.
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectSelectionPage.java
index 5437518ad..f3243b702 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectSelectionPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectSelectionPage.java
@@ -123,6 +123,7 @@ public class RefreshRemoteProjectSelectionPage extends CVSWizardPage {
 			}
 		});
 		workingSetArea.createArea(composite);
+        Dialog.applyDialogFont(parent);
 	}
 
 	/**
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsLocationSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsLocationSelectionPage.java
index d8b708067..6c67e66b5 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsLocationSelectionPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsLocationSelectionPage.java
@@ -19,6 +19,7 @@ import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
@@ -126,6 +127,7 @@ public class CheckoutAsLocationSelectionPage extends CVSWizardPage {
 			}
 		};
 		useDefaultsButton.addSelectionListener(listener);
+        Dialog.applyDialogFont(parent);
 	}
 	
 	/**
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsMainPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsMainPage.java
index 58e3f2e2e..ed4a34fb0 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsMainPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsMainPage.java
@@ -14,6 +14,7 @@ import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
@@ -76,6 +77,7 @@ public class CheckoutAsMainPage extends CVSWizardPage {
 		}
 
 		updateEnablements();
+        Dialog.applyDialogFont(parent);
 	}
 
 	/*
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsProjectSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsProjectSelectionPage.java
index 9b57d1958..4eea0bbd3 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsProjectSelectionPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsProjectSelectionPage.java
@@ -19,6 +19,7 @@ import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -152,6 +153,7 @@ public class CheckoutAsProjectSelectionPage extends CVSWizardPage {
 		initializeValues();
 		updateWidgetEnablements();
 		tree.getControl().setFocus();
+        Dialog.applyDialogFont(parent);
 	}
 
 	/**
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardAutoconnectPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardAutoconnectPage.java
index 3170b7265..ed7ab50df 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardAutoconnectPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardAutoconnectPage.java
@@ -12,6 +12,7 @@ package org.eclipse.team.internal.ccvs.ui.wizards;
 
 
 import org.eclipse.core.resources.IProject;
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
@@ -102,6 +103,7 @@ public class ConfigurationWizardAutoconnectPage extends CVSWizardPage {
 			}
 		});
 		check.setSelection(true);		
+		Dialog.applyDialogFont(parent);	
 	}
 	
 	public FolderSyncInfo getFolderSyncInfo() {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardMainPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardMainPage.java
index 289364c37..e2ddae19b 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardMainPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardMainPage.java
@@ -19,6 +19,7 @@ import java.util.Properties;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.resource.ImageDescriptor;
@@ -218,6 +219,7 @@ public class ConfigurationWizardMainPage extends CVSWizardPage {
 		hostCombo.setFocus();
 		
 		setControl(composite);
+        Dialog.applyDialogFont(parent);
 	}
 	/**
 	 * Utility method to create an editable combo box
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardCommitCommentPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardCommitCommentPage.java
index 5597ff55d..d5727e2dc 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardCommitCommentPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardCommitCommentPage.java
@@ -51,6 +51,7 @@ public class KSubstWizardCommitCommentPage extends CVSWizardPage {
 		// set F1 help
 		WorkbenchHelp.setHelp(top, IHelpContextIds.KEYWORD_SUBSTITUTION_COMMIT_COMMENT_PAGE);
 		commitCommentArea.createArea(top);
+        Dialog.applyDialogFont(parent);
 	}
 
 	/**
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardDirtyFilesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardDirtyFilesPage.java
index d057e3af4..7df0ba1e6 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardDirtyFilesPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardDirtyFilesPage.java
@@ -15,6 +15,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ListViewer;
 import org.eclipse.swt.SWT;
@@ -63,6 +64,7 @@ public class KSubstWizardDirtyFilesPage extends CVSWizardPage {
 		createSeparator(top, SPACER_HEIGHT);
 		listViewer = createFileListViewer(top,
 			Policy.bind("KSubstWizardDirtyFilesPage.dirtyFilesViewer.title"), LIST_HEIGHT_HINT); //$NON-NLS-1$
+        Dialog.applyDialogFont(parent);
 	}
 	
 	public boolean includeDirtyFiles() {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSelectionPage.java
index 56d2ed994..4fec08d51 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSelectionPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSelectionPage.java
@@ -16,6 +16,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
@@ -128,6 +129,7 @@ public class KSubstWizardSelectionPage extends CVSWizardPage {
 			}
 		}
 		updateEnablements();
+        Dialog.applyDialogFont(parent);
 	}
 	
 	/**
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSharedFilesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSharedFilesPage.java
index 2bf2bd94e..de8f0e67a 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSharedFilesPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSharedFilesPage.java
@@ -15,6 +15,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ListViewer;
 import org.eclipse.swt.SWT;
@@ -63,6 +64,7 @@ public class KSubstWizardSharedFilesPage extends CVSWizardPage {
 		createSeparator(top, SPACER_HEIGHT);
 		listViewer = createFileListViewer(top,
 			Policy.bind("KSubstWizardSharedFilesPage.sharedFilesViewer.title"), LIST_HEIGHT_HINT); //$NON-NLS-1$
+        Dialog.applyDialogFont(parent);
 	}
 	
 	public boolean includeSharedFiles() {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSummaryPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSummaryPage.java
index 3e9ad5bf3..b605bbf15 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSummaryPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSummaryPage.java
@@ -16,6 +16,7 @@ import java.util.Comparator;
 import java.util.List;
 
 import org.eclipse.core.resources.IFile;
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.CellEditor;
 import org.eclipse.jface.viewers.CheckStateChangedEvent;
@@ -108,6 +109,7 @@ public class KSubstWizardSummaryPage extends CVSWizardPage {
 			Policy.bind("KSubstWizardSummaryPage.summaryViewer.fileHeader"), //$NON-NLS-1$
 			Policy.bind("KSubstWizardSummaryPage.summaryViewer.ksubstHeader"), //$NON-NLS-1$
 			LIST_HEIGHT_HINT);
+        Dialog.applyDialogFont(parent);
 	}
 	
 	/**
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModuleSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModuleSelectionPage.java
index d34a3bf52..67c881dd4 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModuleSelectionPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModuleSelectionPage.java
@@ -11,6 +11,7 @@
 package org.eclipse.team.internal.ccvs.ui.wizards;
 
 
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Button;
@@ -78,6 +79,7 @@ public class ModuleSelectionPage extends CVSWizardPage {
 		useProjectNameButton.setSelection(true);
 		setControl(composite);
 		setPageComplete(true);
+        Dialog.applyDialogFont(parent);
 	}	
 	public String getModuleName() {
 		return result;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RepositorySelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RepositorySelectionPage.java
index 120c3acab..7ce1652a4 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RepositorySelectionPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RepositorySelectionPage.java
@@ -11,6 +11,7 @@
 package org.eclipse.team.internal.ccvs.ui.wizards;
 
 
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ColumnWeightData;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -113,6 +114,7 @@ public class RepositorySelectionPage extends CVSWizardPage {
 		setControl(composite);
 
 		initializeValues();
+        Dialog.applyDialogFont(parent);
 	}
 	/**
 	 * Initializes states of the controls.
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryFileSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryFileSelectionPage.java
index ed926953f..124a788e9 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryFileSelectionPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryFileSelectionPage.java
@@ -32,6 +32,7 @@ import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.CheckStateChangedEvent;
@@ -176,6 +177,7 @@ public class RestoreFromRepositoryFileSelectionPage extends CVSWizardPage {
 						
 		initializeValues();
 		updateWidgetEnablements();
+        Dialog.applyDialogFont(parent);
 	}
 
 	protected CheckboxTableViewer createRevisionSelectionTable(CompareViewerPane composite, HistoryTableProvider tableProvider) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardFinishPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardFinishPage.java
index ad12bc7b8..269f3ab74 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardFinishPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardFinishPage.java
@@ -11,6 +11,7 @@
 package org.eclipse.team.internal.ccvs.ui.wizards;
 
 
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
@@ -38,5 +39,6 @@ public class SharingWizardFinishPage extends CVSWizardPage {
 		data.widthHint = 350;
 		label.setLayoutData(data);
 		setControl(composite);
+        Dialog.applyDialogFont(parent);
 	}
 }
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizardPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizardPage.java
index 1ea941248..e5cc80c6c 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizardPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizardPage.java
@@ -12,6 +12,7 @@ package org.eclipse.team.internal.ccvs.ui.wizards;
 
 
 import org.eclipse.core.resources.IProject;
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -129,6 +130,7 @@ public class UpdateWizardPage extends CVSWizardPage {
 		seperator.setLayoutData(data);
 		
 		setPageComplete(false);
+        Dialog.applyDialogFont(parent);
 	}
 
 	protected TreeViewer createTree(Composite parent) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DetailsDialog.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DetailsDialog.java
index d5fe9f945..44ab6a890 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DetailsDialog.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DetailsDialog.java
@@ -143,7 +143,6 @@ abstract public class DetailsDialog extends Dialog {
 			layout.numColumns = 2;
 			top.setLayout(layout);
 			top.setLayoutData(new GridData(GridData.FILL_BOTH));
-			top.setFont(parent.getFont());
 		
 			// add the image to the left of the composite
 			Label label = new Label(top, 0);
@@ -162,7 +161,6 @@ abstract public class DetailsDialog extends Dialog {
 			layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
 			right.setLayout(layout);
 			right.setLayoutData(new GridData(GridData.FILL_BOTH));
-			right.setFont(parent.getFont());
 			createMainDialogArea(right);
 		} else {
 			createMainDialogArea(composite);
@@ -172,9 +170,9 @@ abstract public class DetailsDialog extends Dialog {
 		errorMessageLabel.setLayoutData(new GridData(
 			GridData.GRAB_HORIZONTAL |
 			GridData.HORIZONTAL_ALIGN_FILL));
-		errorMessageLabel.setFont(parent.getFont());
 		errorMessageLabel.setForeground(getShell().getDisplay().getSystemColor(SWT.COLOR_RED));
 		
+        Dialog.applyDialogFont(parent);
 		return composite;
 	}
 	
@@ -210,7 +208,7 @@ abstract public class DetailsDialog extends Dialog {
 			detailsCreated = true;
 			detailsButton.setText(IDialogConstants.HIDE_DETAILS_LABEL);
 		}
-	
+        Dialog.applyDialogFont(getContents());
 		Point newSize = getContents().computeSize(SWT.DEFAULT, SWT.DEFAULT);
 	
 		getShell().setSize(new Point(windowSize.x, windowSize.y + (newSize.y - oldSize.y)));
@@ -283,7 +281,6 @@ abstract public class DetailsDialog extends Dialog {
 		layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
 		composite.setLayout(layout);
 		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		composite.setFont(parent.getFont());
 		return composite;
 	}
 	
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DetailsDialogWithProjects.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DetailsDialogWithProjects.java
index b1db66d2a..8993d5299 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DetailsDialogWithProjects.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DetailsDialogWithProjects.java
@@ -61,7 +61,6 @@ public class DetailsDialogWithProjects extends DetailsDialog {
 			GridData.VERTICAL_ALIGN_CENTER);
 		data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);
 		label.setLayoutData(data);
-		label.setFont(composite.getFont());
 		updateEnablements();
 	}
 
@@ -78,7 +77,6 @@ public class DetailsDialogWithProjects extends DetailsDialog {
 		layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
 		composite.setLayout(layout);
 		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		composite.setFont(parent.getFont());
 		
 		detailsList = new org.eclipse.swt.widgets.List(composite, SWT.BORDER | SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);	 
 		GridData data = new GridData ();		
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/PreferencePageContainerDialog.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/PreferencePageContainerDialog.java
index 9ea7871ba..b67505869 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/PreferencePageContainerDialog.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/PreferencePageContainerDialog.java
@@ -149,12 +149,9 @@ public class PreferencePageContainerDialog extends Dialog implements IPreference
 	/**
 	 * @see Dialog#createDialogArea(Composite)
 	 */
-	protected Control createDialogArea(Composite parent) {
-		Font font = parent.getFont();
-		
+	protected Control createDialogArea(Composite parent) {		
 		Composite composite = (Composite)super.createDialogArea(parent);
 		((GridLayout) composite.getLayout()).numColumns = 1;
-		composite.setFont(font);
 		
 		// Build the title area and separator line
 		Composite titleComposite = new Composite(composite, SWT.NONE);
@@ -165,7 +162,6 @@ public class PreferencePageContainerDialog extends Dialog implements IPreference
 		layout.horizontalSpacing = 0;
 		titleComposite.setLayout(layout);
 		titleComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		titleComposite.setFont(font);
 		
 		createTitleArea(titleComposite);
 	
@@ -187,7 +183,7 @@ public class PreferencePageContainerDialog extends Dialog implements IPreference
 		gd.horizontalSpan = 2;
 		separator.setLayoutData(gd);
 	
-		applyDialogFont(composite);
+		applyDialogFont(parent);
 		return composite;
 	}
 	
@@ -218,7 +214,6 @@ public class PreferencePageContainerDialog extends Dialog implements IPreference
 		GridData layoutData = new GridData(GridData.FILL_BOTH);
 		fTitleArea.setLayout(layout);
 		fTitleArea.setLayoutData(layoutData);
-		fTitleArea.setFont(font);
 		fTitleArea.setBackground(bg);
 	
 		// Message label
@@ -265,7 +260,6 @@ public class PreferencePageContainerDialog extends Dialog implements IPreference
 	private Composite createPageContainer(Composite parent) {
 		Composite result = new Composite(parent, SWT.NULL);
 		result.setLayout(new PageLayout());
-		result.setFont(parent.getFont());
 		return result;
 	}
 
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/ExportTargetSiteMainPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/ExportTargetSiteMainPage.java
index a1f63aa88..03f33e02f 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/ExportTargetSiteMainPage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/ExportTargetSiteMainPage.java
@@ -15,6 +15,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.TableLayout;
@@ -137,6 +138,7 @@ public class ExportTargetSiteMainPage extends TeamWizardPage {
 		initializeSites();
 		setControl(composite);
 		updateEnablement();
+        Dialog.applyDialogFont(parent);
 	}
 
 	public void setSelectedSites(Site[] selectedSites) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/ImportTargetSiteMainPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/ImportTargetSiteMainPage.java
index 559896e42..c3c2ccefb 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/ImportTargetSiteMainPage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/ImportTargetSiteMainPage.java
@@ -12,6 +12,7 @@ package org.eclipse.team.internal.ui.target;
 
 import java.io.File;
 
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.SWT;
@@ -142,6 +143,7 @@ public class ImportTargetSiteMainPage extends TeamWizardPage {
 
 		setControl(composite);
 		updateEnablement();
+        Dialog.applyDialogFont(parent);
 	}
 
 }
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/MappingSelectionPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/MappingSelectionPage.java
index 1466d7f60..5ba6a9f55 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/MappingSelectionPage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/MappingSelectionPage.java
@@ -17,6 +17,7 @@ import java.util.List;
 
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -123,6 +124,7 @@ public class MappingSelectionPage extends TargetWizardPage {
 		setViewerInput();
 		setControl(composite);
 		setPageComplete(true);
+        Dialog.applyDialogFont(p);
 	}
 	
 	private IRemoteTargetResource getSelectedRemoteFolder(IStructuredSelection selection) {		
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/ProjectTargetMappingPropertiesPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/ProjectTargetMappingPropertiesPage.java
index 94d5d6f41..a18000996 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/ProjectTargetMappingPropertiesPage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/ProjectTargetMappingPropertiesPage.java
@@ -13,6 +13,7 @@ package org.eclipse.team.internal.ui.target;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.SWT;
@@ -77,7 +78,7 @@ public class ProjectTargetMappingPropertiesPage extends PropertyPage {
 				refreshInfo();
 			}
 		});
-
+        Dialog.applyDialogFont(parent);
 		return container;
 	}
 
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteSelectionPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteSelectionPage.java
index 6e4681c4a..b5fb921b4 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteSelectionPage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteSelectionPage.java
@@ -11,6 +11,7 @@
 package org.eclipse.team.internal.ui.target;
 
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ColumnWeightData;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -146,6 +147,7 @@ public class SiteSelectionPage extends TargetWizardPage {
 
 		setControl(composite);
 		initializeValues();
+        Dialog.applyDialogFont(parent);
 	}
 
 	/**
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizardMainPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizardMainPage.java
index 8f34c0308..7974af079 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizardMainPage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizardMainPage.java
@@ -13,6 +13,7 @@ package org.eclipse.team.internal.ui.wizards;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
@@ -150,6 +151,7 @@ public class ConfigureProjectWizardMainPage extends WizardPage {
 			}
 		});
 		viewer.setInput(wizards);
+        Dialog.applyDialogFont(parent);
 	}
 	/**
 	 * The <code>WizardSelectionPage</code> implementation of 
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetMainPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetMainPage.java
index 6382e6ddd..693f6fd3a 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetMainPage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetMainPage.java
@@ -17,6 +17,7 @@ import java.util.List;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.CheckStateChangedEvent;
@@ -137,6 +138,7 @@ public class ExportProjectSetMainPage extends TeamWizardPage {
 		initializeProjects();
 		setControl(composite);
 		updateEnablement();
+        Dialog.applyDialogFont(parent);
 	}
 
 	private void initializeProjects() {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetMainPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetMainPage.java
index 8de9fcc41..e1a5b9133 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetMainPage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetMainPage.java
@@ -12,6 +12,7 @@ package org.eclipse.team.internal.ui.wizards;
 
 import java.io.File;
 
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.SWT;
@@ -104,6 +105,7 @@ public class ImportProjectSetMainPage extends TeamWizardPage {
 		createWorkinSetCreationArea(inner, 3);
 		setControl(composite);
 		updateEnablement();
+        Dialog.applyDialogFont(parent);
 	}
 
 	/**