summaryrefslogtreecommitdiff
path: root/src/adblock/adblockmanager.cpp
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2012-02-13 21:54:54 +0100
committerAndrea Diamantini <adjam7@gmail.com>2012-03-13 10:24:41 +0100
commit7327127a7852704df9282a45a2995139aa862f4e (patch)
treee203c81e910adad0f1f08bb7162f95d2d9f621bd /src/adblock/adblockmanager.cpp
parentMove adblock manager to use multiple text files for rules and (diff)
downloadrekonq-7327127a7852704df9282a45a2995139aa862f4e.tar.xz
Update adblock dialog
Diffstat (limited to 'src/adblock/adblockmanager.cpp')
-rw-r--r--src/adblock/adblockmanager.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/adblock/adblockmanager.cpp b/src/adblock/adblockmanager.cpp
index ff3aad6a..0c0a66db 100644
--- a/src/adblock/adblockmanager.cpp
+++ b/src/adblock/adblockmanager.cpp
@@ -112,6 +112,7 @@ void AdBlockManager::loadSettings()
}
// else
+ // load automatic and local rules
KConfigGroup filtersGroup(_adblockConfig, "FiltersList");
for (int i = 1; i <= 60; ++i)
{
@@ -123,6 +124,10 @@ void AdBlockManager::loadSettings()
loadRules(rulesFilePath);
}
}
+
+ // load local rules
+ QString localRulesFilePath = KStandardDirs::locateLocal("appdata" , QL1S("adblockrules_local"));
+ loadRules(localRulesFilePath);
}
@@ -328,7 +333,7 @@ void AdBlockManager::showSettings()
dialog->setCaption(i18nc("@title:window", "Ad Block Settings"));
dialog->setButtons(KDialog::Ok | KDialog::Cancel);
- AdBlockWidget widget;
+ AdBlockWidget widget(_adblockConfig);
dialog->setMainWidget(&widget);
connect(dialog, SIGNAL(okClicked()), &widget, SLOT(save()));
connect(dialog, SIGNAL(okClicked()), this, SLOT(loadSettings()));