summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Switch to faster comparisons of about: URL's with QByteArray, thanks to ↵Rohan Garg2010-08-241-6/+8
| | | | | | Harald Sitter modified: src/application.cpp
* Restore mr #174.Andrea Diamantini2010-08-231-0/+2
| | | | Lesson learned: no more hand merging nor reverting on conflicts.. :)
* new rekonq authors for 0.6Andrea Diamantini2010-08-231-2/+12
| | | | Jon, Benjamin: sorry for the late :)
* Merge commit 'refs/merge-requests/190' of ↵Andrea Diamantini2010-08-234-27/+17
|\ | | | | | | git://gitorious.org/rekonq/mainline into m190
| * Useless includeYoann Laissus2010-08-221-1/+0
| |
| * - Move the BK bar context menu slot and connection to BookmarkContextMenuYoann Laissus2010-08-224-26/+17
| | | | | | | | - The context menu now works without selected bookmark in the BK bar
* | Merge commit 'refs/merge-requests/189' of ↵Andrea Diamantini2010-08-234-41/+41
|\ \ | | | | | | | | | git://gitorious.org/rekonq/mainline into m189
| * | Use the selected text as the default search string of the FindBarBenjamin Poulain2010-08-224-7/+23
| | | | | | | | | | | | | | | | | | | | | The common behavior of the Find action is to start a search with the current selected text if any. This patch implement this behavior for Rekonq.
| * | Change the Find action to show() instead of toggle()Benjamin Poulain2010-08-223-10/+1
| | | | | | | | | | | | | | | | | | | | | The find actions generally show a find bar, and is not a toggle action. A general pattern of use is to press "/" or Ctrl+F to show the find bar with the currently selected text, and press escape to hide the bar.
| * | Make the FindBar a bit more robustBenjamin Poulain2010-08-223-25/+18
| |/ | | | | | | | | | | | | | | The FindBar was slots show() and hide() instead of the virtual method QWidget::setVisible(). This can lead to subtle bugs, because the behavior is different depending on the type of call (signal-slot connection VS direct call on a pointer to QWidget) and the function called (hide() is != than setVisible(false)).
* | Merge commit 'refs/merge-requests/188' of git://gitorious.org/rekonq/mainlineAndrea Diamantini2010-08-231-0/+2
|\ \
| * | Add a home icon for about:homeRohan Garg2010-08-221-0/+2
| |/ | | | | | | modified: src/application.cpp
* | Merge commit 'refs/merge-requests/187' of git://gitorious.org/rekonq/mainlineAndrea Diamantini2010-08-231-0/+2
|\ \
| * | Add a missing iconYoann Laissus2010-08-221-0/+2
| |/
* | Merge commit 'refs/merge-requests/186' of ↵Andrea Diamantini2010-08-237-12/+54
|\ \ | | | | | | | | | git://gitorious.org/rekonq/mainline into m186
| * | Add support for domain option in the ad block moduleBenjamin Poulain2010-08-227-12/+54
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some ads were not filtered because they were incorrectly matched by the whitelist. This is because we ignore options, including the domain restrictions. For example, the white filter: @@||pagead2.googlesyndication.com/pagead/show_ads.js$domain=kde.org would match any page regardless of the domain restriction. So no ads from pagead2.googlesyndication.com were filtered. This patch adds support for "domain" options in the fallback rules (the other AdBlockRuleImpl rejects options). The domain of the frame making the request is now compared to the option to take the right decision. This patch requires Qt 4.7 with a recent QtWebKit 2.0.
* | Merge commit 'refs/merge-requests/185' of ↵Andrea Diamantini2010-08-231-20/+38
|\ \ | | | | | | | | | git://gitorious.org/rekonq/mainline into m185
| * | Forget to commit some changesYoann Laissus2010-08-211-3/+4
| | |
| * | - Fix BK toolbar drops at the extremities of the barYoann Laissus2010-08-211-22/+39
| |/ | | | | | | - A little cleanup
* | Merge commit 'refs/merge-requests/184' of ↵Andrea Diamantini2010-08-232-3/+16
|\ \ | | | | | | | | | git://gitorious.org/rekonq/mainline into m184
| * | Don't add open folder in tabs if there are only foldersYoann Laissus2010-08-212-3/+16
| |/
* | fix Messages.sh after yesterday change in extract-messages.shAlbert Astals Cid2010-08-221-1/+1
|/
* Restore bk icon on the rightAndrea Diamantini2010-08-213-16/+16
| | | | | | | This commit intends to revert manually commits de9abc72 && bd27f60d, restoring bk positions on the right. This because most of the developers prefer so. Anyway, if things will change again we can revert the "revertion" :D
* Merge commit 'refs/merge-requests/183' of ↵Andrea Diamantini2010-08-212-43/+67
|\ | | | | | | | | | | | | git://gitorious.org/rekonq/mainline into m183 Conflicts: src/mainwindow.h
| * Useless includeYoann Laissus2010-08-201-1/+0
| |
| * Make a string translatableYoann Laissus2010-08-201-1/+2
| |
| * Fix the help menu and readd the bookmark bar toggle actionYoann Laissus2010-08-202-42/+66
| |
* | BookmarkProvider's code reorderedJon Ander Peñalba2010-08-203-88/+87
| |
* | Minor changes in BookmarkProvider. Searching for bookmarks should be a bit ↵Jon Ander Peñalba2010-08-202-34/+17
| | | | | | | | faster
* | Improved the code to load the bookmarks file using KStandardDirs and other ↵Jon Ander Peñalba2010-08-202-38/+26
| | | | | | | | minor changes to BookmarkProvider.
* | Removed unused includes in src/bookmarks/bookmarkprovider.hJon Ander Peñalba2010-08-208-44/+58
| |
* | Changed the name of the files src/bookmarks/bookmarksmanager.* to ↵Jon Ander Peñalba2010-08-2016-95/+95
| | | | | | | | src/bookmarks/bookmarkprovider.*
* | 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
| | |