Bug 286755 – [Help] The dialog font is not applied to the Help Content preference pages.

6 files changed, 19 insertions, 16 deletions

diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/AddICDialog.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/AddICDialog.java
index 24b5be8bb..c735d85a8 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/AddICDialog.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/AddICDialog.java
@@ -12,6 +12,7 @@
 package org.eclipse.help.ui.internal.preferences;
 
 import org.eclipse.help.ui.internal.Messages;
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.StatusDialog;
 import org.eclipse.jface.window.IShellProvider;
 import org.eclipse.swt.SWT;
@@ -109,8 +110,9 @@ public class AddICDialog extends StatusDialog implements IShellProvider {
 		createPortSection(topGroup);
 		
 		//Initialize validity
-		updateValidity();
-		
+		updateValidity();		
+
+		Dialog.applyDialogFont(topComposite);	
 		return topComposite;
 
 	}
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/EditICDialog.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/EditICDialog.java
index 6198be434..db065cd9b 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/EditICDialog.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/EditICDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
+ * Copyright (c) 2008, 2009 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,6 +12,7 @@
 package org.eclipse.help.ui.internal.preferences;
 
 import org.eclipse.help.ui.internal.Messages;
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.StatusDialog;
 import org.eclipse.jface.window.IShellProvider;
 import org.eclipse.osgi.util.NLS;
@@ -118,8 +119,9 @@ public class EditICDialog extends StatusDialog implements IShellProvider {
 		createPortSection(topGroup);
 	
 		//Initialize validator and setup for User Input
-		updateValidity();
-		
+		updateValidity();	
+
+		Dialog.applyDialogFont(topComposite);	
 		return topComposite;
 	}
 
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/HelpContentPreferencePage.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/HelpContentPreferencePage.java
index f73e7f030..f4ef90fb2 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/HelpContentPreferencePage.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/HelpContentPreferencePage.java
@@ -21,6 +21,7 @@ import org.eclipse.help.internal.base.remote.RemoteHelp;
 import org.eclipse.help.internal.base.remote.RemoteIC;
 import org.eclipse.help.ui.internal.IHelpUIConstants;
 import org.eclipse.help.ui.internal.Messages;
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.preference.PreferencePage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
@@ -75,6 +76,7 @@ public class HelpContentPreferencePage extends PreferencePage implements
 		
 		descLabel = new Label(parent, SWT.NONE);
 		descLabel.setText(Messages.HelpContentPage_title);
+		Dialog.applyDialogFont(descLabel);
 		
 		remoteICPage = new InfocenterDisplay(this);
 		remoteICPage.createContents(parent);
@@ -147,7 +149,7 @@ public class HelpContentPreferencePage extends PreferencePage implements
 		boolean isOn = Platform.getPreferencesService().getBoolean
 		    (HelpBasePlugin.PLUGIN_ID, IHelpBaseConstants.P_KEY_REMOTE_HELP_ON, false, null);
 		checkbox.setSelection(isOn);
-	
+		Dialog.applyDialogFont(checkbox);	
 	}
 	
 	/*
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/InfocenterDisplay.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/InfocenterDisplay.java
index 2f178ffe9..f787cee84 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/InfocenterDisplay.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/InfocenterDisplay.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
+ * Copyright (c) 2008, 2009 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,8 +11,8 @@
 package org.eclipse.help.ui.internal.preferences;
 
 import org.eclipse.help.ui.internal.IHelpUIConstants;
+import org.eclipse.jface.dialogs.Dialog;
 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;
@@ -38,10 +38,7 @@ public class InfocenterDisplay implements IHelpContentBlockContainer {
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent,
 				IHelpUIConstants.PREF_PAGE_HELP_CONTENT);
 
-		Font font = parent.getFont();
-
 		Composite top = new Composite(parent, SWT.NONE);
-		top.setFont(font);
 
 		GridLayout layout = new GridLayout();
 		layout.numColumns = 2;
@@ -53,7 +50,7 @@ public class InfocenterDisplay implements IHelpContentBlockContainer {
 
 		fHelpContentBlock.setContainer(this);
 		fHelpContentBlock.createContents(top);
-
+		Dialog.applyDialogFont(top);
 		return top;
 	}
 
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/TestConnectionDialog.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/TestConnectionDialog.java
index 210ed9b68..2a4ab1e99 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/TestConnectionDialog.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/TestConnectionDialog.java
@@ -11,6 +11,7 @@
 package org.eclipse.help.ui.internal.preferences;
 
 import org.eclipse.help.ui.internal.Messages;
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.StatusDialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.window.IShellProvider;
@@ -60,12 +61,11 @@ public class TestConnectionDialog extends StatusDialog implements IShellProvider
 		layout.marginWidth= 0;
 		layout.makeColumnsEqualWidth = false;
 		topGroup.setLayout(layout);
-		topGroup.setFont(topComposite.getFont());
 		topGroup.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL));
 
-
 		createTestLabelSection(topGroup);
 		createURLSection(topGroup);
+		Dialog.applyDialogFont(topGroup);
 
 		return topGroup;
 	}
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/ViewICPropsDialog.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/ViewICPropsDialog.java
index dc6786139..d9284db9c 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/ViewICPropsDialog.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/ViewICPropsDialog.java
@@ -11,6 +11,7 @@
 package org.eclipse.help.ui.internal.preferences;
 
 import org.eclipse.help.ui.internal.Messages;
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.StatusDialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.window.IShellProvider;
@@ -90,7 +91,6 @@ public class ViewICPropsDialog extends StatusDialog implements IShellProvider {
 		layout.marginWidth= 0;
 		layout.makeColumnsEqualWidth = false;
 		topGroup.setLayout(layout);
-		topGroup.setFont(topComposite.getFont());
 		topGroup.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL));
 
 		
@@ -102,7 +102,7 @@ public class ViewICPropsDialog extends StatusDialog implements IShellProvider {
 		createURLValidateSection(topGroup);
 		createEnabledSection(topGroup);
 		
-		
+		Dialog.applyDialogFont(topComposite);	
 		return topComposite;
 
 	}