From e9a47df73a8d726ced0f5ea454d081f95ed1b880 Mon Sep 17 00:00:00 2001 From: RickyRister Date: Fri, 23 Jan 2026 02:10:44 -0800 Subject: [PATCH] don't hide printing selector dock --- .../deck_editor_database_display_widget.cpp | 6 ++---- .../deck_editor/deck_editor_deck_dock_widget.cpp | 10 ++++------ .../widgets/tabs/abstract_tab_deck_editor.cpp | 3 --- .../interface/widgets/tabs/tab_deck_editor.cpp | 13 ------------- .../visual_deck_editor/tab_deck_editor_visual.cpp | 15 +-------------- 5 files changed, 7 insertions(+), 40 deletions(-) diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp index 590fd1d1b..c625ff1d9 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp @@ -187,10 +187,8 @@ void DeckEditorDatabaseDisplayWidget::databaseCustomMenu(QPoint point) QAction *addToDeck, *addToSideboard, *selectPrinting, *edhRecCommander, *edhRecCard; addToDeck = menu.addAction(tr("Add to Deck")); addToSideboard = menu.addAction(tr("Add to Sideboard")); - if (!SettingsCache::instance().getOverrideAllCardArtWithPersonalPreference()) { - selectPrinting = menu.addAction(tr("Select Printing")); - connect(selectPrinting, &QAction::triggered, this, [this, card] { deckEditor->showPrintingSelector(); }); - } + selectPrinting = menu.addAction(tr("Select Printing")); + connect(selectPrinting, &QAction::triggered, this, [this, card] { deckEditor->showPrintingSelector(); }); if (canBeCommander(card.getInfo())) { edhRecCommander = menu.addAction(tr("Show on EDHRec (Commander)")); connect(edhRecCommander, &QAction::triggered, this, diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp index 2ecb4f46a..f939ae99d 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp @@ -713,14 +713,12 @@ void DeckEditorDeckDockWidget::offsetCountAtIndex(const QModelIndex &idx, bool i void DeckEditorDeckDockWidget::decklistCustomMenu(QPoint point) { - if (!SettingsCache::instance().getOverrideAllCardArtWithPersonalPreference()) { - QMenu menu; + QMenu menu; - QAction *selectPrinting = menu.addAction(tr("Select Printing")); - connect(selectPrinting, &QAction::triggered, deckEditor, &AbstractTabDeckEditor::showPrintingSelector); + QAction *selectPrinting = menu.addAction(tr("Select Printing")); + connect(selectPrinting, &QAction::triggered, deckEditor, &AbstractTabDeckEditor::showPrintingSelector); - menu.exec(deckView->mapToGlobal(point)); - } + menu.exec(deckView->mapToGlobal(point)); } void DeckEditorDeckDockWidget::refreshShortcuts() diff --git a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp index 0043c0496..44fa46bb1 100644 --- a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp +++ b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp @@ -61,9 +61,6 @@ AbstractTabDeckEditor::AbstractTabDeckEditor(TabSupervisor *_tabSupervisor) : Ta cardInfoDockWidget = new DeckEditorCardInfoDockWidget(this); filterDockWidget = new DeckEditorFilterDockWidget(this); printingSelectorDockWidget = new DeckEditorPrintingSelectorDockWidget(this); - connect(&SettingsCache::instance(), &SettingsCache::overrideAllCardArtWithPersonalPreferenceChanged, this, [this] { - printingSelectorDockWidget->setHidden(SettingsCache::instance().getOverrideAllCardArtWithPersonalPreference()); - }); // Connect deck signals to this tab connect(deckStateManager, &DeckStateManager::isModifiedChanged, this, &AbstractTabDeckEditor::onDeckModified); diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp index 1ab7942e2..1d667640d 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp @@ -60,10 +60,6 @@ void TabDeckEditor::createMenus() registerDockWidget(viewMenu, filterDockWidget); registerDockWidget(viewMenu, printingSelectorDockWidget); - if (SettingsCache::instance().getOverrideAllCardArtWithPersonalPreference()) { - dockToActions[printingSelectorDockWidget].menu->setEnabled(false); - } - connect(&SettingsCache::instance(), &SettingsCache::overrideAllCardArtWithPersonalPreferenceChanged, this, [this](bool enabled) { dockToActions[printingSelectorDockWidget].menu->setEnabled(!enabled); }); @@ -148,12 +144,6 @@ void TabDeckEditor::loadLayout() restoreGeometry(layouts.getDeckEditorGeometry()); } - if (SettingsCache::instance().getOverrideAllCardArtWithPersonalPreference()) { - if (!printingSelectorDockWidget->isHidden()) { - printingSelectorDockWidget->setHidden(true); - } - } - cardDatabaseDockWidget->setMinimumSize(layouts.getDeckEditorCardDatabaseSize()); cardDatabaseDockWidget->setMaximumSize(layouts.getDeckEditorCardDatabaseSize()); @@ -183,9 +173,6 @@ void TabDeckEditor::restartLayout() dockWidget->setFloating(false); } - // Printing selector special case - printingSelectorDockWidget->setVisible(!SettingsCache::instance().getOverrideAllCardArtWithPersonalPreference()); - addDockWidget(Qt::LeftDockWidgetArea, cardDatabaseDockWidget); addDockWidget(Qt::RightDockWidgetArea, deckDockWidget); addDockWidget(Qt::RightDockWidgetArea, cardInfoDockWidget); diff --git a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp index 745ec22a8..60fcb0f3f 100644 --- a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp +++ b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp @@ -102,13 +102,6 @@ void TabDeckEditorVisual::createMenus() registerDockWidget(viewMenu, filterDockWidget); registerDockWidget(viewMenu, printingSelectorDockWidget); - if (SettingsCache::instance().getOverrideAllCardArtWithPersonalPreference()) { - dockToActions[printingSelectorDockWidget].menu->setEnabled(false); - } - - connect(&SettingsCache::instance(), &SettingsCache::overrideAllCardArtWithPersonalPreferenceChanged, this, - [this](bool enabled) { dockToActions[printingSelectorDockWidget].menu->setEnabled(!enabled); }); - viewMenu->addSeparator(); aResetLayout = viewMenu->addAction(QString()); @@ -279,12 +272,6 @@ void TabDeckEditorVisual::loadLayout() restoreGeometry(layouts.getDeckEditorGeometry()); } - if (SettingsCache::instance().getOverrideAllCardArtWithPersonalPreference()) { - if (!printingSelectorDockWidget->isHidden()) { - printingSelectorDockWidget->setHidden(true); - } - } - cardInfoDockWidget->setMinimumSize(layouts.getDeckEditorCardSize()); cardInfoDockWidget->setMaximumSize(layouts.getDeckEditorCardSize()); @@ -310,7 +297,7 @@ void TabDeckEditorVisual::restartLayout() deckDockWidget->setVisible(true); cardInfoDockWidget->setVisible(true); filterDockWidget->setVisible(false); - printingSelectorDockWidget->setVisible(!SettingsCache::instance().getOverrideAllCardArtWithPersonalPreference()); + printingSelectorDockWidget->setVisible(true); setCentralWidget(centralWidget); addDockWidget(Qt::RightDockWidgetArea, deckDockWidget);