From 768b957b5495981e84c7e760bc84be48ec7ecbbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Sat, 1 Mar 2025 11:14:28 +0100 Subject: [PATCH] Remove some overriden methods that are now generic enough to not necessitate being overriden anymore. --- .../tab_deck_editor_visual.cpp | 108 ++++-------------- .../tab_deck_editor_visual.h | 3 - 2 files changed, 24 insertions(+), 87 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 ceadb0182..14d9a9463 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 @@ -190,6 +190,30 @@ 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); + printingSelectorDockWidget->printingSelector->updateDisplay(); + aPrintingSelectorDockVisible->setChecked(true); + printingSelectorDockWidget->setVisible(true); +} + void TabDeckEditorVisual::restartLayout() { deckDockWidget->setVisible(true); @@ -309,90 +333,6 @@ void TabDeckEditorVisual::retranslateUi() aResetLayout->setText(tr("Reset layout")); } -void TabDeckEditorVisual::actNewDeck() -{ - auto deckOpenLocation = confirmOpen(false); - - if (deckOpenLocation == CANCELLED) { - return; - } - - if (deckOpenLocation == NEW_TAB) { - emit openDeckEditor(nullptr); - return; - } - - deckDockWidget->cleanDeck(); - setModified(false); - deckMenu->setSaveStatus(false); -} - -void TabDeckEditorVisual::actLoadDeck() -{ - auto deckOpenLocation = confirmOpen(); - - if (deckOpenLocation == CANCELLED) { - return; - } - - DlgLoadDeck dialog(this); - if (!dialog.exec()) - return; - - QString fileName = dialog.selectedFiles().at(0); - TabDeckEditorVisual::openDeckFromFile(fileName, deckOpenLocation); - deckDockWidget->updateBannerCardComboBox(); -} - -void TabDeckEditorVisual::actLoadDeckFromClipboard() -{ - AbstractTabDeckEditor::actLoadDeckFromClipboard(); - tabContainer->visualDeckView->updateDisplay(); - tabContainer->deckAnalytics->refreshDisplays(deckDockWidget->deckModel); - tabContainer->sampleHandWidget->setDeckModel(deckDockWidget->deckModel); -} - -void TabDeckEditorVisual::openDeckFromFile(const QString &fileName, DeckOpenLocation deckOpenLocation) -{ - DeckLoader::FileFormat fmt = DeckLoader::getFormatFromName(fileName); - - auto *l = new DeckLoader; - if (l->loadFromFile(fileName, fmt, true)) { - SettingsCache::instance().recents().updateRecentlyOpenedDeckPaths(fileName); - deckDockWidget->updateBannerCardComboBox(); - if (!l->getBannerCard().first.isEmpty()) { - deckDockWidget->bannerCardComboBox->setCurrentIndex( - deckDockWidget->bannerCardComboBox->findText(l->getBannerCard().first)); - } - if (deckOpenLocation == NEW_TAB) { - emit openDeckEditor(l); - } else { - deckMenu->setSaveStatus(false); - TabDeckEditorVisual::setDeck(l); - } - } else { - l->deleteLater(); - QMessageBox::critical(this, tr("Error"), tr("Could not open deck at %1").arg(fileName)); - } - deckMenu->setSaveStatus(true); -} - -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); - printingSelectorDockWidget->printingSelector->updateDisplay(); - aPrintingSelectorDockVisible->setChecked(true); - printingSelectorDockWidget->setVisible(true); -} - // Method uses to sync docks state with menu items state bool TabDeckEditorVisual::eventFilter(QObject *o, QEvent *e) { 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 5eae6ebfd..1b77e0cac 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 actNewDeck() override; - void actLoadDeck() override; void actLoadDeckFromClipboard() override; void loadLayout() override; @@ -23,7 +21,6 @@ protected slots: void dockTopLevelChanged(bool topLevel) override; protected: - void openDeckFromFile(const QString &fileName, AbstractTabDeckEditor::DeckOpenLocation deckOpenLocation) override; TabDeckEditorVisualTabWidget *tabContainer; QVBoxLayout *centralFrame;