Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java12
-rw-r--r--bundles/org.eclipse.compare/plugin.properties2
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java12
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties2
4 files changed, 26 insertions, 2 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
index 0760adf71..afe8ff4ec 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
+++ b/bundles/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/plugin.properties b/bundles/org.eclipse.compare/plugin.properties
index a18e14b1c..c75ee386f 100644
--- a/bundles/org.eclipse.compare/plugin.properties
+++ b/bundles/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
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

Back to the top