mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-18 16:32:16 -07:00
Move clearing database filter into signal/slot relation.
This commit is contained in:
parent
57a64c97fd
commit
b533f14d87
5 changed files with 14 additions and 2 deletions
|
|
@ -62,6 +62,9 @@ AbstractTabDeckEditor::AbstractTabDeckEditor(TabSupervisor *_tabSupervisor) : Ta
|
||||||
connect(databaseDisplayDockWidget, &DeckEditorDatabaseDisplayWidget::decrementCardFromSideboard, this,
|
connect(databaseDisplayDockWidget, &DeckEditorDatabaseDisplayWidget::decrementCardFromSideboard, this,
|
||||||
&AbstractTabDeckEditor::actDecrementCardFromSideboard);
|
&AbstractTabDeckEditor::actDecrementCardFromSideboard);
|
||||||
|
|
||||||
|
connect(filterDockWidget, &DeckEditorFilterDockWidget::clearAllDatabaseFilters, databaseDisplayDockWidget,
|
||||||
|
&DeckEditorDatabaseDisplayWidget::clearAllDatabaseFilters);
|
||||||
|
|
||||||
connect(&SettingsCache::instance().shortcuts(), SIGNAL(shortCutChanged()), this, SLOT(refreshShortcuts()));
|
connect(&SettingsCache::instance().shortcuts(), SIGNAL(shortCutChanged()), this, SLOT(refreshShortcuts()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -124,6 +124,12 @@ void DeckEditorDatabaseDisplayWidget::updateSearch(const QString &search)
|
||||||
QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
|
QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void DeckEditorDatabaseDisplayWidget::clearAllDatabaseFilters()
|
||||||
|
{
|
||||||
|
databaseDisplayModel->clearFilterAll();
|
||||||
|
searchEdit->setText("");
|
||||||
|
}
|
||||||
|
|
||||||
void DeckEditorDatabaseDisplayWidget::updateCard(const QModelIndex ¤t, const QModelIndex & /*previous*/)
|
void DeckEditorDatabaseDisplayWidget::updateCard(const QModelIndex ¤t, const QModelIndex & /*previous*/)
|
||||||
{
|
{
|
||||||
const QString cardName = current.sibling(current.row(), 0).data().toString();
|
const QString cardName = current.sibling(current.row(), 0).data().toString();
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,7 @@ public:
|
||||||
public slots:
|
public slots:
|
||||||
CardInfoPtr currentCardInfo() const;
|
CardInfoPtr currentCardInfo() const;
|
||||||
void setFilterTree(FilterTree *filterTree);
|
void setFilterTree(FilterTree *filterTree);
|
||||||
|
void clearAllDatabaseFilters();
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void addCardToMainDeck(CardInfoPtr card);
|
void addCardToMainDeck(CardInfoPtr card);
|
||||||
|
|
|
||||||
|
|
@ -115,8 +115,7 @@ void DeckEditorFilterDockWidget::filterRemove(QAction *action)
|
||||||
|
|
||||||
void DeckEditorFilterDockWidget::actClearFilterAll()
|
void DeckEditorFilterDockWidget::actClearFilterAll()
|
||||||
{
|
{
|
||||||
deckEditor->databaseDisplayDockWidget->databaseDisplayModel->clearFilterAll();
|
emit clearAllDatabaseFilters();
|
||||||
deckEditor->databaseDisplayDockWidget->searchEdit->setText("");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void DeckEditorFilterDockWidget::actClearFilterOne()
|
void DeckEditorFilterDockWidget::actClearFilterOne()
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,9 @@ public:
|
||||||
void retranslateUi();
|
void retranslateUi();
|
||||||
QAction *aClearFilterAll, *aClearFilterOne;
|
QAction *aClearFilterAll, *aClearFilterOne;
|
||||||
|
|
||||||
|
signals:
|
||||||
|
void clearAllDatabaseFilters();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
AbstractTabDeckEditor *deckEditor;
|
AbstractTabDeckEditor *deckEditor;
|
||||||
FilterTreeModel *filterModel;
|
FilterTreeModel *filterModel;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue