summaryrefslogtreecommitdiff
path: root/src/adblock/adblockmanager.h
Commit message (Collapse)AuthorAgeFilesLines
* Load the adblock settings in background.Paul Rohrbach2013-07-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | If you open rekonq and start typing immediately, there is a small lag (about half a second). This is caused by the AdBlockManager::loadSettings function reading the adblock rules. It is called with a one second delay to make the startup faster. With this patch, the function is called in a separate thread using QtConcurrent::run to eliminate the lag. To make this safe, the adblocker is enabled after the settings are loaded, which means, that the first site loaded could be partially with ads. But this is no change in behavior, as the adblocker in current master is disabled for a whole second. The only times this blocks now is in situations, where it is necessary that the settings are loaded (showSettings and addCustomRule), but I guess that no normal user will use those in under a second after startup :) REVIEW: 111712 REVIEWED-BY: adjam
* Adding domain-specific hiding support to the adblocker.Paul Rohrbach2013-07-301-3/+4
| | | | | | | | | | | The domain-specific rules are stored in a QMultiHash, where the key is the domain and the values are the rules for the specified domain. This causes redundancy, because on rule can be applied to more than one domain, but has a really fast look-up time. The code for the generic hiding has not changed and is just relocated. REVIEW: 111521 REVIEWED-BY: adjam
* AdBlock ImprovementAndrea Diamantini2013-02-241-1/+5
| | | | | | | | | Hiding rules support (at least the easy ones, the most ones, against hiding id && classes) :D To test it, take a look (in example) at the url: http://simple-adblock.com/faq/testing-your-adblocker/
* - Code style check (codestyle script round)Andrea Diamantini2012-12-121-1/+1
| | | | | | | | | - restored CTRL + ENTER code - applied Vedant's patch about (thanks!!!) CCMAIL: vedant.kota@gmail.com REVIEW: 107662 REVIEWED-BY: Tirtha and me
* Clean up previous commit about adblock and fix enable/disable featureAndrea Diamantini2012-12-101-1/+0
|
* adblock workAndrea Diamantini2012-12-101-5/+3
| | | | | | | | readded an icon in the urlbar when adblock is active, BUT with different features: you can now disable adblock "per-site", in a similar way chromium does. cleaned up adblock manager code, removing some old no more used code fragments
* Restored Adblock moving hiding logic to the one used in kwebkitpartAndrea Diamantini2012-12-101-0/+210
| | | | | This will let everyone to save time reinventing the wheel and let us remove webpage from adblockmanager code, but just manage it via (Q)NAM.
* WARNING COMMIT --> FIRST REKONQ 2 IMPORTAndrea Diamantini2012-12-101-202/+0
| | | | Preparing repo to merge rekonq2 code...
* Clean up headers && fix compilation with (the upcoming) qt 4.8.2Andrea Diamantini2012-04-201-1/+1
|
* Clean up adblock manager code and fix unblock featureAndrea Diamantini2012-03-131-2/+6
|
* check/update/load subscriptions well :)Andrea Diamantini2012-03-131-1/+5
|
* Add dialog allowing adblock to list blocked/hided elements and unblockAndrea Diamantini2012-03-131-4/+13
| | | | some of them
* Let rekonq block sparse images (this idea has been copied from Arora)Andrea Diamantini2012-03-131-0/+4
|
* Update adblock dialogAndrea Diamantini2012-03-131-2/+0
|
* Move adblock manager to use multiple text files for rules andAndrea Diamantini2012-03-131-8/+5
| | | | | | separate adblock settings from rekonq ones. We now have 60 adblock rules list sites stored to be enabled "on click"
* Remove ability to manage abp schemes and add subscriptions on clickAndrea Diamantini2012-03-131-2/+1
|
* Consider option && ~option as null rules when option is not implementedAndrea Diamantini2012-02-101-1/+1
| | | | BUG: 246801
* Unifies macro styleJohannes Troscher2011-11-271-2/+2
| | | | | REVIEW: 103242 REVIEWED-BY: adjam
* Get sure mainWindow() exists before trying applying settingsAndrea Diamantini2011-09-161-2/+2
| | | | BUG: 272107
* Improve adblockAndrea Diamantini2011-09-141-1/+18
| | | | | improve adblock docs check third-party option before (faster)
* Tools Action MenuAndrea Diamantini2011-08-041-0/+1
| | | | | | | | | | | - Removed showDeveloperTools action - Moved adblock GUI to adblock part - renamed toolsMenu and developerMenu to reflect their real/new roles - Added UserAgent action to the tools menu REVIEW:102170 REVIEWED-BY: fritz_van_tom
* Finally found time to update copyrights... ;)Andrea Diamantini2011-02-241-1/+1
|
* Add a special matcher for ad block filters for host nameBenjamin Poulain2010-08-191-0/+3
| | | | | | | | | | Quite a few rules of ad block are just matching domains. Those are of the form: ||trolltech.com^$options This patch add a new class to deal with this kind of filter, AdBlockHostMatcher. Matching a host address is much faster (O(1)) than going through the entire list of rules.
* Include Fixes, first bunchAndrea Diamantini2010-04-301-1/+3
|
* New rekonq_defines.hAndrea Diamantini2010-04-301-1/+3
| | | | Speed up compilation & linking on Win, Lin & Mac. Step 1
* A coding style roundAndrea Diamantini2010-04-301-36/+36
|
* Not so stupid, after all..Andrea Diamantini2010-03-301-1/+1
|
* abp (Ad Block Plus) fake protocol supportAndrea Diamantini2010-03-191-2/+3
| | | | | | | | | This will let rekonq to automatically add abp subscriptions from the adblockplus.org site (or wherever someone provides abp urls) Anyway, consider that the raccomended way to manage adblock (by me and by abp developers) is just adding the EasyList subscription. rekonq just does it by default!!
* Implemented automatic adblock update.Andrea Diamantini2010-03-131-1/+17
| | | | | | | | | | | | | | This (squashed) commit adds this new feature in rekonq, letting people to simply "forgot" adblock and let rekonq do everything for it I added: - a new (rekonq) adblock widget - an asyncronous method to update rules from the net every TOT days - a better AdBlockManager management. What it is actually missing is the adp protocol support to add new subscriptions to adblock. This will come the next week. For now this part seems stable and needs just testing :)
* tests support for every Qt derived rekonq classAndrea Diamantini2010-02-261-1/+2
|
* Fix copyright for 0.4 beta releaseAndrea Diamantini2010-02-101-1/+1
|
* Save memory!Andrea Diamantini2010-01-211-1/+1
| | | | | | With this commit, we save (at least) 3 bytes for each AdBlockRule defined (and probably more than 3!). In my installation I have about 100 rules... :)
* Cleaning again (the morning after) the adblock thing.. :)Andrea Diamantini2010-01-141-9/+9
| | | | | Removed the "options" part. Will be rewritten in rekonq 0.5 together with the UI..
* Better AdBlocking things :)Andrea Diamantini2010-01-141-15/+21
|
* AdBlock Plus rules fast summary :)Andrea Diamantini2010-01-131-1/+78
|
* trade-off: speed vs mem saving.Andrea Diamantini2009-12-021-2/+4
| | | | This time I decided for speed..
* We have adblock! (and it works)Andrea Diamantini2009-11-301-5/+1
| | | | | | | | | | | I had a lot of problems implementing it because I started working on assuming 2 things: 1) konqueror implementation works (it's not true, I found a bug! To guess what, try loading current rekonq vs current konqueror against kde-apps.org) 2) Arora's implementation can be easily ported to kcm technology. Another wrong assumption, based on MVP implementation. Sorry for spamming master branch, guys.
* Porting rekonq to last Qt/KDE APIAndrea Diamantini2009-11-301-2/+9
| | | | adblock (KDE one) fix #1
* removed current bugged adblock implementation.Andrea Diamantini2009-11-281-6/+0
| | | | Sorry about that :(
* Moving (back?) to konqueror adblock support.Andrea Diamantini2009-11-251-2/+7
| | | | | This will be useful (if someone is interested) in pushing our patches directly on khtml filter engine.
* First adblock implementation. now rekonq seems... slower :(Andrea Diamantini2009-11-231-1/+2
| | | | But at least it's ads free!
* Ok, same other bits on the adblock manager.Andrea Diamantini2009-11-211-1/+9
| | | | Now it's really time to go to bed :)
* AdBlock. First blocks :DAndrea Diamantini2009-11-201-0/+48