From 48ca57f1e21eef978d8dc9b0b763e04d8fb8df8e Mon Sep 17 00:00:00 2001
From: "alecf%netscape.com" <alecf%netscape.com>
Date: Fri, 7 Jan 2000 08:11:41 +0000
Subject: [PATCH] re-add mousewheel pref pane, and fix some minor problems with
 the pane

---
 .../resources/content/pref-mousewheel.xul     | 29 +++++++++----------
 .../prefwindow/resources/content/preftree.xul |  6 +++-
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul b/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul
index b8f3ac1849b6..a926eeded76f 100644
--- a/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul
@@ -29,11 +29,10 @@
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
 		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         class="dialog"
-        onload="return StartUp('MouseWheel');"  
+		onload="if (parent.handle) parent.handle.onpageload('pref-mousewheel'); else parent.queuedTag='pref-mousewheel';"
 		align="vertical" title="&title.label;"
 		debug="false">
 
-<html:script language="javascript" src="chrome://pref/content/PrefsWindow.js"/>
 <html:script language="javascript">
 
 function toggleField(aField, aCheckbox)
@@ -41,7 +40,7 @@ function toggleField(aField, aCheckbox)
   var field = document.getElementById(aField);
   var check = document.getElementById(aCheckbox);
   if (check.checked)
-    field.setAttribute("disabled", "true);
+    field.setAttribute("disabled", "true");
   else
     field.removeAttribute("disabled");
 }
@@ -63,7 +62,7 @@ function toggleField(aField, aCheckbox)
 	<html:tr>
 	<html:td>
 		<html:label>
-		<html:input name="nonedefault" type="radio" pref="true" preftype="int" prefstring="mousewheel.withnokey.action" prefindex="0" id="mousewheel.withnokey.action" val="checked" />
+		<html:input name="nonedefault" type="radio" pref="true" preftype="int" prefstring="mousewheel.withnokey.action" prefindex="0" id="mousewheel.withnokey.action0" val="checked" />
 		&numberoflines.label;
 		</html:label>
 		<html:input name="nonenumlines" type="text" size="4" pref="true" preftype="int" prefstring="mousewheel.withnokey.numlines" id="mousewheel.withnokey.numlines" />
@@ -77,7 +76,7 @@ function toggleField(aField, aCheckbox)
 	<html:tr>
 	<html:td>
 		<html:label>
-		<html:input name="nonedefault" type="radio" pref="true" preftype="int" prefstring="mousewheel.withnokey.action" prefindex="1" id="mousewheel.withnokey.action" />
+		<html:input name="nonedefault" type="radio" pref="true" preftype="int" prefstring="mousewheel.withnokey.action" prefindex="1" id="mousewheel.withnokey.action1" />
 		&pageup.label;
 		</html:label>
 	</html:td>
@@ -85,7 +84,7 @@ function toggleField(aField, aCheckbox)
 	<html:tr>
 	<html:td>
 		<html:label>
-		<html:input name="nonedefault" type="radio" pref="true" preftype="int" prefstring="mousewheel.withnokey.action" prefindex="2" id="mousewheel.withnokey.action" />
+		<html:input name="nonedefault" type="radio" pref="true" preftype="int" prefstring="mousewheel.withnokey.action" prefindex="2" id="mousewheel.withnokey.action2" />
 		&history.label;
 		</html:label>
 	</html:td>
@@ -100,7 +99,7 @@ function toggleField(aField, aCheckbox)
 	<html:tr>
 	<html:td>
 	<html:label>
-		<html:input name="controldefault" type="radio" pref="true" preftype="int" prefstring="mousewheel.withcontrolkey.action" prefindex="0" id="mousewheel.withcontrolkey.action" val="checked" />
+		<html:input name="controldefault" type="radio" pref="true" preftype="int" prefstring="mousewheel.withcontrolkey.action" prefindex="0" id="mousewheel.withcontrolkey.action0" val="checked" />
 		&numberoflines.label;
 	</html:label>
 	<html:input name="controlnumlines" type="text" size="4" pref="true" preftype="int" prefstring="mousewheel.withcontrolkey.numlines" id="mousewheel.withcontrolkey.numlines" />
@@ -114,7 +113,7 @@ function toggleField(aField, aCheckbox)
 	<html:tr>
 	<html:td>
 	<html:label>
-		<html:input name="controldefault" type="radio" pref="true" preftype="int" prefstring="mousewheel.withcontrolkey.action" prefindex="1" id="mousewheel.withcontrolkey.action" />
+		<html:input name="controldefault" type="radio" pref="true" preftype="int" prefstring="mousewheel.withcontrolkey.action" prefindex="1" id="mousewheel.withcontrolkey.action1" />
 		&pageup.label;
 	</html:label>
 	</html:td>
@@ -122,7 +121,7 @@ function toggleField(aField, aCheckbox)
 	<html:tr>
 	<html:td>
 	<html:label>
-		<html:input name="controldefault" type="radio" pref="true" preftype="int" prefstring="mousewheel.withcontrolkey.action" prefindex="2" id="mousewheel.withcontrolkey.action" />
+		<html:input name="controldefault" type="radio" pref="true" preftype="int" prefstring="mousewheel.withcontrolkey.action" prefindex="2" id="mousewheel.withcontrolkey.action2" />
 		&history.label;
 		</html:label>
 	</html:td>
@@ -137,7 +136,7 @@ function toggleField(aField, aCheckbox)
 	<html:tr>
 	<html:td>
 	<html:label>
-		<html:input name="shiftdefault" type="radio" pref="true" preftype="int" prefstring="mousewheel.withshiftkey.action" prefindex="0" id="mousewheel.withshiftkey.action" val="checked" />
+		<html:input name="shiftdefault" type="radio" pref="true" preftype="int" prefstring="mousewheel.withshiftkey.action" prefindex="0" id="mousewheel.withshiftkey.action0" val="checked" />
 		&numberoflines.label;
 	</html:label>
 	<html:input name="shiftnumlines" type="text" size="4" pref="true" preftype="int" prefstring="mousewheel.withshiftkey.numlines" id="mousewheel.withshiftkey.numlines" />
@@ -151,7 +150,7 @@ function toggleField(aField, aCheckbox)
 	<html:tr>
 	<html:td>
 	<html:label>
-		<html:input name="shiftdefault" type="radio" pref="true" preftype="bool" prefstring="mousewheel.withshiftkey.action" id="mousewheel.withshiftkey.action" />
+		<html:input name="shiftdefault" type="radio" pref="true" preftype="bool" prefstring="mousewheel.withshiftkey.action" prefindex="1" id="mousewheel.withshiftkey.action1" />
 		&pageup.label;
 	</html:label>
 	</html:td>
@@ -159,7 +158,7 @@ function toggleField(aField, aCheckbox)
 	<html:tr>
 	<html:td>
 	<html:label>
-		<html:input name="shiftdefault" type="radio" pref="true" preftype="int" prefstring="mousewheel.withshiftkey.action" prefindex="2" id="mousewheel.withshiftkey.action" />
+		<html:input name="shiftdefault" type="radio" pref="true" preftype="int" prefstring="mousewheel.withshiftkey.action" prefindex="2" id="mousewheel.withshiftkey.action2" />
 		&history.label;
 	</html:label>
 	</html:td>
@@ -174,7 +173,7 @@ function toggleField(aField, aCheckbox)
 	<html:tr>
 	<html:td>
 	<html:label>
-		<html:input name="altdefault" type="radio" pref="true" preftype="int" prefstring="mousewheel.withaltkey.action" prefindex="0" id="mousewheel.withaltkey.action" val="checked" />
+		<html:input name="altdefault" type="radio" pref="true" preftype="int" prefstring="mousewheel.withaltkey.action" prefindex="0" id="mousewheel.withaltkey.action0" val="checked" />
 		&numberoflines.label;
 	</html:label>
 	<html:input name="altnumlines" type="text" size="4" pref="true" preftype="int" prefstring="mousewheel.withaltkey.numlines" id="mousewheel.withaltkey.numlines" />
@@ -187,7 +186,7 @@ function toggleField(aField, aCheckbox)
 	<html:tr>
 	<html:td>
 	<html:label>
-		<html:input name="altdefault" type="radio" pref="true" preftype="int" prefstring="mousewheel.withaltkey.action" prefindex="1" id="mousewheel.withaltkey.action" />
+		<html:input name="altdefault" type="radio" pref="true" preftype="int" prefstring="mousewheel.withaltkey.action" prefindex="1" id="mousewheel.withaltkey.action1" />
 		&pageup.label;
 	</html:label>
 	</html:td>
@@ -195,7 +194,7 @@ function toggleField(aField, aCheckbox)
 	<html:tr>
 	<html:td>
 	<html:label>
-		<html:input name="altdefault" type="radio" pref="true" preftype="int" prefstring="mousewheel.withaltkey.action" prefindex="2" id="mousewheel.withaltkey.action" />
+		<html:input name="altdefault" type="radio" pref="true" preftype="int" prefstring="mousewheel.withaltkey.action" prefindex="2" id="mousewheel.withaltkey.action2" />
 		&history.label;
 	</html:label>
 	</html:td>
diff --git a/xpfe/components/prefwindow/resources/content/preftree.xul b/xpfe/components/prefwindow/resources/content/preftree.xul
index 687819ae218c..7d855a9eb198 100644
--- a/xpfe/components/prefwindow/resources/content/preftree.xul
+++ b/xpfe/components/prefwindow/resources/content/preftree.xul
@@ -208,6 +208,11 @@
           </treerow>
         </treeitem>
         
+        <treeitem>
+          <treerow>
+            <treecell indent="true" url="chrome://pref/content/pref-mousewheel.xul" value="&mousewheel.label;"/>
+          </treerow>
+        </treeitem>
       </treechildren>
     </treeitem>
   </treechildren>
@@ -216,7 +221,6 @@
       <treerow>       
         <treecell indent="true" url="chrome://pref/content/pref-debug.xul" value="&debug.label;"/> 
       </treerow>
-
     </treeitem>
 
 </tree>