Convert list in SaveAsCharset dialog to outliner, b=144957, fix by neil@parkwaycc.co.uk, r=varga, sr=alecf

editor/ui/dialogs/content/EditorSaveAsCharset.js

@@ -20,6 +20,7 @@
  * Contributor(s): 
  * Frank Tang  ftang@netscape.com
  * J.M  Betak  jbetak@netscape.com
+ * Neil Rashbrook <neil@parkwaycc.co.uk>
  */
 
 
@@ -69,7 +70,6 @@ function Startup()
   // SET FOCUS TO FIRST CONTROL
   SetTextboxFocus(gDialog.TitleInput);
   
-  LoadAvailableCharSets();
   initDone = true;
   
   SetWindowLocation();
@@ -80,6 +80,13 @@ function InitDialog()
 {
   gDialog.TitleInput.value = editorShell.GetDocumentTitle();
   charset = editorShell.GetDocumentCharacterSet();
+  var RDF = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
+  var index = gDialog.charsetTree.builderView.getIndexOfResource(RDF.GetResource(charset));
+  if (index >= 0) {
+    var treeBox = gDialog.charsetTree.treeBoxObject;
+    treeBox.selection.select(index);
+    treeBox.ensureRowIsVisible(index);
+  }
 }
 
 
@@ -115,53 +122,14 @@ function readRDFString(aDS,aRes,aProp)
 }
 
       
-function LoadAvailableCharSets()
-{
-  try 
-  {                                  
-    var rdf=Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
-    var kNC_Root = rdf.GetResource("NC:DecodersRoot");
-    var kNC_name = rdf.GetResource("http://home.netscape.com/NC-rdf#Name");
-    var rdfDataSource = rdf.GetDataSource("rdf:charset-menu");
-    var rdfContainer = Components.classes["@mozilla.org/rdf/container;1"].getService(Components.interfaces.nsIRDFContainer);
-
-    rdfContainer.Init(rdfDataSource, kNC_Root);
-
-    var availableCharsets = rdfContainer.GetElements();
-    var charsetNode;
-    var selectedItem;
-    var item;
-
-    ClearTreelist(gDialog.charsetTree);
-
-    for (var i = 0; i < rdfContainer.GetCount(); i++) 
-	{
-      charsetNode = availableCharsets.getNext().QueryInterface(Components.interfaces.nsIRDFResource);
-      item = AppendStringToTreelist(gDialog.charsetTree, readRDFString(rdfDataSource, charsetNode, kNC_name));
-      item.firstChild.firstChild.setAttribute("value", charsetNode.Value);
-      if(charset == charsetNode.Value) 
-        selectedItem = item;
-    }
-
-    if(selectedItem) 
-	{
-	    var index = gDialog.charsetTree.contentView.getIndexOfItem(selectedItem);
-      gDialog.charsetTree.treeBoxObject.selection.select(index);
-      gDialog.charsetTree.treeBoxObject.ensureRowIsVisible(index);
-    }
-  }
-  catch(e) { }
-}
-
-
 function SelectCharset()
 {
   if(initDone) 
   {
     try 
 	{
-      charset = GetSelectedTreelistAttribute(gDialog.charsetTree, "value");
-      if(charset != "")
+      charset = gDialog.charsetTree.builderView.getResourceAtIndex(gDialog.charsetTree.currentIndex).Value;
+      if (charset)
          charsetWasChanged = true;
     }
     catch(e) {}

editor/ui/dialogs/content/EditorSaveAsCharset.xul

@@ -18,7 +18,9 @@
    - Copyright (C) 1998-1999 Netscape Communications Corporation. All
    - Rights Reserved.
    - 
-   - Contributor(s): loadrunner@betak.net
+   - Contributor(s):
+   -    loadrunner@betak.net
+   -    Neil Rashbrook <neil@parkwaycc.co.uk>
   -->
 
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
@@ -57,13 +59,22 @@
 
     <groupbox flex="1"><caption label="&documentCharsetTitle.label;"/>
         <label value="&documentCharsetDesc.label;"/>
-        <tree id="CharsetTree" flex="1"
-              style="height: 14em;" hidecolumnpicker="true"
-              onselect="SelectCharset();">
-           <treecols>
-               <treecol id="CharsetCol" flex="1" hideheader="true"/>
-           </treecols>
-           <treechildren/>
+        <tree id="CharsetTree" height="148" hidecolumnpicker="true" onselect="SelectCharset();"
+              datasources="rdf:charset-menu" ref="NC:DecodersRoot" flags="dont-build-content">
+            <treecols>
+                <treecol id="CharsetCol" flex="1" hideheader="true"/>
+            </treecols>
+            <template>
+                <rule>
+                    <treechildren>
+                        <treeitem uri="rdf:*">
+                            <treerow>
+                                <treecell label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+                            </treerow>
+                        </treeitem>
+                    </treechildren>
+                </rule>
+            </template>
         </tree>
     </groupbox>