From 084244e9b853c9fd45e8a9ee7ea7faf4eb660c90 Mon Sep 17 00:00:00 2001 From: RickyRister Date: Mon, 18 May 2026 03:11:20 -0700 Subject: [PATCH] [Settings] Split printing settings into own group --- .../appearance_settings_page.cpp | 47 +++++++++++-------- .../settings_page/appearance_settings_page.h | 5 +- 2 files changed, 31 insertions(+), 21 deletions(-) diff --git a/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.cpp index f6740f472..1136d4902 100644 --- a/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.cpp +++ b/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.cpp @@ -121,14 +121,7 @@ AppearanceSettingsPage::AppearanceSettingsPage() menuGroupBox = new QGroupBox; menuGroupBox->setLayout(menuGrid); - // Card rendering - displayCardNamesCheckBox.setChecked(settings.getDisplayCardNames()); - connect(&displayCardNamesCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, &SettingsCache::setDisplayCardNames); - - autoRotateSidewaysLayoutCardsCheckBox.setChecked(settings.getAutoRotateSidewaysLayoutCards()); - connect(&autoRotateSidewaysLayoutCardsCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, - &SettingsCache::setAutoRotateSidewaysLayoutCards); - + // Printings settings overrideAllCardArtWithPersonalPreferenceCheckBox.setChecked(settings.getOverrideAllCardArtWithPersonalPreference()); connect(&overrideAllCardArtWithPersonalPreferenceCheckBox, &QCheckBox::QT_STATE_CHANGED, this, &AppearanceSettingsPage::overrideAllCardArtWithPersonalPreferenceToggled); @@ -137,6 +130,21 @@ AppearanceSettingsPage::AppearanceSettingsPage() connect(&bumpSetsWithCardsInDeckToTopCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, &SettingsCache::setBumpSetsWithCardsInDeckToTop); + auto *printingsGrid = new QGridLayout; + printingsGrid->addWidget(&overrideAllCardArtWithPersonalPreferenceCheckBox, 0, 0, 1, 2); + printingsGrid->addWidget(&bumpSetsWithCardsInDeckToTopCheckBox, 1, 0, 1, 2); + + printingsGroupBox = new QGroupBox; + printingsGroupBox->setLayout(printingsGrid); + + // Card rendering + displayCardNamesCheckBox.setChecked(settings.getDisplayCardNames()); + connect(&displayCardNamesCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, &SettingsCache::setDisplayCardNames); + + autoRotateSidewaysLayoutCardsCheckBox.setChecked(settings.getAutoRotateSidewaysLayoutCards()); + connect(&autoRotateSidewaysLayoutCardsCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, + &SettingsCache::setAutoRotateSidewaysLayoutCards); + cardScalingCheckBox.setChecked(settings.getScaleCards()); connect(&cardScalingCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, &SettingsCache::setCardScaling); @@ -163,14 +171,12 @@ AppearanceSettingsPage::AppearanceSettingsPage() cardsGrid->addWidget(&autoRotateSidewaysLayoutCardsCheckBox, 1, 0, 1, 2); cardsGrid->addWidget(&cardScalingCheckBox, 2, 0, 1, 2); cardsGrid->addWidget(&roundCardCornersCheckBox, 3, 0, 1, 2); - cardsGrid->addWidget(&overrideAllCardArtWithPersonalPreferenceCheckBox, 4, 0, 1, 2); - cardsGrid->addWidget(&bumpSetsWithCardsInDeckToTopCheckBox, 5, 0, 1, 2); - cardsGrid->addWidget(&verticalCardOverlapPercentLabel, 6, 0, 1, 1); - cardsGrid->addWidget(&verticalCardOverlapPercentBox, 6, 1, 1, 1); - cardsGrid->addWidget(&cardViewInitialRowsMaxLabel, 7, 0); - cardsGrid->addWidget(&cardViewInitialRowsMaxBox, 7, 1); - cardsGrid->addWidget(&cardViewExpandedRowsMaxLabel, 8, 0); - cardsGrid->addWidget(&cardViewExpandedRowsMaxBox, 8, 1); + cardsGrid->addWidget(&verticalCardOverlapPercentLabel, 4, 0, 1, 1); + cardsGrid->addWidget(&verticalCardOverlapPercentBox, 4, 1, 1, 1); + cardsGrid->addWidget(&cardViewInitialRowsMaxLabel, 5, 0); + cardsGrid->addWidget(&cardViewInitialRowsMaxBox, 5, 1); + cardsGrid->addWidget(&cardViewExpandedRowsMaxLabel, 6, 0); + cardsGrid->addWidget(&cardViewExpandedRowsMaxBox, 6, 1); cardsGroupBox = new QGroupBox; cardsGroupBox->setLayout(cardsGrid); @@ -267,6 +273,7 @@ AppearanceSettingsPage::AppearanceSettingsPage() auto *mainLayout = new QVBoxLayout; mainLayout->addWidget(themeGroupBox); mainLayout->addWidget(menuGroupBox); + mainLayout->addWidget(printingsGroupBox); mainLayout->addWidget(cardsGroupBox); mainLayout->addWidget(cardCountersGroupBox); mainLayout->addWidget(handGroupBox); @@ -381,13 +388,15 @@ void AppearanceSettingsPage::retranslateUi() showShortcutsCheckBox.setText(tr("Show keyboard shortcuts in right-click menus")); showGameSelectorFilterToolbarCheckBox.setText(tr("Show game filter toolbar above list in room tab")); - cardsGroupBox->setTitle(tr("Card rendering")); - displayCardNamesCheckBox.setText(tr("Display card names on cards having a picture")); - autoRotateSidewaysLayoutCardsCheckBox.setText(tr("Auto-Rotate cards with sideways layout")); + printingsGroupBox->setTitle(tr("Card printings")); overrideAllCardArtWithPersonalPreferenceCheckBox.setText( tr("Override all card art with personal set preference (Pre-ProviderID change behavior)")); bumpSetsWithCardsInDeckToTopCheckBox.setText( tr("Bump sets that the deck contains cards from to the top in the printing selector")); + + cardsGroupBox->setTitle(tr("Card rendering")); + displayCardNamesCheckBox.setText(tr("Display card names on cards having a picture")); + autoRotateSidewaysLayoutCardsCheckBox.setText(tr("Auto-Rotate cards with sideways layout")); cardScalingCheckBox.setText(tr("Scale cards on mouse over")); roundCardCornersCheckBox.setText(tr("Use rounded card corners")); verticalCardOverlapPercentLabel.setText( diff --git a/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.h b/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.h index 116311986..be9ba7c68 100644 --- a/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.h +++ b/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.h @@ -42,10 +42,10 @@ private: QLabel maxFontSizeForCardsLabel; QCheckBox showShortcutsCheckBox; QCheckBox showGameSelectorFilterToolbarCheckBox; - QCheckBox displayCardNamesCheckBox; - QCheckBox autoRotateSidewaysLayoutCardsCheckBox; QCheckBox overrideAllCardArtWithPersonalPreferenceCheckBox; QCheckBox bumpSetsWithCardsInDeckToTopCheckBox; + QCheckBox displayCardNamesCheckBox; + QCheckBox autoRotateSidewaysLayoutCardsCheckBox; QCheckBox cardScalingCheckBox; QCheckBox roundCardCornersCheckBox; QLabel verticalCardOverlapPercentLabel; @@ -59,6 +59,7 @@ private: QCheckBox invertVerticalCoordinateCheckBox; QGroupBox *themeGroupBox; QGroupBox *menuGroupBox; + QGroupBox *printingsGroupBox; QGroupBox *cardsGroupBox; QGroupBox *handGroupBox; QGroupBox *tableGroupBox;