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

Adblock dialog now sets focus when opened to show particular rule. Also updated changelog for new version.

Browse Source
This commit is contained in:
Martin Rotter 2015-06-19 09:05:18 +02:00
parent 6f324664af
commit 1ce9f4ddf6
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/text/CHANGELOG
View File

@ -2,6 +2,7 @@
<center><h2>2.4.1</h2></center>
Added:
<ul>
<li>Experimental support for lighter version of <b>Adblock</b> component. It is configurable via status bar icon in bottom-right corner of main application window. It supports Adblock Plus filters. It is disabled by default. DO NOT user Adblock component if you wish to have LOW memory footprint or use very limited set of rules. Bug set of rules makes RSS Guard more RAM hungry. (issue #7)</li>
<li>Unavailable actions in menus are automatically disabled when such a situation arises. (issue #28)</li>
<li><b>Added support for Google auto-suggest API.</b> Just type your phrase in internal web browser location text box and Google will help you out.</li>
</ul>

16
src/network-web/adblock/adblockdialog.cpp
View File

@ -88,18 +88,19 @@ void AdBlockDialog::createConnections() {
}
void AdBlockDialog::showRule(const AdBlockRule* rule) const {
AdBlockSubscription* subscription = rule->subscription();
AdBlockSubscription *subscription = rule->subscription();
if (subscription == NULL) {
return;
}
for (int i = 0; i < m_ui->m_tabs->count(); i++) {
AdBlockTreeWidget* treeWidget = qobject_cast<AdBlockTreeWidget*>(m_ui->m_tabs->widget(i));
AdBlockTreeWidget *tree_widget = qobject_cast<AdBlockTreeWidget*>(m_ui->m_tabs->widget(i));
if (subscription == treeWidget->subscription()) {
treeWidget->showRule(rule);
if (subscription == tree_widget->subscription()) {
tree_widget->showRule(rule);
m_ui->m_tabs->setCurrentIndex(i);
tree_widget->setFocus();
break;
}
}
@ -129,8 +130,7 @@ void AdBlockDialog::addSubscription() {
}
}
void AdBlockDialog::removeSubscription()
{
void AdBlockDialog::removeSubscription() {
if (m_manager->removeSubscription(m_currentSubscription)) {
delete m_currentTreeWidget;
}
@ -144,6 +144,10 @@ void AdBlockDialog::currentChanged(int index) {
bool is_easylist = m_currentSubscription->url() == QUrl(ADBLOCK_EASYLIST_URL);
m_ui->m_checkUseLimitedEasyList->setEnabled(is_easylist && m_ui->m_checkEnable->isChecked());
m_ui->m_checkUseLimitedEasyList->setVisible(is_easylist);
m_ui->m_txtFilter->blockSignals(true);
m_ui->m_txtFilter->clear();
m_ui->m_txtFilter->blockSignals(false);
}
}