Changeset 489

Timestamp:

2007-07-08 19:19:10 (2 years ago)

Author:

StefanoVerna

Message:

default filters can now be edited and restored

Files:

• trunk/chrome/content/preferences/filtersPane.js (modified) (5 diffs)
• trunk/chrome/content/preferences/filtersPane.xul (modified) (1 diff)
• trunk/chrome/locale/en-US/prefpanes.dtd (modified) (1 diff)
• trunk/chrome/locale/en-US/prefpanes.properties (modified) (2 diffs)
• trunk/components/filterManager.idl (modified) (1 diff)
• trunk/components/filterManager.js (modified) (9 diffs)
• trunk/defaults/preferences/filters.js (modified) (1 diff)

trunk/chrome/content/preferences/filtersPane.js

@@ -247 +247 @@
-                
-                if (idx==-1) {
-
+storere
-                        $("filterLabel", "filterTest").forEach(function(a){a.value=""});
-                        $("filterText", "filterImage", "filterIsRegex").forEach(function(a){a.checked=false});
+                        $("restoreremovebutton").label = _('removebutton');
-                        return;
-                }
@@ -264 +265 @@
-                $("filterText").checked = currentFilter.type & 1;
-                $("filterImage").checked = currentFilter.type & 2;
-
-$("filterLabel", "filterTest", "filterText", "filterImage", "filterIsRegex", "removebutton").forEach(function(a){a.disabled=currentFilter.defFilter});
-
+$("filterLabel", "filterTest", "filterText", "filterImage", "filterIsRegex", "restoreremovebutton").forEach(function(a){a.disabled=false});
+
+$("restoreremovebutton").label = currentFilter.defFilter?_('restorebutton'):_('removebutton');
-                this.doCheckboxValidation();
-        },
@@ -275 +276 @@
-                var currentFilter = this.getFilter(idx);
-                // invalid idx
- || currentFilter.defFilter
+
-                        return;
-                }
@@ -350 +351 @@
-                var currentFilter = this.getFilter(idx);
-                // invalid idx
- || currentFilter.defFilter
+
-                        return;
-                }
@@ -398 +399 @@
-        removeFilter: function() {
-                Debug.dump("remove");
-
-
-
-
-
-
-
-
+
-                this._table.view.selection.select(-1);
-                var currentFilter = currentFilter.remove();
-        },
-s
+
-                if (DTA_confirm(_('restorefilterstitle'), _('restorefilterstext'), _('restore'), DTA_confirm.CANCEL, null, 1) == 1) {
-                        return;
-                }
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-        }

trunk/chrome/content/preferences/filtersPane.xul

@@ -52 +52 @@
-                        <spacer flex="1"/>
-                        <button label="&add.label;" oncommand="Dialog.createFilter();"/>
-
-
+
-                        <spacer flex="1"/>
-                 </hbox>

trunk/chrome/locale/en-US/prefpanes.dtd

@@ -8 +8 @@
-<!ENTITY linksf.label "Links filter">
-<!ENTITY add.label "Add new filter">
-<!ENTITY remove.label "Delete filter">
-<!ENTITY default.label "Restore default filters">
-<!ENTITY highlight.label "Highlight files checked by filters">
-<!ENTITY dtacontext2.label "Preferences">

trunk/chrome/locale/en-US/prefpanes.properties

@@ -6 +6 @@
-restoreprefstitle=Restore Preferences
-restoreprefstext=Do you want to restore preferences to their default state?\nThere is no way to undo this!
-s
-move all user filters and restore the built-in ones
+
+store the built-in values for this filter
-restore=Restore
-regex=Reg. Ex.
@@ -14 +14 @@
-newfilt=New filter
-inserthere=Insert here extensions (split using commas)
+removebutton=Delete filter
+restorebutton=Restore default filter

trunk/components/filterManager.idl

@@ -53 +53 @@
-        boolean match(in string test);
-        void save();
+        void restore();
-        void remove();
-};

trunk/components/filterManager.js

@@ -58 +58 @@
-        LINK_FILTER: (1 << 0),
-        IMAGE_FILTER: (1 << 1),
+        
+        defaultFilters: {
+                deffilter0: {
+                        test: "/.*/i",
+                        regex: true,
+                        type: this.LINK_FILTER + this.IMAGE_FILTER
+                },
+                deffilter1: {
+                        test: "/\\.(?:z(?:ip|[0-9]{2})|r(?:ar|[0-9]{2})|jar|bz2|gz|tar|rpm)$/i",
+                        regex: true,
+                        type: this.LINK_FILTER
+                },
+                deffilter2: {
+                        test: "/\\.(?:mpeg|rm|mpe|avi|mpg|mp4|mov|divx|asf|qt|wmv|ram|m1v|m2v|rv|vob|asx)$/i",
+                        regex: true,
+                        type: this.LINK_FILTER + this.IMAGE_FILTER
+                },
+                deffilter3: {
+                        test: "/\\.(?:jp(?:e?g|e|2)|gif|png|tif|tiff|bmp|ico)$/i",
+                        regex: true,
+                        type: this.LINK_FILTER + this.IMAGE_FILTER
+                },
+                deffilter4: {
+                        test: "/\\.(?:exe|msi|dmg|bin|xpi)$/i",
+                        regex: true,
+                        type: this.LINK_FILTER
+                },
+                deffilter5: {
+                        test: "/\\.jp(e?g|e|2)$/i",
+                        regex: true,
+                        type: this.LINK_FILTER + this.IMAGE_FILTER
+                }
+        },
-
-        _modified: false,
@@ -115 +148 @@
-        },
-        set test(value) {
-                if (this._defFilter) {
-                        throw new Components.Exception("default filters cannot be modified!");
-                }
-                if (this._test == value) {
-                        return;
@@ -149 +179 @@
-        },
-        set isRegex(value) {
-                if (this._defFilter) {
-                        throw new Components.Exception("default filters cannot be deleted!");
-                }
-                if (this._isRegex == value) {
-                        return;
@@ -171 +198 @@
-        },
-        set type(t) {
-                if (this._defFilter) {
-                        throw new Components.Exception("default filters cannot be modified!");
-                }
-                if (this._type == t) {
-                        return;
@@ -197 +221 @@
-         */
-        load: function F_load(localizedLabel) {
+                this._localizedLabel = localizedLabel;
-                this._label = this.getMultiBytePref(this.pref('label'));
-                if (!this._label || !this._label.length) {
@@ -220 +245 @@
-                }
-                this._prefs.setBoolPref(this.pref('active'), this._active);
-
-
-
-
-
-
-
-
+
+
+
+
+
-                // save this last as FM will test for it.
-                this.setMultiBytePref(this.pref('label'), this._label);
-
-                this._modified = false;
+        },
+
+        // exported
+        restore: function F_restore() {
+                if (!this._defFilter) {
+                        throw new Components.Exception("only default filters can be restored!");
+                }
+                this._label = this._localizedLabel;
+                this._test = defaultFilters[this._id].test;
+                this._type = defaultFilters[this._id].type;
+                this._isRegex = defaultFilters[this._id].regex;
+                
+                this.save();
-        },
-
@@ -335 +370 @@
-
-                // load those localized labels for default filters.
-
+ocalizedL
-                                var b = CC['@mozilla.org/intl/stringbundle;1']
-                        .getService(CI.nsIStringBundleService)
@@ -342 +377 @@
-                while (e.hasMoreElements()) {
-                        var prop = e.getNext().QueryInterface(CI.nsIPropertyElement);
-
+ocalizedL
-                }
-
@@ -389 +424 @@
-                                // overwrite with localized labels.
-                                var localizedLabel = null;
-
-
+ocalizedL
+ocalizedL
-                                }
-                                filter.load(localizedLabel);

trunk/defaults/preferences/filters.js

@@ -35 +35 @@
- * ***** END LICENSE BLOCK ***** */
-pref("extensions.dta.filters.deffilter0.label", "All files");
-.*
+/.*/i
-pref("extensions.dta.filters.deffilter0.regex", true);
-pref("extensions.dta.filters.deffilter0.active", false);