jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-05 21:13:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

directly get key signals for eventFilter

Browse source
This commit is contained in:
RickyRister 2026-06-03 21:27:32 -07:00
parent d5e7f1e065
commit 1638bae41f
5 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/interface/key_signals.h
View file

@ -29,7 +29,7 @@ signals:
void onShiftS(); void onShiftS();
void onCtrlC(); void onCtrlC();
public: protected:
bool eventFilter(QObject *, QEvent *event) override; bool eventFilter(QObject *, QEvent *event) override;
}; };

5
cockatrice/src/interface/widgets/deck_editor/card_database_view.cpp
View file

@ -165,8 +165,3 @@ void CardDatabaseView::openCustomMenu(QPoint point)
menu.exec(mapToGlobal(point)); menu.exec(mapToGlobal(point));
} }
bool CardDatabaseView::eventFilter(QObject *object, QEvent *event)
{
return searchKeySignals.eventFilter(object, event);
}

12
cockatrice/src/interface/widgets/deck_editor/card_database_view.h
View file

@ -24,6 +24,15 @@ public:
QString currentCardName() const; QString currentCardName() const;
/**
* @brief Get the KeySignals that are connected to this view.
* You can install the KeySignals as an eventFilter to capture keyboard shortcuts for adding and decrementing cards.
*/
KeySignals *getKeySignals()
{
return &searchKeySignals;
}
signals: signals:
void cardChanged(const QString &cardName); void cardChanged(const QString &cardName);
@ -34,9 +43,6 @@ signals:
void selectPrintingClicked(); void selectPrintingClicked();
void relatedCardClicked(const QString &relatedCard); void relatedCardClicked(const QString &relatedCard);
protected:
bool eventFilter(QObject *, QEvent *event) override;
private slots: private slots:
void actDoubleClick(); void actDoubleClick();

2
cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp
View file

@ -45,7 +45,7 @@ DeckEditorDatabaseDisplayWidget::DeckEditorDatabaseDisplayWidget(QWidget *parent
databaseView->setFocusProxy(searchEdit); databaseView->setFocusProxy(searchEdit);
searchEdit->setTreeView(databaseView); searchEdit->setTreeView(databaseView);
searchEdit->installEventFilter(databaseView); searchEdit->installEventFilter(databaseView->getKeySignals());
connect(searchEdit, &SearchLineEdit::textChanged, databaseDisplayModel, &CardDatabaseDisplayModel::setStringFilter); connect(searchEdit, &SearchLineEdit::textChanged, databaseDisplayModel, &CardDatabaseDisplayModel::setStringFilter);
connect(databaseView, &CardDatabaseView::cardAdded, this, &DeckEditorDatabaseDisplayWidget::addCard); connect(databaseView, &CardDatabaseView::cardAdded, this, &DeckEditorDatabaseDisplayWidget::addCard);

2
cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp
View file

@ -87,7 +87,7 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
databaseView->setVisible(false); databaseView->setVisible(false);
searchEdit->setTreeView(databaseView); searchEdit->setTreeView(databaseView);
searchEdit->installEventFilter(databaseView); searchEdit->installEventFilter(databaseView->getKeySignals());
connect(databaseView, &CardDatabaseView::cardChanged, this, &VisualDatabaseDisplayWidget::onSelectedCardChanged); connect(databaseView, &CardDatabaseView::cardChanged, this, &VisualDatabaseDisplayWidget::onSelectedCardChanged);
connect(databaseView, &CardDatabaseView::cardAdded, this, &VisualDatabaseDisplayWidget::actAddCard); connect(databaseView, &CardDatabaseView::cardAdded, this, &VisualDatabaseDisplayWidget::actAddCard);