From 7f6c9b22d1016aa0dba709495fabf41397676039 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Tue, 28 Feb 2017 10:18:08 +0100 Subject: Blocker rewrites Some code commenting Moved Blocker files for src/blocker Keyboard shortcut for Blocker dialog --- src/forms/blockerdialog.cpp | 64 --------------- src/forms/blockerdialog.h | 45 ----------- src/forms/blockerdialog.ui | 192 -------------------------------------------- 3 files changed, 301 deletions(-) delete mode 100644 src/forms/blockerdialog.cpp delete mode 100644 src/forms/blockerdialog.h delete mode 100644 src/forms/blockerdialog.ui (limited to 'src/forms') diff --git a/src/forms/blockerdialog.cpp b/src/forms/blockerdialog.cpp deleted file mode 100644 index 9c6bd0a..0000000 --- a/src/forms/blockerdialog.cpp +++ /dev/null @@ -1,64 +0,0 @@ -/** LICENSE ******************************************************************** - ** - ** smolbote: yet another qute browser - ** Copyright (C) 2017 Xian Nox - ** - ** This program is free software: you can redistribute it and/or modify - ** it under the terms of the GNU General Public License as published by - ** the Free Software Foundation, either version 3 of the License, or - ** (at your option) any later version. - ** - ** This program is distributed in the hope that it will be useful, - ** but WITHOUT ANY WARRANTY; without even the implied warranty of - ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - ** GNU General Public License for more details. - ** - ** You should have received a copy of the GNU General Public License - ** along with this program. If not, see . - ** - ******************************************************************************/ - -#include "blockerdialog.h" -#include "ui_blockerdialog.h" - -#include "browser.h" -#include -#include - -BlockerDialog::BlockerDialog(QWidget *parent) : - QDialog(parent), - ui(new Ui::UrlInterceptorDialog) -{ - ui->setupUi(this); - - m_subscription = new BlockerSubscription(this); - QString sublocation = sSettings->value("blocker.path").toString(); - if(!sublocation.isEmpty()) { - m_subscription->loadFromFile(sublocation); - } - - ui->title->setText(m_subscription->title()); - ui->homepage->setText(m_subscription->homepage()); - ui->license->setText(m_subscription->license()); - ui->version->setText(m_subscription->version()); - ui->lastModified->setText(m_subscription->lastModified().toString()); - ui->expires->setText(m_subscription->expires().toString()); - - // show subscription items - for(BlockerRule *rule : m_subscription->urlBlacklist()) { - ui->blacklist_listWidget->addItem(rule->toString()); - } - for(BlockerRule *rule : m_subscription->urlWhitelist()) { - ui->whitelist_listWidget->addItem(rule->toString()); - } -} - -BlockerDialog::~BlockerDialog() -{ - delete ui; -} - -BlockerSubscription* BlockerDialog::subscription() -{ - return m_subscription; -} diff --git a/src/forms/blockerdialog.h b/src/forms/blockerdialog.h deleted file mode 100644 index 6970795..0000000 --- a/src/forms/blockerdialog.h +++ /dev/null @@ -1,45 +0,0 @@ -/** LICENSE ******************************************************************** - ** - ** smolbote: yet another qute browser - ** Copyright (C) 2017 Xian Nox - ** - ** This program is free software: you can redistribute it and/or modify - ** it under the terms of the GNU General Public License as published by - ** the Free Software Foundation, either version 3 of the License, or - ** (at your option) any later version. - ** - ** This program is distributed in the hope that it will be useful, - ** but WITHOUT ANY WARRANTY; without even the implied warranty of - ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - ** GNU General Public License for more details. - ** - ** You should have received a copy of the GNU General Public License - ** along with this program. If not, see . - ** - ******************************************************************************/ - -#ifndef URLINTERCEPTORDIALOG_H -#define URLINTERCEPTORDIALOG_H - -#include -#include "webengine/blockersubscription.h" - -namespace Ui { -class UrlInterceptorDialog; -} - -class BlockerDialog : public QDialog -{ - Q_OBJECT - -public: - explicit BlockerDialog(QWidget *parent = 0); - ~BlockerDialog(); - BlockerSubscription *subscription(); - -private: - Ui::UrlInterceptorDialog *ui; - BlockerSubscription *m_subscription; -}; - -#endif // URLINTERCEPTORDIALOG_H diff --git a/src/forms/blockerdialog.ui b/src/forms/blockerdialog.ui deleted file mode 100644 index a84dac8..0000000 --- a/src/forms/blockerdialog.ui +++ /dev/null @@ -1,192 +0,0 @@ - - - UrlInterceptorDialog - - - - 0 - 0 - 640 - 480 - - - - Blocker - - - - - - Subscription - - - - - - - - Title - - - - - - - TextLabel - - - - - - - Homepage - - - - - - - TextLabel - - - - - - - License - - - - - - - TextLabel - - - - - - - - - - - Version - - - - - - - TextLabel - - - - - - - Last Modified - - - - - - - TextLabel - - - - - - - Expires - - - - - - - TextLabel - - - - - - - - - - - - 0 - - - - URL Blacklist - - - - - - - - - - URL Whitelist - - - - - - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Close - - - - - - - - - buttonBox - accepted() - UrlInterceptorDialog - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - UrlInterceptorDialog - reject() - - - 316 - 260 - - - 286 - 274 - - - - - -- cgit v1.2.1