mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-16 07:22:16 -07:00
Remove some overriden methods that are now generic enough to not necessitate being overriden anymore.
This commit is contained in:
parent
fbd79f34f0
commit
768b957b54
2 changed files with 24 additions and 87 deletions
|
|
@ -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()
|
void TabDeckEditorVisual::restartLayout()
|
||||||
{
|
{
|
||||||
deckDockWidget->setVisible(true);
|
deckDockWidget->setVisible(true);
|
||||||
|
|
@ -309,90 +333,6 @@ void TabDeckEditorVisual::retranslateUi()
|
||||||
aResetLayout->setText(tr("Reset layout"));
|
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
|
// Method uses to sync docks state with menu items state
|
||||||
bool TabDeckEditorVisual::eventFilter(QObject *o, QEvent *e)
|
bool TabDeckEditorVisual::eventFilter(QObject *o, QEvent *e)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -8,8 +8,6 @@ class TabDeckEditorVisual : public AbstractTabDeckEditor
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
protected slots:
|
protected slots:
|
||||||
void actNewDeck() override;
|
|
||||||
void actLoadDeck() override;
|
|
||||||
void actLoadDeckFromClipboard() override;
|
void actLoadDeckFromClipboard() override;
|
||||||
|
|
||||||
void loadLayout() override;
|
void loadLayout() override;
|
||||||
|
|
@ -23,7 +21,6 @@ protected slots:
|
||||||
void dockTopLevelChanged(bool topLevel) override;
|
void dockTopLevelChanged(bool topLevel) override;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void openDeckFromFile(const QString &fileName, AbstractTabDeckEditor::DeckOpenLocation deckOpenLocation) override;
|
|
||||||
TabDeckEditorVisualTabWidget *tabContainer;
|
TabDeckEditorVisualTabWidget *tabContainer;
|
||||||
|
|
||||||
QVBoxLayout *centralFrame;
|
QVBoxLayout *centralFrame;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue