From 24363d6be965db3d93896e85d2d7dcbafcd42d4e Mon Sep 17 00:00:00 2001 From: megabigbug Date: Wed, 29 Jul 2009 11:50:08 +0200 Subject: Add WebShorcuts Settings in the configuration panel Remove Webshorcuts Settings item in menus Remove trailing spaces --- src/settings.cpp | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'src/settings.cpp') diff --git a/src/settings.cpp b/src/settings.cpp index 47339ce4..2610a351 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -51,6 +51,8 @@ #include #include #include +#include +#include // Qt Includes #include @@ -65,6 +67,7 @@ private: Ui::privacy privacyUi; Ui::proxy proxyUi; Ui::webkit webkitUi; + KCModuleProxy *ebrowsingModule; Private(SettingsDialog *parent); @@ -109,10 +112,16 @@ Private::Private(SettingsDialog *parent) kWarning() << webkitIconPath; KIcon webkitIcon = KIcon(QIcon(webkitIconPath)); pageItem->setIcon(webkitIcon); - + widget = new KShortcutsEditor(Application::instance()->mainWindow()->actionCollection(),parent); pageItem = parent->addPage(widget , i18n("Shortcuts")); pageItem->setIcon(KIcon("configure-shortcuts")); + + KCModuleInfo ebrowsingInfo("ebrowsing.desktop"); + ebrowsingModule = new KCModuleProxy(ebrowsingInfo,parent); + pageItem = parent->addPage(ebrowsingModule, i18n(ebrowsingInfo.moduleName().toLocal8Bit())); + pageItem->setIcon(KIcon(ebrowsingInfo.icon())); + } @@ -135,11 +144,13 @@ SettingsDialog::SettingsDialog(QWidget *parent) connect(d->privacyUi.exceptionsButton, SIGNAL(clicked()), this, SLOT(showExceptions())); connect(d->privacyUi.cookiesButton, SIGNAL(clicked()), this, SLOT(showCookies())); + connect(d->ebrowsingModule, SIGNAL(changed(bool)), this, SLOT(updateButtons())); + connect(this, SIGNAL(applyClicked()), this, SLOT(saveSettings())); + setWebSettingsToolTips(); } - SettingsDialog::~SettingsDialog() { delete d; @@ -189,8 +200,13 @@ void SettingsDialog::saveSettings() // Save ReKonfig::self()->writeConfig(); + d->ebrowsingModule->save(); } +bool SettingsDialog::hasChanged() +{ + return KConfigDialog::hasChanged() || d->ebrowsingModule->changed(); +} // ---------------------------------------------------------------------------------------------- -- cgit v1.2.1