Attachment 4219 Details for Bug 30644 – Patch to move the long labels to F1 help - Code part

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch to move the long labels to F1 help - Code part

30644-cvs.ui.patch (text/plain), 6.85 KB, created by Boris Shingarov

on 2003-03-18 15:22:35 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Boris Shingarov

Created: 2003-03-18 15:22:35 EST

Size: 6.85 KB

patch

obsolete

>Index: src/org/eclipse/team/internal/ccvs/ui/ExtMethodPreferencePage.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ExtMethodPreferencePage.java,v
>retrieving revision 1.10
>diff -u -r1.10 ExtMethodPreferencePage.java
>--- src/org/eclipse/team/internal/ccvs/ui/ExtMethodPreferencePage.java	10 Mar 2003 21:24:14 -0000	1.10
>+++ src/org/eclipse/team/internal/ccvs/ui/ExtMethodPreferencePage.java	18 Mar 2003 20:20:51 -0000
>@@ -15,7 +15,6 @@
> import org.eclipse.jface.dialogs.IDialogConstants;
> import org.eclipse.jface.preference.IPreferenceStore;
> import org.eclipse.jface.preference.PreferencePage;
>-import org.eclipse.jface.resource.JFaceResources;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.layout.GridData;
> import org.eclipse.swt.layout.GridLayout;
>@@ -57,8 +56,6 @@
> 		data.horizontalAlignment = GridData.FILL;
> 		intro.setLayoutData(data);
> 		
>-		new Label(composite, SWT.NULL); new Label(composite, SWT.NULL); new Label(composite, SWT.NULL); // spacer
>-		
> 		new Label(composite, SWT.LEFT).setText(Policy.bind("ExtMethodPreferencePage_CVS_RSH")); //$NON-NLS-1$
> 		cvsRsh = new Text(composite, SWT.BORDER);
> 		cvsRsh.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
>@@ -82,19 +79,6 @@
> 			}			
> 		});
> 		
>-		Label l = new Label(composite, SWT.LEFT | SWT.BOLD);
>-		l.setText(Policy.bind("ExtMethodPreferencePage_Note__5")); //$NON-NLS-1$
>-		l.setFont(JFaceResources.getBannerFont());
>-		
>-		l = new Label(composite, SWT.LEFT);
>-		l.setText(Policy.bind("ExtMethodPreferencePage_note_CVS_RSH")); //$NON-NLS-1$
>-		data = new GridData();
>-		data.horizontalSpan = 2;
>-		data.horizontalAlignment = GridData.FILL;
>-		l.setLayoutData(data);
>-		
>-		new Label(composite, SWT.NULL); new Label(composite, SWT.NULL); new Label(composite, SWT.NULL); // spacer
>-		
> 		new Label(composite, SWT.LEFT).setText(Policy.bind("ExtMethodPreferencePage_CVS_RSH_Parameters")); //$NON-NLS-1$
> 		cvsRshParameters = new Text(composite, SWT.BORDER);
> 		data = new GridData();
>@@ -102,40 +86,18 @@
> 		data.horizontalAlignment = GridData.FILL;
> 		cvsRshParameters.setLayoutData(data);
> 
>-		l = new Label(composite, SWT.LEFT | SWT.BOLD);
>-		l.setText(Policy.bind("ExtMethodPreferencePage_Note__5")); //$NON-NLS-1$
>-		l.setFont(JFaceResources.getBannerFont());
>-		
>-		l = new Label(composite, SWT.LEFT);
>-		l.setText(Policy.bind("ExtMethodPreferencePage_note_CVS_RSH_Parameters")); //$NON-NLS-1$
>-		data = new GridData();
>-		data.horizontalSpan = 2;
>-		data.horizontalAlignment = GridData.FILL;
>-		l.setLayoutData(data);
>-						
>-		new Label(composite, SWT.NULL); new Label(composite, SWT.NULL); new Label(composite, SWT.NULL); // spacer
>-		
> 		new Label(composite, SWT.LEFT).setText(Policy.bind("ExtMethodPreferencePage_CVS_SERVER__7")); //$NON-NLS-1$
> 		cvsServer = new Text(composite, SWT.BORDER);
> 		data = new GridData();
> 		data.horizontalSpan = 2;
> 		data.horizontalAlignment = GridData.FILL;
> 		cvsServer.setLayoutData(data);
>-
>-		l = new Label(composite, SWT.LEFT | SWT.BOLD);
>-		l.setText(Policy.bind("ExtMethodPreferencePage_Note__8")); //$NON-NLS-1$
>-		l.setFont(JFaceResources.getBannerFont());
>-		
>-		l = new Label(composite, SWT.LEFT);
>-		l.setText(Policy.bind("ExtMethodPreferencePage_NoteForCVS_SERVER")); //$NON-NLS-1$
>-		data = new GridData();
>-		data.horizontalSpan = 2;
>-		data.horizontalAlignment = GridData.FILL;
>-		l.setLayoutData(data);
>-
> 		
> 		initializeDefaults();
> 		WorkbenchHelp.setHelp(composite, IHelpContextIds.EXT_PREFERENCE_PAGE);
>+		WorkbenchHelp.setHelp(cvsRsh, IHelpContextIds.EXT_PREFERENCE_RSH);
>+		WorkbenchHelp.setHelp(cvsRshParameters, IHelpContextIds.EXT_PREFERENCE_PARAM);
>+		WorkbenchHelp.setHelp(cvsServer, IHelpContextIds.EXT_PREFERENCE_SERVER);
> 		Dialog.applyDialogFont(parent);
> 		return composite;
> 	}
>Index: src/org/eclipse/team/internal/ccvs/ui/IHelpContextIds.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IHelpContextIds.java,v
>retrieving revision 1.32
>diff -u -r1.32 IHelpContextIds.java
>--- src/org/eclipse/team/internal/ccvs/ui/IHelpContextIds.java	10 Mar 2003 21:24:14 -0000	1.32
>+++ src/org/eclipse/team/internal/ccvs/ui/IHelpContextIds.java	18 Mar 2003 20:20:51 -0000
>@@ -89,6 +89,10 @@
> 
> 	public static final String CONSOLE_PREFERENCE_PAGE = PREFIX + "console_preference_page_context"; //$NON-NLS-1$
> 	public static final String EXT_PREFERENCE_PAGE = PREFIX + "ext_preference_page_context"; //$NON-NLS-1$
>+	public static final String EXT_PREFERENCE_RSH = PREFIX + "ext_preference_rsh_context"; //$NON-NLS-1$
>+	public static final String EXT_PREFERENCE_PARAM = PREFIX + "ext_preference_param_context"; //$NON-NLS-1$
>+	public static final String EXT_PREFERENCE_SERVER = PREFIX + "ext_preference_server_context"; //$NON-NLS-1$
>+	
> 	public static final String DECORATORS_PREFERENCE_PAGE = PREFIX + "decorators_preference_page_context"; //$NON-NLS-1$
> 	public static final String WATCH_EDIT_PREFERENCE_PAGE = PREFIX + "watch_edit_preference_page_context"; //$NON-NLS-1$
> 
>Index: src/org/eclipse/team/internal/ccvs/ui/messages.properties
>===================================================================
>RCS file: /home/eclipse/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties,v
>retrieving revision 1.250
>diff -u -r1.250 messages.properties
>--- src/org/eclipse/team/internal/ccvs/ui/messages.properties	10 Mar 2003 21:24:14 -0000	1.250
>+++ src/org/eclipse/team/internal/ccvs/ui/messages.properties	18 Mar 2003 20:20:51 -0000
>@@ -715,14 +715,9 @@
> ExtMethodPreferencePage_CVS_RSH=CVS_&RSH:
> ExtMethodPreferencePage_Browse=&Browse...
> ExtMethodPreferencePage_Details=Select a program or script
>-ExtMethodPreferencePage_Note__5=Note:
>-ExtMethodPreferencePage_note_CVS_RSH=This program will be called to connect to the remote CVS server.\nThe RSH command is invoked with following calling pattern:\n<CVS_RSH> <Parameters> <CVS_SERVER>
> ExtMethodPreferencePage_CVS_RSH_Parameters=&Parameters:
> ExtMethodPreferencePage_Add_Variable=&Add Variable...
>-ExtMethodPreferencePage_note_CVS_RSH_Parameters=The default parameter pattern is {host} -l {user}.\nIt can be tailored using {host}, {user}, {password} and {port}.
> ExtMethodPreferencePage_CVS_SERVER__7=CVS_&SERVER:
>-ExtMethodPreferencePage_Note__8=Note:
>-ExtMethodPreferencePage_NoteForCVS_SERVER=This is the name of the remote CVS server program.\nChange this setting only if the remote CVS server name\nis different than the default
> UpdateMergeActionProblems_merging_remote_resources_into_workspace_1=Problems merging remote resources into workspace
> UpdateMergeActionProblems_merging_remote_resources_into_workspace_2=Problems merging remote resources into workspace
> CVSAddResolutionGenerator.Add_Resource_to_CVS_1=Add Resource to CVS

Actions: View | Diff

Attachments on bug 30644: 3244 | 3250 | 4218 | 4219