1 files changed, 10 insertions, 1 deletions
diff --git a/src/blocker/filtercollection.cpp b/src/blocker/filtercollection.cpp
index 2262008..5b0f96f 100644
--- a/src/blocker/filtercollection.cpp
+++ b/src/blocker/filtercollection.cpp
@@ -32,6 +32,10 @@
 #include <QListWidget>
 #include <QLabel>
 
+#include <QTreeView>
+#include "filtertree.h"
+#include "filternode.h"
+
 FilterCollection::FilterCollection(const QString path, QWidget *parent) :
     QWidget(parent),
     ui(new Ui::SubscriptionForm)
@@ -43,6 +47,8 @@ FilterCollection::FilterCollection(const QString path, QWidget *parent) :
 
     qDebug("Adding subscription [%s]", qUtf8Printable(m_url));
 
+    m_filters = new FilterTree(this);
+    ui->treeView->setModel(m_filters);
 
     QFile filterFile(m_url);
     if(!filterFile.open(QIODevice::ReadOnly)) {
@@ -104,7 +110,6 @@ void FilterCollection::load(const QJsonObject &json)
     for(QJsonValue v : json["rules"].toArray()) {
         r = createRule(v.toObject());
         m_rules.append(r);
-        ui->blacklist_listWidget->addItem(r->filter());
     }
 }
 
@@ -123,6 +128,10 @@ FilterRule* FilterCollection::createRule(const QJsonObject &obj)
 
     rule = new FilterRule(obj["firstPartyUrl"].toString(), obj["requestUrl"].toString(), r, obj["shouldBlock"].toBool(), this);
 
+    QList<QVariant> nodeData;
+    nodeData << obj["firstPartyUrl"].toString() << obj["requestUrl"].toString();
+    m_filters->addFilter(nodeData);
+
     return rule;
 }