moving editor prefs into editor directory

see bug # 36911
r: ben

xpfe/components/prefwindow/resources/content/MANIFEST

@@ -15,11 +15,8 @@ pref-colors.xul
 pref-cookies.xul
 pref-themes.xul
 pref-themes.js
-pref-composer.js
-pref-composer.xul
 pref-debug.xul
 pref-download.xul
-pref-editing.xul
 pref-fonts.xul
 pref-fonts.js
 pref-history.xul
@@ -33,7 +30,6 @@ pref-policies.xul
 pref-proxies.js
 pref-proxies.xul
 pref-proxy-manual.xul
-pref-publish.xul
 pref-search.js
 pref-search.xul
 pref-smart_browsing.xul

xpfe/components/prefwindow/resources/content/Makefile.in

@@ -51,11 +51,8 @@ CHROME_CONTENT = \
 		pref-colors.js \
 		pref-themes.xul \
 		pref-themes.js \
-		pref-composer.xul \
-		pref-composer.js \
 		pref-debug.xul \
 		pref-download.xul \
-		pref-editing.xul \
 		pref-fonts.xul \
 		pref-fonts.js \
 		pref-history.xul \
@@ -69,7 +66,6 @@ CHROME_CONTENT = \
 		pref-proxies.js \
 		pref-proxies.xul \
 		pref-proxy-manual.xul \
-		pref-publish.xul \
 		pref-mousewheel.xul \
 		pref-wallet.xul \
 		pref-search.js \

xpfe/components/prefwindow/resources/content/makefile.win

@@ -44,11 +44,8 @@ CHROME_CONTENT = \
 	.\pref-themes.js \
 	.\pref-charset.js \
 	.\pref-charset.xul \
-	.\pref-composer.js \
-	.\pref-composer.xul \
 	.\pref-debug.xul \
 	.\pref-download.xul \
-	.\pref-editing.xul \
 	.\pref-fonts.xul \
 	.\pref-fonts.js \
 	.\pref-history.xul \
@@ -62,7 +59,6 @@ CHROME_CONTENT = \
 	.\pref-policies.xul \
 	.\pref-proxies.xul \
 	.\pref-proxy-manual.xul \
-	.\pref-publish.xul \
 	.\pref-search.js \
 	.\pref-search.xul \
 	.\pref-smart_browsing.xul \

xpfe/components/prefwindow/resources/content/pref-appearance.xul

@@ -42,7 +42,7 @@
     var panel = "chrome://communicator/content/pref/pref-appearance.xul";
     // the first elements in this array will be poked from chromeregistry loaded
     // overlays once overlays.rdf works properly 
-    _elementIDs = ["generalStartupBrowser", "generalStartupEditor", /*"toolbarStyle" */];
+    _elementIDs = ["generalStartupBrowser", /*"toolbarStyle" */];
   ]]>
   </script>
           
@@ -57,13 +57,6 @@
               pref="true" preftype="bool" prefstring="general.startup.browser"
               prefattribute="checked"/>
     <!-- XXX -->
-
-    <!-- XXX remove when editor overlays.rdf works -->
-    <checkbox id="generalStartupEditor" wsm_persist="true"
-              value="&compCheck.label;" accesskey="&compCheck.accesskey;"
-              pref="true" preftype="bool" prefstring="general.startup.editor"
-              prefattribute="checked"/>
-    <!-- XXX -->
     
   </titledbox>
   

xpfe/components/prefwindow/resources/content/preftree.xul

@@ -108,28 +108,6 @@
       </treechildren>
     </treeitem>
     <!-- XXX -->
-
-    <!-- XXX remove once overlays.rdf works properly for editor -->
-    <treeitem container="true" open="true" id="editor">
-      <treerow>       
-        <treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-composer.xul" value="&compose.label;"/> 
-      </treerow>
-      <treechildren>
-        <treeitem>
-          <treerow>
-            <treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-editing.xul" value="&editing.label;"/> 
-          </treerow>
-        </treeitem>
-        <!--     
-        <treeitem>
-		      <treerow>
-            <treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-publish.xul" value="&publish.label;"/> 
-		      </treerow>
-	      </treeitem>  
-        -->
-      </treechildren>
-    </treeitem>
-    <!-- XXX -->
     
     <treeitem open="true" id="smartupdate">
       <treerow>