FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enhancements to add sub dialog.

Browse Source
This commit is contained in:
Martin Rotter 2017-07-21 10:23:39 +02:00
parent a12d6a4764
commit f0fadfcdbe
2 changed files with 56 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/network-web/adblock/adblockaddsubscriptiondialog.cpp
View File

@ -21,6 +21,7 @@
#include "definitions/definitions.h" #include "definitions/definitions.h"
#include <QComboBox> #include <QComboBox>
#include <QCheckBox>
AdBlockAddSubscriptionDialog::AdBlockAddSubscriptionDialog(QWidget* parent) AdBlockAddSubscriptionDialog::AdBlockAddSubscriptionDialog(QWidget* parent)
@ -45,15 +46,17 @@ AdBlockAddSubscriptionDialog::AdBlockAddSubscriptionDialog(QWidget* parent)
QSL("https://raw.githubusercontent.com/heradhis/indonesianadblockrules/master/subscriptions/abpindo.txt")) 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("Easylist China (Chinese)"), QSL("https://easylist-downloads.adblockplus.org/easylistchina.txt"))
<< Subscription(QSL("Anti-Adblock Killer"), << Subscription(QSL("Anti-Adblock Killer"),
QSL("https://raw.githubusercontent.com/reek/anti-adblock-killer/master/anti-adblock-killer-filters.txt")) 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) { foreach (const Subscription& subscription, m_knownSubscriptions) {
m_ui->m_cmbPresets->addItem(subscription.m_title); m_ui->m_cmbPresets->addItem(subscription.m_title);
} }
connect(m_ui->comboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, connect(m_ui->m_cmbPresets, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
&AdBlockAddSubscriptionDialog::indexChanged); &AdBlockAddSubscriptionDialog::indexChanged);
connect(m_ui->m_cbUsePredefined, &QCheckBox::toggled, this, &AdBlockAddSubscriptionDialog::presetsEnabledChanged);
m_ui->m_cbUsePredefined->setChecked(true);
indexChanged(0); indexChanged(0);
} }
@ -67,24 +70,27 @@ QString AdBlockAddSubscriptionDialog::url() const {
void AdBlockAddSubscriptionDialog::indexChanged(int index) { void AdBlockAddSubscriptionDialog::indexChanged(int index) {
const Subscription subscription = m_knownSubscriptions.at(index); const Subscription subscription = m_knownSubscriptions.at(index);
const int pos = subscription.m_title.indexOf(QLatin1Char('('));
// "Other..." entry.
if (subscription.m_url.isEmpty()) {
m_ui->m_txtTitle->clear();
m_ui->m_txtUrl->clear();
}
else {
int pos = subscription.m_title.indexOf(QLatin1Char('('));
QString title = subscription.m_title;
if (pos > 0) { if (pos > 0) {
title = title.left(pos).trimmed(); m_ui->m_txtTitle->setText(subscription.m_title.left(pos).trimmed());
}
else {
m_ui->m_txtTitle->setText(subscription.m_title);
} }
m_ui->m_txtTitle->setText(title);
m_ui->m_txtTitle->setCursorPosition(0);
m_ui->m_txtUrl->setText(subscription.m_url); m_ui->m_txtUrl->setText(subscription.m_url);
m_ui->m_txtUrl->setCursorPosition(0); }
void AdBlockAddSubscriptionDialog::presetsEnabledChanged(bool enabled) {
m_ui->m_txtTitle->setEnabled(!enabled);
m_ui->m_txtUrl->setEnabled(!enabled);
if (!enabled) {
// Presets are disabled, clear txts.
m_ui->m_txtTitle->clear();
m_ui->m_txtUrl->clear();
m_ui->m_txtTitle->setFocus();
} }
} }

1
src/network-web/adblock/adblockaddsubscriptiondialog.h
View File

@ -41,6 +41,7 @@ class AdBlockAddSubscriptionDialog : public QDialog {
private slots: private slots:
void indexChanged(int index); void indexChanged(int index);
void presetsEnabledChanged(bool enabled);
private: private:
Ui::AdBlockAddSubscriptionDialog* m_ui; Ui::AdBlockAddSubscriptionDialog* m_ui;