diff options
| author | Dario Freddi <drf@kde.org> | 2009-10-13 00:40:44 +0200 |
|---|---|---|
| committer | Dario Freddi <drf@kde.org> | 2009-10-13 00:40:44 +0200 |
| commit | 62e0a9d46eb4cbabe9fad31903a63d31df9e8432 (patch) | |
| tree | a8b11e766849562592f46017071335d9c82876d4 /src/settings.cpp | |
| parent | Merge commit 'refs/merge-requests/1757' of git://gitorious.org/rekonq/mainline (diff) | |
| download | rekonq-62e0a9d46eb4cbabe9fad31903a63d31df9e8432.tar.xz | |
Remove rekonq's custom proxy implementation to use KDE's proxy settings through KProtocolManager. This makes rekonq much more integrated withing KDE, as the user expects that changes in System Settings would take place everywhere. And it also leaves less code to maintain
Signed-off-by: Dario Freddi <drf@kde.org>
Diffstat (limited to 'src/settings.cpp')
| -rw-r--r-- | src/settings.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/settings.cpp b/src/settings.cpp index ec5094c2..7b320448 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -42,7 +42,6 @@ //Ui Includes #include "ui_settings_general.h" #include "ui_settings_fonts.h" -#include "ui_settings_proxy.h" #include "ui_settings_webkit.h" // KDE Includes @@ -63,7 +62,6 @@ class Private private: Ui::general generalUi; Ui::fonts fontsUi; - Ui::proxy proxyUi; Ui::webkit webkitUi; KCModuleProxy *ebrowsingModule; KCModuleProxy *cookiesModule; @@ -84,7 +82,7 @@ Private::Private(SettingsDialog *parent) widget->layout()->setMargin(0); pageItem = parent->addPage(widget , i18n("General")); pageItem->setIcon(KIcon("rekonq")); - + widget = new QWidget; fontsUi.setupUi(widget); widget->layout()->setMargin(0); @@ -97,12 +95,6 @@ Private::Private(SettingsDialog *parent) pageItem->setIcon(KIcon(cookiesInfo.icon())); widget = new QWidget; - proxyUi.setupUi(widget); - widget->layout()->setMargin(0); - pageItem = parent->addPage(widget , i18n("Proxy")); - pageItem->setIcon(KIcon("preferences-system-network")); - - widget = new QWidget; webkitUi.setupUi(widget); widget->layout()->setMargin(0); pageItem = parent->addPage(widget , i18n("WebKit")); @@ -185,11 +177,6 @@ void SettingsDialog::readConfig() // ======= Fonts d->fontsUi.kcfg_fixedFont->setOnlyFixed(true); - - // ======= Proxy - bool proxyEnabled = ReKonfig::isProxyEnabled(); - d->proxyUi.groupBox->setEnabled(proxyEnabled); - connect(d->proxyUi.kcfg_isProxyEnabled, SIGNAL(clicked(bool)), d->proxyUi.groupBox, SLOT(setEnabled(bool))); } |