Changeset 538

Show
Ignore:
Timestamp:
2007-07-23 21:04:33 (1 year ago)
Author:
MaierMan
Message:

restructure filters.
This way we don't have that ugly counter at all.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/chrome/locale/en-US/filters.properties

    r110 r538  
    1 deffilter0=All files 
    2 deffilter1=Archives (zip, rar..) 
    3 deffilter2=Videos (mpeg, avi, wmv..) 
    4 deffilter3=Images (gif, jpg, png..) 
    5 deffilter4=Software 
    6 deffilter5=JPEG 
     1deffilter-all=All files 
     2deffilter-arch=Archives (zip, rar, ...) 
     3deffilter-vid=Videos (mpeg, avi, ...) 
     4deffilter-aud=Audio (mp3, wav, ...) 
     5deffilter-img=Images (jpg, png, ...) 
     6deffilter-imgjpg=JPEG Images 
     7deffilter-imgpng=PNG Images 
     8deffilter-imggif=GIF Images 
     9deffilter-bin=Software (exe, xpi, ...) 

  • trunk/components/filterManager.js

    r493 r538  
    202202                this._type = this._prefs.getIntPref(this.pref('type')); 
    203203                this._isRegex = this._prefs.getBoolPref(this.pref('regex')); 
    204                 this._defFilter = this._id.search(/deffilter\d+/) != -1; 
     204                this._defFilter = this._id.search(/^deffilter/) != -1; 
    205205                this._createRegex(); 
    206206                this._modified = false; 

  • trunk/defaults/preferences/filters.js

    r489 r538  
    3434 * 
    3535 * ***** END LICENSE BLOCK ***** */ 
    36 pref("extensions.dta.filters.deffilter0.label", "All files"); 
    37 pref("extensions.dta.filters.deffilter0.test", "/.*/i"); 
    38 pref("extensions.dta.filters.deffilter0.regex", true); 
    39 pref("extensions.dta.filters.deffilter0.active", false); 
    40 pref("extensions.dta.filters.deffilter0.type", 3); 
     36  
     37// See chrome/locale/filters.properties 
     38pref("extensions.dta.filters.deffilter-all.label", "All files"); 
     39pref("extensions.dta.filters.deffilter-all.test", "/.*/i"); 
     40pref("extensions.dta.filters.deffilter-all.regex", true); 
     41pref("extensions.dta.filters.deffilter-all.active", false); 
     42pref("extensions.dta.filters.deffilter-all.type", 3); 
    4143 
    42 pref("extensions.dta.filters.deffilter1.label", "Archives (zip, rar..)"); 
    43 pref("extensions.dta.filters.deffilter1.test", "/\\.(?:z(?:ip|[0-9]{2})|r(?:ar|[0-9]{2})|jar|bz2|gz|tar|rpm)$/i"); 
    44 pref("extensions.dta.filters.deffilter1.regex", true); 
    45 pref("extensions.dta.filters.deffilter1.active", false); 
    46 pref("extensions.dta.filters.deffilter1.type", 1); 
     44pref("extensions.dta.filters.deffilter-arch.label", "Archives)"); 
     45pref("extensions.dta.filters.deffilter-arch.test", "/\\.(?:z(?:ip|[0-9]{2})|r(?:ar|[0-9]{2})|jar|bz2|gz|tar|rpm)$/i"); 
     46pref("extensions.dta.filters.deffilter-arch.regex", true); 
     47pref("extensions.dta.filters.deffilter-arch.active", false); 
     48pref("extensions.dta.filters.deffilter-arch.type", 1); 
    4749 
    48 pref("extensions.dta.filters.deffilter2.label", "Videos (mpeg, avi, wmv..)"); 
    49 pref("extensions.dta.filters.deffilter2.test", "/\\.(?:mpeg|rm|mpe|avi|mpg|mp4|mov|divx|asf|qt|wmv|ram|m1v|m2v|rv|vob|asx)$/i"); 
    50 pref("extensions.dta.filters.deffilter2.regex", true); 
    51 pref("extensions.dta.filters.deffilter2.active", true); 
    52 pref("extensions.dta.filters.deffilter2.type", 3); 
     50pref("extensions.dta.filters.deffilter-vid.label", "Videos"); 
     51pref("extensions.dta.filters.deffilter-vid.test", "/\\.(?:mpeg|ra?m|avi|mp(?:g|e|4)|mov|divx|asf|qt|wmv|m\dv|rv|vob|asx|ogm)$/i"); 
     52pref("extensions.dta.filters.deffilter-vid.regex", true); 
     53pref("extensions.dta.filters.deffilter-vid.active", true); 
     54pref("extensions.dta.filters.deffilter-vid.type", 3); 
    5355 
    54 pref("extensions.dta.filters.deffilter3.label", "Images (gif, jpg, png..)"); 
    55 pref("extensions.dta.filters.deffilter3.test", "/\\.(?:jp(?:e?g|e|2)|gif|png|tif|tiff|bmp|ico)$/i"); 
    56 pref("extensions.dta.filters.deffilter3.regex", true); 
    57 pref("extensions.dta.filters.deffilter3.active", true); 
    58 pref("extensions.dta.filters.deffilter3.type", 3); 
     56pref("extensions.dta.filters.deffilter-aud.label", "Audio"); 
     57pref("extensions.dta.filters.deffilter-aud.test", "/\\.(?:mp3|wav|og(?:g|a)|flac|midi?|rm|aac|wma|mka|ape)$/i"); 
     58pref("extensions.dta.filters.deffilter-aud.regex", true); 
     59pref("extensions.dta.filters.deffilter-aud.active", true); 
     60pref("extensions.dta.filters.deffilter-aud.type", 1); 
    5961 
    60 pref("extensions.dta.filters.deffilter4.label", "Software"); 
    61 pref("extensions.dta.filters.deffilter4.test", "/\\.(?:exe|msi|dmg|bin|xpi)$/i"); 
    62 pref("extensions.dta.filters.deffilter4.regex", true); 
    63 pref("extensions.dta.filters.deffilter4.active", true); 
    64 pref("extensions.dta.filters.deffilter4.type", 1); 
     62pref("extensions.dta.filters.deffilter-img.label", "Images"); 
     63pref("extensions.dta.filters.deffilter-img.test", "/\\.(?:jp(?:e?g|e|2)|gif|png|tiff?|bmp|ico)$/i"); 
     64pref("extensions.dta.filters.deffilter-img.regex", true); 
     65pref("extensions.dta.filters.deffilter-img.active", true); 
     66pref("extensions.dta.filters.deffilter-img.type", 3); 
    6567 
    66 pref("extensions.dta.filters.deffilter5.label", "JPEG"); 
    67 pref("extensions.dta.filters.deffilter5.test", "/\\.jp(e?g|e|2)$/i"); 
    68 pref("extensions.dta.filters.deffilter5.regex", true); 
    69 pref("extensions.dta.filters.deffilter5.active", false); 
    70 pref("extensions.dta.filters.deffilter5.type", 3); 
     68pref("extensions.dta.filters.deffilter-bin.label", "Software"); 
     69pref("extensions.dta.filters.deffilter-bin.test", "/\\.(?:exe|msi|dmg|bin|xpi|iso)$/i"); 
     70pref("extensions.dta.filters.deffilter-bin.regex", true); 
     71pref("extensions.dta.filters.deffilter-bin.active", true); 
     72pref("extensions.dta.filters.deffilter-bin.type", 1); 
     73 
     74pref("extensions.dta.filters.deffilter-imgjpg.label", "JPEG"); 
     75pref("extensions.dta.filters.deffilter-imgjpg.test", "/\\.jp(e?g|e|2)$/i"); 
     76pref("extensions.dta.filters.deffilter-imgjpg.regex", true); 
     77pref("extensions.dta.filters.deffilter-imgjpg.active", false); 
     78pref("extensions.dta.filters.deffilter-imgjpg.type", 3); 
     79 
     80pref("extensions.dta.filters.deffilter-imggif.label", "GIF"); 
     81pref("extensions.dta.filters.deffilter-imggif.test", "/\\.gif$/i"); 
     82pref("extensions.dta.filters.deffilter-imggif.regex", true); 
     83pref("extensions.dta.filters.deffilter-imggif.active", false); 
     84pref("extensions.dta.filters.deffilter-imggif.type", 2); 
     85 
     86pref("extensions.dta.filters.deffilter-imgpng.label", "PNG"); 
     87pref("extensions.dta.filters.deffilter-imgpng.test", "/\\.png$/i"); 
     88pref("extensions.dta.filters.deffilter-imgpng.regex", true); 
     89pref("extensions.dta.filters.deffilter-imgpng.active", false); 
     90pref("extensions.dta.filters.deffilter-imgpng.type", 2);