Attachment #2572 for bug #26985





import org.eclipse.swt.SWT;
import org.eclipse.swt.events.*;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Widget;

import org.eclipse.swt.widgets.Button;

import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.viewers.*;
import org.eclipse.jface.util.Assert;
import org.eclipse.jface.dialogs.*;

 	 * Creates SWT control tree.
 	 */
	protected synchronized Control createDialogArea(Composite parent) {
		final Font font = parent.getFont();
		
		getShell().setText(Utilities.getString(fBundle, "title")); //$NON-NLS-1$
		

				}
			);
			
			fMemberTable.setFont(font);
			fMemberPane.setContent(fMemberTable);
			
			fEditionPane= new CompareViewerPane(hsplitter, SWT.BORDER | SWT.FLAT);
			fEditionPane.setFont(font);
		} else {
			if (fStructureCompare) {
				// we need two panes: the left for the elements, the right one for the structured diff

				fEditionPane= new CompareViewerPane(hsplitter, SWT.BORDER | SWT.FLAT);
				fStructuredComparePane= new CompareViewerSwitchingPane(hsplitter, SWT.BORDER | SWT.FLAT, true) {
					protected Viewer getViewer(Viewer oldViewer, Object input) {
						if (input instanceof ICompareInput) {
							Viewer viewer = CompareUIPlugin.findStructureViewer(oldViewer, (ICompareInput)input, this, fCompareConfiguration);
							
							if (viewer != null)
								viewer.getControl().setFont(font);
							
							return viewer;							
						}
						return null;
					}
				};

						}
					}
				);
				fStructuredComparePane.setFont(font);
			} else {
				// only a single pane showing the editions
				fEditionPane= new CompareViewerPane(vsplitter, SWT.BORDER | SWT.FLAT);

		}
		
		fEditionTree= new Tree(fEditionPane, SWT.H_SCROLL + SWT.V_SCROLL);
		fEditionTree.setFont(font);
		fEditionTree.addSelectionListener(
			new SelectionAdapter() {
//				public void widgetDefaultSelected(SelectionEvent e) {

			}
		);
		fEditionPane.setContent(fEditionTree);		
		fEditionPane.setFont(font);
		
		// now start the thread (and forget about it)
		if (fThread != null) {

		
		fContentPane= new CompareViewerSwitchingPane(vsplitter, SWT.BORDER | SWT.FLAT) {
			protected Viewer getViewer(Viewer oldViewer, Object input) {
				Viewer viewer = CompareUIPlugin.findContentViewer(oldViewer, input, this, fCompareConfiguration);

				if (viewer != null)
					viewer.getControl().setFont(JFaceResources.getTextFont());
				
				return viewer;
			}
		};
		fContentPane.setFont(font);		
		vsplitter.setWeights(new int[] { 30, 70 });
				
		return vsplitter;




	 * @return the new control
	 */
	protected final Control buildControl(Composite parent) {
		Font font = parent.getFont();
					
		fComposite= new Composite(parent, fStyles) {
			public boolean setFocus() {
				return internalSetFocus();

		hookControl(fComposite);	// hook help & dispose listener
		
		fComposite.setLayout(new ContentMergeViewerLayout());
		fComposite.setFont(font);
		
		int style= SWT.SHADOW_OUT;
		fAncestorLabel= new CLabel(fComposite, style);
		fAncestorLabel.setFont(font);
		
		fLeftLabel= new CLabel(fComposite, style);
		fLeftLabel.setFont(font);
		new Resizer(fLeftLabel, VERTICAL);
		
		fDirectionLabel= new CLabel(fComposite, style);

		new Resizer(fDirectionLabel, HORIZONTAL | VERTICAL);
		
		fRightLabel= new CLabel(fComposite, style);
		fRightLabel.setFont(font);
		new Resizer(fRightLabel, VERTICAL);
		
		if (fCenter == null || fCenter.isDisposed())





import org.eclipse.jface.dialogs.*;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.viewers.Viewer;

import org.eclipse.core.resources.*;

	}
				
	protected synchronized Control createDialogArea(Composite parent) {
		Font font = parent.getFont();
		
		getShell().setText(Utilities.getString(fBundle, "title")); //$NON-NLS-1$
		

		layout.numColumns= 1;
		c.setLayout(layout);
		Label l1= new Label(c, SWT.NONE);
		l1.setFont(font);
		l1.setText(Utilities.getString(fBundle, "memberDescription"));	//$NON-NLS-1$
		fMemberPane= new CompareViewerPane(c, SWT.BORDER | SWT.FLAT);
		GridData gd= new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL);
		fMemberPane.setLayoutData(gd);
		fMemberPane.setFont(font);

		fMemberTable= new Table(fMemberPane, SWT.CHECK | SWT.H_SCROLL | SWT.V_SCROLL);
		fMemberTable.setFont(font);
		fMemberTable.addSelectionListener(
			new SelectionAdapter() {
				public void widgetSelected(SelectionEvent e) {

		layout.numColumns= 1;
		c.setLayout(layout);
		Label l2= new Label(c, SWT.NONE);
		l2.setFont(font);
		l2.setText(Utilities.getString(fBundle, "editionDescription"));	//$NON-NLS-1$
		fEditionPane= new CompareViewerPane(c, SWT.BORDER | SWT.FLAT);
		gd= new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL);
		fEditionPane.setLayoutData(gd);
		fEditionPane.setFont(font);
		
		fEditionTree= new Tree(fEditionPane, SWT.H_SCROLL | SWT.V_SCROLL);
		fEditionTree.addSelectionListener(

			}
		);
		fEditionPane.setContent(fEditionTree);		
		fEditionTree.setFont(font);
		
		fContentPane= new CompareViewerSwitchingPane(vsplitter, SWT.BORDER | SWT.FLAT) {
			protected Viewer getViewer(Viewer oldViewer, Object input) {
				Viewer viewer = CompareUIPlugin.findContentViewer(oldViewer, input, this, fCompareConfiguration);

				if (viewer != null)
					viewer.getControl().setFont(JFaceResources.getTextFont());
					
				return viewer;
			}
		};
		fContentPane.setFont(font);
		
		vsplitter.setWeights(new int[] { 30, 70 });
				
		return vsplitter;




import org.eclipse.swt.widgets.*;
import org.eclipse.swt.layout.*;
import org.eclipse.swt.events.*;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Color;


		TabFolder folder= new TabFolder(parent, SWT.NONE);
		folder.setLayout(new TabFolderLayout());	
		folder.setLayoutData(new GridData(GridData.FILL_BOTH));
		folder.setFont(parent.getFont());
		
		TabItem item= new TabItem(folder, SWT.NONE);
		item.setText(Utilities.getString("ComparePreferencePage.generalTab.label"));	//$NON-NLS-1$

		GridLayout layout= new GridLayout();
		layout.numColumns= 1;
		composite.setLayout(layout);
		composite.setFont(parent.getFont());
				
		addCheckBox(composite, "ComparePreferencePage.structureCompare.label", OPEN_STRUCTURE_COMPARE, 0);	//$NON-NLS-1$
		

	}
	
	private Control createTextComparePage(Composite parent) {
		Font font = parent.getFont();
		
		Composite composite= new Composite(parent, SWT.NULL);
		GridLayout layout= new GridLayout();
		layout.numColumns= 1;
		composite.setLayout(layout);
		composite.setFont(font);
				
		addCheckBox(composite, "ComparePreferencePage.synchronizeScrolling.label", SYNCHRONIZE_SCROLLING, 0);	//$NON-NLS-1$
		

		
		Label previewLabel= new Label(composite, SWT.NULL);
		previewLabel.setText(Utilities.getString("ComparePreferencePage.preview.label"));	//$NON-NLS-1$
		previewLabel.setFont(font);
		
		Control previewer= createPreviewer(composite);
		GridData gd= new GridData(GridData.FILL_BOTH);

		String label= Utilities.getString(labelKey);

		Group group= new Group(parent, SWT.NULL);
		group.setFont(parent.getFont());
		group.setText(label);
		GridLayout layout= new GridLayout();
		layout.numColumns= 3;

		gd.horizontalIndent= indentation;
		gd.horizontalSpan= 2;
		checkBox.setLayoutData(gd);
		checkBox.setFont(parent.getFont());
		
		if (fCheckBoxListener == null) {
			fCheckBoxListener= new SelectionAdapter() {




import org.eclipse.swt.SWT;
import org.eclipse.swt.dnd.*;
import org.eclipse.swt.events.*;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.layout.*;
import org.eclipse.swt.widgets.*;


	}
	
	public void createControl(Composite parent) {
		Font font = parent.getFont();
		Composite composite= new Composite(parent, SWT.NULL);
		composite.setLayout(new GridLayout());
		composite.setLayoutData(new GridData(/* GridData.VERTICAL_ALIGN_FILL | */ GridData.HORIZONTAL_ALIGN_FILL));
		composite.setFont(font);
		setControl(composite);
		
		Label l= new Label(composite, SWT.NONE);	// a spacer
		l.setText(PatchMessages.getString("InputPatchPage.SelectInput")); //$NON-NLS-1$
		l.setFont(font);
		buildInputGroup(composite);
		
		new Label(composite, SWT.NONE);	// a spacer		

	 *	Create the group for selecting the patch file
	 */
	private void buildPatchFileGroup(Composite parent) {
		Font font = parent.getFont();
		fPatchFileGroup= new Group(parent, SWT.NONE);
		fPatchFileGroup.setFont(font);
		fPatchFileGroup.setText(PatchMessages.getString("InputPatchPage.SelectPatch.title")); //$NON-NLS-1$
		GridLayout layout= new GridLayout();
		layout.numColumns= 3;

		
		// 1st row
		fUsePatchFileButton= new Button(fPatchFileGroup, SWT.RADIO);
		fUsePatchFileButton.setFont(font);
		fUsePatchFileButton.setText(PatchMessages.getString("InputPatchPage.FileButton.text")); //$NON-NLS-1$
		
		fPatchFileNameField= new Combo(fPatchFileGroup, SWT.BORDER);

		//gd.horizontalIndent= 8;
		gd.widthHint= SIZING_TEXT_FIELD_WIDTH;
		fPatchFileNameField.setLayoutData(gd);
		fPatchFileNameField.setFont(font);
		
		fPatchFileBrowseButton= new Button(fPatchFileGroup, SWT.PUSH);
		fPatchFileBrowseButton.setText(PatchMessages.getString("InputPatchPage.ChooseFileButton.text")); //$NON-NLS-1$
		fPatchFileBrowseButton.setLayoutData(new GridData());
		fPatchFileBrowseButton.setFont(font);
		
		// 2nd row
		fUseClipboardButton= new Button(fPatchFileGroup, SWT.RADIO);

		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
		gd.horizontalSpan= 2;
		fUseClipboardButton.setLayoutData(gd);
		fUseClipboardButton.setFont(font);


		// Add listeners

		GridData gd= new GridData(GridData.FILL_HORIZONTAL);
		gd.heightHint= 200;
		tree.setLayoutData(gd);
		tree.setFont(parent.getFont());
		
		fPatchTargets= new CheckboxTreeViewer(tree);
		fPatchTargets.setLabelProvider(new WorkbenchLabelProvider());





import org.eclipse.swt.SWT;
import org.eclipse.swt.events.*;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.*;
import org.eclipse.swt.widgets.*;

import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.JFaceResources;

import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.*;

	}
	
	public void createControl(Composite parent) {
		Font font = parent.getFont();
		
		Composite composite= new Composite(parent, SWT.NULL);
		composite.setLayout(new GridLayout());
		composite.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL));
		composite.setFont(font);
		
		setControl(composite);
		
		buildPatchOptionsGroup(composite);

		gd.grabExcessHorizontalSpace= true;
		gd.grabExcessVerticalSpace= true;
		fTree.setLayoutData(gd);
		fTree.setFont(font);
				
		// bottom pane showing hunks in compare viewer 
		fHunkViewer= new CompareViewerSwitchingPane(splitter, SWT.BORDER | SWT.FLAT) {
			protected Viewer getViewer(Viewer oldViewer, Object input) {
				Viewer viewer = CompareUI.findContentViewer(oldViewer, (ICompareInput)input, this, fCompareConfiguration);

				if (viewer != null)
					viewer.getControl().setFont(JFaceResources.getTextFont());

				return viewer;
			}
		};
		gd= new GridData();

		gd.grabExcessHorizontalSpace= true;
		gd.grabExcessVerticalSpace= true;
		fHunkViewer.setLayoutData(gd);
		fHunkViewer.setFont(font);
		
		// register listeners
		

				
		final Patcher patcher= fPatchWizard.getPatcher();
		
		Font font = parent.getFont();
		
		Group group= new Group(parent, SWT.NONE);
		group.setFont(font);
		group.setText(PatchMessages.getString("PreviewPatchPage.PatchOptions.title")); //$NON-NLS-1$
		GridLayout layout= new GridLayout();
		layout.numColumns= 5;

		//fPatchFileGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
	
		// 1st row
		Label ignoreSegments = new Label(group, SWT.NONE);
		ignoreSegments.setText(PatchMessages.getString("PreviewPatchPage.IgnoreSegments.text")); //$NON-NLS-1$
		ignoreSegments.setFont(font);
		
		fStripPrefixSegments= new Combo(group, SWT.DROP_DOWN | SWT.READ_ONLY | SWT.SIMPLE);
		int prefixCnt= patcher.getStripPrefixSegments();
		String prefix= Integer.toString(prefixCnt);
		fStripPrefixSegments.add(prefix);
		fStripPrefixSegments.setFont(font);
		fStripPrefixSegments.setText(prefix);
		
		addSpacer(group);
		
		fReversePatchButton= new Button(group, SWT.CHECK);
		fReversePatchButton.setFont(font);
		fReversePatchButton.setText(PatchMessages.getString("PreviewPatchPage.ReversePatch.text")); //$NON-NLS-1$
		
		addSpacer(group);
		
		// 2nd row
		Label l= new Label(group, SWT.NONE);
		l.setFont(font);
		l.setText(PatchMessages.getString("PreviewPatchPage.FuzzFactor.text")); //$NON-NLS-1$
		l.setToolTipText(PatchMessages.getString("PreviewPatchPage.FuzzFactor.tooltip")); //$NON-NLS-1$
		fFuzzField= new Text(group, SWT.BORDER);
		fFuzzField.setFont(font);
		fFuzzField.setText("2"); //$NON-NLS-1$
		GridData gd2= new GridData(GridData.HORIZONTAL_ALIGN_CENTER);
		gd2.widthHint= 30;

		addSpacer(group);
		
		fIgnoreWhitespaceButton= new Button(group, SWT.CHECK);
		fIgnoreWhitespaceButton.setFont(font);
		fIgnoreWhitespaceButton.setText(PatchMessages.getString("PreviewPatchPage.IgnoreWhitespace.text")); //$NON-NLS-1$
		
		addSpacer(group);

Return to bug 26985

Lines 22-27 Link Here

(-)compare/org/eclipse/compare/EditionSelectionDialog.java (-3 / +23 lines)
22		22
23	import org.eclipse.swt.SWT;	23	import org.eclipse.swt.SWT;
24	import org.eclipse.swt.events.*;	24	import org.eclipse.swt.events.*;
		25	import org.eclipse.swt.graphics.Font;
25	import org.eclipse.swt.graphics.Image;	26	import org.eclipse.swt.graphics.Image;
26	import org.eclipse.swt.layout.GridData;	27	import org.eclipse.swt.layout.GridData;
27	import org.eclipse.swt.widgets.Widget;	28	import org.eclipse.swt.widgets.Widget;
Lines 37-42 Link Here
37	import org.eclipse.swt.widgets.Button;	38	import org.eclipse.swt.widgets.Button;
38		39
39	import org.eclipse.jface.resource.ImageDescriptor;	40	import org.eclipse.jface.resource.ImageDescriptor;
		41	import org.eclipse.jface.resource.JFaceResources;
40	import org.eclipse.jface.viewers.*;	42	import org.eclipse.jface.viewers.*;
41	import org.eclipse.jface.util.Assert;	43	import org.eclipse.jface.util.Assert;
42	import org.eclipse.jface.dialogs.*;	44	import org.eclipse.jface.dialogs.*;
Lines 645-650 Link Here
645	* Creates SWT control tree.	647	* Creates SWT control tree.
646	*/	648	*/
647	protected synchronized Control createDialogArea(Composite parent) {	649	protected synchronized Control createDialogArea(Composite parent) {
		650	final Font font = parent.getFont();
648		651
649	getShell().setText(Utilities.getString(fBundle, "title")); //$NON-NLS-1$	652	getShell().setText(Utilities.getString(fBundle, "title")); //$NON-NLS-1$
650		653
Lines 678-686 Link Here
678	}	681	}
679	);	682	);
680		683
		684	fMemberTable.setFont(font);
681	fMemberPane.setContent(fMemberTable);	685	fMemberPane.setContent(fMemberTable);
682		686
683	fEditionPane= new CompareViewerPane(hsplitter, SWT.BORDER \| SWT.FLAT);	687	fEditionPane= new CompareViewerPane(hsplitter, SWT.BORDER \| SWT.FLAT);
		688	fEditionPane.setFont(font);
684	} else {	689	} else {
685	if (fStructureCompare) {	690	if (fStructureCompare) {
686	// we need two panes: the left for the elements, the right one for the structured diff	691	// we need two panes: the left for the elements, the right one for the structured diff
Lines 689-696 Link Here
689	fEditionPane= new CompareViewerPane(hsplitter, SWT.BORDER \| SWT.FLAT);	694	fEditionPane= new CompareViewerPane(hsplitter, SWT.BORDER \| SWT.FLAT);
690	fStructuredComparePane= new CompareViewerSwitchingPane(hsplitter, SWT.BORDER \| SWT.FLAT, true) {	695	fStructuredComparePane= new CompareViewerSwitchingPane(hsplitter, SWT.BORDER \| SWT.FLAT, true) {
691	protected Viewer getViewer(Viewer oldViewer, Object input) {	696	protected Viewer getViewer(Viewer oldViewer, Object input) {
692	if (input instanceof ICompareInput)	697	if (input instanceof ICompareInput) {
693	return CompareUIPlugin.findStructureViewer(oldViewer, (ICompareInput)input, this, fCompareConfiguration);	698	Viewer viewer = CompareUIPlugin.findStructureViewer(oldViewer, (ICompareInput)input, this, fCompareConfiguration);
		699
		700	if (viewer != null)
		701	viewer.getControl().setFont(font);
		702
		703	return viewer;
		704	}
694	return null;	705	return null;
695	}	706	}
696	};	707	};
Lines 701-706 Link Here
701	}	712	}
702	}	713	}
703	);	714	);
		715	fStructuredComparePane.setFont(font);
704	} else {	716	} else {
705	// only a single pane showing the editions	717	// only a single pane showing the editions
706	fEditionPane= new CompareViewerPane(vsplitter, SWT.BORDER \| SWT.FLAT);	718	fEditionPane= new CompareViewerPane(vsplitter, SWT.BORDER \| SWT.FLAT);
Lines 715-720 Link Here
715	}	727	}
716		728
717	fEditionTree= new Tree(fEditionPane, SWT.H_SCROLL + SWT.V_SCROLL);	729	fEditionTree= new Tree(fEditionPane, SWT.H_SCROLL + SWT.V_SCROLL);
		730	fEditionTree.setFont(font);
718	fEditionTree.addSelectionListener(	731	fEditionTree.addSelectionListener(
719	new SelectionAdapter() {	732	new SelectionAdapter() {
720	// public void widgetDefaultSelected(SelectionEvent e) {	733	// public void widgetDefaultSelected(SelectionEvent e) {
Lines 726-731 Link Here
726	}	739	}
727	);	740	);
728	fEditionPane.setContent(fEditionTree);	741	fEditionPane.setContent(fEditionTree);
		742	fEditionPane.setFont(font);
729		743
730	// now start the thread (and forget about it)	744	// now start the thread (and forget about it)
731	if (fThread != null) {	745	if (fThread != null) {
Lines 735-743 Link Here
735		749
736	fContentPane= new CompareViewerSwitchingPane(vsplitter, SWT.BORDER \| SWT.FLAT) {	750	fContentPane= new CompareViewerSwitchingPane(vsplitter, SWT.BORDER \| SWT.FLAT) {
737	protected Viewer getViewer(Viewer oldViewer, Object input) {	751	protected Viewer getViewer(Viewer oldViewer, Object input) {
738	return CompareUIPlugin.findContentViewer(oldViewer, input, this, fCompareConfiguration);	752	Viewer viewer = CompareUIPlugin.findContentViewer(oldViewer, input, this, fCompareConfiguration);
		753
		754	if (viewer != null)
		755	viewer.getControl().setFont(JFaceResources.getTextFont());
		756
		757	return viewer;
739	}	758	}
740	};	759	};
		760	fContentPane.setFont(font);
741	vsplitter.setWeights(new int[] { 30, 70 });	761	vsplitter.setWeights(new int[] { 30, 70 });
742		762
743	return vsplitter;	763	return vsplitter;

Lines 631-637 Link Here

(-)compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java (-1 / +6 lines)
631	* @return the new control	631	* @return the new control
632	*/	632	*/
633	protected final Control buildControl(Composite parent) {	633	protected final Control buildControl(Composite parent) {
634		634	Font font = parent.getFont();
		635
635	fComposite= new Composite(parent, fStyles) {	636	fComposite= new Composite(parent, fStyles) {
636	public boolean setFocus() {	637	public boolean setFocus() {
637	return internalSetFocus();	638	return internalSetFocus();
Lines 642-652 Link Here
642	hookControl(fComposite); // hook help & dispose listener	643	hookControl(fComposite); // hook help & dispose listener
643		644
644	fComposite.setLayout(new ContentMergeViewerLayout());	645	fComposite.setLayout(new ContentMergeViewerLayout());
		646	fComposite.setFont(font);
645		647
646	int style= SWT.SHADOW_OUT;	648	int style= SWT.SHADOW_OUT;
647	fAncestorLabel= new CLabel(fComposite, style);	649	fAncestorLabel= new CLabel(fComposite, style);
		650	fAncestorLabel.setFont(font);
648		651
649	fLeftLabel= new CLabel(fComposite, style);	652	fLeftLabel= new CLabel(fComposite, style);
		653	fLeftLabel.setFont(font);
650	new Resizer(fLeftLabel, VERTICAL);	654	new Resizer(fLeftLabel, VERTICAL);
651		655
652	fDirectionLabel= new CLabel(fComposite, style);	656	fDirectionLabel= new CLabel(fComposite, style);
Lines 654-659 Link Here
654	new Resizer(fDirectionLabel, HORIZONTAL \| VERTICAL);	658	new Resizer(fDirectionLabel, HORIZONTAL \| VERTICAL);
655		659
656	fRightLabel= new CLabel(fComposite, style);	660	fRightLabel= new CLabel(fComposite, style);
		661	fRightLabel.setFont(font);
657	new Resizer(fRightLabel, VERTICAL);	662	new Resizer(fRightLabel, VERTICAL);
658		663
659	if (fCenter == null \|\| fCenter.isDisposed())	664	if (fCenter == null \|\| fCenter.isDisposed())

Lines 12-17 Link Here

(-)compare/org/eclipse/compare/internal/AddFromHistoryDialog.java (-1 / +16 lines)
12		12
13	import org.eclipse.jface.dialogs.*;	13	import org.eclipse.jface.dialogs.*;
14	import org.eclipse.jface.resource.ImageDescriptor;	14	import org.eclipse.jface.resource.ImageDescriptor;
		15	import org.eclipse.jface.resource.JFaceResources;
15	import org.eclipse.jface.viewers.Viewer;	16	import org.eclipse.jface.viewers.Viewer;
16		17
17	import org.eclipse.core.resources.*;	18	import org.eclipse.core.resources.*;
Lines 170-175 Link Here
170	}	171	}
171		172
172	protected synchronized Control createDialogArea(Composite parent) {	173	protected synchronized Control createDialogArea(Composite parent) {
		174	Font font = parent.getFont();
173		175
174	getShell().setText(Utilities.getString(fBundle, "title")); //$NON-NLS-1$	176	getShell().setText(Utilities.getString(fBundle, "title")); //$NON-NLS-1$
175		177
Lines 199-210 Link Here
199	layout.numColumns= 1;	201	layout.numColumns= 1;
200	c.setLayout(layout);	202	c.setLayout(layout);
201	Label l1= new Label(c, SWT.NONE);	203	Label l1= new Label(c, SWT.NONE);
		204	l1.setFont(font);
202	l1.setText(Utilities.getString(fBundle, "memberDescription")); //$NON-NLS-1$	205	l1.setText(Utilities.getString(fBundle, "memberDescription")); //$NON-NLS-1$
203	fMemberPane= new CompareViewerPane(c, SWT.BORDER \| SWT.FLAT);	206	fMemberPane= new CompareViewerPane(c, SWT.BORDER \| SWT.FLAT);
204	GridData gd= new GridData(GridData.FILL_HORIZONTAL \| GridData.FILL_VERTICAL);	207	GridData gd= new GridData(GridData.FILL_HORIZONTAL \| GridData.FILL_VERTICAL);
205	fMemberPane.setLayoutData(gd);	208	fMemberPane.setLayoutData(gd);
		209	fMemberPane.setFont(font);
206		210
207	fMemberTable= new Table(fMemberPane, SWT.CHECK \| SWT.H_SCROLL \| SWT.V_SCROLL);	211	fMemberTable= new Table(fMemberPane, SWT.CHECK \| SWT.H_SCROLL \| SWT.V_SCROLL);
		212	fMemberTable.setFont(font);
208	fMemberTable.addSelectionListener(	213	fMemberTable.addSelectionListener(
209	new SelectionAdapter() {	214	new SelectionAdapter() {
210	public void widgetSelected(SelectionEvent e) {	215	public void widgetSelected(SelectionEvent e) {
Lines 236-245 Link Here
236	layout.numColumns= 1;	241	layout.numColumns= 1;
237	c.setLayout(layout);	242	c.setLayout(layout);
238	Label l2= new Label(c, SWT.NONE);	243	Label l2= new Label(c, SWT.NONE);
		244	l2.setFont(font);
239	l2.setText(Utilities.getString(fBundle, "editionDescription")); //$NON-NLS-1$	245	l2.setText(Utilities.getString(fBundle, "editionDescription")); //$NON-NLS-1$
240	fEditionPane= new CompareViewerPane(c, SWT.BORDER \| SWT.FLAT);	246	fEditionPane= new CompareViewerPane(c, SWT.BORDER \| SWT.FLAT);
241	gd= new GridData(GridData.FILL_HORIZONTAL \| GridData.FILL_VERTICAL);	247	gd= new GridData(GridData.FILL_HORIZONTAL \| GridData.FILL_VERTICAL);
242	fEditionPane.setLayoutData(gd);	248	fEditionPane.setLayoutData(gd);
		249	fEditionPane.setFont(font);
243		250
244	fEditionTree= new Tree(fEditionPane, SWT.H_SCROLL \| SWT.V_SCROLL);	251	fEditionTree= new Tree(fEditionPane, SWT.H_SCROLL \| SWT.V_SCROLL);
245	fEditionTree.addSelectionListener(	252	fEditionTree.addSelectionListener(
Lines 250-261 Link Here
250	}	257	}
251	);	258	);
252	fEditionPane.setContent(fEditionTree);	259	fEditionPane.setContent(fEditionTree);
		260	fEditionTree.setFont(font);
253		261
254	fContentPane= new CompareViewerSwitchingPane(vsplitter, SWT.BORDER \| SWT.FLAT) {	262	fContentPane= new CompareViewerSwitchingPane(vsplitter, SWT.BORDER \| SWT.FLAT) {
255	protected Viewer getViewer(Viewer oldViewer, Object input) {	263	protected Viewer getViewer(Viewer oldViewer, Object input) {
256	return CompareUIPlugin.findContentViewer(oldViewer, input, this, fCompareConfiguration);	264	Viewer viewer = CompareUIPlugin.findContentViewer(oldViewer, input, this, fCompareConfiguration);
		265
		266	if (viewer != null)
		267	viewer.getControl().setFont(JFaceResources.getTextFont());
		268
		269	return viewer;
257	}	270	}
258	};	271	};
		272	fContentPane.setFont(font);
		273
259	vsplitter.setWeights(new int[] { 30, 70 });	274	vsplitter.setWeights(new int[] { 30, 70 });
260		275
261	return vsplitter;	276	return vsplitter;

Lines 11-16 Link Here

(-)compare/org/eclipse/compare/internal/ComparePreferencePage.java (+8 lines)
11	import org.eclipse.swt.widgets.*;	11	import org.eclipse.swt.widgets.*;
12	import org.eclipse.swt.layout.*;	12	import org.eclipse.swt.layout.*;
13	import org.eclipse.swt.events.*;	13	import org.eclipse.swt.events.*;
		14	import org.eclipse.swt.graphics.Font;
14	import org.eclipse.swt.graphics.Image;	15	import org.eclipse.swt.graphics.Image;
15	import org.eclipse.swt.graphics.Color;	16	import org.eclipse.swt.graphics.Color;
16		17
Lines 190-195 Link Here
190	TabFolder folder= new TabFolder(parent, SWT.NONE);	191	TabFolder folder= new TabFolder(parent, SWT.NONE);
191	folder.setLayout(new TabFolderLayout());	192	folder.setLayout(new TabFolderLayout());
192	folder.setLayoutData(new GridData(GridData.FILL_BOTH));	193	folder.setLayoutData(new GridData(GridData.FILL_BOTH));
		194	folder.setFont(parent.getFont());
193		195
194	TabItem item= new TabItem(folder, SWT.NONE);	196	TabItem item= new TabItem(folder, SWT.NONE);
195	item.setText(Utilities.getString("ComparePreferencePage.generalTab.label")); //$NON-NLS-1$	197	item.setText(Utilities.getString("ComparePreferencePage.generalTab.label")); //$NON-NLS-1$
Lines 213-218 Link Here
213	GridLayout layout= new GridLayout();	215	GridLayout layout= new GridLayout();
214	layout.numColumns= 1;	216	layout.numColumns= 1;
215	composite.setLayout(layout);	217	composite.setLayout(layout);
		218	composite.setFont(parent.getFont());
216		219
217	addCheckBox(composite, "ComparePreferencePage.structureCompare.label", OPEN_STRUCTURE_COMPARE, 0); //$NON-NLS-1$	220	addCheckBox(composite, "ComparePreferencePage.structureCompare.label", OPEN_STRUCTURE_COMPARE, 0); //$NON-NLS-1$
218		221
Lines 224-234 Link Here
224	}	227	}
225		228
226	private Control createTextComparePage(Composite parent) {	229	private Control createTextComparePage(Composite parent) {
		230	Font font = parent.getFont();
227		231
228	Composite composite= new Composite(parent, SWT.NULL);	232	Composite composite= new Composite(parent, SWT.NULL);
229	GridLayout layout= new GridLayout();	233	GridLayout layout= new GridLayout();
230	layout.numColumns= 1;	234	layout.numColumns= 1;
231	composite.setLayout(layout);	235	composite.setLayout(layout);
		236	composite.setFont(font);
232		237
233	addCheckBox(composite, "ComparePreferencePage.synchronizeScrolling.label", SYNCHRONIZE_SCROLLING, 0); //$NON-NLS-1$	238	addCheckBox(composite, "ComparePreferencePage.synchronizeScrolling.label", SYNCHRONIZE_SCROLLING, 0); //$NON-NLS-1$
234		239
Lines 243-248 Link Here
243		248
244	Label previewLabel= new Label(composite, SWT.NULL);	249	Label previewLabel= new Label(composite, SWT.NULL);
245	previewLabel.setText(Utilities.getString("ComparePreferencePage.preview.label")); //$NON-NLS-1$	250	previewLabel.setText(Utilities.getString("ComparePreferencePage.preview.label")); //$NON-NLS-1$
		251	previewLabel.setFont(font);
246		252
247	Control previewer= createPreviewer(composite);	253	Control previewer= createPreviewer(composite);
248	GridData gd= new GridData(GridData.FILL_BOTH);	254	GridData gd= new GridData(GridData.FILL_BOTH);
Lines 294-299 Link Here
294	String label= Utilities.getString(labelKey);	300	String label= Utilities.getString(labelKey);
295		301
296	Group group= new Group(parent, SWT.NULL);	302	Group group= new Group(parent, SWT.NULL);
		303	group.setFont(parent.getFont());
297	group.setText(label);	304	group.setText(label);
298	GridLayout layout= new GridLayout();	305	GridLayout layout= new GridLayout();
299	layout.numColumns= 3;	306	layout.numColumns= 3;
Lines 319-324 Link Here
319	gd.horizontalIndent= indentation;	326	gd.horizontalIndent= indentation;
320	gd.horizontalSpan= 2;	327	gd.horizontalSpan= 2;
321	checkBox.setLayoutData(gd);	328	checkBox.setLayoutData(gd);
		329	checkBox.setFont(parent.getFont());
322		330
323	if (fCheckBoxListener == null) {	331	if (fCheckBoxListener == null) {
324	fCheckBoxListener= new SelectionAdapter() {	332	fCheckBoxListener= new SelectionAdapter() {

Lines 10-15 Link Here

(-)compare/org/eclipse/compare/internal/patch/InputPatchPage.java (-2 / +11 lines)
10	import org.eclipse.swt.SWT;	10	import org.eclipse.swt.SWT;
11	import org.eclipse.swt.dnd.*;	11	import org.eclipse.swt.dnd.*;
12	import org.eclipse.swt.events.*;	12	import org.eclipse.swt.events.*;
		13	import org.eclipse.swt.graphics.Font;
13	import org.eclipse.swt.layout.*;	14	import org.eclipse.swt.layout.*;
14	import org.eclipse.swt.widgets.*;	15	import org.eclipse.swt.widgets.*;
15		16
Lines 75-88 Link Here
75	}	76	}
76		77
77	public void createControl(Composite parent) {	78	public void createControl(Composite parent) {
78		79	Font font = parent.getFont();
79	Composite composite= new Composite(parent, SWT.NULL);	80	Composite composite= new Composite(parent, SWT.NULL);
80	composite.setLayout(new GridLayout());	81	composite.setLayout(new GridLayout());
81	composite.setLayoutData(new GridData(/* GridData.VERTICAL_ALIGN_FILL \| */ GridData.HORIZONTAL_ALIGN_FILL));	82	composite.setLayoutData(new GridData(/* GridData.VERTICAL_ALIGN_FILL \| */ GridData.HORIZONTAL_ALIGN_FILL));
		83	composite.setFont(font);
82	setControl(composite);	84	setControl(composite);
83		85
84	Label l= new Label(composite, SWT.NONE); // a spacer	86	Label l= new Label(composite, SWT.NONE); // a spacer
85	l.setText(PatchMessages.getString("InputPatchPage.SelectInput")); //$NON-NLS-1$	87	l.setText(PatchMessages.getString("InputPatchPage.SelectInput")); //$NON-NLS-1$
		88	l.setFont(font);
86	buildInputGroup(composite);	89	buildInputGroup(composite);
87		90
88	new Label(composite, SWT.NONE); // a spacer	91	new Label(composite, SWT.NONE); // a spacer
Lines 250-257 Link Here
250	* Create the group for selecting the patch file	253	* Create the group for selecting the patch file
251	*/	254	*/
252	private void buildPatchFileGroup(Composite parent) {	255	private void buildPatchFileGroup(Composite parent) {
253		256	Font font = parent.getFont();
254	fPatchFileGroup= new Group(parent, SWT.NONE);	257	fPatchFileGroup= new Group(parent, SWT.NONE);
		258	fPatchFileGroup.setFont(font);
255	fPatchFileGroup.setText(PatchMessages.getString("InputPatchPage.SelectPatch.title")); //$NON-NLS-1$	259	fPatchFileGroup.setText(PatchMessages.getString("InputPatchPage.SelectPatch.title")); //$NON-NLS-1$
256	GridLayout layout= new GridLayout();	260	GridLayout layout= new GridLayout();
257	layout.numColumns= 3;	261	layout.numColumns= 3;
Lines 260-265 Link Here
260		264
261	// 1st row	265	// 1st row
262	fUsePatchFileButton= new Button(fPatchFileGroup, SWT.RADIO);	266	fUsePatchFileButton= new Button(fPatchFileGroup, SWT.RADIO);
		267	fUsePatchFileButton.setFont(font);
263	fUsePatchFileButton.setText(PatchMessages.getString("InputPatchPage.FileButton.text")); //$NON-NLS-1$	268	fUsePatchFileButton.setText(PatchMessages.getString("InputPatchPage.FileButton.text")); //$NON-NLS-1$
264		269
265	fPatchFileNameField= new Combo(fPatchFileGroup, SWT.BORDER);	270	fPatchFileNameField= new Combo(fPatchFileGroup, SWT.BORDER);
Lines 267-276 Link Here
267	//gd.horizontalIndent= 8;	272	//gd.horizontalIndent= 8;
268	gd.widthHint= SIZING_TEXT_FIELD_WIDTH;	273	gd.widthHint= SIZING_TEXT_FIELD_WIDTH;
269	fPatchFileNameField.setLayoutData(gd);	274	fPatchFileNameField.setLayoutData(gd);
		275	fPatchFileNameField.setFont(font);
270		276
271	fPatchFileBrowseButton= new Button(fPatchFileGroup, SWT.PUSH);	277	fPatchFileBrowseButton= new Button(fPatchFileGroup, SWT.PUSH);
272	fPatchFileBrowseButton.setText(PatchMessages.getString("InputPatchPage.ChooseFileButton.text")); //$NON-NLS-1$	278	fPatchFileBrowseButton.setText(PatchMessages.getString("InputPatchPage.ChooseFileButton.text")); //$NON-NLS-1$
273	fPatchFileBrowseButton.setLayoutData(new GridData());	279	fPatchFileBrowseButton.setLayoutData(new GridData());
		280	fPatchFileBrowseButton.setFont(font);
274		281
275	// 2nd row	282	// 2nd row
276	fUseClipboardButton= new Button(fPatchFileGroup, SWT.RADIO);	283	fUseClipboardButton= new Button(fPatchFileGroup, SWT.RADIO);
Lines 278-283 Link Here
278	gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);	285	gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
279	gd.horizontalSpan= 2;	286	gd.horizontalSpan= 2;
280	fUseClipboardButton.setLayoutData(gd);	287	fUseClipboardButton.setLayoutData(gd);
		288	fUseClipboardButton.setFont(font);
281		289
282		290
283	// Add listeners	291	// Add listeners
Lines 329-334 Link Here
329	GridData gd= new GridData(GridData.FILL_HORIZONTAL);	337	GridData gd= new GridData(GridData.FILL_HORIZONTAL);
330	gd.heightHint= 200;	338	gd.heightHint= 200;
331	tree.setLayoutData(gd);	339	tree.setLayoutData(gd);
		340	tree.setFont(parent.getFont());
332		341
333	fPatchTargets= new CheckboxTreeViewer(tree);	342	fPatchTargets= new CheckboxTreeViewer(tree);
334	fPatchTargets.setLabelProvider(new WorkbenchLabelProvider());	343	fPatchTargets.setLabelProvider(new WorkbenchLabelProvider());