summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-10-13 11:29:10 +0200
committerAndrea Diamantini <adjam7@gmail.com>2009-10-13 11:29:10 +0200
commitd0cef4573a07065ed9389ce231ffcdc77359124f (patch)
treec9769aa3b8167a674a909da310f4ca0060dd1248
parentMerge commit 'refs/merge-requests/1772' of git://gitorious.org/rekonq/mainlin... (diff)
downloadrekonq-d0cef4573a07065ed9389ce231ffcdc77359124f.tar.xz
Proxy configuration dialog
-rw-r--r--src/settings.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/settings.cpp b/src/settings.cpp
index 9b12ef3a..4a6c50b8 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -63,6 +63,7 @@ private:
Ui::general generalUi;
Ui::fonts fontsUi;
Ui::webkit webkitUi;
+ KCModuleProxy *proxyModule;
KCModuleProxy *ebrowsingModule;
KCModuleProxy *cookiesModule;
KShortcutsEditor *shortcutsEditor;
@@ -95,6 +96,11 @@ Private::Private(SettingsDialog *parent)
pageItem = parent->addPage(cookiesModule, i18n(cookiesInfo.moduleName().toLocal8Bit()));
pageItem->setIcon(KIcon(cookiesInfo.icon()));
+ KCModuleInfo proxyInfo("proxy.desktop");
+ proxyModule = new KCModuleProxy(proxyInfo,parent);
+ pageItem = parent->addPage(proxyModule, i18n(proxyInfo.moduleName().toLocal8Bit()));
+ pageItem->setIcon(KIcon(proxyInfo.icon()));
+
widget = new QWidget;
webkitUi.setupUi(widget);
widget->layout()->setMargin(0);
@@ -136,6 +142,7 @@ SettingsDialog::SettingsDialog(QWidget *parent)
connect(d->ebrowsingModule, SIGNAL(changed(bool)), this, SLOT(updateButtons()));
connect(d->cookiesModule, SIGNAL(changed(bool)), this, SLOT(updateButtons()));
+ connect(d->proxyModule, SIGNAL(changed(bool)), this, SLOT(updateButtons()));
connect(d->shortcutsEditor, SIGNAL(keyChange()), this, SLOT(updateButtons()));
connect(this, SIGNAL(applyClicked()), this, SLOT(saveSettings()));
@@ -190,6 +197,7 @@ void SettingsDialog::saveSettings()
ReKonfig::self()->writeConfig();
d->ebrowsingModule->save();
d->cookiesModule->save();
+ d->proxyModule->save();
d->shortcutsEditor->save();
}
@@ -199,6 +207,7 @@ bool SettingsDialog::hasChanged()
return KConfigDialog::hasChanged()
|| d->ebrowsingModule->changed()
|| d->cookiesModule->changed()
+ || d->proxyModule->changed()
;
}