Add a disable all button.

Mike Perry · Mike Perry · commit e2001c6f9c6d · 2010-11-11T10:13:51.000-08:00
Also rename the DTD elements to better reflect the buttons.
diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js
@@ -80,15 +80,15 @@ function https_prefs_save(doc) {
   }
 }
 
-function https_enable_all(doc) {
-  // "restore defaults" / enable all rules
+function https_set_all(doc,val) {
+  // set all rules to val (enable/disable)
   var o_httpsprefs = https_everywhere.get_prefs();
   var rulesets = https_everywhere.https_rules.rules;
   var rs = doc.getElementById('https_everywhere_RuleSetList');
   for (var i = 0; i < rulesets.length; i++) {
     var ruleset = rulesets[i];
-    ruleset.active = true;
+    ruleset.active = val;
     var elem = doc.getElementById(id_prefix + ruleset.name);
-    elem.checked = true;
+    elem.checked = val;
   }
 }
diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul
@@ -6,10 +6,12 @@
 <dialog id="https-everywhere-prefs"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
-        buttons="accept,cancel,extra1"
+        buttons="accept,cancel,extra1,extra2"
         title="&https-everywhere.prefs.title;"
-        buttonlabelextra1="&https-everywhere.prefs.restore_defaults;"
-        ondialogextra1="https_enable_all(document);"
+        buttonlabelextra1="&https-everywhere.prefs.enable_all;"
+        buttonlabelextra2="&https-everywhere.prefs.disable_all;"
+        ondialogextra1="https_set_all(document,true);"
+        ondialogextra2="https_set_all(document,false);"
         persist="screenX screenY"
         onload="https_prefs_init(document)"
         ondialogaccept="https_prefs_save(document)" 
diff --git a/src/chrome/locale/en/https-everywhere.dtd b/src/chrome/locale/en/https-everywhere.dtd
@@ -1,2 +1,3 @@
 <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Preferences">
-<!ENTITY https-everywhere.prefs.restore_defaults "Enable All">
+<!ENTITY https-everywhere.prefs.enable_all "Enable All">
+<!ENTITY https-everywhere.prefs.disable_all "Disable All">

Original file line number	Diff line number	Diff line change
`@@ -80,15 +80,15 @@ function https_prefs_save(doc) {`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`
`83`		`-function https_enable_all(doc) {`
`84`		`- // "restore defaults" / enable all rules`
	`83`	`+function https_set_all(doc,val) {`
	`84`	`+ // set all rules to val (enable/disable)`
`85`	`85`	`var o_httpsprefs = https_everywhere.get_prefs();`
`86`	`86`	`var rulesets = https_everywhere.https_rules.rules;`
`87`	`87`	`var rs = doc.getElementById('https_everywhere_RuleSetList');`
`88`	`88`	`for (var i = 0; i < rulesets.length; i++) {`
`89`	`89`	`var ruleset = rulesets[i];`
`90`		`- ruleset.active = true;`
	`90`	`+ ruleset.active = val;`
`91`	`91`	`var elem = doc.getElementById(id_prefix + ruleset.name);`
`92`		`- elem.checked = true;`
	`92`	`+ elem.checked = val;`
`93`	`93`	`}`
`94`	`94`	`}`