Bug 131141 [Patch] UI issues in the Create Patch wizard

2 files changed, 24 insertions, 8 deletions

diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
index abd52c60c..9bd820f36 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
@@ -338,7 +338,7 @@ AddToBranchAction_enterTag=Enter Branch Tag
 AddToBranchAction_enterTagLong=Enter the name of the branch:
 
 GenerateCVSDiff_title=Create Patch
-GenerateCVSDiff_pageTitle=Crate a patch using the CVS diff command
+GenerateCVSDiff_pageTitle=Create a Patch Using the CVS Diff Command
 GenerateCVSDiff_pageDescription=The results of the CVS diff command can be used as an input file for the Apply Patch wizard.
 GenerateCVSDiff_overwriteTitle=Confirm Overwrite
 GenerateCVSDiff_overwriteMsg=A file with that name already exists. Overwrite?
@@ -593,8 +593,8 @@ Diff_output_format_12=Diff output format
 Unified__format_required_by_Compare_With_Patch_feature__13=&Unified (format required by the Apply Patch wizard)
 Context_14=&Context
 Standard_15=&Standard
-Advanced_options_19=Advanced options
-Configure_the_options_used_for_the_CVS_diff_command_20=Configure the options used for the CVS diff command
+Advanced_options_19=Advanced Options
+Configure_the_options_used_for_the_CVS_diff_command_20=Configure the options used for the CVS diff command.
 
 
 TagSelectionDialog_Select_a_Tag_1=&Select a branch or version
@@ -929,14 +929,14 @@ GenerateDiffFileWizard_2=Please enter a file name.
 GenerateDiffFileWizard_3=The specified directory does not exist.
 GenerateDiffFileWizard_4=Please select a location in the workspace by browsing.
 GenerateDiffFileWizard_5=Please enter a valid filename.
-GenerateDiffFileWizard_6=Workspace (Multi-project Apply Patch wizard specific)
-GenerateDiffFileWizard_7=Project
-GenerateDiffFileWizard_8=Selection
+GenerateDiffFileWizard_6=&Workspace (Multi-project Apply Patch wizard specific)
+GenerateDiffFileWizard_7=&Project
+GenerateDiffFileWizard_8=S&election
 GenerateDiffFileWizard_9=Patch Location
 GenerateDiffFileWizard_10=Patch Root
 GenerateDiffFileWizard_File_multisegments=File name cannot contain multiple segments
-GenerateDiffFileWizard_SelectAll=Select All
-GenerateDiffFileWizard_DeselectAll=Deselect All
+GenerateDiffFileWizard_SelectAll=Select &All
+GenerateDiffFileWizard_DeselectAll=&Deselect All
 
 MergeSynchronizeParticipant_8=Missing id initializing cvs merge participant
 MergeSynchronizeParticipant_9=Unable to initialize cvs merge subscriber
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java
index b4a4ef4f1..9e00a5ca3 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java
@@ -564,10 +564,18 @@ public class GenerateDiffFileWizard extends Wizard {
             
             wsPathText= new Text(nameGroup, SWT.BORDER);
             GridData gd= new GridData(GridData.FILL_HORIZONTAL);
+            gd.verticalAlignment = GridData.CENTER;
+            gd.grabExcessVerticalSpace = false;
+            gd.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH;
             wsPathText.setLayoutData(gd);
             wsPathText.setEditable(false);
             
             wsBrowseButton = new Button(nameGroup, SWT.NULL);
+            gd = new GridData();
+    		gd.horizontalAlignment = GridData.FILL;
+    		int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
+    		gd.widthHint = Math.max(widthHint, wsBrowseButton.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
+    		wsBrowseButton.setLayoutData(gd);
             wsBrowseButton.setText(CVSUIMessages.Browse____4); 
         }
         
@@ -590,9 +598,17 @@ public class GenerateDiffFileWizard extends Wizard {
             
             fsPathText= new Text(nameGroup, SWT.BORDER);
             GridData gd= new GridData(GridData.FILL_HORIZONTAL);
+            gd.verticalAlignment = GridData.CENTER;
+            gd.grabExcessVerticalSpace = false;
+            gd.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH;
             fsPathText.setLayoutData(gd);
             
             fsBrowseButton = new Button(nameGroup, SWT.NULL);
+            gd = new GridData();
+    		gd.horizontalAlignment = GridData.FILL;
+    		int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
+    		gd.widthHint = Math.max(widthHint, fsBrowseButton.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
+    		fsBrowseButton.setLayoutData(gd);
             fsBrowseButton.setText(CVSUIMessages.Browse____4); 
         }