Browse Source

Merge pull request #6315 from glassez/cat-tree-state

Fix category filter widget doesn't save on/off state
adaptive-webui-19844
sledgehammer999 8 years ago committed by GitHub
parent
commit
fa8c69a5e1
  1. 1
      src/gui/categoryfilterwidget.cpp
  2. 8
      src/gui/transferlistfilterswidget.cpp
  3. 2
      src/gui/transferlistfilterswidget.h

1
src/gui/categoryfilterwidget.cpp

@ -78,6 +78,7 @@ CategoryFilterWidget::CategoryFilterWidget(QWidget *parent) @@ -78,6 +78,7 @@ CategoryFilterWidget::CategoryFilterWidget(QWidget *parent)
setAttribute(Qt::WA_MacShowFocusRect, false);
#endif
setContextMenuPolicy(Qt::CustomContextMenu);
setCurrentIndex(model()->index(0, 0));
connect(this, SIGNAL(collapsed(QModelIndex)), SLOT(callUpdateGeometry()));
connect(this, SIGNAL(expanded(QModelIndex)), SLOT(callUpdateGeometry()));

8
src/gui/transferlistfilterswidget.cpp

@ -580,7 +580,7 @@ TransferListFiltersWidget::TransferListFiltersWidget(QWidget *parent, TransferLi @@ -580,7 +580,7 @@ TransferListFiltersWidget::TransferListFiltersWidget(QWidget *parent, TransferLi
, transferList, SLOT(startVisibleTorrents()));
connect(m_categoryFilterWidget, SIGNAL(categoryChanged(QString))
, transferList, SLOT(applyCategoryFilter(QString)));
onCategoryFilterStateChanged(pref->getCategoryFilterState());
toggleCategoryFilter(pref->getCategoryFilterState());
frameLayout->addWidget(m_categoryFilterWidget);
QCheckBox *trackerLabel = new QCheckBox(tr("Trackers"), this);
@ -638,6 +638,12 @@ void TransferListFiltersWidget::trackerError(BitTorrent::TorrentHandle *const to @@ -638,6 +638,12 @@ void TransferListFiltersWidget::trackerError(BitTorrent::TorrentHandle *const to
}
void TransferListFiltersWidget::onCategoryFilterStateChanged(bool enabled)
{
toggleCategoryFilter(enabled);
Preferences::instance()->setCategoryFilterState(enabled);
}
void TransferListFiltersWidget::toggleCategoryFilter(bool enabled)
{
m_categoryFilterWidget->setVisible(enabled);
m_transferList->applyCategoryFilter(enabled ? m_categoryFilterWidget->currentCategory() : QString());

2
src/gui/transferlistfilterswidget.h

@ -162,6 +162,8 @@ private slots: @@ -162,6 +162,8 @@ private slots:
void onCategoryFilterStateChanged(bool enabled);
private:
void toggleCategoryFilter(bool enabled);
TransferListWidget *m_transferList;
TrackerFiltersList *m_trackerFilters;
CategoryFilterWidget *m_categoryFilterWidget;

Loading…
Cancel
Save