Attachment 4187 Details for Bug 35130 – Compare Patches

[patch] Compare Patches

35130_COMPARE.patch (text/plain), 6.94 KB, created by Dirk Baeumer

on 2003-03-17 16:42:42 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Dirk Baeumer

Created: 2003-03-17 16:42:42 EST

Size: 6.94 KB

patch

obsolete

>Index: compare/org/eclipse/compare/EditionSelectionDialog.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java,v
>retrieving revision 1.44
>diff -u -r1.44 EditionSelectionDialog.java
>--- compare/org/eclipse/compare/EditionSelectionDialog.java	10 Mar 2003 21:25:35 -0000	1.44
>+++ compare/org/eclipse/compare/EditionSelectionDialog.java	17 Mar 2003 21:25:40 -0000
>@@ -789,7 +789,8 @@
> 			}
> 		};
> 		vsplitter.setWeights(new int[] { 30, 70 });
>-				
>+
>+		applyDialogFont(parent);				
> 		return parent;
> 	}	
> 	
>Index: compare/org/eclipse/compare/internal/AddFromHistoryDialog.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java,v
>retrieving revision 1.16
>diff -u -r1.16 AddFromHistoryDialog.java
>--- compare/org/eclipse/compare/internal/AddFromHistoryDialog.java	10 Mar 2003 21:25:35 -0000	1.16
>+++ compare/org/eclipse/compare/internal/AddFromHistoryDialog.java	17 Mar 2003 21:25:43 -0000
>@@ -262,13 +262,14 @@
> 		);
> 		fEditionPane.setContent(fEditionTree);		
> 		
>+		applyDialogFont(parent); // to avoid applying font to compare viewer
> 		fContentPane= new CompareViewerSwitchingPane(vsplitter, SWT.BORDER | SWT.FLAT) {
> 			protected Viewer getViewer(Viewer oldViewer, Object input) {
> 				return CompareUIPlugin.findContentViewer(oldViewer, input, this, fCompareConfiguration);	
> 			}
> 		};
> 		vsplitter.setWeights(new int[] { 30, 70 });
>-				
>+		
> 		return parent;
> 	}
> 	
>Index: compare/org/eclipse/compare/internal/CompareDialog.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareDialog.java,v
>retrieving revision 1.10
>diff -u -r1.10 CompareDialog.java
>--- compare/org/eclipse/compare/internal/CompareDialog.java	10 Mar 2003 21:25:35 -0000	1.10
>+++ compare/org/eclipse/compare/internal/CompareDialog.java	17 Mar 2003 21:25:44 -0000
>@@ -84,7 +84,7 @@
> 		Shell shell= c.getShell();
> 		shell.setText(fCompareEditorInput.getTitle());
> 		shell.setImage(fCompareEditorInput.getTitleImage());
>-
>+		applyDialogFont(parent);
> 		return parent;
> 	}
> 		
>Index: compare/org/eclipse/compare/internal/ComparePreferencePage.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java,v
>retrieving revision 1.28
>diff -u -r1.28 ComparePreferencePage.java
>--- compare/org/eclipse/compare/internal/ComparePreferencePage.java	10 Mar 2003 21:25:35 -0000	1.28
>+++ compare/org/eclipse/compare/internal/ComparePreferencePage.java	17 Mar 2003 21:25:46 -0000
>@@ -19,6 +19,7 @@
> import org.eclipse.swt.events.*;
> import org.eclipse.swt.graphics.Image;
> 
>+import org.eclipse.jface.dialogs.Dialog;
> import org.eclipse.jface.preference.*;
> import org.eclipse.jface.util.*;
> 
>@@ -206,7 +207,7 @@
> 		item.setControl(createTextComparePage(folder));
> 		
> 		initializeFields();
>-		
>+		Dialog.applyDialogFont(folder);
> 		return folder;
> 	}
> 	
>Index: compare/org/eclipse/compare/internal/ListDialog.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/ListDialog.java,v
>retrieving revision 1.4
>diff -u -r1.4 ListDialog.java
>--- compare/org/eclipse/compare/internal/ListDialog.java	10 Mar 2003 21:25:35 -0000	1.4
>+++ compare/org/eclipse/compare/internal/ListDialog.java	17 Mar 2003 21:25:47 -0000
>@@ -80,6 +80,7 @@
> 		gd.heightHint= convertHeightInCharsToPixels(15);
> 		gd.widthHint= convertWidthInCharsToPixels(55);
> 		table.setLayoutData(gd);
>+		applyDialogFont(parent);
> 		return parent;
> 	}
> 	
>Index: compare/org/eclipse/compare/internal/TimeoutContext.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/TimeoutContext.java,v
>retrieving revision 1.7
>diff -u -r1.7 TimeoutContext.java
>--- compare/org/eclipse/compare/internal/TimeoutContext.java	10 Mar 2003 21:25:35 -0000	1.7
>+++ compare/org/eclipse/compare/internal/TimeoutContext.java	17 Mar 2003 21:25:49 -0000
>@@ -211,7 +211,7 @@
> 			fProgressIndicator.worked(fProgressMonitor.fWorked);
> 	
> 			fProgressMonitor.activate(this);
>-
>+			applyDialogFont(c);
> 			return c;
> 		}
> 		
>Index: compare/org/eclipse/compare/internal/patch/CompareWithPatchAction.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/CompareWithPatchAction.java,v
>retrieving revision 1.9
>diff -u -r1.9 CompareWithPatchAction.java
>--- compare/org/eclipse/compare/internal/patch/CompareWithPatchAction.java	10 Mar 2003 21:25:35 -0000	1.9
>+++ compare/org/eclipse/compare/internal/patch/CompareWithPatchAction.java	17 Mar 2003 21:25:50 -0000
>@@ -134,6 +134,7 @@
> 						}
> 					}
> 				);
>+				applyDialogFont(result);
> 				return result;
> 			}
> 		};
>Index: compare/org/eclipse/compare/internal/patch/InputPatchPage.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java,v
>retrieving revision 1.16
>diff -u -r1.16 InputPatchPage.java
>--- compare/org/eclipse/compare/internal/patch/InputPatchPage.java	10 Mar 2003 21:25:35 -0000	1.16
>+++ compare/org/eclipse/compare/internal/patch/InputPatchPage.java	17 Mar 2003 21:25:53 -0000
>@@ -20,6 +20,7 @@
> import org.eclipse.swt.widgets.*;
> 
> import org.eclipse.jface.dialogs.*;
>+import org.eclipse.jface.dialogs.Dialog;
> import org.eclipse.jface.viewers.*;
> import org.eclipse.jface.wizard.*;
> 
>@@ -94,6 +95,7 @@
> 		updateWidgetEnablements();
> 		//updatePageCompletion();
> 		
>+		Dialog.applyDialogFont(composite);
> 		WorkbenchHelp.setHelp(composite, ICompareContextIds.PATCH_INPUT_WIZARD_PAGE);
> 	}
> 	
>Index: compare/org/eclipse/compare/internal/patch/PreviewPatchPage.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage.java,v
>retrieving revision 1.17
>diff -u -r1.17 PreviewPatchPage.java
>--- compare/org/eclipse/compare/internal/patch/PreviewPatchPage.java	10 Mar 2003 21:25:35 -0000	1.17
>+++ compare/org/eclipse/compare/internal/patch/PreviewPatchPage.java	17 Mar 2003 21:25:57 -0000
>@@ -26,6 +26,7 @@
> 
> import org.eclipse.jface.viewers.Viewer;
> import org.eclipse.jface.wizard.WizardPage;
>+import org.eclipse.jface.dialogs.Dialog;
> import org.eclipse.jface.operation.IRunnableWithProgress;
> import org.eclipse.jface.resource.ImageDescriptor;
> 
>@@ -230,6 +231,7 @@
> 		
> 		// creating tree's content
> 		buildTree();
>+		Dialog.applyDialogFont(composite);		
> 	}
> 	
> 	/**

Actions: View | Diff

Attachments on bug 35130: 4187 | 4188 | 4189 | 4190 | 4191 | 4192 | 4213