summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'opensearch2'Andrea Diamantini2010-08-200-0/+0
|\
| * Merge commit 'refs/merge-requests/169' of ↵Andrea Diamantini2010-08-204-8/+43
| |\ | | | | | | | | | git://gitorious.org/rekonq/mainline into opensearch2
* | | rekonq 0.5.60Andrea Diamantini2010-08-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | improve bk toolbar opensearch suggestions bk panel cleanup Last before beta
* | | Merge branch 'opensearch'Andrea Diamantini2010-08-2020-109/+1435
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/CMakeLists.txt src/urlbar/urlresolver.cpp
| * | | Change from QByteArray to QString in the right wayAndrea Diamantini2010-08-201-1/+1
| | | |
| * | | Merge commit 'refs/merge-requests/169' of ↵Andrea Diamantini2010-08-204-8/+43
| |\ \ \ | | |/ / | |/| / | | |/ git://gitorious.org/rekonq/mainline into opensearch
| | * fix suggestion item: use the correct search enginemegabigbug2010-08-194-8/+43
| | |
| * | OpenSearch reviewAndrea Diamantini2010-08-1614-284/+520
| | | | | | | | | | | | | | | | | | - file headers fix - clean up code - import engine files
| * | Merge commit 'refs/merge-requests/169' of ↵Andrea Diamantini2010-08-1620-104/+1159
| |\ \ | | |/ | | | | | | git://gitorious.org/rekonq/mainline into opensearch
| | * working opensearch suggestionsmegabigbug2010-08-154-114/+176
| | |
| | * wait signalmegabigbug2010-08-154-0/+25
| | |
| | * introduce a new SuggestionListItemlionelc2010-08-1218-10/+978
| | | | | | | | | | | | introduce an opensearch engine
* | | bk toolbar by default for the next rekonq.Andrea Diamantini2010-08-201-1/+0
| | | | | | | | | | | | It is really awesome :)
* | | Merge commit 'refs/merge-requests/181' of ↵Andrea Diamantini2010-08-2012-255/+271
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | git://gitorious.org/rekonq/mainline into m181 Conflicts: src/bookmarks/bookmarkstoolbar.h
| * | | - The bookmark toolbar is now a real toolbar, not an action.Yoann Laissus2010-08-2012-262/+270
| | | | | | | | | | | | | | | | | | | | | | | | It fixes the problem of the submenu if there are too much items to fit on the bar - Improve a bit the new redesign of BookmarkOwner - Reenable the bookmark menu by default (because the icon in the bar is on the left)
* | | | Krazy fixes, first bunchAndrea Diamantini2010-08-208-25/+30
| | | |
* | | | Add a "show main toolbar" action in the empty tabbar contextual menuAndrea Diamantini2010-08-201-0/+6
| | | | | | | | | | | | | | | | to prevent rekonq being WITHOUT any bar...
* | | | cppcheck: reduce variable scopeAndrea Diamantini2010-08-201-2/+1
|/ / /
* | | Fixed tooltip in the bookmarks panelJon Ander Peñalba2010-08-201-2/+2
| | |
* | | Bookmarks panel code reorderedJon Ander Peñalba2010-08-203-131/+132
| | |
* | | Bookmarks panel code clean-upJon Ander Peñalba2010-08-194-134/+91
| | |
* | | rekonq 0.5.57Andrea Diamantini2010-08-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Probaly last before beta release We NOW DEPENDS on Qt 4.7 / KDE SC 4.5 (also if Qt 4.7 has not been officially released yet!) - fixed kget integration - History Review (The 3rd one..) - dramatically improved adblock performance - Bookmarks Management clean-up && review - Search Engine review - new features for the bookmarks toolbar - tons of fixes
* | | Merge branch 'HistoryReview3'Andrea Diamantini2010-08-196-493/+105
|\ \ \
| * | | Stupid me, QtWebKit calls addHistoryEntry itself when you let it load a page..Andrea Diamantini2010-08-191-6/+0
| | | |
| * | | HistoryManager review (the second):Andrea Diamantini2010-08-195-487/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - impressive cleanup of the code - removed unneeded classes - one List to manage the items in the historyManager, one easier Hash in the HistoryFilterModel to speed up searches - better HistoryItem updates
* | | | Merge branch 'master' of gitorious.org:rekonq/mainlineAndrea Diamantini2010-08-190-0/+0
|\ \ \ \ | |/ / /
| * | | Simpler than I thought, fix kget integrationAndrea Diamantini2010-08-194-5/+5
| | | |
* | | | Simpler than I thought, fix kget integrationAndrea Diamantini2010-08-194-5/+5
|/ / /
* | | Merge commit 'refs/merge-requests/179' of ↵Andrea Diamantini2010-08-1911-13/+159
|\ \ \ | | | | | | | | | | | | git://gitorious.org/rekonq/mainline into m179
| * | | Skip the hiding rules specific to domainsBenjamin Poulain2010-08-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The rules to hide elements for a specific domains were interpreted as regular RegExp rules, which grows the list of filter to test. Those rules are not working with the current implementation, we should just skip them for efficiency.
| * | | Add a special matcher for ad block filters for host nameBenjamin Poulain2010-08-195-1/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Improve the performance of AdBlockRuleTextMatchImplBenjamin Poulain2010-08-197-12/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comparing unicode string without case sensitive is rather expensive because each codepoint must be converted, which is non trivial for unicode. This patch introduce a new argument of ::match() taking the encoded url in lowercase. This way, the conversion can be done only once for a lot of rules.
* | | | BookmarkOwner class clean-upJon Ander Peñalba2010-08-192-154/+128
| | | |
* | | | BookmarkOwner class moved to it's own fileJon Ander Peñalba2010-08-1910-546/+612
| | | |
* | | | The bookmark actions in BookmarkOwner are now working and being usedJon Ander Peñalba2010-08-197-265/+174
| | | |
* | | | Create and store all bookmark actions in BookmarkOwnerJon Ander Peñalba2010-08-192-0/+71
| | | |
* | | | Minor improvements in the insertion and deletion of bookmarks codeJon Ander Peñalba2010-08-191-13/+14
| | | |
* | | | All insertion and deletion of bookmarks code moved to the same place ↵Jon Ander Peñalba2010-08-194-86/+132
| | | | | | | | | | | | | | | | (BookmarkOwner)
* | | | Merge branch 'master' of gitorious.org:rekonq/mainlineAndrea Diamantini2010-08-191-0/+1
|\ \ \ \
| * | | | SVN_SILENT made messages (.desktop file)Script Kiddy2010-08-191-0/+1
| |/ / /
* | | | Merge commit 'refs/merge-requests/173' of ↵Andrea Diamantini2010-08-188-296/+582
|\ \ \ \ | |/ / / |/| | | | | | | git://gitorious.org/rekonq/mainline into m173
| * | | Fix a strange behaviour if a dragged item is dropped on itselfYoann Laissus2010-08-171-1/+2
| | | |
| * | | - Drag and drop in the bookmark toolbar between root items only (for the ↵Yoann Laissus2010-08-178-296/+581
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | moment) - Drag accepted from the panel - Move two classes to a separate file Partially fixed : CCBUG: 226479
* | | | Merge commit 'refs/merge-requests/178' of ↵Andrea Diamantini2010-08-189-100/+323
|\ \ \ \ | | | | | | | | | | | | | | | git://gitorious.org/rekonq/mainline into m178
| * | | | Add a primitive text machter as an AdBlockRule implementationsBenjamin Poulain2010-08-184-1/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | About 30% of the filter of easylist are just simple text matching. This new AdBlockRule implementation detects the simple occurences of this to match the url directly. On Qt 4.7, this reduce the time spend in AdBlock by around 20%.
| * | | | Split AdBlock rule in two classes to move the implementation out of itBenjamin Poulain2010-08-186-84/+203
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to make special matching rules, we need specialization of the implementation depending on the type of rule. The previous AdBlockRule was entierly based on regexp. The new one is only a factory to a AdBlockRuleImpl, and delegate everything to this implementation. This will allow faster specialization of the ad block rules in the future.
| * | | | Remove the method pattern() from AdBlockRuleBenjamin Poulain2010-08-183-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | The method pattern imply the rule is implemented with a regexp, which is what we should try to avoid in the future for performance reasons.
| * | | | Cleaning of the constructor of AdBlockRuleBenjamin Poulain2010-08-181-21/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basic cleaning and bug fixing of AdBlockRule. The options shoud be parsed before checking if the filter is a regexp, otherwhise a regexp with option will never match the rule. For example: -"/.*/$xmlhttprequest" is a valid regexp that would not be matched. -"/.*$xmlhttprequest/" is a valid regexp without options and the option should not have been parsed. The matching of the option should match the last index of "$", not the first, for the same reason as above. Use mid() to split the vector at once instead QString::mid() + QString::lef(). Clean the coding style to follow the conventions of KDE.
* | | | | disableKGet --> checkKGetPresenceAndrea Diamantini2010-08-182-11/+17
| | | | | | | | | | | | | | | | | | | | let rekonq also reenable it :)
* | | | | Merge commit 'refs/merge-requests/176' of ↵Andrea Diamantini2010-08-182-0/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | git://gitorious.org/rekonq/mainline into m176