Attachment #36451 for bug #127658

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




		fProgressMonitorCancelButton.setFont(font);
		monitorComposite.setVisible(false);

		/*
		 * Create the rest of the button bar, but tell it not to
		 * create a help button (we've already created it).
		 */
		boolean helpAvailable = isHelpAvailable();
		setHelpAvailable(false);
		super.createButtonBar(composite);
		setHelpAvailable(helpAvailable);
		buttonComposite.setLayout(layout);
		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_END | GridData.VERTICAL_ALIGN_CENTER);
		buttonComposite.setLayoutData(data);
		buttonComposite.setFont(composite.getFont());
		createButtonsForButtonBar(buttonComposite);
		return composite;
	}





        fStatusLine.setLayoutData(statusData);

		/*
		 * Create the rest of the button bar, but tell it not to
		 * create a help button (we've already created it).
		 * Since this is a custom button bar, we explicitly added the help control
		 * in an appropriate place above, and we use the Dialog implementation of
		 * createButtonBar, which does not add a help control.
		 */
		boolean helpAvailable = isHelpAvailable();
		setHelpAvailable(false);
		super.createButtonBar(composite);
		setHelpAvailable(helpAvailable);
		layout.numColumns = 0; // this is incremented by createButton
		layout.makeColumnsEqualWidth = true;
		layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
		layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
		layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
		layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
		buttonComposite.setLayout(layout);
		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_END
				| GridData.VERTICAL_ALIGN_CENTER);
		buttonComposite.setLayoutData(data);
		buttonComposite.setFont(composite.getFont());
		
		// Add the buttons to the button bar.
		createButtonsForButtonBar(buttonComposite);
        return composite;
    }


Return to bug 127658

Lines 436-454 Link Here

(-)ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java (-13 / +8 lines)
436	fProgressMonitorCancelButton.setFont(font);	436	fProgressMonitorCancelButton.setFont(font);
437	monitorComposite.setVisible(false);	437	monitorComposite.setVisible(false);
438		438
439	Composite buttonComposite = new Composite(composite, SWT.NONE);	439	/*
440	layout = new GridLayout();	440	* Create the rest of the button bar, but tell it not to
441	layout.numColumns = 0;	441	* create a help button (we've already created it).
442	layout.makeColumnsEqualWidth = true;	442	*/
443	layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);	443	boolean helpAvailable = isHelpAvailable();
444	layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);	444	setHelpAvailable(false);
445	layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);	445	super.createButtonBar(composite);
446	layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);	446	setHelpAvailable(helpAvailable);
447	buttonComposite.setLayout(layout);
448	GridData data = new GridData(GridData.HORIZONTAL_ALIGN_END \| GridData.VERTICAL_ALIGN_CENTER);
449	buttonComposite.setLayoutData(data);
450	buttonComposite.setFont(composite.getFont());
451	createButtonsForButtonBar(buttonComposite);
452	return composite;	447	return composite;
453	}	448	}
454		449

Lines 188-217 Link Here

(-)Eclipse UI/org/eclipse/ui/dialogs/SelectionStatusDialog.java (-23 / +6 lines)
188	fStatusLine.setLayoutData(statusData);	188	fStatusLine.setLayoutData(statusData);
189		189
190	/*	190	/*
191	* This code is duplicated from Dialog#createButtonBar. We do not want	191	* Create the rest of the button bar, but tell it not to
192	* to call the TrayDialog implementation because it adds a help control.	192	* create a help button (we've already created it).
193	* Since this is a custom button bar, we explicitly added the help control
194	* in an appropriate place above, and we use the Dialog implementation of
195	* createButtonBar, which does not add a help control.
196	*/	193	*/
197	Composite buttonComposite = new Composite(composite, SWT.NONE);	194	boolean helpAvailable = isHelpAvailable();
198	// create a layout with spacing and margins appropriate for the font	195	setHelpAvailable(false);
199	// size.	196	super.createButtonBar(composite);
200	layout = new GridLayout();	197	setHelpAvailable(helpAvailable);
201	layout.numColumns = 0; // this is incremented by createButton
202	layout.makeColumnsEqualWidth = true;
203	layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
204	layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
205	layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
206	layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
207	buttonComposite.setLayout(layout);
208	GridData data = new GridData(GridData.HORIZONTAL_ALIGN_END
209	\| GridData.VERTICAL_ALIGN_CENTER);
210	buttonComposite.setLayoutData(data);
211	buttonComposite.setFont(composite.getFont());
212
213	// Add the buttons to the button bar.
214	createButtonsForButtonBar(buttonComposite);
215	return composite;	198	return composite;
216	}	199	}
217		200