From 68d5238904a739ba5e3ac09df5f9e5a5c4eed1ab Mon Sep 17 00:00:00 2001
From: "hyatt%netscape.com" <hyatt%netscape.com>
Date: Wed, 1 Dec 1999 10:55:44 +0000
Subject: [PATCH] Changes to make prefs work with new trees.

---
 suite/common/pref/pref-themes.xul             | 53 +++++++++++++++-
 suite/common/pref/preftree.xul                | 60 +++++++++----------
 .../resources/content/pref-themes.xul         | 53 +++++++++++++++-
 .../prefwindow/resources/content/preftree.xul | 60 +++++++++----------
 4 files changed, 164 insertions(+), 62 deletions(-)

diff --git a/suite/common/pref/pref-themes.xul b/suite/common/pref/pref-themes.xul
index 5936670daab9..2c91b0ab990a 100644
--- a/suite/common/pref/pref-themes.xul
+++ b/suite/common/pref/pref-themes.xul
@@ -35,6 +35,57 @@
   <titledbutton class="right-header-text" value="&rHeader;"/>
 </box>
 
-<spring flex="1"/>
+<tabcontrol flex="1" align="vertical">
+  <tabbox>
+    <tab selected="true">Theme View</tab>
+    <tab>Package View</tab>
+  </tabbox>
+  <tabpanel align="vertical" flex="1">
+    <box flex="1" align="vertical">
+	  <html:fieldset>
+	    <html:legend align="left">
+		  <html:div>Themes</html:div> 
+		</html:legend>
+		<html:div style="height:100px">
+		<tree style="height:100%;width:100%;">
+			<treecol/>
+			<treechildren>
+			  <treeitem>
+				<treerow>
+				  <treecell value="Classic 4.x"/>
+				</treerow>
+			  </treeitem>
+			  <treeitem>
+				<treerow>
+				  <treecell value="Purple and Blue"/>
+				</treerow>
+			  </treeitem>
+			  <treeitem>
+				<treerow>
+				  <treecell value="That 70's Chrome"/>
+				</treerow>
+			  </treeitem>
+			</treechildren>
+		  </tree>
+		</html:div>
+	</html:fieldset>
+	  <spring style="width: 2px"/>
+	  <html:fieldset>
+	    <html:legend align="left">
+		  <html:div>Selected Theme: Purple and Blue</html:div> 
+		</html:legend>
+		<html:div>Author: Mozilla.org</html:div>
+		<html:div>Version: 1.0</html:div>
+		<html:div>Site: <html:a href="http://www.mozilla.org">http://www.mozilla.org</html:a></html:div>
+		<html:div>Preview Image:<html:br/>The thumbnail image would go here.</html:div>
+		<html:div>
+		    <titledbutton class="push dialog" value="Apply Theme"/>
+		    <titledbutton class="push dialog" value="Delete Theme"/>
+			<titledbutton class="push dialog" value="Details"/>
+		</html:div>
+	  </html:fieldset>
+	</box>
+  </tabpanel>
+</tabcontrol>
 
 </window>
diff --git a/suite/common/pref/preftree.xul b/suite/common/pref/preftree.xul
index bc4a538a151a..778f63fb73d2 100644
--- a/suite/common/pref/preftree.xul
+++ b/suite/common/pref/preftree.xul
@@ -73,110 +73,110 @@
   <treecol style="width:100%" />
   </treehead>
   <treechildren>
-    <treeitem open="true">
+    <treeitem open="true" container="true">
       <treerow>   
-        <treecell name="chrome://pref/content/pref-appearance.xul"><treeindentation/>&appear.label;</treecell>
+        <treecell indent="true" name="chrome://pref/content/pref-appearance.xul" value="&appear.label;"/> 
       </treerow>
       <treechildren>
         <treeitem open="true">
           <treerow>
-            <treecell name="chrome://pref/content/pref-fonts.xul"><treeindentation/>&fonts.label;</treecell>
+            <treecell indent="true" name="chrome://pref/content/pref-fonts.xul" value="&fonts.label;"/> 
           </treerow>
         </treeitem>
 
         <treeitem open="true">
           <treerow>
-            <treecell name="chrome://pref/content/pref-colors.xul"><treeindentation/>&colors.label;</treecell>
+            <treecell indent="true" name="chrome://pref/content/pref-colors.xul" value="&colors.label;"/> 
           </treerow>
         </treeitem>
 
 		<treeitem open="true">
           <treerow>
-            <treecell name="chrome://pref/content/pref-themes.xul"><treeindentation/>&themes.label;</treecell>
+            <treecell indent="true" name="chrome://pref/content/pref-themes.xul" value="&themes.label;"/> 
           </treerow>
         </treeitem>
 
       </treechildren>
     </treeitem>
 
-    <treeitem open="true">
+    <treeitem container="true" open="true">
       <treerow>
-        <treecell name="chrome://pref/content/pref-navigator.xul"><treeindentation/>&navigator.label;</treecell>
+        <treecell indent="true" name="chrome://pref/content/pref-navigator.xul" value="&navigator.label;"/> 
       </treerow>
       <treechildren>
         <treeitem open="true">
           <treerow>
-            <treecell name="chrome://pref/content/pref-languages.xul"><treeindentation/>&languages.label;</treecell>
+            <treecell indent="true" name="chrome://pref/content/pref-languages.xul" value="&languages.label;"/> 
           </treerow>
         </treeitem>
 
         <treeitem open="true">
           <treerow>
-            <treecell name="chrome://pref/content/pref-applications.xul"><treeindentation/>&applications.label;</treecell>
+            <treecell indent="true" name="chrome://pref/content/pref-applications.xul" value="&applications.label;"/> 
           </treerow>
         </treeitem>
 
         <treeitem open="true">
           <treerow>
-            <treecell name="chrome://pref/content/pref-smart_browsing.xul"><treeindentation/>&smartBrowse.label;</treecell>
+            <treecell indent="true" name="chrome://pref/content/pref-smart_browsing.xul" value="&smartBrowse.label;"/> 
           </treerow>
         </treeitem>
       </treechildren>
     </treeitem>
  
-    <treeitem open="true">
+    <treeitem container="true" open="true">
       <treerow>       
-        <treecell name="chrome://messenger/content/pref-mailnews.xul"><treeindentation/>&mail.label;</treecell>
+        <treecell indent="true" name="chrome://messenger/content/pref-mailnews.xul" value="&mail.label;"/> 
       </treerow>
 
       <treechildren>
         <treeitem open="true">
           <treerow>
-            <treecell name="chrome://addressbook/content/pref-addressing.xul"><treeindentation/>&address.label;</treecell>
+            <treecell indent="true" name="chrome://addressbook/content/pref-addressing.xul" value="&address.label;"/> 
           </treerow>
         </treeitem>
 
         <treeitem open="true">
           <treerow>
-            <treecell name="chrome://messengercompose/content/pref-messages.xul"><treeindentation/>&mess.label;</treecell>
+            <treecell indent="true" name="chrome://messengercompose/content/pref-messages.xul" value="&mess.label;"/> 
           </treerow>
         </treeitem>
 
         <treeitem open="true">
           <treerow>
-            <treecell name="chrome://messenger/content/pref-winsetting.xul"><treeindentation/>&windowSet.label;</treecell>
+            <treecell indent="true" name="chrome://messenger/content/pref-winsetting.xul" value="&windowSet.label;"/> 
           </treerow>
         </treeitem>
 
         <treeitem open="true">
           <treerow>
-            <treecell name="chrome://messengercompose/content/pref-formatting.xul"><treeindentation/>&format.label;</treecell>
+            <treecell indent="true" name="chrome://messengercompose/content/pref-formatting.xul" value="&format.label;"/> 
           </treerow>
         </treeitem>
 
         <treeitem open="true">
           <treerow>
-            <treecell name="chrome://messenger/content/pref-receipts.xul"><treeindentation/>&return.label;</treecell>
+            <treecell indent="true" name="chrome://messenger/content/pref-receipts.xul" value="&return.label;"/> 
           </treerow>
         </treeitem>
 
         <treeitem open="true">
           <treerow>
-            <treecell name="chrome://messenger/content/pref-diskspace.xul"><treeindentation/>&disk.label;</treecell>
+            <treecell indent="true" name="chrome://messenger/content/pref-diskspace.xul" value="&disk.label;"/> 
           </treerow>
         </treeitem>
       </treechildren>
     </treeitem>
 
-    <treeitem open="true">
+    <treeitem container="true" open="true">
       <treerow>       
-        <treecell name="chrome://pref/content/pref-composer.xul"><treeindentation/>&compose.label;</treecell>
+        <treecell indent="true" name="chrome://pref/content/pref-composer.xul" value="&compose.label;"/> 
       </treerow>
 
       <treechildren>
         <treerow>
           <treeitem open="true">
-            <treecell name="chrome://pref/content/pref-publish.xul"><treeindentation/>&publish.label;</treecell>
+            <treecell indent="true" name="chrome://pref/content/pref-publish.xul" value="&publish.label;"/> 
 	  </treeitem>
         </treerow>
       </treechildren>
@@ -184,39 +184,39 @@
     
     <treeitem open="true">
       <treerow>
-        <treecell name="chrome://pref/content/pref-smartupdate.xul"><treeindentation/>&smart.label;</treecell>
+        <treecell indent="true" name="chrome://pref/content/pref-smartupdate.xul" value="&smart.label;"/> 
       </treerow>
     </treeitem>
 
-    <treeitem open="true">
+    <treeitem container="true" open="true">
       <treerow>       
-        <treecell name="chrome://pref/content/pref-offline.xul"><treeindentation/>&offline.label;</treecell>
+        <treecell indent="true" name="chrome://pref/content/pref-offline.xul" value="&offline.label;"/> 
       </treerow>
 
       <treechildren>
         <treeitem open="true">
           <treerow>
-            <treecell name="chrome://pref/content/pref-download.xul"><treeindentation/>&down.label;</treecell>
+            <treecell indent="true" name="chrome://pref/content/pref-download.xul" value="&down.label;"/> 
           </treerow>
         </treeitem>
       </treechildren>
     </treeitem>
     
-    <treeitem open="true">
+    <treeitem container="true" open="true">
       <treerow>
-        <treecell name="chrome://pref/content/pref-advanced.xul"><treeindentation/>&advance.label;</treecell>
+        <treecell indent="true" name="chrome://pref/content/pref-advanced.xul" value="&advance.label;"/> 
       </treerow>
 
       <treechildren>
         <treeitem open="true">
           <treerow>
-            <treecell name="chrome://pref/content/pref-cache.xul"><treeindentation/>&cache.label;</treecell>
+            <treecell indent="true" name="chrome://pref/content/pref-cache.xul" value="&cache.label;"/> 
           </treerow>
         </treeitem>
 
         <treeitem open="true">
           <treerow>
-            <treecell name="chrome://pref/content/pref-proxies.xul"><treeindentation/>&proxies.label;</treecell>
+            <treecell indent="true" name="chrome://pref/content/pref-proxies.xul" value="&proxies.label;"/> 
           </treerow>
         </treeitem>
         
@@ -226,7 +226,7 @@
 
     <treeitem open="true">
       <treerow>       
-        <treecell name="chrome://pref/content/pref-debug.xul"><treeindentation/>&debug.label;</treecell>
+        <treecell indent="true" name="chrome://pref/content/pref-debug.xul" value="&debug.label;"/> 
       </treerow>
 
     </treeitem>
diff --git a/xpfe/components/prefwindow/resources/content/pref-themes.xul b/xpfe/components/prefwindow/resources/content/pref-themes.xul
index 5936670daab9..2c91b0ab990a 100644
--- a/xpfe/components/prefwindow/resources/content/pref-themes.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-themes.xul
@@ -35,6 +35,57 @@
   <titledbutton class="right-header-text" value="&rHeader;"/>
 </box>
 
-<spring flex="1"/>
+<tabcontrol flex="1" align="vertical">
+  <tabbox>
+    <tab selected="true">Theme View</tab>
+    <tab>Package View</tab>
+  </tabbox>
+  <tabpanel align="vertical" flex="1">
+    <box flex="1" align="vertical">
+	  <html:fieldset>
+	    <html:legend align="left">
+		  <html:div>Themes</html:div> 
+		</html:legend>
+		<html:div style="height:100px">
+		<tree style="height:100%;width:100%;">
+			<treecol/>
+			<treechildren>
+			  <treeitem>
+				<treerow>
+				  <treecell value="Classic 4.x"/>
+				</treerow>
+			  </treeitem>
+			  <treeitem>
+				<treerow>
+				  <treecell value="Purple and Blue"/>
+				</treerow>
+			  </treeitem>
+			  <treeitem>
+				<treerow>
+				  <treecell value="That 70's Chrome"/>
+				</treerow>
+			  </treeitem>
+			</treechildren>
+		  </tree>
+		</html:div>
+	</html:fieldset>
+	  <spring style="width: 2px"/>
+	  <html:fieldset>
+	    <html:legend align="left">
+		  <html:div>Selected Theme: Purple and Blue</html:div> 
+		</html:legend>
+		<html:div>Author: Mozilla.org</html:div>
+		<html:div>Version: 1.0</html:div>
+		<html:div>Site: <html:a href="http://www.mozilla.org">http://www.mozilla.org</html:a></html:div>
+		<html:div>Preview Image:<html:br/>The thumbnail image would go here.</html:div>
+		<html:div>
+		    <titledbutton class="push dialog" value="Apply Theme"/>
+		    <titledbutton class="push dialog" value="Delete Theme"/>
+			<titledbutton class="push dialog" value="Details"/>
+		</html:div>
+	  </html:fieldset>
+	</box>
+  </tabpanel>
+</tabcontrol>
 
 </window>
diff --git a/xpfe/components/prefwindow/resources/content/preftree.xul b/xpfe/components/prefwindow/resources/content/preftree.xul
index bc4a538a151a..778f63fb73d2 100644
--- a/xpfe/components/prefwindow/resources/content/preftree.xul
+++ b/xpfe/components/prefwindow/resources/content/preftree.xul
@@ -73,110 +73,110 @@
   <treecol style="width:100%" />
   </treehead>
   <treechildren>
-    <treeitem open="true">
+    <treeitem open="true" container="true">
       <treerow>   
-        <treecell name="chrome://pref/content/pref-appearance.xul"><treeindentation/>&appear.label;</treecell>
+        <treecell indent="true" name="chrome://pref/content/pref-appearance.xul" value="&appear.label;"/> 
       </treerow>
       <treechildren>
         <treeitem open="true">
           <treerow>
-            <treecell name="chrome://pref/content/pref-fonts.xul"><treeindentation/>&fonts.label;</treecell>
+            <treecell indent="true" name="chrome://pref/content/pref-fonts.xul" value="&fonts.label;"/> 
           </treerow>
         </treeitem>
 
         <treeitem open="true">
           <treerow>
-            <treecell name="chrome://pref/content/pref-colors.xul"><treeindentation/>&colors.label;</treecell>
+            <treecell indent="true" name="chrome://pref/content/pref-colors.xul" value="&colors.label;"/> 
           </treerow>
         </treeitem>
 
 		<treeitem open="true">
           <treerow>
-            <treecell name="chrome://pref/content/pref-themes.xul"><treeindentation/>&themes.label;</treecell>
+            <treecell indent="true" name="chrome://pref/content/pref-themes.xul" value="&themes.label;"/> 
           </treerow>
         </treeitem>
 
       </treechildren>
     </treeitem>
 
-    <treeitem open="true">
+    <treeitem container="true" open="true">
       <treerow>
-        <treecell name="chrome://pref/content/pref-navigator.xul"><treeindentation/>&navigator.label;</treecell>
+        <treecell indent="true" name="chrome://pref/content/pref-navigator.xul" value="&navigator.label;"/> 
       </treerow>
       <treechildren>
         <treeitem open="true">
           <treerow>
-            <treecell name="chrome://pref/content/pref-languages.xul"><treeindentation/>&languages.label;</treecell>
+            <treecell indent="true" name="chrome://pref/content/pref-languages.xul" value="&languages.label;"/> 
           </treerow>
         </treeitem>
 
         <treeitem open="true">
           <treerow>
-            <treecell name="chrome://pref/content/pref-applications.xul"><treeindentation/>&applications.label;</treecell>
+            <treecell indent="true" name="chrome://pref/content/pref-applications.xul" value="&applications.label;"/> 
           </treerow>
         </treeitem>
 
         <treeitem open="true">
           <treerow>
-            <treecell name="chrome://pref/content/pref-smart_browsing.xul"><treeindentation/>&smartBrowse.label;</treecell>
+            <treecell indent="true" name="chrome://pref/content/pref-smart_browsing.xul" value="&smartBrowse.label;"/> 
           </treerow>
         </treeitem>
       </treechildren>
     </treeitem>
  
-    <treeitem open="true">
+    <treeitem container="true" open="true">
       <treerow>       
-        <treecell name="chrome://messenger/content/pref-mailnews.xul"><treeindentation/>&mail.label;</treecell>
+        <treecell indent="true" name="chrome://messenger/content/pref-mailnews.xul" value="&mail.label;"/> 
       </treerow>
 
       <treechildren>
         <treeitem open="true">
           <treerow>
-            <treecell name="chrome://addressbook/content/pref-addressing.xul"><treeindentation/>&address.label;</treecell>
+            <treecell indent="true" name="chrome://addressbook/content/pref-addressing.xul" value="&address.label;"/> 
           </treerow>
         </treeitem>
 
         <treeitem open="true">
           <treerow>
-            <treecell name="chrome://messengercompose/content/pref-messages.xul"><treeindentation/>&mess.label;</treecell>
+            <treecell indent="true" name="chrome://messengercompose/content/pref-messages.xul" value="&mess.label;"/> 
           </treerow>
         </treeitem>
 
         <treeitem open="true">
           <treerow>
-            <treecell name="chrome://messenger/content/pref-winsetting.xul"><treeindentation/>&windowSet.label;</treecell>
+            <treecell indent="true" name="chrome://messenger/content/pref-winsetting.xul" value="&windowSet.label;"/> 
           </treerow>
         </treeitem>
 
         <treeitem open="true">
           <treerow>
-            <treecell name="chrome://messengercompose/content/pref-formatting.xul"><treeindentation/>&format.label;</treecell>
+            <treecell indent="true" name="chrome://messengercompose/content/pref-formatting.xul" value="&format.label;"/> 
           </treerow>
         </treeitem>
 
         <treeitem open="true">
           <treerow>
-            <treecell name="chrome://messenger/content/pref-receipts.xul"><treeindentation/>&return.label;</treecell>
+            <treecell indent="true" name="chrome://messenger/content/pref-receipts.xul" value="&return.label;"/> 
           </treerow>
         </treeitem>
 
         <treeitem open="true">
           <treerow>
-            <treecell name="chrome://messenger/content/pref-diskspace.xul"><treeindentation/>&disk.label;</treecell>
+            <treecell indent="true" name="chrome://messenger/content/pref-diskspace.xul" value="&disk.label;"/> 
           </treerow>
         </treeitem>
       </treechildren>
     </treeitem>
 
-    <treeitem open="true">
+    <treeitem container="true" open="true">
       <treerow>       
-        <treecell name="chrome://pref/content/pref-composer.xul"><treeindentation/>&compose.label;</treecell>
+        <treecell indent="true" name="chrome://pref/content/pref-composer.xul" value="&compose.label;"/> 
       </treerow>
 
       <treechildren>
         <treerow>
           <treeitem open="true">
-            <treecell name="chrome://pref/content/pref-publish.xul"><treeindentation/>&publish.label;</treecell>
+            <treecell indent="true" name="chrome://pref/content/pref-publish.xul" value="&publish.label;"/> 
 	  </treeitem>
         </treerow>
       </treechildren>
@@ -184,39 +184,39 @@
     
     <treeitem open="true">
       <treerow>
-        <treecell name="chrome://pref/content/pref-smartupdate.xul"><treeindentation/>&smart.label;</treecell>
+        <treecell indent="true" name="chrome://pref/content/pref-smartupdate.xul" value="&smart.label;"/> 
       </treerow>
     </treeitem>
 
-    <treeitem open="true">
+    <treeitem container="true" open="true">
       <treerow>       
-        <treecell name="chrome://pref/content/pref-offline.xul"><treeindentation/>&offline.label;</treecell>
+        <treecell indent="true" name="chrome://pref/content/pref-offline.xul" value="&offline.label;"/> 
       </treerow>
 
       <treechildren>
         <treeitem open="true">
           <treerow>
-            <treecell name="chrome://pref/content/pref-download.xul"><treeindentation/>&down.label;</treecell>
+            <treecell indent="true" name="chrome://pref/content/pref-download.xul" value="&down.label;"/> 
           </treerow>
         </treeitem>
       </treechildren>
     </treeitem>
     
-    <treeitem open="true">
+    <treeitem container="true" open="true">
       <treerow>
-        <treecell name="chrome://pref/content/pref-advanced.xul"><treeindentation/>&advance.label;</treecell>
+        <treecell indent="true" name="chrome://pref/content/pref-advanced.xul" value="&advance.label;"/> 
       </treerow>
 
       <treechildren>
         <treeitem open="true">
           <treerow>
-            <treecell name="chrome://pref/content/pref-cache.xul"><treeindentation/>&cache.label;</treecell>
+            <treecell indent="true" name="chrome://pref/content/pref-cache.xul" value="&cache.label;"/> 
           </treerow>
         </treeitem>
 
         <treeitem open="true">
           <treerow>
-            <treecell name="chrome://pref/content/pref-proxies.xul"><treeindentation/>&proxies.label;</treecell>
+            <treecell indent="true" name="chrome://pref/content/pref-proxies.xul" value="&proxies.label;"/> 
           </treerow>
         </treeitem>
         
@@ -226,7 +226,7 @@
 
     <treeitem open="true">
       <treerow>       
-        <treecell name="chrome://pref/content/pref-debug.xul"><treeindentation/>&debug.label;</treecell>
+        <treecell indent="true" name="chrome://pref/content/pref-debug.xul" value="&debug.label;"/> 
       </treerow>
 
     </treeitem>