diff options
| author | Erich Gamma | 2005-05-23 10:47:46 +0000 |
|---|---|---|
| committer | Erich Gamma | 2005-05-23 10:47:46 +0000 |
| commit | fcc09e6801648ffbbf59addd59121a51d35b265d (patch) | |
| tree | cbb90ca832c71947c24bcb779fdd9b43513b6f3e /bundles/org.eclipse.compare/plugins | |
| parent | f3d565b2239d1b34b0d208d461b809e57b2ecb64 (diff) | |
| download | eclipse.platform.team-fcc09e6801648ffbbf59addd59121a51d35b265d.tar.gz eclipse.platform.team-fcc09e6801648ffbbf59addd59121a51d35b265d.tar.xz eclipse.platform.team-fcc09e6801648ffbbf59addd59121a51d35b265d.zip | |
[Bug 95322] Missing preferences link
Diffstat (limited to 'bundles/org.eclipse.compare/plugins')
2 files changed, 13 insertions, 1 deletions
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java index 0760adf71..afe8ff4ec 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java @@ -14,6 +14,8 @@ import java.io.*; import java.util.*; import org.eclipse.ui.*; +import org.eclipse.ui.dialogs.PreferenceLinkArea; +import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; import org.eclipse.ui.texteditor.AbstractTextEditor; import org.eclipse.swt.SWT; @@ -283,7 +285,8 @@ public class ComparePreferencePage extends PreferencePage implements IWorkbenchP //addCheckBox(composite, "ComparePreferencePage.useResolveUI.label", USE_RESOLVE_UI, 0); //$NON-NLS-1$ // a spacer - new Label(composite, SWT.NONE); + Label separator= new Label(composite, SWT.SEPARATOR | SWT.HORIZONTAL); + separator.setVisible(false); Label previewLabel= new Label(composite, SWT.NULL); previewLabel.setText(Utilities.getString("ComparePreferencePage.preview.label")); //$NON-NLS-1$ @@ -294,6 +297,13 @@ public class ComparePreferencePage extends PreferencePage implements IWorkbenchP gd.heightHint= convertHeightInCharsToPixels(13); previewer.setLayoutData(gd); + PreferenceLinkArea area = new PreferenceLinkArea(composite, SWT.NONE, + "org.eclipse.ui.preferencePages.ColorsAndFonts", Utilities.getString("ComparePreferencePage.colorAndFontLink"), //$NON-NLS-1$ //$NON-NLS-2$ + (IWorkbenchPreferenceContainer) getContainer(), null); + + GridData data= new GridData(SWT.FILL, SWT.CENTER, false, false); + area.getControl().setLayoutData(data); + return composite; } diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties index a18e14b1c..c75ee386f 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties @@ -135,6 +135,8 @@ ComparePreferencePage.previewAncestor= 1\n2\n3\nconflict\n4\n5 ComparePreferencePage.previewLeft= 1\n2\noutgoing addition\n3\noutgoing change\n4\npseudo conflict\n5 ComparePreferencePage.previewRight= 1\nincoming addition\nincoming addition\n2\n3\nincoming change\n4\npseudo conflict\n5 +ComparePreferencePage.colorAndFontLink=See '<a>Colors and Fonts</a>' preferences for text compare colors and fonts. + textCompareAppearance.label=Text Compare compareIncomingColor.label= Incoming change color |