Attachment #36455 for bug #132275

View | Details | Raw Unified | Return to bug 132275
Collapse All | Expand All

Lines 1-5 Link Here

(-)compare/org/eclipse/compare/internal/patch/PreviewPatchPage.java (-13 / +15 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2004 IBM Corporation and others.	2	* Copyright (c) 2000, 2006 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 36-41 Link Here
36	import org.eclipse.core.runtime.IPath;	36	import org.eclipse.core.runtime.IPath;
37	import org.eclipse.core.runtime.IProgressMonitor;	37	import org.eclipse.core.runtime.IProgressMonitor;
38	import org.eclipse.jface.dialogs.Dialog;	38	import org.eclipse.jface.dialogs.Dialog;
		39	import org.eclipse.jface.dialogs.IDialogConstants;
39	import org.eclipse.jface.operation.IRunnableWithProgress;	40	import org.eclipse.jface.operation.IRunnableWithProgress;
40	import org.eclipse.jface.viewers.CheckStateChangedEvent;	41	import org.eclipse.jface.viewers.CheckStateChangedEvent;
41	import org.eclipse.jface.viewers.DecoratingLabelProvider;	42	import org.eclipse.jface.viewers.DecoratingLabelProvider;
Lines 135-147 Link Here
135		136
136	GridLayout layout= new GridLayout();	137	GridLayout layout= new GridLayout();
137	layout.numColumns= 1;	138	layout.numColumns= 1;
		139	layout.marginHeight= convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
		140	layout.marginWidth= convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
138	composite.setLayout(layout);	141	composite.setLayout(layout);
139	final GridData data= new GridData(SWT.FILL, SWT.FILL, true, true);	142	final GridData data= new GridData(SWT.FILL, SWT.FILL, true, true);
140	composite.setLayoutData(data);	143	composite.setLayoutData(data);
141		144
142	//add controls to composite as necessary	145	//add controls to composite as necessary
143	Label label= new Label(composite, SWT.LEFT\|SWT.WRAP);	146	Label label= new Label(composite, SWT.LEFT\|SWT.WRAP);
144	label.setText(NLS.bind(PatchMessages.Diff_2Args, new String[] {PatchMessages.PreviewPatchPage_SelectProject, rpSelectedProject.getName()}));	147	label.setText(NLS.bind(PatchMessages.PreviewPatchPage_SelectProject, rpSelectedProject.getName()));
145	final GridData data2= new GridData(SWT.FILL, SWT.BEGINNING, true, false);	148	final GridData data2= new GridData(SWT.FILL, SWT.BEGINNING, true, false);
146	label.setLayoutData(data2);	149	label.setLayoutData(data2);
147		150
Lines 159-164 Link Here
159		162
160	setupListeners();	163	setupListeners();
161		164
		165	Dialog.applyDialogFont(composite);
		166
162	return parent;	167	return parent;
163	}	168	}
164		169
Lines 281-286 Link Here
281		286
282	setControl(composite);	287	setControl(composite);
283		288
		289	initializeDialogUnits(parent);
		290
284	buildPatchOptionsGroup(composite);	291	buildPatchOptionsGroup(composite);
285		292
286	Splitter splitter= new Splitter(composite, SWT.VERTICAL);	293	Splitter splitter= new Splitter(composite, SWT.VERTICAL);
Lines 296-314 Link Here
296	return CompareUI.findContentViewer(oldViewer, (ICompareInput) input, this, fCompareConfiguration);	303	return CompareUI.findContentViewer(oldViewer, (ICompareInput) input, this, fCompareConfiguration);
297	}	304	}
298	};	305	};
299	GridData gd= new GridData();	306	fHunkViewer.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
300	gd.verticalAlignment= GridData.FILL;
301	gd.horizontalAlignment= GridData.FILL;
302	gd.grabExcessHorizontalSpace= true;
303	gd.grabExcessVerticalSpace= true;
304	fHunkViewer.setLayoutData(gd);
305		307
306	//create Match Project button	308	//create Match Project button
307	fMatchProject= new Button(composite, SWT.PUSH);	309	fMatchProject= new Button(composite, SWT.PUSH);
308	gd= new GridData();	310	fMatchProject.setLayoutData(new GridData(SWT.END, GridData.BEGINNING, false, false));
309	gd.verticalAlignment= GridData.BEGINNING;
310	gd.horizontalAlignment= GridData.END;
311	fMatchProject.setLayoutData(gd);
312		311
313	fMatchProject.setText(PatchMessages.PreviewPatchPage_MatchProjects);	312	fMatchProject.setText(PatchMessages.PreviewPatchPage_MatchProjects);
314	fMatchProject.setEnabled(false);	313	fMatchProject.setEnabled(false);
Lines 408-414 Link Here
408		407
409	Group group= new Group(parent, SWT.NONE);	408	Group group= new Group(parent, SWT.NONE);
410	group.setText(PatchMessages.PreviewPatchPage_PatchOptions_title);	409	group.setText(PatchMessages.PreviewPatchPage_PatchOptions_title);
411	gl= new GridLayout(); gl.numColumns= 4; gl.marginHeight= 0;	410	gl= new GridLayout(); gl.numColumns= 4;
412	group.setLayout(gl);	411	group.setLayout(gl);
413	group.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL\|GridData.GRAB_HORIZONTAL));	412	group.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL\|GridData.GRAB_HORIZONTAL));
414		413
Lines 470-475 Link Here
470	}	469	}
471	);	470	);
472	gd= new GridData(GridData.VERTICAL_ALIGN_CENTER);	471	gd= new GridData(GridData.VERTICAL_ALIGN_CENTER);
		472	int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
		473	Point minSize = b.computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
		474	gd.widthHint = Math.max(widthHint, minSize.x);
473	b.setLayoutData(gd);	475	b.setLayoutData(gd);
474		476
475	addSpacer(group);	477	addSpacer(group);




###############################################################################
# Copyright (c) 2000, 2006 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at

InputPatchPage_ChooseFileButton_text=&Browse...
InputPatchPage_UseClipboardButton_text=&Clipboard
InputPatchPage_UseWorkspaceButton_text=&Workspace
InputPatchPage_WorkspaceSelectPatch_text=&Select the location of the patch:
InputPatchPage_NothingSelected_message=Select a file or folder to be patched
InputPatchPage_ClipboardIsEmpty_message=Clipboard is empty
InputPatchPage_NoTextInClipboard_message=Clipboard does not contain text

PreviewPatchPage_Target=(target: {0})
PreviewPatchPage_Left_title= Original
PreviewPatchPage_Right_title= Result
PreviewPatchPage_PatchOptions_title=Patch options
PreviewPatchPage_IgnoreSegments_text=&Ignore leading path name segments:
PreviewPatchPage_ReversePatch_text=&Reverse patch
PreviewPatchPage_FuzzFactor_text=&Maximum fuzz factor:

PreviewPatchPage_NoMatch_error=(no match)
PreviewPatchPage_MatchProjects=Match &Project...
PreviewPatchPage_RetargetPatch=Retarget Patch
PreviewPatchPage_SelectProject=Select the project in your workspace that corresponds to project ''{0}'':
PreviewPatchPage_FileIsReadOnly_error=(file is read-only)
PreviewPatchPage_GuessFuzz_text= &Guess
PreviewPatchPage_GuessFuzzProgress_text= Guessing Fuzz Factor...




/*******************************************************************************
 * Copyright (c) 2000, 2006 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ISelectionChangedListener;

import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.ShellAdapter;
import org.eclipse.swt.events.ShellEvent;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;

	private Button fUsePatchFileButton;

	private Button fUseWorkspaceButton;
	private Label fWorkspaceSelectLabel;
	private TreeViewer fTreeViewer;

	private PatchWizard fPatchWizard;

		composite.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL));
		setControl(composite);

		initializeDialogUnits(parent);
		
		buildPatchFileGroup(composite);
		
		//see if there are any better options presently selected

	}

	private void setEnableWorkspacePatch(boolean enable) {
		fWorkspaceSelectLabel.setEnabled(enable);
		fTreeViewer.getTree().setEnabled(enable);
	}


		fUsePatchFileButton.setText(PatchMessages.InputPatchPage_FileButton_text);

		fPatchFileNameField= new Combo(composite, SWT.BORDER);
		//gd.horizontalIndent= 8;
		gd= new GridData(GridData.FILL_HORIZONTAL);
		gd.widthHint= SIZING_TEXT_FIELD_WIDTH;
		fPatchFileNameField.setLayoutData(gd);

		fPatchFileBrowseButton= new Button(composite, SWT.PUSH);
		fPatchFileBrowseButton.setText(PatchMessages.InputPatchPage_ChooseFileButton_text);
		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
		int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
		Point minSize = fPatchFileBrowseButton.computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
		data.widthHint = Math.max(widthHint, minSize.x);
		fPatchFileBrowseButton.setLayoutData(data);

		//3rd row
		fUseWorkspaceButton= new Button(composite, SWT.RADIO);

	}

	private void addWorkspaceControls(Composite composite) {

	
		Composite newComp = new Composite(composite, SWT.NONE);
		GridLayout layout= new GridLayout(1, false);
		layout.marginLeft = 16; //align w/ lable of check button
		layout.marginHeight = 0;
		layout.marginLeft = 5;
		newComp.setLayout(layout);
		newComp.setLayoutData(new GridData(GridData.FILL_BOTH));
			
		fWorkspaceSelectLabel = new Label(newComp, SWT.LEFT);
		fWorkspaceSelectLabel.setText(PatchMessages.InputPatchPage_WorkspaceSelectPatch_text);

		fTreeViewer= new TreeViewer(newComp, SWT.BORDER);
		fTreeViewer.getTree().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
		gd.widthHint= 0;
		gd.heightHint= 0;
		fTreeViewer.getTree().setLayoutData(gd);

		fTreeViewer.setLabelProvider(new WorkbenchLabelProvider());
		fTreeViewer.setContentProvider(new WorkbenchContentProvider());

Return to bug 132275

Lines 1-5 Link Here

(-)compare/org/eclipse/compare/internal/patch/PatchMessages.properties (-4 / +4 lines)
1	###############################################################################	1	###############################################################################
2	# Copyright (c) 2000, 2004 IBM Corporation and others.	2	# Copyright (c) 2000, 2006 IBM Corporation and others.
3	# All rights reserved. This program and the accompanying materials	3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0	4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at	5	# which accompanies this distribution, and is available at
Lines 38-44 Link Here
38	InputPatchPage_ChooseFileButton_text=&Browse...	38	InputPatchPage_ChooseFileButton_text=&Browse...
39	InputPatchPage_UseClipboardButton_text=&Clipboard	39	InputPatchPage_UseClipboardButton_text=&Clipboard
40	InputPatchPage_UseWorkspaceButton_text=&Workspace	40	InputPatchPage_UseWorkspaceButton_text=&Workspace
41	InputPatchPage_WorkspaceSelectPatch_text=&Select the location of the patch	41	InputPatchPage_WorkspaceSelectPatch_text=&Select the location of the patch:
42	InputPatchPage_NothingSelected_message=Select a file or folder to be patched	42	InputPatchPage_NothingSelected_message=Select a file or folder to be patched
43	InputPatchPage_ClipboardIsEmpty_message=Clipboard is empty	43	InputPatchPage_ClipboardIsEmpty_message=Clipboard is empty
44	InputPatchPage_NoTextInClipboard_message=Clipboard does not contain text	44	InputPatchPage_NoTextInClipboard_message=Clipboard does not contain text
Lines 68-74 Link Here
68	PreviewPatchPage_Target=(target: {0})	68	PreviewPatchPage_Target=(target: {0})
69	PreviewPatchPage_Left_title= Original	69	PreviewPatchPage_Left_title= Original
70	PreviewPatchPage_Right_title= Result	70	PreviewPatchPage_Right_title= Result
71	PreviewPatchPage_PatchOptions_title=Patch Options	71	PreviewPatchPage_PatchOptions_title=Patch options
72	PreviewPatchPage_IgnoreSegments_text=&Ignore leading path name segments:	72	PreviewPatchPage_IgnoreSegments_text=&Ignore leading path name segments:
73	PreviewPatchPage_ReversePatch_text=&Reverse patch	73	PreviewPatchPage_ReversePatch_text=&Reverse patch
74	PreviewPatchPage_FuzzFactor_text=&Maximum fuzz factor:	74	PreviewPatchPage_FuzzFactor_text=&Maximum fuzz factor:
Lines 80-86 Link Here
80	PreviewPatchPage_NoMatch_error=(no match)	80	PreviewPatchPage_NoMatch_error=(no match)
81	PreviewPatchPage_MatchProjects=Match &Project...	81	PreviewPatchPage_MatchProjects=Match &Project...
82	PreviewPatchPage_RetargetPatch=Retarget Patch	82	PreviewPatchPage_RetargetPatch=Retarget Patch
83	PreviewPatchPage_SelectProject=Select the project in your workspace that corresponds to project	83	PreviewPatchPage_SelectProject=Select the project in your workspace that corresponds to project ''{0}'':
84	PreviewPatchPage_FileIsReadOnly_error=(file is read-only)	84	PreviewPatchPage_FileIsReadOnly_error=(file is read-only)
85	PreviewPatchPage_GuessFuzz_text= &Guess	85	PreviewPatchPage_GuessFuzz_text= &Guess
86	PreviewPatchPage_GuessFuzzProgress_text= Guessing Fuzz Factor...	86	PreviewPatchPage_GuessFuzzProgress_text= Guessing Fuzz Factor...