From baa03e5adc8a9022b64b77a6450491738724ab6d Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 25 Mar 2012 10:45:05 +0200 Subject: Privacy tab settings Clean up (again) rekonq settings, adding "advanced" and "privacy" sections and removing the "network" one, merged here and there with the other ones --- src/CMakeLists.txt | 5 +- src/rekonq.kcfg | 100 +++++-- src/settings/advancedwidget.cpp | 64 ++++ src/settings/advancedwidget.h | 59 ++++ src/settings/generalwidget.cpp | 8 - src/settings/privacywidget.cpp | 114 +++++++ src/settings/privacywidget.h | 63 ++++ src/settings/settings_advanced.ui | 153 ++++++++++ src/settings/settings_appearance.ui | 582 +++++++++++++++--------------------- src/settings/settings_general.ui | 41 +-- src/settings/settings_privacy.ui | 260 ++++++++++++++++ src/settings/settings_webkit.ui | 93 +++--- src/settings/settingsdialog.cpp | 36 ++- src/settings/webkitwidget.cpp | 15 - src/settings/webkitwidget.h | 1 - 15 files changed, 1084 insertions(+), 510 deletions(-) create mode 100644 src/settings/advancedwidget.cpp create mode 100644 src/settings/advancedwidget.h create mode 100644 src/settings/privacywidget.cpp create mode 100644 src/settings/privacywidget.h create mode 100644 src/settings/settings_advanced.ui create mode 100644 src/settings/settings_privacy.ui diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index da9b48c5..14547b2b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -49,10 +49,11 @@ SET( rekonq_KDEINIT_SRCS #---------------------------------------- settings/settingsdialog.cpp settings/appearancewidget.cpp + settings/advancedwidget.cpp settings/generalwidget.cpp + settings/privacywidget.cpp settings/tabswidget.cpp settings/webkitwidget.cpp - settings/networkwidget.cpp #---------------------------------------- bookmarks/bookmarkmanager.cpp bookmarks/bookmarkspanel.cpp @@ -113,6 +114,8 @@ KDE4_ADD_UI_FILES( rekonq_KDEINIT_SRCS settings/settings_tabs.ui settings/settings_appearance.ui settings/settings_webkit.ui + settings/settings_advanced.ui + settings/settings_privacy.ui # ---------------------------------------- adblock/settings_adblock.ui adblock/blocked_elements.ui diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg index 1675c558..89d3b742 100644 --- a/src/rekonq.kcfg +++ b/src/rekonq.kcfg @@ -76,15 +76,6 @@ false - - false - - - false - - - false - @@ -129,25 +120,8 @@ - - - - - - - true - - - false - - - 2 - - - - - + KGlobalSettings::generalFont().family() @@ -175,11 +149,20 @@ ISO 8859-1 + + + + + false + + + false + 1 @@ -210,12 +193,6 @@ true - - false - - - false - 0 @@ -252,6 +229,63 @@ + + + + 0 + + + true + + + + + + + + false + + + false + + + false + + + true + + + false + + + 2 + + + + + + + + false + + + false + + + EasyList + + + https://easylist-downloads.adblockplus.org/easylist.txt + + + QDateTime(QDate(2009,03,13)) + + + 7 + + + + diff --git a/src/settings/advancedwidget.cpp b/src/settings/advancedwidget.cpp new file mode 100644 index 00000000..a9ecebfe --- /dev/null +++ b/src/settings/advancedwidget.cpp @@ -0,0 +1,64 @@ +/* ============================================================ +* +* This file is a part of the rekonq project +* +* Copyright (C) 2012 by Andrea Diamantini +* +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of +* the License or (at your option) version 3 or any later version +* accepted by the membership of KDE e.V. (or its successor approved +* by the membership of KDE e.V.), which shall act as a proxy +* defined in Section 14 of version 3 of the license. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* ============================================================ */ + + +// Local Includes +#include "advancedwidget.h" +#include "advancedwidget.moc" + +// KDE Includes +#include + + +AdvancedWidget::AdvancedWidget(QWidget *parent) + : QWidget(parent) + , _changed(false) +{ + setupUi(this); + + connect(proxyButton, SIGNAL(clicked()), this, SLOT(launchProxySettings())); +} + + +void AdvancedWidget::save() +{ +} + + +bool AdvancedWidget::changed() +{ + return _changed; +} + + +void AdvancedWidget::hasChanged() +{ +} + + +void AdvancedWidget::launchProxySettings() +{ + kDebug() << "PROXY"; +} diff --git a/src/settings/advancedwidget.h b/src/settings/advancedwidget.h new file mode 100644 index 00000000..88fcf2af --- /dev/null +++ b/src/settings/advancedwidget.h @@ -0,0 +1,59 @@ +/* ============================================================ +* +* This file is a part of the rekonq project +* +* Copyright (C) 2012 by Andrea Diamantini +* +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of +* the License or (at your option) version 3 or any later version +* accepted by the membership of KDE e.V. (or its successor approved +* by the membership of KDE e.V.), which shall act as a proxy +* defined in Section 14 of version 3 of the license. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* ============================================================ */ + + +#ifndef ADVANCED_WIDGET_H +#define ADVANCED_WIDGET_H + + +// Ui Includes +#include "ui_settings_advanced.h" + +// Qt Includes +#include + + +class AdvancedWidget : public QWidget, private Ui::advanced +{ + Q_OBJECT + +public: + AdvancedWidget(QWidget *parent = 0); + + void save(); + bool changed(); + +Q_SIGNALS: + void changed(bool); + +private Q_SLOTS: + void hasChanged(); + void launchProxySettings(); + +private: + bool _changed; +}; + +#endif // ADVANCED_WIDGET_H diff --git a/src/settings/generalwidget.cpp b/src/settings/generalwidget.cpp index 226c11c9..9e19f801 100644 --- a/src/settings/generalwidget.cpp +++ b/src/settings/generalwidget.cpp @@ -55,10 +55,6 @@ GeneralWidget::GeneralWidget(QWidget *parent) checkKGetPresence(); - KConfigGroup cg = KConfigGroup(KSharedConfig::openConfig("kioslaverc", KConfig::NoGlobals), QString()); - doNotTrackCheckBox->setChecked(cg.readEntry("DoNotTrack", false)); - - connect(doNotTrackCheckBox, SIGNAL(clicked()), this, SLOT(hasChanged())); connect(kcfg_homePage, SIGNAL(editingFinished()), this, SLOT(fixHomePageURL())); kcfg_downloadPath->setMode(KFile::Directory); @@ -76,10 +72,6 @@ void GeneralWidget::save() { ReKonfig::setAskDownloadPath(askDownloadYes->isChecked()); - KConfigGroup cg = KConfigGroup(KSharedConfig::openConfig("kioslaverc", KConfig::NoGlobals), QString()); - cg.writeEntry("DoNotTrack", doNotTrackCheckBox->isChecked()); - cg.sync(); - _changed = false; } diff --git a/src/settings/privacywidget.cpp b/src/settings/privacywidget.cpp new file mode 100644 index 00000000..789c29b1 --- /dev/null +++ b/src/settings/privacywidget.cpp @@ -0,0 +1,114 @@ +/* ============================================================ +* +* This file is a part of the rekonq project +* +* Copyright (C) 2012 by Andrea Diamantini +* +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of +* the License or (at your option) version 3 or any later version +* accepted by the membership of KDE e.V. (or its successor approved +* by the membership of KDE e.V.), which shall act as a proxy +* defined in Section 14 of version 3 of the license. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* ============================================================ */ + + +// Local Includes +#include "privacywidget.h" +#include "privacywidget.moc" + +// Auto Includes +#include "rekonq.h" + +// KDE Includes +#include + + +PrivacyWidget::PrivacyWidget(QWidget *parent) + : QWidget(parent) + , _changed(false) +{ + setupUi(this); + + // JAVASCRIPT + updateJavascriptSettings(ReKonfig::javascriptEnabled()); + + // DO NOT TRACK + KConfigGroup cg = KConfigGroup(KSharedConfig::openConfig("kioslaverc", KConfig::NoGlobals), QString()); + doNotTrackCheckBox->setChecked(cg.readEntry("DoNotTrack", false)); + connect(doNotTrackCheckBox, SIGNAL(clicked()), this, SLOT(hasChanged())); + + // CACHE & COOKIES + connect(cacheButton, SIGNAL(clicked()), this, SLOT(launchCacheSettings())); + connect(cookiesButton, SIGNAL(clicked()), this, SLOT(launchCookieSettings())); + + // PASSWORDS + connect(managePassExceptionsButton, SIGNAL(clicked()), this, SLOT(showPassExceptions())); +} + + +void PrivacyWidget::save() +{ + KConfigGroup cg = KConfigGroup(KSharedConfig::openConfig("kioslaverc", KConfig::NoGlobals), QString()); + cg.writeEntry("DoNotTrack", doNotTrackCheckBox->isChecked()); + cg.sync(); +} + + +bool PrivacyWidget::changed() +{ + return _changed; +} + + +void PrivacyWidget::hasChanged() +{ +} + + +void PrivacyWidget::updateJavascriptSettings(bool b) +{ + kcfg_javascriptCanAccessClipboard->setEnabled(b); + kcfg_javascriptCanOpenWindows->setEnabled(b); + + if (b) + { + kcfg_javascriptCanOpenWindows->setToolTip(i18n("If enabled, JavaScript programs are allowed to open new windows.")); + kcfg_javascriptCanAccessClipboard->setToolTip(i18n("If enabled, JavaScript programs are allowed to read from and to write to the clipboard.")); + } + else + { + QString str = i18n("Javascript is NOT enabled, cannot change this settings"); + kcfg_javascriptCanOpenWindows->setToolTip(str); + kcfg_javascriptCanAccessClipboard->setToolTip(str); + } +} + + +void PrivacyWidget::launchCacheSettings() +{ + kDebug() << "CACHE"; +} + + +void PrivacyWidget::launchCookieSettings() +{ + kDebug() << "COOKIES"; +} + + +void PrivacyWidget::showPassExceptions() +{ + kDebug() << "PASS EXCEPTIONS"; +} diff --git a/src/settings/privacywidget.h b/src/settings/privacywidget.h new file mode 100644 index 00000000..6d14e57f --- /dev/null +++ b/src/settings/privacywidget.h @@ -0,0 +1,63 @@ +/* ============================================================ +* +* This file is a part of the rekonq project +* +* Copyright (C) 2012 by Andrea Diamantini +* +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of +* the License or (at your option) version 3 or any later version +* accepted by the membership of KDE e.V. (or its successor approved +* by the membership of KDE e.V.), which shall act as a proxy +* defined in Section 14 of version 3 of the license. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* ============================================================ */ + + +#ifndef PRIVACY_WIDGET_H +#define PRIVACY_WIDGET_H + + +// Ui Includes +#include "ui_settings_privacy.h" + +// Qt Includes +#include + + +class PrivacyWidget : public QWidget, private Ui::privacy +{ + Q_OBJECT + +public: + PrivacyWidget(QWidget *parent = 0); + + void save(); + bool changed(); + +Q_SIGNALS: + void changed(bool); + +private Q_SLOTS: + void hasChanged(); + void updateJavascriptSettings(bool); + + void launchCacheSettings(); + void launchCookieSettings(); + void showPassExceptions(); + +private: + bool _changed; +}; + +#endif // PRIVACY_WIDGET_H diff --git a/src/settings/settings_advanced.ui b/src/settings/settings_advanced.ui new file mode 100644 index 00000000..8680afb3 --- /dev/null +++ b/src/settings/settings_advanced.ui @@ -0,0 +1,153 @@ + + + advanced + + + + 0 + 0 + 480 + 440 + + + + + + + Proxy + + + + + + Rekonq is using your system's proxy settings + + + + + + + Qt::Horizontal + + + + 60 + 20 + + + + + + + + Change them! + + + + + + + + + + + + + misc + + + + + + Use horizontal scroll wheel to go through web history + + + + + + + Use favicon of the current website as window icon + + + + + + + Scroll pages with an eye candy effect + + + Enable smooth scrolling + + + true + + + + + + + Enable Vi-like navigation shortcuts + + + + + + + Enable keyboard navigation using the Ctrl key + + + + + + + + + Middle click should: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + Auto-scroll + + + + + Load Clipboard URL + + + + + Do Nothing + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 155 + + + + + + + + + diff --git a/src/settings/settings_appearance.ui b/src/settings/settings_appearance.ui index 651807b7..b0232089 100644 --- a/src/settings/settings_appearance.ui +++ b/src/settings/settings_appearance.ui @@ -6,359 +6,255 @@ 0 0 - 494 - 472 + 570 + 562 Appearance - + - - - 0 + + + Fonts - - - Fonts - - - - - - Fonts - - - - - - - - - 0 - 0 - - - - - 150 - 0 - - - - Standard font: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - 150 - 0 - - - - Fixed font: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Serif font: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - Sans Serif font: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - - - - - - Cursive font: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - Fantasy font: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - - - - - Size - - - - - - - 0 - 0 - - - - - 150 - 0 - - - - Default font size: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - 0 - 0 - - - - - 150 - 0 - - - - Minimal font size: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - - - Character Encoding - - - - - - Default character encoding: - - - - - - - - - - - - - Qt::Vertical - - - - 20 - 84 - - - - - - - - - Stylesheets - - - - - - Custom Style Sheet - - - - QFormLayout::ExpandingFieldsGrow + + + + + + + + 0 + 0 + - - - - - 150 - 0 - - - - Path to custom CSS file: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - *.css - - - - - - - - - - Qt::Vertical - - - - 20 - 527 - - - - - - - - - Misc - - - - - - Scroll pages with an eye candy effect - - - Enable smooth scrolling - - - true - - - - - - - Use favicon of the current website as window icon - - - - - - - - - Middle click should: - - - - - - - - Auto-scroll - - - - - Load Clipboard URL - - - - - Do Nothing - - - - - - - - - - Qt::Vertical - - - - 20 - 513 - - - - - - + + + 150 + 0 + + + + Standard font: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 150 + 0 + + + + Fixed font: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Serif font: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + Sans Serif font: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + + + + + + Cursive font: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + Fantasy font: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + + + Font size + + + + + + + 0 + 0 + + + + + 150 + 0 + + + + Default font size: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + 0 + 0 + + + + + 150 + 0 + + + + Minimal font size: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + + + Character Encoding + + + + + + Default character encoding: + + + + + + + + + + + + + Custom Style Sheet + + + + QFormLayout::ExpandingFieldsGrow + + + + + + 150 + 0 + + + + Path to custom CSS file: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + *.css + + + + + + + + + + Qt::Vertical + + + + 20 + 149 + + + + diff --git a/src/settings/settings_general.ui b/src/settings/settings_general.ui index 908f1c27..7d4419b8 100644 --- a/src/settings/settings_general.ui +++ b/src/settings/settings_general.ui @@ -6,8 +6,8 @@ 0 0 - 480 - 571 + 573 + 410 @@ -230,43 +230,6 @@ - - - - Misc - - - - - - Use horizontal scroll wheel to go through web history - - - - - - - Send DNT headers to tell websites you don't want to be tracked - - - - - - - Enable Vi-like navigation shortcuts - - - - - - - Enable keyboard navigation using the Ctrl key - - - - - - diff --git a/src/settings/settings_privacy.ui b/src/settings/settings_privacy.ui new file mode 100644 index 00000000..40fe5c9a --- /dev/null +++ b/src/settings/settings_privacy.ui @@ -0,0 +1,260 @@ + + + privacy + + + + 0 + 0 + 535 + 520 + + + + + + + Javascript + + + + + + Let Javascript open new windows + + + + + + + Let Javascript access clipboard + + + + + + + + + + Tracking + + + + + + Send DNT headers to tell websites you don't want to be tracked + + + + + + + + + + History + + + + + + + + Remove history items: + + + + + + + + don't even store them + + + + + at application exit + + + + + every day + + + + + every month + + + + + every 3 months + + + + + never + + + + + + + + + + + + + Passwords + + + + + + + + Remember passwords for sites + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Manage Exceptions + + + + + + + + + + + + Cookies + + + + + + Rekonq is sharing cookies settings with all other KDE applications + + + false + + + + + + + + + Manage Cookies + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + Cache + + + + + + Rekonq is sharing cache settings with all other KDE applications + + + false + + + + + + + + + Manage Cache + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 135 + + + + + + + + + diff --git a/src/settings/settings_webkit.ui b/src/settings/settings_webkit.ui index 5235eab2..a6644ee0 100644 --- a/src/settings/settings_webkit.ui +++ b/src/settings/settings_webkit.ui @@ -12,11 +12,11 @@ - + - Javascript + General - + @@ -31,16 +31,44 @@ - + + + load java applets + + + + + + + WebGL + + + + + + + Spatial Navigation + + + + + - Let Javascript open new windows + Frame Flattening - + - Let Javascript access clipboard + Prefetch DNS entries + + + + + + + Print element backgrounds @@ -145,57 +173,6 @@ - - - - Misc - - - - - - load java applets - - - - - - - WebGL - - - - - - - Spatial Navigation - - - - - - - Frame Flattening - - - - - - - Prefetch DNS entries - - - - - - - Print element backgrounds - - - - - - diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp index ef01a32f..3e3a5bd4 100644 --- a/src/settings/settingsdialog.cpp +++ b/src/settings/settingsdialog.cpp @@ -40,11 +40,12 @@ #include "opensearchmanager.h" // Widget Includes -#include "networkwidget.h" -#include "generalwidget.h" +#include "advancedwidget.h" #include "appearancewidget.h" -#include "webkitwidget.h" +#include "generalwidget.h" +#include "privacywidget.h" #include "tabswidget.h" +#include "webkitwidget.h" // KDE Includes #include @@ -68,8 +69,9 @@ private: TabsWidget *tabsWidg; AppearanceWidget *appearanceWidg; WebKitWidget *webkitWidg; - NetworkWidget *networkWidg; - + PrivacyWidget *privacyWidg; + AdvancedWidget *advancedWidg; + KCModuleProxy *ebrowsingModule; KShortcutsEditor *shortcutsEditor; @@ -109,10 +111,16 @@ Private::Private(SettingsDialog *parent) pageItem->setIcon(webkitIcon); // -- 5 - networkWidg = new NetworkWidget(parent); - networkWidg->layout()->setMargin(0); - pageItem = parent->addPage(networkWidg , i18n("Network")); - pageItem->setIcon(KIcon("preferences-system-network")); + privacyWidg = new PrivacyWidget(parent); + privacyWidg->layout()->setMargin(0); + pageItem = parent->addPage(privacyWidg, i18n("Privacy")); + pageItem->setIcon(KIcon("view-media-artist")); + + // -- 6 + advancedWidg = new AdvancedWidget(parent); + advancedWidg->layout()->setMargin(0); + pageItem = parent->addPage(advancedWidg, i18n("Advanced")); + pageItem->setIcon(KIcon("applications-system")); // -- 7 shortcutsEditor = new KShortcutsEditor(rApp->mainWindow()->actionCollection(), parent); @@ -155,8 +163,10 @@ SettingsDialog::SettingsDialog(QWidget *parent) connect(d->tabsWidg, SIGNAL(changed(bool)), this, SLOT(updateButtons())); connect(d->appearanceWidg, SIGNAL(changed(bool)), this, SLOT(updateButtons())); connect(d->webkitWidg, SIGNAL(changed(bool)), this, SLOT(updateButtons())); - connect(d->networkWidg, SIGNAL(changed(bool)), this, SLOT(updateButtons())); connect(d->ebrowsingModule, SIGNAL(changed(bool)), this, SLOT(updateButtons())); + connect(d->advancedWidg, SIGNAL(changed(bool)), this, SLOT(updateButtons())); + connect(d->privacyWidg, SIGNAL(changed(bool)), this, SLOT(updateButtons())); + connect(d->shortcutsEditor, SIGNAL(keyChange()), this, SLOT(updateButtons())); // save settings @@ -189,7 +199,8 @@ void SettingsDialog::saveSettings() d->tabsWidg->save(); d->appearanceWidg->save(); d->webkitWidg->save(); - d->networkWidg->save(); + d->advancedWidg->save(); + d->privacyWidg->save(); d->shortcutsEditor->save(); d->ebrowsingModule->save(); @@ -208,7 +219,8 @@ bool SettingsDialog::hasChanged() || d->tabsWidg->changed() || d->appearanceWidg->changed() || d->webkitWidg->changed() - || d->networkWidg->changed() + || d->advancedWidg->changed() + || d->privacyWidg->changed() || d->ebrowsingModule->changed() || d->shortcutsEditor->isModified(); ; diff --git a/src/settings/webkitwidget.cpp b/src/settings/webkitwidget.cpp index 0f7a4b3d..31224f05 100644 --- a/src/settings/webkitwidget.cpp +++ b/src/settings/webkitwidget.cpp @@ -28,9 +28,6 @@ #include "webkitwidget.h" #include "webkitwidget.moc" -// Auto Includes -#include "rekonq.h" - WebKitWidget::WebKitWidget(QWidget *parent) : QWidget(parent) @@ -38,9 +35,6 @@ WebKitWidget::WebKitWidget(QWidget *parent) { setupUi(this); setWebSettingsToolTips(); - - updateJavascriptSettings(ReKonfig::javascriptEnabled()); - connect(kcfg_javascriptEnabled, SIGNAL(clicked(bool)), this, SLOT(updateJavascriptSettings(bool))); } @@ -70,17 +64,8 @@ void WebKitWidget::setWebSettingsToolTips() kcfg_dnsPrefetch->setToolTip(i18n("Specifies whether WebKit will try to prefetch DNS entries to speed up browsing.")); kcfg_printElementBackgrounds->setToolTip(i18n("If enabled, background colors and images are also drawn when the page is printed.")); kcfg_javascriptEnabled->setToolTip(i18n("Enables the execution of JavaScript programs.")); - kcfg_javascriptCanOpenWindows->setToolTip(i18n("If enabled, JavaScript programs are allowed to open new windows.")); - kcfg_javascriptCanAccessClipboard->setToolTip(i18n("If enabled, JavaScript programs are allowed to read from and to write to the clipboard.")); kcfg_javaEnabled->setToolTip(i18n("Enables support for Java applets.")); kcfg_offlineStorageDatabaseEnabled->setToolTip(i18n("Enables support for the HTML 5 offline storage feature.")); kcfg_offlineWebApplicationCacheEnabled->setToolTip(i18n("Enables support for the HTML 5 web application cache feature.")); kcfg_localStorageEnabled->setToolTip(i18n("Enables support for the HTML 5 local storage feature.")); } - - -void WebKitWidget::updateJavascriptSettings(bool b) -{ - kcfg_javascriptCanAccessClipboard->setEnabled(b); - kcfg_javascriptCanOpenWindows->setEnabled(b); -} diff --git a/src/settings/webkitwidget.h b/src/settings/webkitwidget.h index 8561d60a..1a41a6a1 100644 --- a/src/settings/webkitwidget.h +++ b/src/settings/webkitwidget.h @@ -50,7 +50,6 @@ Q_SIGNALS: private Q_SLOTS: void hasChanged(); - void updateJavascriptSettings(bool); private: void setWebSettingsToolTips(); -- cgit v1.2.1