diff options
3 files changed, 20 insertions, 2 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ChangeVariableValueInputDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ChangeVariableValueInputDialog.java index ba0df5caf..776cb3ed8 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ChangeVariableValueInputDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ChangeVariableValueInputDialog.java @@ -10,6 +10,7 @@ import org.eclipse.jface.dialogs.IInputValidator; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.graphics.Font; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; @@ -126,6 +127,7 @@ protected void createButtonsForButtonBar(Composite parent) { * Method declared on Dialog. */ protected Control createDialogArea(Composite parent) { + Font font = parent.getFont(); // create composite Composite composite = (Composite)super.createDialogArea(parent); @@ -139,7 +141,7 @@ protected Control createDialogArea(Composite parent) { GridData.VERTICAL_ALIGN_CENTER); data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);; label.setLayoutData(data); - label.setFont(parent.getFont()); + label.setFont(font); } text= new Text(composite, SWT.MULTI | SWT.BORDER | SWT.V_SCROLL); @@ -147,6 +149,7 @@ protected Control createDialogArea(Composite parent) { | GridData.GRAB_VERTICAL | GridData.VERTICAL_ALIGN_FILL); gridData.heightHint= 50; text.setLayoutData(gridData); + text.setFont(font); text.addModifyListener( new ModifyListener() { public void modifyText(ModifyEvent e) { @@ -164,8 +167,9 @@ protected Control createDialogArea(Composite parent) { errorMessageLabel.setLayoutData(new GridData( GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL)); - errorMessageLabel.setFont(parent.getFont()); + errorMessageLabel.setFont(font); + applyDialogFont(composite); return composite; } /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPropertiesDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPropertiesDialog.java index 8e1d54c77..c78c45aeb 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPropertiesDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPropertiesDialog.java @@ -98,6 +98,7 @@ public class LaunchConfigurationPropertiesDialog extends LaunchConfigurationsDia topLayout.marginHeight = 5; topLayout.marginWidth = 0; topComp.setLayout(topLayout); + topComp.setFont(dialogComp.getFont()); // Set the things that TitleAreaDialog takes care of setTitle("Edit launch configuration properties"); @@ -109,6 +110,7 @@ public class LaunchConfigurationPropertiesDialog extends LaunchConfigurationsDia setEditArea(editAreaComp); gd = new GridData(GridData.FILL_BOTH); editAreaComp.setLayoutData(gd); + editAreaComp.setFont(dialogComp.getFont()); // Build the separator line that demarcates the button bar Label separator = new Label(topComp, SWT.HORIZONTAL | SWT.SEPARATOR); @@ -117,6 +119,7 @@ public class LaunchConfigurationPropertiesDialog extends LaunchConfigurationsDia separator.setLayoutData(gd); dialogComp.layout(true); + applyDialogFont(dialogComp); } protected void createButtonsForButtonBar(Composite parent) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java index 1bdeb0492..dbae6218c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java @@ -58,6 +58,7 @@ import org.eclipse.swt.events.KeyEvent; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.graphics.Cursor; +import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.Rectangle; @@ -583,6 +584,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun gd = new GridData(GridData.FILL_BOTH); gd.horizontalSpan = 2; getSashForm().setLayoutData(gd); + getSashForm().setFont(dialogComp.getFont()); // Build the launch configuration selection area and put it into the composite. Control launchConfigSelectionArea = createLaunchConfigurationSelectionArea(getSashForm()); @@ -602,6 +604,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun separator.setLayoutData(gd); dialogComp.layout(true); + applyDialogFont(dialogComp); } /** @@ -637,6 +640,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun * @return the composite used for launch configuration selection area */ protected Control createLaunchConfigurationSelectionArea(Composite parent) { + Font font = parent.getFont(); Composite comp = new Composite(parent, SWT.NONE); setSelectionArea(comp); GridLayout layout = new GridLayout(); @@ -644,11 +648,13 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun layout.marginHeight = 0; layout.marginWidth = 5; comp.setLayout(layout); + comp.setFont(font); setTreeLabel(new Label(comp, SWT.NONE)); GridData gd = new GridData(); gd.horizontalSpan = 3; getTreeLabel().setLayoutData(gd); + getTreeLabel().setFont(font); getTreeLabel().setText(LaunchConfigurationsMessages.getString("LaunchConfigurationDialog.Launch_Con&figurations__1")); //$NON-NLS-1$ // TODO: tooltip //updateTreeLabelTooltip(); @@ -664,6 +670,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun // width of the 'New' & 'Delete' buttons. Otherwise tree wants to be much wider. gd.widthHint = 0; control.setLayoutData(gd); + control.setFont(font); viewer.addSelectionChangedListener(new ISelectionChangedListener() { /** * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) @@ -724,6 +731,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun * @see Dialog#createButtonBar(Composite) */ protected Control createButtonBar(Composite parent) { + Font font = parent.getFont(); Composite composite= new Composite(parent, SWT.NULL); GridLayout layout= new GridLayout(); layout.numColumns= 2; @@ -731,18 +739,21 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun layout.marginWidth= 0; composite.setLayout(layout); composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + composite.setFont(font); GridLayout pmLayout = new GridLayout(); pmLayout.numColumns = 3; setProgressMonitorPart(new ProgressMonitorPart(composite, pmLayout, PROGRESS_INDICATOR_HEIGHT)); Button cancelButton = createButton(getProgressMonitorPart(), ID_CANCEL_BUTTON, LaunchConfigurationsMessages.getString("LaunchConfigurationDialog.Cancel_3"), true); //$NON-NLS-1$ setProgressMonitorCancelButton(cancelButton); + getProgressMonitorCancelButton().setFont(font); getProgressMonitorCancelButton().addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent evt) { setCancelButtonPressed(true); } }); getProgressMonitorPart().setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + getProgressMonitorPart().setFont(font); getProgressMonitorPart().setVisible(false); return super.createButtonBar(composite); |