diff options
author | Michael Valenta | 2007-04-30 17:52:55 +0000 |
---|---|---|
committer | Michael Valenta | 2007-04-30 17:52:55 +0000 |
commit | 8bdd3e9c1c0503624a7d23edb46bc2dcde86961a (patch) | |
tree | bd6fb882759136b518e90c262354175c3e54b075 /bundles/org.eclipse.team.cvs.ui | |
parent | affc4090f6b305b94a094596fa78216757eeca86 (diff) | |
download | eclipse.platform.team-8bdd3e9c1c0503624a7d23edb46bc2dcde86961a.tar.gz eclipse.platform.team-8bdd3e9c1c0503624a7d23edb46bc2dcde86961a.tar.xz eclipse.platform.team-8bdd3e9c1c0503624a7d23edb46bc2dcde86961a.zip |
Bug 177651 [Preferences] Add hyperlink from CVS to proxy and SSH2 settings
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui')
5 files changed, 13 insertions, 3 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoratorPreferencesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoratorPreferencesPage.java index 6eb85fe47..f5821c0cc 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoratorPreferencesPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoratorPreferencesPage.java @@ -325,14 +325,14 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork final Composite composite= SWTUtils.createHFillComposite(parent, SWTUtils.MARGINS_DEFAULT); Dialog.applyDialogFont(composite); - SWTUtils.createPreferenceLink((IWorkbenchPreferenceContainer) getContainer(), composite, CVSUIMessages.CVSDecoratorPreferencesPage_36, CVSUIMessages.CVSDecoratorPreferencesPage_37); // + SWTUtils.createPreferenceLink((IWorkbenchPreferenceContainer) getContainer(), composite, CVSUIMessages.CVSDecoratorPreferencesPage_36, CVSUIMessages.CVSDecoratorPreferencesPage_37); fShowDirty= SWTUtils.createCheckBox(composite, CVSUIMessages.CVSDecoratorPreferencesPage_16); SWTUtils.createLabel(composite, CVSUIMessages.CVSDecoratorPreferencesPage_17); fUseFontDecorations= SWTUtils.createCheckBox(composite, CVSUIMessages.CVSDecoratorPreferencesPage_18); - SWTUtils.createPreferenceLink((IWorkbenchPreferenceContainer) getContainer(), composite, CVSUIMessages.CVSDecoratorPreferencesPage_19, CVSUIMessages.CVSDecoratorPreferencesPage_20); // + SWTUtils.createPreferenceLink((IWorkbenchPreferenceContainer) getContainer(), composite, CVSUIMessages.CVSDecoratorPreferencesPage_19, CVSUIMessages.CVSDecoratorPreferencesPage_20); fShowDirty.addSelectionListener(this); fUseFontDecorations.addSelectionListener(this); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java index 8390b1503..a82a57b8d 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java @@ -37,6 +37,7 @@ import org.eclipse.team.internal.ccvs.core.client.Command.KSubstOption; import org.eclipse.team.internal.ccvs.core.client.Command.QuietOption; import org.eclipse.team.internal.ui.SWTUtils; import org.eclipse.ui.*; +import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; /** * CVS Preference Page @@ -496,6 +497,8 @@ public class CVSPreferencesPage extends PreferencePage implements IWorkbenchPref CVSUIMessages.CVSPreferencesPage_32, IHelpContextIds.PREF_COMPRESSION, COMPRESSION_LABELS, COMPRESSION_VALUES); + + SWTUtils.createPreferenceLink((IWorkbenchPreferenceContainer) getContainer(), composite, CVSUIMessages.CVSPreferencesPage_52, CVSUIMessages.CVSPreferencesPage_53); return composite; } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIMessages.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIMessages.java index 35b424f86..72c88e24d 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIMessages.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIMessages.java @@ -70,6 +70,8 @@ public class CVSUIMessages extends NLS { public static String CVSPreferencesPage_49; public static String CVSPreferencesPage_50; public static String CVSPreferencesPage_51; + public static String CVSPreferencesPage_52; + public static String CVSPreferencesPage_53; public static String CVSPreferencesPage_QuickDiffAnnotate; public static String DiffOperation_CreatePatchConflictMessage; public static String DiffOperation_CreatePatchConflictTitle; diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ExtMethodPreferencePage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ExtMethodPreferencePage.java index 8f5d13868..bf8650ecc 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ExtMethodPreferencePage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ExtMethodPreferencePage.java @@ -24,7 +24,9 @@ import org.eclipse.swt.widgets.*; import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; import org.eclipse.team.internal.ccvs.core.IConnectionMethod; import org.eclipse.team.internal.ccvs.core.connection.CVSRepositoryLocation; +import org.eclipse.team.internal.ui.SWTUtils; import org.eclipse.ui.*; +import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; public class ExtMethodPreferencePage extends PreferencePage implements IWorkbenchPreferencePage { @@ -62,6 +64,8 @@ public class ExtMethodPreferencePage extends PreferencePage implements IWorkbenc useInternal.addSelectionListener(selectionListener); internal = createInternalArea(composite); + SWTUtils.createPreferenceLink((IWorkbenchPreferenceContainer) getContainer(), composite, CVSUIMessages.CVSPreferencesPage_52, CVSUIMessages.CVSPreferencesPage_53); + initializeDefaults(); PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IHelpContextIds.EXT_PREFERENCE_PAGE); Dialog.applyDialogFont(parent); @@ -123,7 +127,6 @@ public class ExtMethodPreferencePage extends PreferencePage implements IWorkbenc b.setText(CVSUIMessages.ExtMethodPreferencePage_Browse); data = new GridData(); data.horizontalAlignment = GridData.FILL; - data.heightHint = convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT); int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH); data.widthHint = Math.max(widthHint, b.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x); b.setLayoutData(data); 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 d02fc2da0..c5ef7d7f7 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 @@ -230,6 +230,8 @@ CVSPreferencesPage_48=Maximum number of comments must be positive CVSPreferencesPage_49=Maximum number of comments must be a number CVSPreferencesPage_50=Commit resources with warnings CVSPreferencesPage_51=Commit resources with errors +CVSPreferencesPage_52=org.eclipse.jsch.ui.SSHPreferences +CVSPreferencesPage_53=See <a>''{0}''</a> to configure the SSH connection information. CVSPropertiesPage_virtualModule=<no corresponding remote folder> CVSProxyPreferencePage_enableProxy=&Enable proxy connection |