View | Details | Raw Unified | Return to bug 35130 | Differences between
and this patch

Collapse All | Expand All

(-)compare/org/eclipse/compare/EditionSelectionDialog.java (-1 / +2 lines)
Lines 789-795 Link Here
789
			}
789
			}
790
		};
790
		};
791
		vsplitter.setWeights(new int[] { 30, 70 });
791
		vsplitter.setWeights(new int[] { 30, 70 });
792
				
792
793
		applyDialogFont(parent);				
793
		return parent;
794
		return parent;
794
	}	
795
	}	
795
	
796
	
(-)compare/org/eclipse/compare/internal/AddFromHistoryDialog.java (-1 / +2 lines)
Lines 262-274 Link Here
262
		);
262
		);
263
		fEditionPane.setContent(fEditionTree);		
263
		fEditionPane.setContent(fEditionTree);		
264
		
264
		
265
		applyDialogFont(parent); // to avoid applying font to compare viewer
265
		fContentPane= new CompareViewerSwitchingPane(vsplitter, SWT.BORDER | SWT.FLAT) {
266
		fContentPane= new CompareViewerSwitchingPane(vsplitter, SWT.BORDER | SWT.FLAT) {
266
			protected Viewer getViewer(Viewer oldViewer, Object input) {
267
			protected Viewer getViewer(Viewer oldViewer, Object input) {
267
				return CompareUIPlugin.findContentViewer(oldViewer, input, this, fCompareConfiguration);	
268
				return CompareUIPlugin.findContentViewer(oldViewer, input, this, fCompareConfiguration);	
268
			}
269
			}
269
		};
270
		};
270
		vsplitter.setWeights(new int[] { 30, 70 });
271
		vsplitter.setWeights(new int[] { 30, 70 });
271
				
272
		
272
		return parent;
273
		return parent;
273
	}
274
	}
274
	
275
	
(-)compare/org/eclipse/compare/internal/CompareDialog.java (-1 / +1 lines)
Lines 84-90 Link Here
84
		Shell shell= c.getShell();
84
		Shell shell= c.getShell();
85
		shell.setText(fCompareEditorInput.getTitle());
85
		shell.setText(fCompareEditorInput.getTitle());
86
		shell.setImage(fCompareEditorInput.getTitleImage());
86
		shell.setImage(fCompareEditorInput.getTitleImage());
87
87
		applyDialogFont(parent);
88
		return parent;
88
		return parent;
89
	}
89
	}
90
		
90
		
(-)compare/org/eclipse/compare/internal/ComparePreferencePage.java (-1 / +2 lines)
Lines 19-24 Link Here
19
import org.eclipse.swt.events.*;
19
import org.eclipse.swt.events.*;
20
import org.eclipse.swt.graphics.Image;
20
import org.eclipse.swt.graphics.Image;
21
21
22
import org.eclipse.jface.dialogs.Dialog;
22
import org.eclipse.jface.preference.*;
23
import org.eclipse.jface.preference.*;
23
import org.eclipse.jface.util.*;
24
import org.eclipse.jface.util.*;
24
25
Lines 206-212 Link Here
206
		item.setControl(createTextComparePage(folder));
207
		item.setControl(createTextComparePage(folder));
207
		
208
		
208
		initializeFields();
209
		initializeFields();
209
		
210
		Dialog.applyDialogFont(folder);
210
		return folder;
211
		return folder;
211
	}
212
	}
212
	
213
	
(-)compare/org/eclipse/compare/internal/ListDialog.java (+1 lines)
Lines 80-85 Link Here
80
		gd.heightHint= convertHeightInCharsToPixels(15);
80
		gd.heightHint= convertHeightInCharsToPixels(15);
81
		gd.widthHint= convertWidthInCharsToPixels(55);
81
		gd.widthHint= convertWidthInCharsToPixels(55);
82
		table.setLayoutData(gd);
82
		table.setLayoutData(gd);
83
		applyDialogFont(parent);
83
		return parent;
84
		return parent;
84
	}
85
	}
85
	
86
	
(-)compare/org/eclipse/compare/internal/TimeoutContext.java (-1 / +1 lines)
Lines 211-217 Link Here
211
			fProgressIndicator.worked(fProgressMonitor.fWorked);
211
			fProgressIndicator.worked(fProgressMonitor.fWorked);
212
	
212
	
213
			fProgressMonitor.activate(this);
213
			fProgressMonitor.activate(this);
214
214
			applyDialogFont(c);
215
			return c;
215
			return c;
216
		}
216
		}
217
		
217
		
(-)compare/org/eclipse/compare/internal/patch/CompareWithPatchAction.java (+1 lines)
Lines 134-139 Link Here
134
						}
134
						}
135
					}
135
					}
136
				);
136
				);
137
				applyDialogFont(result);
137
				return result;
138
				return result;
138
			}
139
			}
139
		};
140
		};
(-)compare/org/eclipse/compare/internal/patch/InputPatchPage.java (+2 lines)
Lines 20-25 Link Here
20
import org.eclipse.swt.widgets.*;
20
import org.eclipse.swt.widgets.*;
21
21
22
import org.eclipse.jface.dialogs.*;
22
import org.eclipse.jface.dialogs.*;
23
import org.eclipse.jface.dialogs.Dialog;
23
import org.eclipse.jface.viewers.*;
24
import org.eclipse.jface.viewers.*;
24
import org.eclipse.jface.wizard.*;
25
import org.eclipse.jface.wizard.*;
25
26
Lines 94-99 Link Here
94
		updateWidgetEnablements();
95
		updateWidgetEnablements();
95
		//updatePageCompletion();
96
		//updatePageCompletion();
96
		
97
		
98
		Dialog.applyDialogFont(composite);
97
		WorkbenchHelp.setHelp(composite, ICompareContextIds.PATCH_INPUT_WIZARD_PAGE);
99
		WorkbenchHelp.setHelp(composite, ICompareContextIds.PATCH_INPUT_WIZARD_PAGE);
98
	}
100
	}
99
	
101
	
(-)compare/org/eclipse/compare/internal/patch/PreviewPatchPage.java (+2 lines)
Lines 26-31 Link Here
26
26
27
import org.eclipse.jface.viewers.Viewer;
27
import org.eclipse.jface.viewers.Viewer;
28
import org.eclipse.jface.wizard.WizardPage;
28
import org.eclipse.jface.wizard.WizardPage;
29
import org.eclipse.jface.dialogs.Dialog;
29
import org.eclipse.jface.operation.IRunnableWithProgress;
30
import org.eclipse.jface.operation.IRunnableWithProgress;
30
import org.eclipse.jface.resource.ImageDescriptor;
31
import org.eclipse.jface.resource.ImageDescriptor;
31
32
Lines 230-235 Link Here
230
		
231
		
231
		// creating tree's content
232
		// creating tree's content
232
		buildTree();
233
		buildTree();
234
		Dialog.applyDialogFont(composite);		
233
	}
235
	}
234
	
236
	
235
	/**
237
	/**

Return to bug 35130