### Eclipse Workspace Patch 1.0
#P org.eclipse.ui.workbench
Index: Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferencePage.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferencePage.java,v
retrieving revision 1.58
diff -u -r1.58 NewKeysPreferencePage.java
--- Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferencePage.java	7 May 2007 22:11:36 -0000	1.58
+++ Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferencePage.java	8 May 2007 11:43:27 -0000
@@ -57,7 +57,6 @@
 import org.eclipse.jface.contexts.IContextIds;
 import org.eclipse.jface.databinding.swt.SWTObservables;
 import org.eclipse.jface.databinding.viewers.ViewersObservables;
-import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.internal.databinding.provisional.swt.ControlUpdater;
@@ -1137,7 +1136,6 @@
 	private final Control createButtonBar(final Composite parent) {
 		GridLayout layout;
 		GridData gridData;
-		int widthHint;
 
 		// Create the composite to house the button bar.
 		final Composite buttonBar = new Composite(parent, SWT.NONE);
@@ -1150,12 +1148,8 @@
 
 		// Advanced button.
 		final Button advancedButton = new Button(buttonBar, SWT.PUSH);
-		gridData = new GridData();
-		widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
 		advancedButton.setText(NewKeysPreferenceMessages.AdvancedButton_Text);
-		gridData.widthHint = Math.max(widthHint, advancedButton.computeSize(
-				SWT.DEFAULT, SWT.DEFAULT, true).x) + 5;
-		advancedButton.setLayoutData(gridData);
+		setButtonLayoutData(advancedButton);
 		advancedButton.addSelectionListener(new SelectionListener() {
 			public void widgetDefaultSelected(SelectionEvent e) {
 			}
@@ -1182,6 +1176,7 @@
 	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
 	 */
 	protected final Control createContents(final Composite parent) {
+		initializeDialogUnits(parent);
 		GridLayout layout = null;
 
 		long startTime = 0L;
@@ -1308,9 +1303,7 @@
 				| SWT.ARROW);
 		addKeyButton
 				.setToolTipText(NewKeysPreferenceMessages.AddKeyButton_ToolTipText);
-		gridData = new GridData();
-		gridData.heightHint = schemeCombo.getCombo().getTextHeight();
-		addKeyButton.setLayoutData(gridData);
+		setButtonLayoutData(addKeyButton);
 
 		// Arrow buttons aren't normally added to the tab list. Let's fix that.
 		final Control[] tabStops = dataArea.getTabList();
@@ -1554,7 +1547,6 @@
 	private final Control createTreeControls(final Composite parent) {
 		GridLayout layout;
 		GridData gridData;
-		int widthHint;
 
 		// Creates controls related to the tree.
 		final Composite treeControls = new Composite(parent, SWT.NONE);
@@ -1587,13 +1579,9 @@
 
 		// Create the delete binding button.
 		final Button addBindingButton = new Button(treeControls, SWT.PUSH);
-		gridData = new GridData();
-		widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
 		addBindingButton
 				.setText(NewKeysPreferenceMessages.AddBindingButton_Text);
-		gridData.widthHint = Math.max(widthHint, addBindingButton.computeSize(
-				SWT.DEFAULT, SWT.DEFAULT, true).x) + 5;
-		addBindingButton.setLayoutData(gridData);
+		setButtonLayoutData(addBindingButton);
 		addBindingButton.addSelectionListener(new SelectionAdapter() {
 			public final void widgetSelected(final SelectionEvent event) {
 				selectAddBindingButton(event);
@@ -1609,13 +1597,9 @@
 
 		// Create the delete binding button.
 		final Button removeBindingButton = new Button(treeControls, SWT.PUSH);
-		gridData = new GridData();
-		widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
 		removeBindingButton
 				.setText(NewKeysPreferenceMessages.RemoveBindingButton_Text);
-		gridData.widthHint = Math.max(widthHint, removeBindingButton
-				.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x) + 5;
-		removeBindingButton.setLayoutData(gridData);
+		setButtonLayoutData(removeBindingButton);
 		removeBindingButton.addSelectionListener(new SelectionAdapter() {
 			public final void widgetSelected(final SelectionEvent event) {
 				selectRemoveBindingButton(event);
@@ -1631,12 +1615,8 @@
 
 		// Create the delete binding button.
 		final Button restore = new Button(treeControls, SWT.PUSH);
-		gridData = new GridData();
-		widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
 		restore.setText(NewKeysPreferenceMessages.RestoreBindingButton_Text);
-		gridData.widthHint = Math.max(widthHint, restore.computeSize(
-				SWT.DEFAULT, SWT.DEFAULT, true).x) + 5;
-		restore.setLayoutData(gridData);
+		setButtonLayoutData(restore);
 		restore.addSelectionListener(new SelectionAdapter() {
 			public final void widgetSelected(final SelectionEvent event) {
 				selectRestoreBindingButton(event);