pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed main adblock dialog.

Browse source
This commit is contained in:
Martin Rotter 2017-07-19 11:35:55 +02:00
parent d34767d1c4
commit f02f8bab09
2 changed files with 139 additions and 153 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

265
src/network-web/adblock/adblockdialog.cpp
View file

@ -16,171 +16,156 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with RSS Guard. If not, see <http://www.gnu.org/licenses/>. // along with RSS Guard. If not, see <http://www.gnu.org/licenses/>.
#include "adblockdialog.h" #include "network-web/adblock/adblockdialog.h"
#include "adblockmanager.h" #include "network-web/adblock/adblockmanager.h"
#include "adblocksubscription.h" #include "network-web/adblock/adblocksubscription.h"
#include "adblocktreewidget.h" #include "network-web/adblock/adblocktreewidget.h"
#include "adblockaddsubscriptiondialog.h" #include "network-web/adblock/adblockaddsubscriptiondialog.h"
#include "mainapplication.h"
#include "qztools.h" #include "network-web/webfactory.h"
#include <QMenu> #include <QMenu>
#include <QTimer> #include <QTimer>
#include <QMessageBox> #include <QMessageBox>
#include <QInputDialog> #include <QInputDialog>
AdBlockDialog::AdBlockDialog(QWidget* parent)
: QWidget(parent)
, m_manager(AdBlockManager::instance())
, m_currentTreeWidget(0)
, m_currentSubscription(0)
, m_loaded(false)
{
setAttribute(Qt::WA_DeleteOnClose);
setupUi(this);
QzTools::centerWidgetOnScreen(this); AdBlockDialog::AdBlockDialog(QWidget* parent)
: QWidget(parent), m_ui(new Ui::AdBlockDialog), m_manager(AdBlockManager::instance()), m_currentTreeWidget(0), m_currentSubscription(0), m_loaded(false) {
setAttribute(Qt::WA_DeleteOnClose);
m_ui->setupUi(this);
#ifdef Q_OS_MACOS #ifdef Q_OS_MACOS
tabWidget->setDocumentMode(false); m_ui->tabWidget->setDocumentMode(false);
#endif #endif
adblockCheckBox->setChecked(m_manager->isEnabled());
QMenu* menu = new QMenu(buttonOptions); m_ui->adblockCheckBox->setChecked(m_manager->isEnabled());
m_actionAddRule = menu->addAction(tr("Add Rule"), this, SLOT(addRule()));
m_actionRemoveRule = menu->addAction(tr("Remove Rule"), this, SLOT(removeRule()));
menu->addSeparator();
m_actionAddSubscription = menu->addAction(tr("Add Subscription"), this, SLOT(addSubscription()));
m_actionRemoveSubscription = menu->addAction(tr("Remove Subscription"), this, SLOT(removeSubscription()));
menu->addAction(tr("Update Subscriptions"), m_manager, SLOT(updateAllSubscriptions()));
menu->addSeparator();
menu->addAction(tr("Learn about writing rules..."), this, SLOT(learnAboutRules()));
buttonOptions->setMenu(menu); QMenu* menu = new QMenu(buttonOptions);
connect(menu, SIGNAL(aboutToShow()), this, SLOT(aboutToShowMenu())); m_actionAddRule = menu->addAction(tr("Add Rule"), this, SLOT(addRule()));
m_actionRemoveRule = menu->addAction(tr("Remove Rule"), this, SLOT(removeRule()));
menu->addSeparator();
m_actionAddSubscription = menu->addAction(tr("Add Subscription"), this, SLOT(addSubscription()));
m_actionRemoveSubscription = menu->addAction(tr("Remove Subscription"), this, SLOT(removeSubscription()));
menu->addAction(tr("Update Subscriptions"), m_manager, SLOT(updateAllSubscriptions()));
menu->addSeparator();
menu->addAction(tr("Learn about writing rules..."), this, SLOT(learnAboutRules()));
connect(adblockCheckBox, SIGNAL(toggled(bool)), this, SLOT(enableAdBlock(bool))); m_ui->buttonOptions->setMenu(menu);
connect(search, SIGNAL(textChanged(QString)), this, SLOT(filterString(QString))); connect(menu, SIGNAL(aboutToShow()), this, SLOT(aboutToShowMenu()));
connect(tabWidget, SIGNAL(currentChanged(int)), this, SLOT(currentChanged(int)));
connect(buttonBox, SIGNAL(accepted()), this, SLOT(close()));
connect(adblockCheckBox, SIGNAL(toggled(bool)), this, SLOT(enableAdBlock(bool)));
connect(search, SIGNAL(textChanged(QString)), this, SLOT(filterString(QString)));
connect(tabWidget, SIGNAL(currentChanged(int)), this, SLOT(currentChanged(int)));
connect(buttonBox, SIGNAL(accepted()), this, SLOT(close()));
load();
m_ui->buttonBox->setFocus();
}
void AdBlockDialog::showRule(const AdBlockRule* rule) const {
AdBlockSubscription *subscription = rule->subscription();
if (!subscription) {
return;
}
for (int i = 0; i < tabWidget->count(); ++i) {
AdBlockTreeWidget *treeWidget = qobject_cast<AdBlockTreeWidget*>(tabWidget->widget(i));
if (subscription == treeWidget->subscription()) {
treeWidget->showRule(rule);
tabWidget->setCurrentIndex(i);
break;
}
}
}
void AdBlockDialog::addRule() {
m_currentTreeWidget->addRule();
}
void AdBlockDialog::removeRule() {
m_currentTreeWidget->removeRule();
}
void AdBlockDialog::addSubscription() {
AdBlockAddSubscriptionDialog dialog(this);
if (dialog.exec() != QDialog::Accepted) {
return;
}
QString title = dialog.title();
QString url = dialog.url();
if (AdBlockSubscription *subscription = m_manager->addSubscription(title, url)) {
AdBlockTreeWidget *tree = new AdBlockTreeWidget(subscription, tabWidget);
int index = tabWidget->insertTab(tabWidget->count() - 1, tree, subscription->title());
tabWidget->setCurrentIndex(index);
}
}
void AdBlockDialog::removeSubscription() {
if (m_manager->removeSubscription(m_currentSubscription)) {
delete m_currentTreeWidget;
}
}
void AdBlockDialog::currentChanged(int index) {
if (index != -1) {
m_currentTreeWidget = qobject_cast<AdBlockTreeWidget*>(tabWidget->widget(index));
m_currentSubscription = m_currentTreeWidget->subscription();
}
}
void AdBlockDialog::filterString(const QString &string) {
if (m_currentTreeWidget && adblockCheckBox->isChecked()) {
m_currentTreeWidget->filterString(string);
}
}
void AdBlockDialog::enableAdBlock(bool state) {
m_manager->setEnabled(state);
if (state) {
load(); load();
}
buttonBox->setFocus();
} }
void AdBlockDialog::showRule(const AdBlockRule* rule) const void AdBlockDialog::aboutToShowMenu() {
{ bool subscriptionEditable = m_currentSubscription && m_currentSubscription->canEditRules();
AdBlockSubscription* subscription = rule->subscription(); bool subscriptionRemovable = m_currentSubscription && m_currentSubscription->canBeRemoved();
if (!subscription) {
return;
}
for (int i = 0; i < tabWidget->count(); ++i) { m_actionAddRule->setEnabled(subscriptionEditable);
AdBlockTreeWidget* treeWidget = qobject_cast<AdBlockTreeWidget*>(tabWidget->widget(i)); m_actionRemoveRule->setEnabled(subscriptionEditable);
m_actionRemoveSubscription->setEnabled(subscriptionRemovable);
if (subscription == treeWidget->subscription()) {
treeWidget->showRule(rule);
tabWidget->setCurrentIndex(i);
break;
}
}
} }
void AdBlockDialog::addRule() void AdBlockDialog::learnAboutRules() {
{ WebFactory::instance()->openUrlInExternalBrowser(QSL("http://adblockplus.org/en/filters"));
m_currentTreeWidget->addRule();
} }
void AdBlockDialog::removeRule() void AdBlockDialog::loadSubscriptions() {
{ for (int i = 0; i < tabWidget->count(); ++i) {
m_currentTreeWidget->removeRule(); AdBlockTreeWidget* treeWidget = qobject_cast<AdBlockTreeWidget*>(tabWidget->widget(i));
treeWidget->refresh();
}
} }
void AdBlockDialog::addSubscription() void AdBlockDialog::load() {
{ if (m_loaded || !adblockCheckBox->isChecked()) {
AdBlockAddSubscriptionDialog dialog(this); return;
if (dialog.exec() != QDialog::Accepted) { }
return;
}
QString title = dialog.title(); foreach (AdBlockSubscription* subscription, m_manager->subscriptions()) {
QString url = dialog.url(); AdBlockTreeWidget* tree = new AdBlockTreeWidget(subscription, tabWidget);
tabWidget->addTab(tree, subscription->title());
}
if (AdBlockSubscription* subscription = m_manager->addSubscription(title, url)) { m_loaded = true;
AdBlockTreeWidget* tree = new AdBlockTreeWidget(subscription, tabWidget);
int index = tabWidget->insertTab(tabWidget->count() - 1, tree, subscription->title());
tabWidget->setCurrentIndex(index); QTimer::singleShot(50, this, SLOT(loadSubscriptions()));
}
}
void AdBlockDialog::removeSubscription()
{
if (m_manager->removeSubscription(m_currentSubscription)) {
delete m_currentTreeWidget;
}
}
void AdBlockDialog::currentChanged(int index)
{
if (index != -1) {
m_currentTreeWidget = qobject_cast<AdBlockTreeWidget*>(tabWidget->widget(index));
m_currentSubscription = m_currentTreeWidget->subscription();
}
}
void AdBlockDialog::filterString(const QString &string)
{
if (m_currentTreeWidget && adblockCheckBox->isChecked()) {
m_currentTreeWidget->filterString(string);
}
}
void AdBlockDialog::enableAdBlock(bool state)
{
m_manager->setEnabled(state);
if (state) {
load();
}
}
void AdBlockDialog::aboutToShowMenu()
{
bool subscriptionEditable = m_currentSubscription && m_currentSubscription->canEditRules();
bool subscriptionRemovable = m_currentSubscription && m_currentSubscription->canBeRemoved();
m_actionAddRule->setEnabled(subscriptionEditable);
m_actionRemoveRule->setEnabled(subscriptionEditable);
m_actionRemoveSubscription->setEnabled(subscriptionRemovable);
}
void AdBlockDialog::learnAboutRules()
{
mApp->addNewTab(QUrl("http://adblockplus.org/en/filters"));
}
void AdBlockDialog::loadSubscriptions()
{
for (int i = 0; i < tabWidget->count(); ++i) {
AdBlockTreeWidget* treeWidget = qobject_cast<AdBlockTreeWidget*>(tabWidget->widget(i));
treeWidget->refresh();
}
}
void AdBlockDialog::load()
{
if (m_loaded || !adblockCheckBox->isChecked()) {
return;
}
foreach (AdBlockSubscription* subscription, m_manager->subscriptions()) {
AdBlockTreeWidget* tree = new AdBlockTreeWidget(subscription, tabWidget);
tabWidget->addTab(tree, subscription->title());
}
m_loaded = true;
QTimer::singleShot(50, this, SLOT(loadSubscriptions()));
} }

27
src/network-web/adblock/adblockdialog.h
View file

@ -21,24 +21,23 @@
#include <QWidget> #include <QWidget>
#include "qzcommon.h"
#include "ui_adblockdialog.h" #include "ui_adblockdialog.h"
class AdBlockSubscription; class AdBlockSubscription;
class AdBlockTreeWidget; class AdBlockTreeWidget;
class AdBlockManager; class AdBlockManager;
class AdBlockRule; class AdBlockRule;
class QUPZILLA_EXPORT AdBlockDialog : public QWidget, public Ui_AdBlockDialog class AdBlockDialog : public QWidget {
{
Q_OBJECT Q_OBJECT
public: public:
explicit AdBlockDialog(QWidget* parent = 0); explicit AdBlockDialog(QWidget* parent = 0);
void showRule(const AdBlockRule* rule) const; void showRule(const AdBlockRule* rule) const;
private slots: private slots:
void addRule(); void addRule();
void removeRule(); void removeRule();
@ -55,17 +54,19 @@ private slots:
void loadSubscriptions(); void loadSubscriptions();
void load(); void load();
private: private:
AdBlockManager* m_manager; AdBlockManager *m_manager;
AdBlockTreeWidget* m_currentTreeWidget; AdBlockTreeWidget *m_currentTreeWidget;
AdBlockSubscription* m_currentSubscription; AdBlockSubscription *m_currentSubscription;
QAction* m_actionAddRule; QAction *m_actionAddRule;
QAction* m_actionRemoveRule; QAction *m_actionRemoveRule;
QAction* m_actionAddSubscription; QAction *m_actionAddSubscription;
QAction* m_actionRemoveSubscription; QAction *m_actionRemoveSubscription;
bool m_loaded; bool m_loaded;
Ui::AdBlockDialog *m_ui;
}; };
#endif // ADBLOCKDIALOG_H #endif // ADBLOCKDIALOG_H