diff options
author | Andre Weinand | 2005-05-08 15:10:46 +0000 |
---|---|---|
committer | Andre Weinand | 2005-05-08 15:10:46 +0000 |
commit | 6ff1099c3befda96ac29db3928cb1ad5af4816c6 (patch) | |
tree | e2587902b9dc2b96d14f93cf847b6dedce9a9221 | |
parent | 9f31d1b2155cffd3b1e8c8e5cde8d31d2bb0ca07 (diff) | |
download | eclipse.platform.team-6ff1099c3befda96ac29db3928cb1ad5af4816c6.tar.gz eclipse.platform.team-6ff1099c3befda96ac29db3928cb1ad5af4816c6.tar.xz eclipse.platform.team-6ff1099c3befda96ac29db3928cb1ad5af4816c6.zip |
fixed #93924: Add keywords to preference pages
6 files changed, 26 insertions, 0 deletions
diff --git a/bundles/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/buildnotes_compare.html index cca7a63ad..0943dd5d7 100644 --- a/bundles/org.eclipse.compare/buildnotes_compare.html +++ b/bundles/org.eclipse.compare/buildnotes_compare.html @@ -21,6 +21,7 @@ Eclipse Build Input May 10th 2005 <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=93901">93901</a>: Applying patch with one line added inserts new line one line above<br> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=78653">78653</a>: Eclipse compare support does not appear to use file inspection correctly<br> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=78652">78652</a>: content type should be bound hierarchically<br> +<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=93924">93924</a>: Add keywords to preference pages<br> diff --git a/bundles/org.eclipse.compare/plugin.properties b/bundles/org.eclipse.compare/plugin.properties index 162fef264..4821be1e1 100644 --- a/bundles/org.eclipse.compare/plugin.properties +++ b/bundles/org.eclipse.compare/plugin.properties @@ -149,6 +149,9 @@ compareResolvedColor.description= The color used to indicate a resolved change i compareFontDefiniton.label= Compare text font compareFontDefiniton.description= The compare text font is used by textual compare/merge tools. + +preferenceKeywords.general=merg white filter structure synchronize scoll ancestor conflict line pseudo + # New UI #ComparePreferencePage.useSplines.label= Use splines in center panel #ComparePreferencePage.useResolveUI.label= Use new resolve UI diff --git a/bundles/org.eclipse.compare/plugin.xml b/bundles/org.eclipse.compare/plugin.xml index 61c84c9e4..d689373b9 100644 --- a/bundles/org.eclipse.compare/plugin.xml +++ b/bundles/org.eclipse.compare/plugin.xml @@ -84,6 +84,7 @@ id="org.eclipse.compare.CompareEditor"> </editor> </extension> + <extension point="org.eclipse.ui.preferencePages"> <page @@ -91,9 +92,17 @@ category="org.eclipse.ui.preferencePages.Workbench" class="org.eclipse.compare.internal.ComparePreferencePage" id="org.eclipse.compare.internal.ComparePreferencePage"> + <keywordReference id="org.eclipse.compare.general"/> </page> </extension> + <extension + point="org.eclipse.ui.keywords"> + <keyword + label="%preferenceKeywords.general" + id="org.eclipse.compare.general"/> + </extension> + <!-- commands and their bindings --> <extension point="org.eclipse.ui.commands"> diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html index cca7a63ad..0943dd5d7 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html @@ -21,6 +21,7 @@ Eclipse Build Input May 10th 2005 <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=93901">93901</a>: Applying patch with one line added inserts new line one line above<br> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=78653">78653</a>: Eclipse compare support does not appear to use file inspection correctly<br> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=78652">78652</a>: content type should be bound hierarchically<br> +<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=93924">93924</a>: Add keywords to preference pages<br> 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 162fef264..4821be1e1 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties @@ -149,6 +149,9 @@ compareResolvedColor.description= The color used to indicate a resolved change i compareFontDefiniton.label= Compare text font compareFontDefiniton.description= The compare text font is used by textual compare/merge tools. + +preferenceKeywords.general=merg white filter structure synchronize scoll ancestor conflict line pseudo + # New UI #ComparePreferencePage.useSplines.label= Use splines in center panel #ComparePreferencePage.useResolveUI.label= Use new resolve UI diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml index 61c84c9e4..d689373b9 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml @@ -84,6 +84,7 @@ id="org.eclipse.compare.CompareEditor"> </editor> </extension> + <extension point="org.eclipse.ui.preferencePages"> <page @@ -91,9 +92,17 @@ category="org.eclipse.ui.preferencePages.Workbench" class="org.eclipse.compare.internal.ComparePreferencePage" id="org.eclipse.compare.internal.ComparePreferencePage"> + <keywordReference id="org.eclipse.compare.general"/> </page> </extension> + <extension + point="org.eclipse.ui.keywords"> + <keyword + label="%preferenceKeywords.general" + id="org.eclipse.compare.general"/> + </extension> + <!-- commands and their bindings --> <extension point="org.eclipse.ui.commands"> |