jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-09-28 00:42:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Move settings to own group

Browse source 
Took 11 minutes
This commit is contained in:
Lukas Brübach 2026-08-13 23:55:18 +02:00
parent 519297bb6f
commit 1c85a4aad8
2 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

32
cockatrice/src/interface/widgets/settings_page/appearance_settings_page.cpp
View file

@ -321,6 +321,15 @@ AppearanceSettingsPage::AppearanceSettingsPage()
&InterfaceSettings::setMinPlayersForMultiColumnLayout); &InterfaceSettings::setMinPlayersForMultiColumnLayout);
minPlayersForMultiColumnLayoutLabel.setBuddy(&minPlayersForMultiColumnLayoutEdit); minPlayersForMultiColumnLayoutLabel.setBuddy(&minPlayersForMultiColumnLayoutEdit);
auto *tableGrid = new QGridLayout;
tableGrid->addWidget(&invertVerticalCoordinateCheckBox, 0, 0, 1, 2);
tableGrid->addWidget(&minPlayersForMultiColumnLayoutLabel, 1, 0, 1, 1);
tableGrid->addWidget(&minPlayersForMultiColumnLayoutEdit, 1, 1, 1, 1);
tableGroupBox = new QGroupBox;
tableGroupBox->setLayout(tableGrid);
// Playmat settings
playmatVisibilityCombo.addItem(tr("Show all playmats"), 2); playmatVisibilityCombo.addItem(tr("Show all playmats"), 2);
playmatVisibilityCombo.addItem(tr("Show own playmat only"), 1); playmatVisibilityCombo.addItem(tr("Show own playmat only"), 1);
playmatVisibilityCombo.addItem(tr("Don't use playmats"), 0); playmatVisibilityCombo.addItem(tr("Don't use playmats"), 0);
@ -344,19 +353,16 @@ AppearanceSettingsPage::AppearanceSettingsPage()
overrideButtons->addWidget(&playmatOverrideEditButton); overrideButtons->addWidget(&playmatOverrideEditButton);
overrideButtons->addWidget(&playmatOverrideClearButton); overrideButtons->addWidget(&playmatOverrideClearButton);
auto *tableGrid = new QGridLayout; auto *playmatGrid = new QGridLayout;
tableGrid->addWidget(&invertVerticalCoordinateCheckBox, 0, 0, 1, 2); playmatGrid->addWidget(&playmatVisibilityLabel, 0, 0, 1, 1);
tableGrid->addWidget(&minPlayersForMultiColumnLayoutLabel, 1, 0, 1, 1); playmatGrid->addWidget(&playmatVisibilityCombo, 0, 1, 1, 1);
tableGrid->addWidget(&minPlayersForMultiColumnLayoutEdit, 1, 1, 1, 1); playmatGrid->addWidget(&playmatOverrideLabel, 1, 0, 1, 1);
tableGrid->addWidget(&playmatVisibilityLabel, 2, 0, 1, 1); playmatGrid->addLayout(overrideButtons, 1, 1, 1, 1);
tableGrid->addWidget(&playmatVisibilityCombo, 2, 1, 1, 1); playmatGrid->addWidget(&playmatDefaultLabel, 2, 0, 1, 1);
tableGrid->addWidget(&playmatOverrideLabel, 3, 0, 1, 1); playmatGrid->addWidget(&playmatDefaultEditButton, 2, 1, 1, 1);
tableGrid->addLayout(overrideButtons, 3, 1, 1, 1);
tableGrid->addWidget(&playmatDefaultLabel, 4, 0, 1, 1);
tableGrid->addWidget(&playmatDefaultEditButton, 4, 1, 1, 1);
tableGroupBox = new QGroupBox; playmatGroupBox = new QGroupBox;
tableGroupBox->setLayout(tableGrid); playmatGroupBox->setLayout(playmatGrid);
// putting it all together // putting it all together
auto *mainLayout = new QVBoxLayout; auto *mainLayout = new QVBoxLayout;
@ -369,6 +375,7 @@ AppearanceSettingsPage::AppearanceSettingsPage()
mainLayout->addWidget(cardLayoutGroupBox); mainLayout->addWidget(cardLayoutGroupBox);
mainLayout->addWidget(cardCountersGroupBox); mainLayout->addWidget(cardCountersGroupBox);
mainLayout->addWidget(handGroupBox); mainLayout->addWidget(handGroupBox);
mainLayout->addWidget(playmatGroupBox);
mainLayout->addWidget(tableGroupBox); mainLayout->addWidget(tableGroupBox);
mainLayout->addStretch(); mainLayout->addStretch();
@ -558,6 +565,7 @@ void AppearanceSettingsPage::retranslateUi()
tableGroupBox->setTitle(tr("Table grid layout")); tableGroupBox->setTitle(tr("Table grid layout"));
invertVerticalCoordinateCheckBox.setText(tr("Invert vertical coordinate")); invertVerticalCoordinateCheckBox.setText(tr("Invert vertical coordinate"));
minPlayersForMultiColumnLayoutLabel.setText(tr("Minimum player count for multi-column layout:")); minPlayersForMultiColumnLayoutLabel.setText(tr("Minimum player count for multi-column layout:"));
playmatGroupBox->setTitle(tr("Playmat settings"));
playmatVisibilityLabel.setText(tr("Playmat visibility:")); playmatVisibilityLabel.setText(tr("Playmat visibility:"));
playmatOverrideLabel.setText(tr("Force playmat for all decks:")); playmatOverrideLabel.setText(tr("Force playmat for all decks:"));
playmatOverrideClearButton.setText(tr("Clear")); playmatOverrideClearButton.setText(tr("Clear"));

1
cockatrice/src/interface/widgets/settings_page/appearance_settings_page.h
View file

@ -78,6 +78,7 @@ private:
QGroupBox *cardsGroupBox; QGroupBox *cardsGroupBox;
QGroupBox *cardLayoutGroupBox; QGroupBox *cardLayoutGroupBox;
QGroupBox *handGroupBox; QGroupBox *handGroupBox;
QGroupBox *playmatGroupBox;
QGroupBox *tableGroupBox; QGroupBox *tableGroupBox;
QGroupBox *cardCountersGroupBox; QGroupBox *cardCountersGroupBox;
QList<QLabel *> cardCounterNames; QList<QLabel *> cardCounterNames;