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

[DeckEditor] Reuse the inherited CardDatabaseModel in the visual editor (#7112)

Browse source 
Took 6 minutes

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
BruebachL 2026-08-14 07:11:26 +02:00 • committed by GitHub
parent 813a3ea034
commit 2eca362e2b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
View file

@ -27,7 +27,6 @@
#include <QTimer> #include <QTimer>
#include <QTreeView> #include <QTreeView>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <libcockatrice/card/database/card_database_manager.h>
#include <libcockatrice/models/deck_list/deck_list_model.h> #include <libcockatrice/models/deck_list/deck_list_model.h>
#include <libcockatrice/protocol/pb/command_deck_upload.pb.h> #include <libcockatrice/protocol/pb/command_deck_upload.pb.h>
#include <libcockatrice/protocol/pending_command.h> #include <libcockatrice/protocol/pending_command.h>
@ -67,9 +66,6 @@ void TabDeckEditorVisual::createCentralFrame()
centralFrame = new QVBoxLayout; centralFrame = new QVBoxLayout;
centralWidget->setLayout(centralFrame); centralWidget->setLayout(centralFrame);
auto databaseModel = new CardDatabaseModel(CardDatabaseManager::getInstance(), true, this);
databaseModel->setObjectName("databaseModel");
tabContainer = new TabDeckEditorVisualTabWidget(centralWidget, this, deckStateManager->getModel(), databaseModel); tabContainer = new TabDeckEditorVisualTabWidget(centralWidget, this, deckStateManager->getModel(), databaseModel);
connect(tabContainer, &TabDeckEditorVisualTabWidget::cardChanged, this, connect(tabContainer, &TabDeckEditorVisualTabWidget::cardChanged, this,

3
cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp
View file

@ -25,7 +25,8 @@ TabDeckEditorVisualTabWidget::TabDeckEditorVisualTabWidget(QWidget *parent,
layout = new QVBoxLayout(this); layout = new QVBoxLayout(this);
setLayout(layout); setLayout(layout);
visualDeckView = new VisualDeckEditorWidget(this, deckModel, _deckEditor->deckDockWidget->getSelectionModel()); visualDeckView = new VisualDeckEditorWidget(this, deckModel, _deckEditor->deckDockWidget->getSelectionModel(),
_cardDatabaseModel);
visualDeckView->setObjectName("visualDeckView"); visualDeckView->setObjectName("visualDeckView");
connect(visualDeckView, &VisualDeckEditorWidget::activeCardChanged, this, connect(visualDeckView, &VisualDeckEditorWidget::activeCardChanged, this,
&TabDeckEditorVisualTabWidget::onCardChanged); &TabDeckEditorVisualTabWidget::onCardChanged);

10
cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp
View file

@ -29,8 +29,10 @@
VisualDeckEditorWidget::VisualDeckEditorWidget(QWidget *parent, VisualDeckEditorWidget::VisualDeckEditorWidget(QWidget *parent,
DeckListModel *_deckListModel, DeckListModel *_deckListModel,
QItemSelectionModel *_selectionModel) QItemSelectionModel *_selectionModel,
: QWidget(parent), deckListModel(_deckListModel), selectionModel(_selectionModel) CardDatabaseModel *_cardDatabaseModel)
: QWidget(parent), deckListModel(_deckListModel), selectionModel(_selectionModel),
cardDatabaseModel(_cardDatabaseModel)
{ {
// The Main Widget and Main Layout, which contain a single Widget: The Scroll Area // The Main Widget and Main Layout, which contain a single Widget: The Scroll Area
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
@ -94,7 +96,9 @@ void VisualDeckEditorWidget::initializeSearchBarAndCompleter()
setFocusProxy(searchBar); setFocusProxy(searchBar);
setFocusPolicy(Qt::ClickFocus); setFocusPolicy(Qt::ClickFocus);
cardDatabaseModel = new CardDatabaseModel(CardDatabaseManager::getInstance(), false, this); if (!cardDatabaseModel) {
cardDatabaseModel = new CardDatabaseModel(CardDatabaseManager::getInstance(), false, this);
}
cardDatabaseDisplayModel = new CardDatabaseDisplayModel(this); cardDatabaseDisplayModel = new CardDatabaseDisplayModel(this);
cardDatabaseDisplayModel->setSourceModel(cardDatabaseModel); cardDatabaseDisplayModel->setSourceModel(cardDatabaseModel);

5
cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h
View file

@ -38,7 +38,10 @@ class VisualDeckEditorWidget : public QWidget
Q_OBJECT Q_OBJECT
public: public:
explicit VisualDeckEditorWidget(QWidget *parent, DeckListModel *deckListModel, QItemSelectionModel *selectionModel); explicit VisualDeckEditorWidget(QWidget *parent,
DeckListModel *deckListModel,
QItemSelectionModel *selectionModel,
CardDatabaseModel *_cardDatabaseModel = nullptr);
void retranslateUi(); void retranslateUi();
void updateCompactMode(); void updateCompactMode();
void clearAllDisplayWidgets(); void clearAllDisplayWidgets();