From 0256c31411fbc79faf2dab4593a855374073334a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Sat, 1 Mar 2025 11:26:48 +0100 Subject: [PATCH] Use some of the new generic conveniences in the visual deck editor --- .../tab_deck_editor_visual.cpp | 24 +++++++------------ .../tab_deck_editor_visual.h | 4 +--- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/cockatrice/src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp b/cockatrice/src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp index 14d9a9463..c364c44be 100644 --- a/cockatrice/src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp +++ b/cockatrice/src/client/tabs/visual_deck_editor/tab_deck_editor_visual.cpp @@ -81,6 +81,14 @@ void TabDeckEditorVisual::createCentralFrame() setDockOptions(QMainWindow::AnimatedDocks | QMainWindow::AllowNestedDocks | QMainWindow::AllowTabbedDocks); } +void TabDeckEditorVisual::onDeckChanged() +{ + AbstractTabDeckEditor::onDeckChanged(); + tabContainer->visualDeckView->updateDisplay(); + tabContainer->deckAnalytics->refreshDisplays(deckDockWidget->deckModel); + tabContainer->sampleHandWidget->setDeckModel(deckDockWidget->deckModel); +} + void TabDeckEditorVisual::createMenus() { deckMenu = new DeckEditorMenu(this); @@ -190,22 +198,6 @@ void TabDeckEditorVisual::processCardClickDatabaseDisplay(QMouseEvent *event, } } -void TabDeckEditorVisual::actLoadDeckFromClipboard() -{ - AbstractTabDeckEditor::actLoadDeckFromClipboard(); - tabContainer->visualDeckView->updateDisplay(); - tabContainer->deckAnalytics->refreshDisplays(deckDockWidget->deckModel); - tabContainer->sampleHandWidget->setDeckModel(deckDockWidget->deckModel); -} - -void TabDeckEditorVisual::setDeck(DeckLoader *_deck) -{ - AbstractTabDeckEditor::setDeck(_deck); - tabContainer->visualDeckView->updateDisplay(); - tabContainer->deckAnalytics->refreshDisplays(deckDockWidget->deckModel); - tabContainer->sampleHandWidget->setDeckModel(deckDockWidget->deckModel); -} - void TabDeckEditorVisual::showPrintingSelector() { printingSelectorDockWidget->printingSelector->setCard(cardInfoDockWidget->cardInfo->getInfo(), DECK_ZONE_MAIN); diff --git a/cockatrice/src/client/tabs/visual_deck_editor/tab_deck_editor_visual.h b/cockatrice/src/client/tabs/visual_deck_editor/tab_deck_editor_visual.h index 1b77e0cac..7d5c8da38 100644 --- a/cockatrice/src/client/tabs/visual_deck_editor/tab_deck_editor_visual.h +++ b/cockatrice/src/client/tabs/visual_deck_editor/tab_deck_editor_visual.h @@ -8,8 +8,6 @@ class TabDeckEditorVisual : public AbstractTabDeckEditor { Q_OBJECT protected slots: - void actLoadDeckFromClipboard() override; - void loadLayout() override; void restartLayout() override; void freeDocksSize() override; @@ -34,7 +32,6 @@ protected: public: explicit TabDeckEditorVisual(TabSupervisor *_tabSupervisor); - void setDeck(DeckLoader *_deck) override; void retranslateUi() override; QString getTabText() const override; void changeModelIndexAndCardInfo(CardInfoPtr activeCard); @@ -45,6 +42,7 @@ public: void createCentralFrame(); public slots: + void onDeckChanged() override; void showPrintingSelector() override; void processMainboardCardClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance); void processSideboardCardClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance);