From 6f2f545421cb65d4b1768e96edbd1bbbb63b72a0 Mon Sep 17 00:00:00 2001
From: "matt%netscape.com" <matt%netscape.com>
Date: Thu, 20 Jan 2000 03:08:44 +0000
Subject: [PATCH] fixing for font pref emergency r=erik brendan okayed

---
 .../resources/content/pref-fonts.js           | 17 +++++++-----
 .../resources/content/pref-fonts.xul          | 27 ++++++++++++++++---
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/xpfe/components/prefwindow/resources/content/pref-fonts.js b/xpfe/components/prefwindow/resources/content/pref-fonts.js
index fca15743a8bc..bdb2e0001c71 100644
--- a/xpfe/components/prefwindow/resources/content/pref-fonts.js
+++ b/xpfe/components/prefwindow/resources/content/pref-fonts.js
@@ -53,29 +53,34 @@ function selectLang()
 
 
 	lang = document.getElementById("selectLangs").value;
-	var fontSizePrefstring = 'font.size.' + lang;
-	document.getElementById('size').setAttribute('prefstring', fontSizePrefstring);	
+	var fontSizePrefint = 'font.size.variable.' + lang;
+	var fontSizePrefFontint = 'font.size.fixed.' + lang;
+	document.getElementById('size').setAttribute('prefstring', fontSizePrefint);	
+	document.getElementById('sizeFixed').setAttribute('prefstring', fontSizePrefFontint);	
+
 	for (i = 0; i < generics.length; i++)  {
 		var select = document.getElementById(generics[i]);
 		var selectParent = select.parentNode;
 		var selectNew = select.cloneNode(false);
 		var fontPrefstring = 'font.name.' + generics[i] + '.' + lang;
-        select.setAttribute('prefstring', fontPrefstring);
+        selectNew.setAttribute('prefstring', fontPrefstring);
+	//	dump('selectNew:' + selectNew.getAttribute('prefstring'));
 		fonts = enumerator.EnumerateFonts(lang, generics[i], fontCount);
 
 		
 		for (j = 0; j < fonts.length; j++) {
 			var option = document.createElement("html:option");
 			var text = document.createTextNode(fonts[j]);
-			option.appendChild(text);;
+			option.appendChild(text);
 			option.setAttribute('value' , fonts[j]);
-			selectNew.appendChild(option)
+			selectNew.appendChild(option);
 	//		dump(fonts[j] + " || ");
 
 		}
 
 		selectParent.replaceChild(selectNew , select);
-
+       	//dump('select:' + document.getElementById(generics[i]).getAttribute('prefstring') + '\n');
+		
 	}
 }
 
diff --git a/xpfe/components/prefwindow/resources/content/pref-fonts.xul b/xpfe/components/prefwindow/resources/content/pref-fonts.xul
index df395cdd995b..a801d8f32db1 100644
--- a/xpfe/components/prefwindow/resources/content/pref-fonts.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-fonts.xul
@@ -48,10 +48,9 @@
 		  			<html:select id="selectLangs" onchange = "selectLang();">
   					</html:select>						
 				  </html:td>
-				  <html:td/>
-				   <html:td>&size.select;</html:td>
+				   <html:td>&varFont.select;</html:td>
 				  <html:td>
-	  			<html:select id="size" pref="true" preftype="string">
+	  			<html:select id="size" pref="true" preftype="int">
   					<html:option value="&font8.option;" >&font8.option;</html:option>
 					<html:option value="&font9.option;" >&font9.option;</html:option>
 					<html:option value="&font10.option;" >&font10.option;</html:option>
@@ -112,7 +111,27 @@
 	  				<html:select id="monospace" pref="true" preftype="string" prefstring="">			   
 			    	</html:select>
 				  </html:td>
-	
+	            <html:td>&fixedFont.Select;</html:td>
+				  <html:td>
+	  			<html:select id="sizeFixed" pref="true" preftype="int">
+  					<html:option value="&font8.option;" >&font8.option;</html:option>
+					<html:option value="&font9.option;" >&font9.option;</html:option>
+					<html:option value="&font10.option;" >&font10.option;</html:option>
+					<html:option value="&font11.option;" >&font11.option;</html:option>
+					<html:option value="&font12.option;" >&font12.option;</html:option>
+					<html:option value="&font14.option;" >&font14.option;</html:option>
+					<html:option value="&font16.option;" >&font16.option;</html:option>
+					<html:option value="&font18.option;" >&font18.option;</html:option>
+					<html:option value="&font20.option;" >&font20.option;</html:option>
+					<html:option value="&font22.option;" >&font22.option;</html:option>
+					<html:option value="&font24.option;" >&font24.option;</html:option>
+					<html:option value="&font26.option;" >&font26.option;</html:option>
+					<html:option value="&font28.option;" >&font28.option;</html:option>
+					<html:option value="&font36.option;" >&font36.option;</html:option>
+					<html:option value="&font48.option;" >&font48.option;</html:option>
+					<html:option value="&font72.option;" >&font72.option;</html:option> 
+     				</html:select> 
+				  </html:td>
 			  </html:tr> 
 			</html:table>  
     </html:fieldset>