From 7327127a7852704df9282a45a2995139aa862f4e Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 13 Feb 2012 21:54:54 +0100
Subject: Update adblock dialog

---
 src/adblock/adblockmanager.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/adblock/adblockmanager.cpp')

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()));
-- 
cgit v1.2.1