From 52e934bef5f3d42589fefe10507613b37cf51072 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Thu, 25 May 2017 11:39:04 +0200 Subject: Displaying filter rules in a tree model view --- src/blocker/filtercollection.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/blocker/filtercollection.cpp') 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 #include +#include +#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 nodeData; + nodeData << obj["firstPartyUrl"].toString() << obj["requestUrl"].toString(); + m_filters->addFilter(nodeData); + return rule; } -- cgit v1.2.1