summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | Remove return, formatting++Rohan Garg2010-08-171-4/+0
| | | | | | | | | | | | | | | | modified: src/settings/generalwidget.cpp
| * | | Define GeneralWidget::disableKGet() to disable KGetRohan Garg2010-08-172-0/+21
| | |/ | |/| | | | | | | | | | | | | | | | when KGet is not installed modified: src/settings/generalwidget.cpp Declare GeneralWidget::disableKGet() modified: src/settings/generalwidget.h
* | | Merge commit 'refs/merge-requests/175' of ↵Andrea Diamantini2010-08-183-72/+52
|\ \ \ | | | | | | | | | | | | git://gitorious.org/rekonq/mainline into m175
| * | | search engine reviewlionelc2010-08-173-72/+52
| |/ /
* | | Merge commit 'refs/merge-requests/2290' of ↵Andrea Diamantini2010-08-181-6/+6
|\ \ \ | | | | | | | | | | | | git://gitorious.org/rekonq/mainline into m2290
| * | | Remove a spaceYoann Laissus2010-08-171-1/+1
| | | |
| * | | - Fix an issue with some websites which need to handle wheel events (eg: ↵Yoann Laissus2010-08-171-6/+6
| |/ / | | | | | | | | | | | | | | | google maps) - Smooth scrolling now works on editable contents without sliders
* | | Merge commit 'refs/merge-requests/174' of ↵Andrea Diamantini2010-08-182-16/+3
|\ \ \ | | | | | | | | | | | | git://gitorious.org/rekonq/mainline into m174
| * | | - Adapt removeBookmark to Jon's new methodYoann Laissus2010-08-172-16/+3
| |/ / | | | | | | | | | - Add tooltips for the bookmark icon
* | | Fix tools & bookmarks shortcuts behaviorAndrea Diamantini2010-08-182-13/+30
|/ / | | | | | | Patch (and implementation) by Glad Deschrijver. Thanks!
* | Merge commit 'refs/merge-requests/172' of ↵Andrea Diamantini2010-08-174-56/+65
|\ \ | | | | | | | | | git://gitorious.org/rekonq/mainline into m172
| * | Message displayed when deleting a bookmark improvedJon Ander Peñalba2010-08-161-6/+20
| | |
| * | Unify the deletion of bookmarks in one placeJon Ander Peñalba2010-08-164-56/+51
| | |
* | | Made the bookmark search case insensitive and added some comments to the ↵Jon Ander Peñalba2010-08-162-9/+14
|/ / | | | | | | BookmarksProxy class.
* | Bug when closing the 'New Folder' dialog fixed.Jon Ander Peñalba2010-08-151-2/+5
| |
* | SVN_SILENT made messages (.desktop file)Script Kiddy2010-08-151-0/+5
| |
* | Follow pano & yoann suggestions about bookmark savingAndrea Diamantini2010-08-141-6/+7
| |
* | Moving bookmark icon on the leftAndrea Diamantini2010-08-143-18/+17
| |
* | Manually importing Yoann merge 2260Andrea Diamantini2010-08-147-0/+329
| | | | | | | | PLease, check if I did something wrong..
* | Fixed focus regression.Andrea Diamantini2010-08-144-22/+14
| | | | | | | | | | | | As show slot calls setVisible(true) in QWidget code, we cannot override show() AND setVisible(bool). The best thing is IMHO inheriting show() && hide() slots
* | Merge commit 'refs/merge-requests/168' of ↵Andrea Diamantini2010-08-131-6/+6
|\ \ | | | | | | | | | git://gitorious.org/rekonq/mainline into m168
| * | Fix the BK panel's drag and dropYoann Laissus2010-08-121-6/+6
| | |
* | | Fix the double fill of the bookmark bar at startupYoann Laissus2010-08-121-2/+4
|/ /
* | Merge commit 'refs/merge-requests/165' of git://gitorious.org/rekonq/mainlineAndrea Diamantini2010-08-121-2/+2
|\ \
| * | Fix smooth scrolling for some sites (eg: gmail)Yoann Laissus2010-08-111-2/+2
| | |
* | | Merge commit 'refs/merge-requests/164' of ↵Andrea Diamantini2010-08-121-2/+16
|\ \ \ | | | | | | | | | | | | git://gitorious.org/rekonq/mainline into m164
| * | | loading color: (highlight + 2*background)/3lionelc2010-08-111-4/+14
| | | |
| * | | loading animation color: fallback to the Highlight color if ToolTipBase ↵lionelc2010-08-111-1/+5
| | | | | | | | | | | | | | | | color is quiet the same as Text color
| * | | change gradiant of the loading animation: fix aliasinglionelc2010-08-111-1/+1
| | | |
* | | | Merge commit 'refs/merge-requests/163' of git://gitorious.org/rekonq/mainlineAndrea Diamantini2010-08-121-0/+1
|\ \ \ \
| * | | | Set the hide timer of FindBar to single shotBenjamin Poulain2010-08-111-0/+1
| | |_|/ | |/| | | | | | | | | | We don't need a timeout every minute after the bar has been hidden.
* | | | Merge commit 'refs/merge-requests/162' of ↵Andrea Diamantini2010-08-122-64/+69
|\ \ \ \ | | | | | | | | | | | | | | | git://gitorious.org/rekonq/mainline into m162
| * | | | Refactor createNavItem to use it everywhere .link items are usedBenjamin Poulain2010-08-112-31/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change createNavItem() to a more generic createLinkItem() capable of generating icon of any type. Use the new createLinkItem() in every position where .link items are created. Fix the flags used for icons. The flags were specified with a boolean or operator: KIconLoader::SizeSmall || KIconLoader::Small -> one | All the icon flags have been changed to KIconLoader::Toolbar in order to keep the same behavior as before (Toolbar value equals 1).
| * | | | Refactor NewTabPage::browsingMenu() to clean the creation of itemBenjamin Poulain2010-08-112-53/+24
| | | | | | | | | | | | | | | | | | | | | | | | | Almost identical code was copied 5 times. It has been replaced by a private function.
| * | | | Fix the file scheme of NewTabPage::browsingMenu()Benjamin Poulain2010-08-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The path added to the scheme is already supposed to be an absolute path, so starting with a '/'. By putting three slashes for the scheme, the final path has four /, which is not a valid url (legacy url).
| * | | | Modify NewTabPage::browsingMenu() to use explicit text encoding.Benjamin Poulain2010-08-111-30/+55
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use explicit text encoding in NewTabPage::browsingMenu() with QLatin1String(). Using explicit text encoding has a some advantages: -it is safe if the default codec is changed -the application compile even with QT_NO_CAST_FROM_ASCII Reviewed-by: Andreas Kling
* | | | SVN_SILENT made messages (.desktop file)Script Kiddy2010-08-121-0/+1
|/ / /
* | | remove superfluous spacePanagiotis Papadopoulos2010-08-111-1/+1
| | |
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-14 22:04:13 +0000