Bug 544398: [LtxR-Editor, WikidocR-Editor] Move preference pages
'Wikitext/LaTeX+R Options' to preferences of doc language
Change-Id: Ic79bcba8c16f4ef20559bde94d5d899d673abc40
diff --git a/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/r/ui/RUI.java b/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/r/ui/RUI.java
index fb1ace7..5389465 100644
--- a/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/r/ui/RUI.java
+++ b/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/r/ui/RUI.java
@@ -33,6 +33,8 @@
public static final String R_HELP_VIEW_ID = "org.eclipse.statet.r.views.RHelp"; //$NON-NLS-1$
public static final String R_HELP_SEARCH_PAGE_ID = "org.eclipse.statet.r.searchPages.RHelpPage"; //$NON-NLS-1$
+ public static final String SOURCE_EDITORS_PREF_PAGE_ID= "org.eclipse.statet.r.preferencePages.SourceEditors"; //$NON-NLS-1$
+
public static final String IMG_OBJ_R_SCRIPT = RUI.BUNDLE_ID + "/image/obj/r_script"; //$NON-NLS-1$
public static final String IMG_OBJ_R_RUNTIME_ENV = RUI.BUNDLE_ID + "/image/obj/r_environment"; //$NON-NLS-1$
public static final String IMG_OBJ_R_REMOTE_ENV = RUI.BUNDLE_ID + "/image/obj/r_environment.remote"; //$NON-NLS-1$
diff --git a/redocs/org.eclipse.statet.redocs.tex.r/plugin.xml b/redocs/org.eclipse.statet.redocs.tex.r/plugin.xml
index becab28..b1e0f34 100644
--- a/redocs/org.eclipse.statet.redocs.tex.r/plugin.xml
+++ b/redocs/org.eclipse.statet.redocs.tex.r/plugin.xml
@@ -405,7 +405,7 @@
point="org.eclipse.ui.preferencePages">
<page
id="org.eclipse.statet.r.preferencePages.LtxRweaveEditor"
- category="org.eclipse.statet.r.preferencePages.SourceEditors"
+ category="org.eclipse.statet.docmlet.preferencePages.Tex"
name="%preferencePages_SweaveEditorOptions"
class="org.eclipse.statet.internal.redocs.tex.r.ui.config.EditorPreferencePage">
<keywordReference id="org.eclipse.statet.ltk.keywords.SourceEditor"/>
diff --git a/redocs/org.eclipse.statet.redocs.tex.r/src/org/eclipse/statet/internal/redocs/tex/r/ui/config/EditorPreferencePage.java b/redocs/org.eclipse.statet.redocs.tex.r/src/org/eclipse/statet/internal/redocs/tex/r/ui/config/EditorPreferencePage.java
index b885a30..8f11274 100644
--- a/redocs/org.eclipse.statet.redocs.tex.r/src/org/eclipse/statet/internal/redocs/tex/r/ui/config/EditorPreferencePage.java
+++ b/redocs/org.eclipse.statet.redocs.tex.r/src/org/eclipse/statet/internal/redocs/tex/r/ui/config/EditorPreferencePage.java
@@ -35,7 +35,7 @@
import org.eclipse.statet.ecommons.runtime.core.StatusChangeListener;
import org.eclipse.statet.ecommons.ui.util.LayoutUtils;
-import org.eclipse.statet.docmlet.tex.ui.TexUI;
+import org.eclipse.statet.r.ui.RUI;
import org.eclipse.statet.redocs.tex.r.ui.sourceediting.TexRweaveEditingOptions;
@@ -76,7 +76,7 @@
// Controls
{ final Link link= addLinkControl(pageComposite, NLS.bind(
Messages.EditorOptions_LatexAndRRef_note,
- TexUI.BASE_PREF_PAGE_ID ));
+ RUI.SOURCE_EDITORS_PREF_PAGE_ID ));
final GridData gd= new GridData(SWT.FILL, SWT.TOP, true, false);
gd.widthHint= 300;
link.setLayoutData(gd);
diff --git a/redocs/org.eclipse.statet.redocs.tex.r/src/org/eclipse/statet/internal/redocs/tex/r/ui/config/Messages.properties b/redocs/org.eclipse.statet.redocs.tex.r/src/org/eclipse/statet/internal/redocs/tex/r/ui/config/Messages.properties
index a4189f2..3bba077 100644
--- a/redocs/org.eclipse.statet.redocs.tex.r/src/org/eclipse/statet/internal/redocs/tex/r/ui/config/Messages.properties
+++ b/redocs/org.eclipse.statet.redocs.tex.r/src/org/eclipse/statet/internal/redocs/tex/r/ui/config/Messages.properties
@@ -12,9 +12,9 @@
# Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
#=============================================================================#
-EditorOptions_title= Sweave (LaTex+R) Editing Options
+EditorOptions_title= Sweave (LaTeX+R) Editing Options
-EditorOptions_LatexAndRRef_note= Note that some settings are inherited from the <a href=\"{0}\">LaTeX</a> editor and R editor.
+EditorOptions_LatexAndRRef_note= Some settings are inherited from the LaTeX editor and the <a href=\"{0}\">R editor</a>.
EditorOptions_SyntaxColoring_note= The markers '<<', '>>=' and '@' for R chunks are displayed according to the <a href=\"org.eclipse.statet.r.preferencePages.RTextStyles\">coloring</a> options for 'Invalid / Other' tokens.
EditorOptions_SpellChecking_Enable_label= Enable s&pell checking
diff --git a/redocs/org.eclipse.statet.redocs.wikitext.r/plugin.xml b/redocs/org.eclipse.statet.redocs.wikitext.r/plugin.xml
index 5d8b6fd..641dc56 100644
--- a/redocs/org.eclipse.statet.redocs.wikitext.r/plugin.xml
+++ b/redocs/org.eclipse.statet.redocs.wikitext.r/plugin.xml
@@ -249,7 +249,7 @@
point="org.eclipse.ui.preferencePages">
<page
id="org.eclipse.statet.redocs.preferencePages.WikitextREditor"
- category="org.eclipse.statet.r.preferencePages.SourceEditors"
+ category="org.eclipse.statet.docmlet.preferencePages.Wikitext"
name="%preferencePages_WikitextRweaveEditorOptions"
class="org.eclipse.statet.internal.redocs.wikitext.r.ui.config.EditorPreferencePage">
<keywordReference id="org.eclipse.statet.ltk.keywords.SourceEditor"/>
diff --git a/redocs/org.eclipse.statet.redocs.wikitext.r/src/org/eclipse/statet/internal/redocs/wikitext/r/ui/config/EditorPreferencePage.java b/redocs/org.eclipse.statet.redocs.wikitext.r/src/org/eclipse/statet/internal/redocs/wikitext/r/ui/config/EditorPreferencePage.java
index 912c894..4d6dfe5 100644
--- a/redocs/org.eclipse.statet.redocs.wikitext.r/src/org/eclipse/statet/internal/redocs/wikitext/r/ui/config/EditorPreferencePage.java
+++ b/redocs/org.eclipse.statet.redocs.wikitext.r/src/org/eclipse/statet/internal/redocs/wikitext/r/ui/config/EditorPreferencePage.java
@@ -35,7 +35,7 @@
import org.eclipse.statet.ecommons.runtime.core.StatusChangeListener;
import org.eclipse.statet.ecommons.ui.util.LayoutUtils;
-import org.eclipse.statet.docmlet.wikitext.ui.WikitextUI;
+import org.eclipse.statet.r.ui.RUI;
import org.eclipse.statet.redocs.wikitext.r.ui.sourceediting.WikitextRweaveEditingSettings;
@@ -76,7 +76,7 @@
// Controls
{ final Link link= addLinkControl(pageComposite, NLS.bind(
Messages.EditorOptions_WikitextAndRRef_note,
- WikitextUI.BASE_PREF_PAGE_ID ));
+ RUI.SOURCE_EDITORS_PREF_PAGE_ID ));
final GridData gd= new GridData(SWT.FILL, SWT.TOP, true, false);
gd.widthHint= 300;
link.setLayoutData(gd);
diff --git a/redocs/org.eclipse.statet.redocs.wikitext.r/src/org/eclipse/statet/internal/redocs/wikitext/r/ui/config/Messages.properties b/redocs/org.eclipse.statet.redocs.wikitext.r/src/org/eclipse/statet/internal/redocs/wikitext/r/ui/config/Messages.properties
index 768508a..4caacf7 100644
--- a/redocs/org.eclipse.statet.redocs.wikitext.r/src/org/eclipse/statet/internal/redocs/wikitext/r/ui/config/Messages.properties
+++ b/redocs/org.eclipse.statet.redocs.wikitext.r/src/org/eclipse/statet/internal/redocs/wikitext/r/ui/config/Messages.properties
@@ -12,7 +12,7 @@
# Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
#=============================================================================#
-EditorOptions_WikitextAndRRef_note= Note that some settings are inherited from the <a href=\"{0}\">Wikitext</a> editor and R editor.
+EditorOptions_WikitextAndRRef_note= Some settings are inherited from the Wikitext editor and the <a href=\"{0}\">R editor</a>.
EditorOptions_SyntaxColoring_note= The markers for R chunks are displayed according to the <a href=\"org.eclipse.statet.r.preferencePages.RTextStyles\">coloring</a> options for 'Invalid / Other' tokens.
EditorOptions_SpellChecking_Enable_label= Enable s&pell checking
