summaryrefslogtreecommitdiffstats
path: root/application/palemoon/components/preferences/advanced.xul
diff options
context:
space:
mode:
Diffstat (limited to 'application/palemoon/components/preferences/advanced.xul')
-rw-r--r--application/palemoon/components/preferences/advanced.xul35
1 files changed, 21 insertions, 14 deletions
diff --git a/application/palemoon/components/preferences/advanced.xul b/application/palemoon/components/preferences/advanced.xul
index 3bd5becb3..e5f3bb160 100644
--- a/application/palemoon/components/preferences/advanced.xul
+++ b/application/palemoon/components/preferences/advanced.xul
@@ -27,10 +27,7 @@
<!--XXX button prefs -->
<!-- General tab -->
-<!-- Pale Moon: remove accessibility features, they confuse people anyway -->
-<!-- <preference id="accessibility.browsewithcaret" name="accessibility.browsewithcaret" type="bool"/> -->
<preference id="accessibility.typeaheadfind" name="accessibility.typeaheadfind" type="bool"/>
-<!-- <preference id="accessibility.blockautorefresh" name="accessibility.blockautorefresh" type="bool"/> -->
<preference id="general.autoScroll" name="general.autoScroll" type="bool"/>
<preference id="general.smoothScroll" name="general.smoothScroll" type="bool"/>
@@ -51,8 +48,8 @@
type="bool"/>
#endif
<preference id="pref.general.compatmode" name="general.useragent.compatMode" type="int"/>
-
- <!-- Data Choices tab -->
+
+ <preference id="pref.general.captiveportal" name="network.captive-portal-service.enabled" type="bool"/>
<!-- Network tab -->
<preference id="browser.cache.disk.capacity" name="browser.cache.disk.capacity" type="int"/>
@@ -109,6 +106,8 @@
<preference id="general.smoothScroll.scrollbars" name="general.smoothScroll.scrollbars" type="bool"/>
<preference id="general.smoothScroll.scrollbars.durationMinMS" name="general.smoothScroll.scrollbars.durationMinMS" type="int"/>
<preference id="general.smoothScroll.scrollbars.durationMaxMS" name="general.smoothScroll.scrollbars.durationMaxMS" type="int"/>
+
+ <preference id="mousewheel.default.delta_multiplier_y" name="mousewheel.default.delta_multiplier_y" type="int"/>
</preferences>
#ifdef HAVE_SHELL_SERVICE
@@ -136,22 +135,13 @@
<tabpanel id="generalPanel" orient="vertical">
<!-- Accessibility -->
-<!-- Pale Moon: remove accessibility features, they confuse people anyway -->
<groupbox id="accessibilityGroup" align="start">
<caption label="&accessibility.label;"/>
-<!-- <checkbox id="useCursorNavigation"
- label="&useCursorNavigation.label;"
- accesskey="&useCursorNavigation.accesskey;"
- preference="accessibility.browsewithcaret"/> -->
<checkbox id="searchStartTyping"
label="&searchStartTyping.label;"
accesskey="&searchStartTyping.accesskey;"
preference="accessibility.typeaheadfind"/>
-<!-- <checkbox id="blockAutoRefresh"
- label="&blockAutoRefresh.label;"
- accesskey="&blockAutoRefresh.accesskey;"
- preference="accessibility.blockautorefresh"/> -->
</groupbox>
<!-- Browsing -->
@@ -193,6 +183,7 @@
</hbox>
</groupbox>
#endif
+ <!-- User Agent compatibility -->
<groupbox id="UACompatGroup" orient="vertical">
<caption label="&UACompatGroup.label;"/>
<hbox align="center">
@@ -206,6 +197,15 @@
</menulist>
</hbox>
</groupbox>
+
+ <!-- Captive portal detection -->
+ <groupbox id="captivePortalGroup" orient="vertical">
+ <caption label="&captivePortalGroup.label;"/>
+ <checkbox id="captivePortalDetect"
+ label="&captivePortalDetect.label;"
+ preference="pref.general.captiveportal"/>
+ </groupbox>
+
</tabpanel>
<!-- Network -->
@@ -447,6 +447,13 @@
preference="general.smoothScroll.scrollbars.durationMaxMS"/>
<label flex="1">ms.</label>
</hbox>
+
+ <hbox align="center">
+ <label value="&smoothscroll.overall.yspeed.label;"/>
+ <textbox type="number" size="3" min="1" max="999"
+ preference="mousewheel.default.delta_multiplier_y"/>
+ <label flex="1">%.</label>
+ </hbox>
</groupbox>
</tabpanel>
<!-- end Smooth scrolling tab -->