diff --git a/src/definitions/definitions.h b/src/definitions/definitions.h index 01b1dee21..b00e717c1 100755 --- a/src/definitions/definitions.h +++ b/src/definitions/definitions.h @@ -26,6 +26,7 @@ #define ARGUMENTS_LIST_SEPARATOR "\n" +#define ADBLOCK_EASYLIST_URL "https://easylist-downloads.adblockplus.org/easylist.txt" #define DEFAULT_SQL_MESSAGES_FILTER "0 > 1" #define MAX_MULTICOLUMN_SORT_STATES 3 #define ENCLOSURES_OUTER_SEPARATOR '#' diff --git a/src/network-web/adblock/adblockaddsubscriptiondialog.cpp b/src/network-web/adblock/adblockaddsubscriptiondialog.cpp index e0dcecf35..930819b6b 100755 --- a/src/network-web/adblock/adblockaddsubscriptiondialog.cpp +++ b/src/network-web/adblock/adblockaddsubscriptiondialog.cpp @@ -16,77 +16,73 @@ // You should have received a copy of the GNU General Public License // along with RSS Guard. If not, see . -#include "adblockaddsubscriptiondialog.h" -#include "ui_adblockaddsubscriptiondialog.h" +#include "network-web/adblock/adblockaddsubscriptiondialog.h" + +#include "definitions/definitions.h" + AdBlockAddSubscriptionDialog::AdBlockAddSubscriptionDialog(QWidget* parent) - : QDialog(parent) - , ui(new Ui::AdBlockAddSubscriptionDialog) -{ - ui->setupUi(this); + : QDialog(parent), m_ui(new Ui::AdBlockAddSubscriptionDialog) { + m_ui->setupUi(this); - m_knownSubscriptions << Subscription("EasyList (English)", ADBLOCK_EASYLIST_URL) - << Subscription("BSI Lista Polska (Polish)", "http://www.bsi.info.pl/filtrABP.txt") - << Subscription("Czech List (Czech)", "http://adblock.dajbych.net/adblock.txt") - << Subscription("dutchblock (Dutch)", "http://groenewoudt.net/dutchblock/list.txt") - << Subscription("Filtros Nauscopicos (Spanish)", "http://abp.mozilla-hispano.org/nauscopio/filtros.txt") - << Subscription("IsraelList (Hebrew)", "http://secure.fanboy.co.nz/israelilist/IsraelList.txt") - << Subscription("NLBlock (Dutch)", "http://www.verzijlbergh.com/adblock/nlblock.txt") - << Subscription("Peter Lowe's list (English)", "http://pgl.yoyo.org/adservers/serverlist.php?hostformat=adblockplus&mimetype=plaintext") - << Subscription("PLgeneral (Polish)", "http://www.niecko.pl/adblock/adblock.txt") - << Subscription("Schacks Adblock Plus liste (Danish)", "http://adblock.schack.dk/block.txt") - << Subscription("Xfiles (Italian)", "http://mozilla.gfsolone.com/filtri.txt") - << Subscription("EasyPrivacy (English)", "http://easylist-downloads.adblockplus.org/easyprivacy.txt") - << Subscription("RU Adlist (Russian)", "https://easylist-downloads.adblockplus.org/advblock.txt") - << Subscription("ABPindo (Indonesian)", "https://raw.githubusercontent.com/heradhis/indonesianadblockrules/master/subscriptions/abpindo.txt") - << Subscription("Easylist China (Chinese)", "https://easylist-downloads.adblockplus.org/easylistchina.txt") - << Subscription("Anti-Adblock Killer", "https://raw.githubusercontent.com/reek/anti-adblock-killer/master/anti-adblock-killer-filters.txt") - << Subscription(tr("Other..."), QString()); + m_knownSubscriptions << Subscription(QSL("EasyList (English)"), ADBLOCK_EASYLIST_URL) + << Subscription(QSL("BSI Lista Polska (Polish)"), QSL("http://www.bsi.info.pl/filtrABP.txt")) + << Subscription(QSL("Czech List (Czech)"), QSL("http://adblock.dajbych.net/adblock.txt")) + << Subscription(QSL("dutchblock (Dutch)"), QSL("http://groenewoudt.net/dutchblock/list.txt")) + << Subscription(QSL("Filtros Nauscopicos (Spanish)"), QSL("http://abp.mozilla-hispano.org/nauscopio/filtros.txt")) + << Subscription(QSL("IsraelList (Hebrew)"), QSL("http://secure.fanboy.co.nz/israelilist/IsraelList.txt")) + << Subscription(QSL("NLBlock (Dutch)"), QSL("http://www.verzijlbergh.com/adblock/nlblock.txt")) + << Subscription(QSL("Peter Lowe's list (English)"), QSL("http://pgl.yoyo.org/adservers/serverlist.php?hostformat=adblockplus&mimetype=plaintext")) + << Subscription(QSL("PLgeneral (Polish))", QSL("http://www.niecko.pl/adblock/adblock.txt")) + << Subscription(QSL("Schacks Adblock Plus liste (Danish)"), QSL("http://adblock.schack.dk/block.txt")) + << Subscription(QSL("Xfiles (Italian)"), QSL("http://mozilla.gfsolone.com/filtri.txt")) + << Subscription(QSL("EasyPrivacy (English)"), QSL("http://easylist-downloads.adblockplus.org/easyprivacy.txt")) + << Subscription(QSL("RU Adlist (Russian)"), QSL("https://easylist-downloads.adblockplus.org/advblock.txt")) + << Subscription(QSL("ABPindo (Indonesian)"), QSL("https://raw.githubusercontent.com/heradhis/indonesianadblockrules/master/subscriptions/abpindo.txt")) + << Subscription(QSL("Easylist China (Chinese)"), QSL("https://easylist-downloads.adblockplus.org/easylistchina.txt")) + << Subscription(QSL("Anti-Adblock Killer"), QSL("https://raw.githubusercontent.com/reek/anti-adblock-killer/master/anti-adblock-killer-filters.txt")) + << Subscription(tr("Other..."), QString()); - foreach (const Subscription &subscription, m_knownSubscriptions) { - ui->comboBox->addItem(subscription.title); + foreach (const Subscription &subscription, m_knownSubscriptions) { + m_ui->comboBox->addItem(subscription.m_title); + } + + connect(m_ui->comboBox, &QComboBox::currentIndexChanged, this, &AdBlockAddSubscriptionDialog::indexChanged); + indexChanged(0); +} + +QString AdBlockAddSubscriptionDialog::title() const { + return m_ui->title->text(); +} + +QString AdBlockAddSubscriptionDialog::url() const { + return m_ui->url->text(); +} + +void AdBlockAddSubscriptionDialog::indexChanged(int index) { + const Subscription subscription = m_knownSubscriptions.at(index); + + // "Other..." entry + if (subscription.m_url.isEmpty()) { + m_ui->title->clear(); + m_ui->url->clear(); + } + else { + int pos = subscription.m_title.indexOf(QLatin1Char('(')); + QString title = subscription.m_title; + + if (pos > 0) { + title = title.left(pos).trimmed(); } - connect(ui->comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(indexChanged(int))); - indexChanged(0); + m_ui->title->setText(title); + m_ui->title->setCursorPosition(0); + + m_ui->url->setText(subscription.m_url); + m_ui->url->setCursorPosition(0); + } } -QString AdBlockAddSubscriptionDialog::title() const -{ - return ui->title->text(); -} - -QString AdBlockAddSubscriptionDialog::url() const -{ - return ui->url->text(); -} - -void AdBlockAddSubscriptionDialog::indexChanged(int index) -{ - const Subscription subscription = m_knownSubscriptions.at(index); - - // "Other..." entry - if (subscription.url.isEmpty()) { - ui->title->clear(); - ui->url->clear(); - } - else { - int pos = subscription.title.indexOf(QLatin1Char('(')); - QString title = subscription.title; - - if (pos > 0) { - title = title.left(pos).trimmed(); - } - - ui->title->setText(title); - ui->title->setCursorPosition(0); - - ui->url->setText(subscription.url); - ui->url->setCursorPosition(0); - } -} - -AdBlockAddSubscriptionDialog::~AdBlockAddSubscriptionDialog() -{ - delete ui; +AdBlockAddSubscriptionDialog::~AdBlockAddSubscriptionDialog() { + delete m_ui; } diff --git a/src/network-web/adblock/adblockaddsubscriptiondialog.h b/src/network-web/adblock/adblockaddsubscriptiondialog.h index 7f7460b20..2bb14a719 100755 --- a/src/network-web/adblock/adblockaddsubscriptiondialog.h +++ b/src/network-web/adblock/adblockaddsubscriptiondialog.h @@ -22,39 +22,38 @@ #include #include -#include "qzcommon.h" +#include "ui_adblockaddsubscriptiondialog.h" -namespace Ui -{ -class AdBlockAddSubscriptionDialog; + +namespace Ui { + class AdBlockAddSubscriptionDialog; } -class QUPZILLA_EXPORT AdBlockAddSubscriptionDialog : public QDialog -{ +class AdBlockAddSubscriptionDialog : public QDialog { Q_OBJECT -public: + public: explicit AdBlockAddSubscriptionDialog(QWidget* parent = 0); - ~AdBlockAddSubscriptionDialog(); + virtual ~AdBlockAddSubscriptionDialog(); QString title() const; QString url() const; -private slots: + private slots: void indexChanged(int index); -private: - Ui::AdBlockAddSubscriptionDialog* ui; + private: + Ui::AdBlockAddSubscriptionDialog* m_ui; struct Subscription { - QString title; - QString url; + QString m_title; + QString m_url; Subscription() {} Subscription(const QString &t, const QString &u) { - title = t; - url = u; + m_title = t; + m_url = u; } };