jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-26 16:43:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[Settings] Split appearance home tab settings into own group (#6905)

Browse source
This commit is contained in:
RickyRister 2026-05-19 03:33:25 -07:00 • committed by GitHub
parent 55c84ca860
commit fe31a49f86
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 25 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -60,6 +60,18 @@ AppearanceSettingsPage::AppearanceSettingsPage()
connect(&editPaletteButton, &QPushButton::clicked, this, &AppearanceSettingsPage::editPalette); connect(&editPaletteButton, &QPushButton::clicked, this, &AppearanceSettingsPage::editPalette);
auto *themeGrid = new QGridLayout;
themeGrid->addWidget(&themeLabel, 0, 0);
themeGrid->addWidget(&themeBox, 0, 1);
themeGrid->addWidget(&openThemeButton, 1, 1);
themeGrid->addWidget(&schemeComboLabel, 2, 0);
themeGrid->addWidget(&schemeCombo, 2, 1);
themeGrid->addWidget(&editPaletteButton, 3, 1);
themeGroupBox = new QGroupBox;
themeGroupBox->setLayout(themeGrid);
// Home tab settings
for (const auto &entry : BackgroundSources::all()) { for (const auto &entry : BackgroundSources::all()) {
homeTabBackgroundSourceBox.addItem(QObject::tr(entry.trKey), QVariant::fromValue(entry.type)); homeTabBackgroundSourceBox.addItem(QObject::tr(entry.trKey), QVariant::fromValue(entry.type));
} }
@ -89,22 +101,15 @@ AppearanceSettingsPage::AppearanceSettingsPage()
updateHomeTabSettingsVisibility(); updateHomeTabSettingsVisibility();
auto *themeGrid = new QGridLayout; auto *homeTabGrid = new QGridLayout;
themeGrid->addWidget(&themeLabel, 0, 0); homeTabGrid->addWidget(&homeTabBackgroundSourceLabel, 0, 0);
themeGrid->addWidget(&themeBox, 0, 1); homeTabGrid->addWidget(&homeTabBackgroundSourceBox, 0, 1);
themeGrid->addWidget(&openThemeButton, 1, 1); homeTabGrid->addWidget(&homeTabBackgroundShuffleFrequencyLabel, 1, 0);
themeGrid->addWidget(&schemeComboLabel, 2, 0); homeTabGrid->addWidget(&homeTabBackgroundShuffleFrequencySpinBox, 1, 1);
themeGrid->addWidget(&schemeCombo, 2, 1); homeTabGrid->addWidget(&homeTabDisplayCardNameCheckBox, 2, 0, 1, 2);
themeGrid->addWidget(&editPaletteButton, 3, 1);
themeGrid->addWidget(&homeTabBackgroundSourceLabel, 4, 0);
themeGrid->addWidget(&homeTabBackgroundSourceBox, 4, 1);
themeGrid->addWidget(&homeTabBackgroundShuffleFrequencyLabel, 5, 0);
themeGrid->addWidget(&homeTabBackgroundShuffleFrequencySpinBox, 5, 1);
themeGrid->addWidget(&homeTabDisplayCardNameLabel, 6, 0);
themeGrid->addWidget(&homeTabDisplayCardNameCheckBox, 6, 1);
themeGroupBox = new QGroupBox; homeTabGroupBox = new QGroupBox;
themeGroupBox->setLayout(themeGrid); homeTabGroupBox->setLayout(homeTabGrid);
// Menu settings // Menu settings
showShortcutsCheckBox.setChecked(settings.getShowShortcuts()); showShortcutsCheckBox.setChecked(settings.getShowShortcuts());
@ -266,6 +271,7 @@ AppearanceSettingsPage::AppearanceSettingsPage()
// putting it all together // putting it all together
auto *mainLayout = new QVBoxLayout; auto *mainLayout = new QVBoxLayout;
mainLayout->addWidget(themeGroupBox); mainLayout->addWidget(themeGroupBox);
mainLayout->addWidget(homeTabGroupBox);
mainLayout->addWidget(menuGroupBox); mainLayout->addWidget(menuGroupBox);
mainLayout->addWidget(cardsGroupBox); mainLayout->addWidget(cardsGroupBox);
mainLayout->addWidget(cardCountersGroupBox); mainLayout->addWidget(cardCountersGroupBox);
@ -313,7 +319,6 @@ void AppearanceSettingsPage::updateHomeTabSettingsVisibility()
homeTabBackgroundShuffleFrequencyLabel.setVisible(visible); homeTabBackgroundShuffleFrequencyLabel.setVisible(visible);
homeTabBackgroundShuffleFrequencySpinBox.setVisible(visible); homeTabBackgroundShuffleFrequencySpinBox.setVisible(visible);
homeTabDisplayCardNameLabel.setVisible(visible);
homeTabDisplayCardNameCheckBox.setVisible(visible); homeTabDisplayCardNameCheckBox.setVisible(visible);
} }
@ -372,10 +377,12 @@ void AppearanceSettingsPage::retranslateUi()
openThemeButton.setText(tr("Open themes folder")); openThemeButton.setText(tr("Open themes folder"));
schemeComboLabel.setText(tr("Active theme palette:")); schemeComboLabel.setText(tr("Active theme palette:"));
editPaletteButton.setText(tr("Edit theme palette")); editPaletteButton.setText(tr("Edit theme palette"));
homeTabGroupBox->setTitle(tr("Home tab settings"));
homeTabBackgroundSourceLabel.setText(tr("Home tab background source:")); homeTabBackgroundSourceLabel.setText(tr("Home tab background source:"));
homeTabBackgroundShuffleFrequencyLabel.setText(tr("Home tab background shuffle frequency:")); homeTabBackgroundShuffleFrequencyLabel.setText(tr("Home tab background shuffle frequency:"));
homeTabBackgroundShuffleFrequencySpinBox.setSpecialValueText(tr("Disabled")); homeTabBackgroundShuffleFrequencySpinBox.setSpecialValueText(tr("Disabled"));
homeTabDisplayCardNameLabel.setText(tr("Display card name of background in bottom right:")); homeTabDisplayCardNameCheckBox.setText(tr("Display card name of background in bottom right"));
menuGroupBox->setTitle(tr("Menu settings")); menuGroupBox->setTitle(tr("Menu settings"));
showShortcutsCheckBox.setText(tr("Show keyboard shortcuts in right-click menus")); showShortcutsCheckBox.setText(tr("Show keyboard shortcuts in right-click menus"));

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

@ -36,7 +36,6 @@ private:
QComboBox homeTabBackgroundSourceBox; QComboBox homeTabBackgroundSourceBox;
QLabel homeTabBackgroundShuffleFrequencyLabel; QLabel homeTabBackgroundShuffleFrequencyLabel;
QSpinBox homeTabBackgroundShuffleFrequencySpinBox; QSpinBox homeTabBackgroundShuffleFrequencySpinBox;
QLabel homeTabDisplayCardNameLabel;
QCheckBox homeTabDisplayCardNameCheckBox; QCheckBox homeTabDisplayCardNameCheckBox;
QLabel minPlayersForMultiColumnLayoutLabel; QLabel minPlayersForMultiColumnLayoutLabel;
QLabel maxFontSizeForCardsLabel; QLabel maxFontSizeForCardsLabel;
@ -58,6 +57,7 @@ private:
QCheckBox leftJustifiedHandCheckBox; QCheckBox leftJustifiedHandCheckBox;
QCheckBox invertVerticalCoordinateCheckBox; QCheckBox invertVerticalCoordinateCheckBox;
QGroupBox *themeGroupBox; QGroupBox *themeGroupBox;
QGroupBox *homeTabGroupBox;
QGroupBox *menuGroupBox; QGroupBox *menuGroupBox;
QGroupBox *cardsGroupBox; QGroupBox *cardsGroupBox;
QGroupBox *handGroupBox; QGroupBox *handGroupBox;