Add a 'Notes' column in the preferences dialog.

katmagic · katmagic · commit 7aefd56408fd · 2010-12-17T15:41:53.000-05:00
diff --git a/src/chrome/content/code/HTTPSRules.js b/src/chrome/content/code/HTTPSRules.js
@@ -20,6 +20,7 @@ function RuleSet(name, match_rule, default_off) {
   var on_by_default = true;
   this.name = name;
   this.ruleset_match = match_rule;
+  this.notes = "";
   if (match_rule) {
     this.ruleset_match_c = new RegExp(match_rule);
   } else {
@@ -30,6 +31,7 @@ function RuleSet(name, match_rule, default_off) {
     // the default_off XML attribute.  Ideally we'd like this attribute to be
     // "valueless"
     on_by_default = false;
+    this.notes = default_off;
   }
   this.rules = [];
   this.exclusions = [];
@@ -264,8 +266,8 @@ const HTTPSRules = {
         }
       }
 
-      // for any rulesets with <target host="*"> 
-      // every URI needs to be checked against these rulesets 
+      // for any rulesets with <target host="*">
+      // every URI needs to be checked against these rulesets
       // (though currently we don't ship any)
       this.global_rulesets = this.targets["*"] ? this.targets["*"] : [];
 
@@ -289,7 +291,7 @@ const HTTPSRules = {
       try {
         this.log(DBUG,"Loading ruleset file: "+rulefiles[i].path);
         r = RuleWriter.read(rulefiles[i], targets, this.rulesets);
-        if (r != null) 
+        if (r != null)
           this.rulesets.push(r);
       } catch(e) {
         this.log(WARN, "Error in ruleset file: " + e);
@@ -334,13 +336,13 @@ const HTTPSRules = {
         results = results.concat(this.targets[t]);
     }
     this.log(DBUG,"Applicable rules for " + host + ":");
-    for (i = 0; i < results.length; ++i) 
+    for (i = 0; i < results.length; ++i)
       this.log(DBUG, "  " + results[i].name);
     return results;
   },
-  
+
   shouldSecureCookie: function(c) {
-    // Check to see if the Cookie object c meets any of our cookierule citeria 
+    // Check to see if the Cookie object c meets any of our cookierule citeria
     // for being marked as secure
     //this.log(DBUG, "Testing cookie:");
     //this.log(DBUG, "  name: " + c.name);
@@ -351,10 +353,10 @@ const HTTPSRules = {
     var rs = this.applicableRulesets(c.host);
     for (i = 0; i < rs.length; ++i) {
       var ruleset = rs[i];
-      if (ruleset.active) 
+      if (ruleset.active)
         for (j = 0; j < ruleset.cookierules.length; j++) {
           var cr = ruleset.cookierules[j];
-          if (cr.host_c.test(c.host) && cr.name_c.test(c.name)) 
+          if (cr.host_c.test(c.host) && cr.name_c.test(c.name))
             return true;
         }
     }
diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js
@@ -19,13 +19,23 @@ function https_prefs_init(doc) {
   treeView = {
     rules: rulesets,
     rowCount: rulesets.length,
-    getCellText: function(row, col) { // site names
+    getCellValue: function(row, col) { // site names
       if (!this.rules[row]) return;
-      return this.rules[row].name;
+
+      switch (col.id) {
+        case "site_col":
+          return this.rules[row].name;
+        case "note_col":
+          return this.rules[row].notes;
+        case "enabled_col":
+          var e = o_httpsprefs.getBoolPref(this.rules[row].name);
+          return e ? "true" : "false";
+        default:
+          return;
+      }
     },
-    getCellValue: function(row, col) { // activation indicator
-      if (!this.rules[row]) return;
-      return o_httpsprefs.getBoolPref(this.rules[row].name) ? "true" : "false";
+    getCellText: function(row, col) { // activation indicator
+       return this.getCellValue(row, col);
     },
     setCellValue: function(row, col, val) { // toggle a rule's activation
       var rule = this.rules[row];
diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul
@@ -25,6 +25,7 @@
               <treecol id="enabled_col" type="checkbox" label="Enabled"
                        editable="true" />
               <treecol id="site_col" label="Site" flex="1" editable="false" />
+              <treecol id="note_col" label="Notes" flex="1" editable="false" />
             </treecols>
             <treechildren/>
           </tree>
