summaryrefslogtreecommitdiff
path: root/src/settings.cpp
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-10-13 11:17:24 +0200
committerAndrea Diamantini <adjam7@gmail.com>2009-10-13 11:17:24 +0200
commit363147061d4aa8146008d4363ee8f583cf3e88dc (patch)
treebe75932223aa81b7aced8bb4b082b2e689d06d5f /src/settings.cpp
parentcosmetic... (diff)
parentSmall fixes (const issue, single char issue, file not ending with a new line)... (diff)
downloadrekonq-363147061d4aa8146008d4363ee8f583cf3e88dc.tar.xz
Merge commit 'refs/merge-requests/1772' of git://gitorious.org/rekonq/mainline into proxy
Diffstat (limited to 'src/settings.cpp')
-rw-r--r--src/settings.cpp15
1 files changed, 1 insertions, 14 deletions
diff --git a/src/settings.cpp b/src/settings.cpp
index 9711d250..9b12ef3a 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;
@@ -85,7 +83,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);
@@ -98,12 +96,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"));
@@ -187,11 +179,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)));
}