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/settings | |
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/settings')
-rw-r--r-- | src/settings/generalwidget.cpp | 4 | ||||
-rw-r--r-- | src/settings/settingsdialog.cpp | 16 |
2 files changed, 11 insertions, 9 deletions
diff --git a/src/settings/generalwidget.cpp b/src/settings/generalwidget.cpp index 642813ae..0128830c 100644 --- a/src/settings/generalwidget.cpp +++ b/src/settings/generalwidget.cpp @@ -48,9 +48,9 @@ GeneralWidget::GeneralWidget(QWidget *parent) connect(setHomeToCurrentPageButton, SIGNAL(clicked()), this, SLOT(setHomeToCurrentPage())); disableHomeSettings(ReKonfig::useNewTabPage()); - + connect(kcfg_useNewTabPage, SIGNAL(toggled(bool)), this, SLOT(disableHomeSettings(bool))); - + checkKGetPresence(); } diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp index a3b4f976..4a8776ad 100644 --- a/src/settings/settingsdialog.cpp +++ b/src/settings/settingsdialog.cpp @@ -37,6 +37,7 @@ #include "mainwindow.h" #include "webtab.h" #include "searchengine.h" +#include "opensearchmanager.h" // Widget Includes #include "adblockwidget.h" @@ -70,7 +71,7 @@ private: WebKitWidget *webkitWidg; NetworkWidget *networkWidg; AdBlockWidget *adBlockWidg; - + KCModuleProxy *ebrowsingModule; KShortcutsEditor *shortcutsEditor; @@ -94,13 +95,13 @@ Private::Private(SettingsDialog *parent) tabsWidg->layout()->setMargin(0); pageItem = parent->addPage(tabsWidg, i18n("Tabs")); pageItem->setIcon(KIcon("tab-duplicate")); - + // -- 3 appearanceWidg = new AppearanceWidget(parent); appearanceWidg->layout()->setMargin(0); pageItem = parent->addPage(appearanceWidg, i18n("Appearance")); pageItem->setIcon(KIcon("preferences-desktop-font")); - + // -- 4 webkitWidg = new WebKitWidget(parent); webkitWidg->layout()->setMargin(0); @@ -108,7 +109,7 @@ Private::Private(SettingsDialog *parent) QString webkitIconPath = KStandardDirs::locate("appdata", "pics/webkit-icon.png"); KIcon webkitIcon = KIcon(QIcon(webkitIconPath)); pageItem->setIcon(webkitIcon); - + // -- 5 networkWidg = new NetworkWidget(parent); networkWidg->layout()->setMargin(0); @@ -151,7 +152,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) setModal(true); readConfig(); - + // update buttons connect(d->generalWidg, SIGNAL(changed(bool)), this, SLOT(updateButtons())); connect(d->tabsWidg, SIGNAL(changed(bool)), this, SLOT(updateButtons())); @@ -187,7 +188,7 @@ void SettingsDialog::saveSettings() return; ReKonfig::self()->writeConfig(); - + d->generalWidg->save(); d->tabsWidg->save(); d->appearanceWidg->save(); @@ -196,8 +197,9 @@ void SettingsDialog::saveSettings() d->adBlockWidg->save(); d->shortcutsEditor->save(); d->ebrowsingModule->save(); - + SearchEngine::reload(); + Application::opensearchManager()->removeDeletedEngines(); updateButtons(); emit settingsChanged("ReKonfig"); |