Bug 274179 Add horizontal options to mouse wheel prefs panel

p=mozilla@Weilbacher.org r=neil.parkwaycc.co.uk sr=jag
This commit is contained in:
bugzilla%arlen.demon.co.uk 2006-05-17 02:39:33 +00:00
Родитель a8e30dd852
Коммит f20be6918a
2 изменённых файлов: 211 добавлений и 77 удалений

Просмотреть файл

@ -23,6 +23,7 @@
Contributor(s): Contributor(s):
bryner@brianryner.com bryner@brianryner.com
sspitzer@netscape.com sspitzer@netscape.com
Peter Weilbacher <mozilla@weilbacher.org>
Alternatively, the contents of this file may be used under the terms of Alternatively, the contents of this file may be used under the terms of
either of the GNU General Public License Version 2 or later (the "GPL"), either of the GNU General Public License Version 2 or later (the "GPL"),
@ -56,7 +57,11 @@
var _elementIDs = ["mousewheelWithNoKeyAction", "mousewheelWithNoKeyNumlines", "mousewheelWithNoKeySysNumlines", var _elementIDs = ["mousewheelWithNoKeyAction", "mousewheelWithNoKeyNumlines", "mousewheelWithNoKeySysNumlines",
"mousewheelWithAltKeyAction", "mousewheelWithAltKeyNumlines", "mousewheelWithAltKeySysNumlines", "mousewheelWithAltKeyAction", "mousewheelWithAltKeyNumlines", "mousewheelWithAltKeySysNumlines",
"mousewheelWithCtrlKeyAction", "mousewheelWithCtrlKeyNumlines", "mousewheelWithCtrlKeySysNumlines", "mousewheelWithCtrlKeyAction", "mousewheelWithCtrlKeyNumlines", "mousewheelWithCtrlKeySysNumlines",
"mousewheelWithShiftKeyAction", "mousewheelWithShiftKeyNumlines", "mousewheelWithShiftKeySysNumlines"]; "mousewheelWithShiftKeyAction", "mousewheelWithShiftKeyNumlines", "mousewheelWithShiftKeySysNumlines",
"mousewheelHorizWithNoKeyAction", "mousewheelWithNoKeyNumchars", "mousewheelWithNoKeySysNumchars",
"mousewheelHorizWithAltKeyAction", "mousewheelWithAltKeyNumchars", "mousewheelWithAltKeySysNumchars",
"mousewheelHorizWithCtrlKeyAction", "mousewheelWithCtrlKeyNumchars", "mousewheelWithCtrlKeySysNumchars",
"mousewheelHorizWithShiftKeyAction", "mousewheelWithShiftKeyNumchars", "mousewheelWithShiftKeySysNumchars"];
function switchPage( aElement ) function switchPage( aElement )
{ {
@ -75,8 +80,10 @@
function Startup() function Startup()
{ {
var fields = ["mousewheelWithNoKeyNumlines", "mousewheelWithAltKeyNumlines", "mousewheelWithCtrlKeyNumlines", "mousewheelWithShiftKeyNumlines"]; var fields = ["mousewheelWithNoKeyNumlines", "mousewheelWithAltKeyNumlines", "mousewheelWithCtrlKeyNumlines", "mousewheelWithShiftKeyNumlines",
var checkboxes = ["mousewheelWithNoKeySysNumlines", "mousewheelWithAltKeySysNumlines", "mousewheelWithCtrlKeySysNumlines", "mousewheelWithShiftKeySysNumlines"]; "mousewheelWithNoKeyNumchars", "mousewheelWithAltKeyNumchars", "mousewheelWithCtrlKeyNumchars", "mousewheelWithShiftKeyNumchars"];
var checkboxes = ["mousewheelWithNoKeySysNumlines", "mousewheelWithAltKeySysNumlines", "mousewheelWithCtrlKeySysNumlines", "mousewheelWithShiftKeySysNumlines",
"mousewheelWithNoKeySysNumchars", "mousewheelWithAltKeySysNumchars", "mousewheelWithCtrlKeySysNumchars", "mousewheelWithShiftKeySysNumchars"];
for( var i = 0; i < checkboxes.length; i++ ) for( var i = 0; i < checkboxes.length; i++ )
{ {
var currEl = document.getElementById( checkboxes[i] ); var currEl = document.getElementById( checkboxes[i] );
@ -114,88 +121,206 @@
<tabpanels> <tabpanels>
<!-- no key modifiers --> <!-- no key modifiers -->
<radiogroup id="mousewheelWithNoKeyAction" <vbox>
prefstring="mousewheel.withnokey.action"> <groupbox>
<hbox align="start"> <caption label="&mousewheelGroup.label;"/>
<radio value="0" label="&scroll.label;" accesskey="&scroll.accesskey;"/> <radiogroup id="mousewheelWithNoKeyAction"
<vbox align="start"> prefstring="mousewheel.withnokey.action">
<hbox align="center"> <hbox align="start">
<textbox id="mousewheelWithNoKeyNumlines" size="3" <radio value="0" label="&scroll.label;" accesskey="&scroll.accesskey;"/>
preftype="int" prefstring="mousewheel.withnokey.numlines" <vbox align="start">
prefattribute="value"/> <hbox align="center">
<label value="&scrollLines.label;"/> <textbox id="mousewheelWithNoKeyNumlines" size="3"
preftype="int" prefstring="mousewheel.withnokey.numlines"
prefattribute="value"/>
<label value="&scrollLines.label;"/>
</hbox>
<checkbox id="mousewheelWithNoKeySysNumlines" label="&useSystemDefault.label;"
accesskey="&useSystemDefault.accesskey;"
prefstring="mousewheel.withnokey.sysnumlines"
oncommand="enableField(this, 'mousewheelWithNoKeyNumlines', true);"/>
</vbox>
</hbox> </hbox>
<checkbox id="mousewheelWithNoKeySysNumlines" label="&useSystemDefault.label;" accesskey="&useSystemDefault.accesskey;" <radio value="1" label="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/>
prefstring="mousewheel.withnokey.sysnumlines" <radio value="2" label="&history.label;" accesskey="&history.accesskey;"/>
oncommand="enableField(this, 'mousewheelWithNoKeyNumlines', true);"/> <radio value="3" label="&textsize.label;" accesskey="&textsize.accesskey;"/>
</vbox> </radiogroup>
</hbox> </groupbox>
<radio value="1" label="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/> <groupbox>
<radio value="2" label="&history.label;" accesskey="&history.accesskey;"/> <caption label="&mousewheelHorizGroup.label;"/>
<radio value="3" label="&textsize.label;" accesskey="&textsize.accesskey;"/> <radiogroup id="mousewheelHorizWithNoKeyAction"
</radiogroup> prefstring="mousewheel.horizscroll.withnokey.action">
<hbox align="start">
<radio value="0" label="&scroll.label;" accesskey="&scrollHoriz.accesskey;"/>
<vbox align="start">
<hbox align="center">
<textbox id="mousewheelWithNoKeyNumchars" size="3"
preftype="int" prefstring="mousewheel.horizscroll.withnokey.numlines"
prefattribute="value"/>
<label value="&scrollChars.label;"/>
</hbox>
<checkbox id="mousewheelWithNoKeySysNumchars" label="&useSystemDefault.label;"
accesskey="&useSystemDefaultHoriz.accesskey;"
prefstring="mousewheel.horizscroll.withnokey.sysnumlines"
oncommand="enableField(this, 'mousewheelWithNoKeyNumchars', true);"/>
</vbox>
</hbox>
<radio value="1" label="&scrollPgLtPgRt.label;" accesskey="&scrollPgLtPgRt.accesskey;"/>
<radio value="2" label="&history.label;" accesskey="&historyHoriz.accesskey;"/>
<radio value="3" label="&textsize.label;" accesskey="&textsizeHoriz.accesskey;"/>
</radiogroup>
</groupbox>
</vbox>
<!-- alt modifiers --> <!-- alt modifiers -->
<radiogroup id="mousewheelWithAltKeyAction" <vbox>
prefstring="mousewheel.withaltkey.action"> <groupbox>
<hbox align="start"> <caption label="&mousewheelGroup.label;"/>
<radio value="0" label="&scroll.label;" accesskey="&scroll.accesskey;"/> <radiogroup id="mousewheelWithAltKeyAction"
<vbox align="start"> prefstring="mousewheel.withaltkey.action">
<hbox align="center"> <hbox align="start">
<textbox id="mousewheelWithAltKeyNumlines" size="3" <radio value="0" label="&scroll.label;" accesskey="&scroll.accesskey;"/>
preftype="int" prefstring="mousewheel.withaltkey.numlines"/> <vbox align="start">
<label value="&scrollLines.label;"/> <hbox align="center">
<textbox id="mousewheelWithAltKeyNumlines" size="3"
preftype="int" prefstring="mousewheel.withaltkey.numlines"/>
<label value="&scrollLines.label;"/>
</hbox>
<checkbox id="mousewheelWithAltKeySysNumlines" label="&useSystemDefault.label;"
accesskey="&useSystemDefault.accesskey;"
prefstring="mousewheel.withaltkey.sysnumlines"
oncommand="enableField(this, 'mousewheelWithAltKeyNumlines', true);"/>
</vbox>
</hbox> </hbox>
<checkbox id="mousewheelWithAltKeySysNumlines" label="&useSystemDefault.label;" accesskey="&useSystemDefault.accesskey;" <radio value="1" label="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/>
prefstring="mousewheel.withaltkey.sysnumlines" <radio value="2" label="&history.label;" accesskey="&history.accesskey;"/>
oncommand="enableField(this, 'mousewheelWithAltKeyNumlines', true);"/> <radio value="3" label="&textsize.label;" accesskey="&textsize.accesskey;"/>
</vbox> </radiogroup>
</hbox> </groupbox>
<radio value="1" label="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/> <groupbox>
<radio value="2" label="&history.label;" accesskey="&history.accesskey;"/> <caption label="&mousewheelHorizGroup.label;"/>
<radio value="3" label="&textsize.label;" accesskey="&textsize.accesskey;"/> <radiogroup id="mousewheelHorizWithAltKeyAction"
</radiogroup> prefstring="mousewheel.horizscroll.withaltkey.action">
<hbox align="start">
<radio value="0" label="&scroll.label;" accesskey="&scrollHoriz.accesskey;"/>
<vbox align="start">
<hbox align="center">
<textbox id="mousewheelWithAltKeyNumchars" size="3"
preftype="int" prefstring="mousewheel.horizscroll.withaltkey.numlines"/>
<label value="&scrollChars.label;"/>
</hbox>
<checkbox id="mousewheelWithAltKeySysNumchars" label="&useSystemDefault.label;"
accesskey="&useSystemDefaultHoriz.accesskey;"
prefstring="mousewheel.horizscroll.withaltkey.sysnumlines"
oncommand="enableField(this, 'mousewheelWithAltKeyNumchars', true);"/>
</vbox>
</hbox>
<radio value="1" label="&scrollPgLtPgRt.label;" accesskey="&scrollPgLtPgRt.accesskey;"/>
<radio value="2" label="&history.label;" accesskey="&historyHoriz.accesskey;"/>
<radio value="3" label="&textsize.label;" accesskey="&textsizeHoriz.accesskey;"/>
</radiogroup>
</groupbox>
</vbox>
<!-- ctrl modifiers --> <!-- ctrl modifiers -->
<radiogroup id="mousewheelWithCtrlKeyAction" <vbox>
prefstring="mousewheel.withcontrolkey.action" > <groupbox>
<hbox align="start"> <caption label="&mousewheelGroup.label;"/>
<radio value="0" label="&scroll.label;" accesskey="&scroll.accesskey;"/> <radiogroup id="mousewheelWithCtrlKeyAction"
<vbox align="start"> prefstring="mousewheel.withcontrolkey.action" >
<hbox align="center"> <hbox align="start">
<textbox id="mousewheelWithCtrlKeyNumlines" size="3" <radio value="0" label="&scroll.label;" accesskey="&scroll.accesskey;"/>
preftype="int" prefstring="mousewheel.withcontrolkey.numlines"/> <vbox align="start">
<label value="&scrollLines.label;"/> <hbox align="center">
<textbox id="mousewheelWithCtrlKeyNumlines" size="3"
preftype="int" prefstring="mousewheel.withcontrolkey.numlines"/>
<label value="&scrollLines.label;"/>
</hbox>
<checkbox id="mousewheelWithCtrlKeySysNumlines" label="&useSystemDefault.label;"
accesskey="&useSystemDefault.accesskey;"
prefstring="mousewheel.withcontrolkey.sysnumlines"
oncommand="enableField(this, 'mousewheelWithCtrlKeyNumlines', true);"/>
</vbox>
</hbox> </hbox>
<checkbox id="mousewheelWithCtrlKeySysNumlines" label="&useSystemDefault.label;" accesskey="&useSystemDefault.accesskey;" <radio value="1" label="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/>
prefstring="mousewheel.withcontrolkey.sysnumlines" <radio value="2" label="&history.label;" accesskey="&history.accesskey;"/>
oncommand="enableField(this, 'mousewheelWithCtrlKeyNumlines', true);"/> <radio value="3" label="&textsize.label;" accesskey="&textsize.accesskey;"/>
</vbox> </radiogroup>
</hbox> </groupbox>
<radio value="1" label="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/> <groupbox>
<radio value="2" label="&history.label;" accesskey="&history.accesskey;"/> <caption label="&mousewheelHorizGroup.label;"/>
<radio value="3" label="&textsize.label;" accesskey="&textsize.accesskey;"/> <radiogroup id="mousewheelHorizWithCtrlKeyAction"
</radiogroup> prefstring="mousewheel.horizscroll.withcontrolkey.action" >
<hbox align="start">
<radio value="0" label="&scroll.label;" accesskey="&scrollHoriz.accesskey;"/>
<vbox align="start">
<hbox align="center">
<textbox id="mousewheelWithCtrlKeyNumchars" size="3"
preftype="int" prefstring="mousewheel.horizscroll.withcontrolkey.numlines"/>
<label value="&scrollChars.label;"/>
</hbox>
<checkbox id="mousewheelWithCtrlKeySysNumchars" label="&useSystemDefault.label;"
accesskey="&useSystemDefaultHoriz.accesskey;"
prefstring="mousewheel.horizscroll.withcontrolkey.sysnumlines"
oncommand="enableField(this, 'mousewheelWithCtrlKeyNumchars', true);"/>
</vbox>
</hbox>
<radio value="1" label="&scrollPgLtPgRt.label;" accesskey="&scrollPgLtPgRt.accesskey;"/>
<radio value="2" label="&history.label;" accesskey="&historyHoriz.accesskey;"/>
<radio value="3" label="&textsize.label;" accesskey="&textsizeHoriz.accesskey;"/>
</radiogroup>
</groupbox>
</vbox>
<!-- shift modifiers --> <!-- shift modifiers -->
<radiogroup id="mousewheelWithShiftKeyAction" prefstring="mousewheel.withshiftkey.action"> <vbox>
<hbox align="start"> <groupbox>
<radio value="0" label="&scroll.label;" accesskey="&scroll.accesskey;"/> <caption label="&mousewheelGroup.label;"/>
<vbox align="start"> <radiogroup id="mousewheelWithShiftKeyAction"
<hbox align="center"> prefstring="mousewheel.withshiftkey.action">
<textbox id="mousewheelWithShiftKeyNumlines" size="3" <hbox align="start">
preftype="int" prefstring="mousewheel.withshiftkey.numlines"/> <radio value="0" label="&scroll.label;" accesskey="&scroll.accesskey;"/>
<label value="&scrollLines.label;"/> <vbox align="start">
<hbox align="center">
<textbox id="mousewheelWithShiftKeyNumlines" size="3"
preftype="int" prefstring="mousewheel.withshiftkey.numlines"/>
<label value="&scrollLines.label;"/>
</hbox>
<checkbox id="mousewheelWithShiftKeySysNumlines" label="&useSystemDefault.label;"
accesskey="&useSystemDefault.accesskey;"
prefstring="mousewheel.withshiftkey.sysnumlines"
oncommand="enableField(this, 'mousewheelWithShiftKeyNumlines', true);"/>
</vbox>
</hbox> </hbox>
<checkbox id="mousewheelWithShiftKeySysNumlines" label="&useSystemDefault.label;" accesskey="&useSystemDefault.accesskey;" <radio value="1" label="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/>
prefstring="mousewheel.withshiftkey.sysnumlines" <radio value="2" label="&history.label;" accesskey="&history.accesskey;"/>
oncommand="enableField(this, 'mousewheelWithShiftKeyNumlines', true);"/> <radio value="3" label="&textsize.label;" accesskey="&textsize.accesskey;"/>
</vbox> </radiogroup>
</hbox> </groupbox>
<radio value="1" label="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/> <groupbox>
<radio value="2" label="&history.label;" accesskey="&history.accesskey;"/> <caption label="&mousewheelHorizGroup.label;"/>
<radio value="3" label="&textsize.label;" accesskey="&textsize.accesskey;"/> <radiogroup id="mousewheelHorizWithShiftKeyAction"
</radiogroup> prefstring="mousewheel.horizscroll.withshiftkey.action">
<hbox align="start">
<radio value="0" label="&scroll.label;" accesskey="&scrollHoriz.accesskey;"/>
<vbox align="start">
<hbox align="center">
<textbox id="mousewheelWithShiftKeyNumchars" size="3"
preftype="int" prefstring="mousewheel.horizscroll.withshiftkey.numlines"/>
<label value="&scrollChars.label;"/>
</hbox>
<checkbox id="mousewheelWithShiftKeySysNumchars" label="&useSystemDefault.label;"
accesskey="&useSystemDefaultHoriz.accesskey;"
prefstring="mousewheel.horizscroll.withshiftkey.sysnumlines"
oncommand="enableField(this, 'mousewheelWithShiftKeyNumchars', true);"/>
</vbox>
</hbox>
<radio value="1" label="&scrollPgLtPgRt.label;" accesskey="&scrollPgLtPgRt.accesskey;"/>
<radio value="2" label="&history.label;" accesskey="&historyHoriz.accesskey;"/>
<radio value="3" label="&textsize.label;" accesskey="&textsizeHoriz.accesskey;"/>
</radiogroup>
</groupbox>
</vbox>
</tabpanels> </tabpanels>
</tabbox> </tabbox>
</page> </page>

Просмотреть файл

@ -8,14 +8,23 @@
<!ENTITY usingWheelAndAlt.label "&altKey.label;"> <!ENTITY usingWheelAndAlt.label "&altKey.label;">
<!ENTITY usingWheelAndCtrl.label "&ctrlKey.label;"> <!ENTITY usingWheelAndCtrl.label "&ctrlKey.label;">
<!ENTITY usingWheelAndShft.label "&shiftKey.label;"> <!ENTITY usingWheelAndShft.label "&shiftKey.label;">
<!ENTITY mousewheelGroup.label "Vertical scrolling">
<!ENTITY mousewheelHorizGroup.label "Horizontal scrolling">
<!ENTITY scroll.label "Scroll the document by "> <!ENTITY scroll.label "Scroll the document by ">
<!ENTITY scroll.accesskey "s"> <!ENTITY scroll.accesskey "s">
<!ENTITY scrollHoriz.accesskey "c">
<!ENTITY scrollLines.label " lines. "> <!ENTITY scrollLines.label " lines. ">
<!ENTITY scrollChars.label " characters. ">
<!ENTITY useSystemDefault.label "Use system default"> <!ENTITY useSystemDefault.label "Use system default">
<!ENTITY useSystemDefault.accesskey "y"> <!ENTITY useSystemDefault.accesskey "y">
<!ENTITY useSystemDefaultHoriz.accesskey "d">
<!ENTITY scrollPgUpPgDn.label "Scroll a page up or a page down"> <!ENTITY scrollPgUpPgDn.label "Scroll a page up or a page down">
<!ENTITY scrollPgUpPgDn.accesskey "p"> <!ENTITY scrollPgUpPgDn.accesskey "p">
<!ENTITY scrollPgLtPgRt.label "Scroll a page left or a page right">
<!ENTITY scrollPgLtPgRt.accesskey "o">
<!ENTITY history.label "Move back and forward in the browsing history"> <!ENTITY history.label "Move back and forward in the browsing history">
<!ENTITY history.accesskey "h"> <!ENTITY history.accesskey "m">
<!ENTITY historyHoriz.accesskey "b">
<!ENTITY textsize.label "Make the text larger or smaller"> <!ENTITY textsize.label "Make the text larger or smaller">
<!ENTITY textsize.accesskey "t"> <!ENTITY textsize.accesskey "t">
<!ENTITY textsizeHoriz.accesskey "e">