diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2010-05-16 10:51:54 +0200 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2010-05-16 10:51:54 +0200 |
commit | 5a50391d6500c5933988e3541e7d326607f4c284 (patch) | |
tree | 900b30133521fd5a1b2f34cd03abf0993ae313fb | |
parent | SVN_SILENT made messages (.desktop file) (diff) | |
parent | Disable ad block related widgets when ad blocking is disabled. (diff) | |
download | rekonq-5a50391d6500c5933988e3541e7d326607f4c284.tar.xz |
Merge commit 'refs/merge-requests/96' of git://gitorious.org/rekonq/mainline into m96
-rw-r--r-- | src/settings/adblockwidget.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/settings/adblockwidget.cpp b/src/settings/adblockwidget.cpp index 412f03d9..a703fe09 100644 --- a/src/settings/adblockwidget.cpp +++ b/src/settings/adblockwidget.cpp @@ -108,6 +108,9 @@ void AdBlockWidget::load() { bool isAdBlockEnabled = ReKonfig::adBlockEnabled(); checkEnableAdblock->setChecked(isAdBlockEnabled); + // update enabled status + checkHideAds->setEnabled(checkEnableAdblock->isChecked()); + tabWidget->setEnabled(checkEnableAdblock->isChecked()); bool areImageFiltered = ReKonfig::hideAdsEnabled(); checkHideAds->setChecked(areImageFiltered); @@ -181,6 +184,9 @@ void AdBlockWidget::save() void AdBlockWidget::hasChanged() { + // update enabled status + checkHideAds->setEnabled(checkEnableAdblock->isChecked()); + tabWidget->setEnabled(checkEnableAdblock->isChecked()); _changed = true; emit changed(true); } |