diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-12-21 21:59:23 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-12-21 21:59:23 +0100 |
| commit | 925725bfcf0f3ffba5107949bc8424e1fd6d1902 (patch) | |
| tree | ee10e2c10e3ec63b0977661cfbc0ef69ad98002a /src/application.cpp | |
| parent | Adding a tab list menu entry showing all open tabs. (diff) | |
| download | rekonq-925725bfcf0f3ffba5107949bc8424e1fd6d1902.tar.xz | |
Icon at the right of the urlbar that allows to add an opensearch engine
introduce search icon
description file downloaded after validation, not before
icons updated when engine added
add opensearch xml description files
sync desktop file => fix add webshortcut
use db_opensearch.json file to track opensearch engines
create an opensearch description only when the engine support suggestions
remove opensearch description when an engine is deleted in the webshortcut setting dialog
popup: disable ok button when webshortcut is already used
Lionel Chauvin is the man having done this big, big, big work!!
I'm just merging ;)
Diffstat (limited to 'src/application.cpp')
| -rw-r--r-- | src/application.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/application.cpp b/src/application.cpp index 95aa9cf0..a7575b94 100644 --- a/src/application.cpp +++ b/src/application.cpp @@ -503,7 +503,7 @@ void Application::updateConfiguration() // Enabling WebKit "Page Cache" feature: http://webkit.org/blog/427/webkit-page-cache-i-the-basics/ defaultSettings->setMaximumPagesInCache(3); - + // ===== HTML 5 features WebKit support ====== defaultSettings->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled, ReKonfig::offlineStorageDatabaseEnabled()); defaultSettings->setAttribute(QWebSettings::OfflineWebApplicationCacheEnabled, ReKonfig::offlineWebApplicationCacheEnabled()); @@ -600,20 +600,20 @@ void Application::setPrivateBrowsingMode(bool b) bool isJustEnabled = settings->testAttribute(QWebSettings::PrivateBrowsingEnabled); if(isJustEnabled == b) return; // uhm... something goes wrong... - + if (b) { QString caption = i18n("Are you sure you want to turn on private browsing?"); QString text = i18n("<b>%1</b>" "<p>rekonq will save your current tabs for when you'll stop private browsing the net..</p>", caption); - + int button = KMessageBox::warningContinueCancel(mainWindow(), text, caption, KStandardGuiItem::cont(), KStandardGuiItem::cancel(), i18n("don't ask again") ); if (button != KMessageBox::Continue) return; - + settings->setAttribute(QWebSettings::PrivateBrowsingEnabled, true); _privateBrowsingAction->setChecked(true); - + Q_FOREACH(const QWeakPointer<MainWindow> &w, m_mainWindows) { w.data()->close(); @@ -629,7 +629,7 @@ void Application::setPrivateBrowsingMode(bool b) settings->setAttribute(QWebSettings::PrivateBrowsingEnabled, false); _privateBrowsingAction->setChecked(false); - + loadUrl( KUrl("about:blank"), Rekonq::NewWindow); if(!sessionManager()->restoreSession()) loadUrl( KUrl("about:home"), Rekonq::NewWindow); |