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

Rebase.

Browse source 
Took 5 minutes

Took 50 seconds

Took 15 seconds
This commit is contained in:
Lukas Brübach 2026-08-10 14:41:18 +02:00
parent 9e084614c0
commit 68ee017553
3 changed files with 38 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

32
cockatrice/CMakeLists.txt
View file

@ -517,25 +517,25 @@ qt6_add_executable(
) )
qt6_add_shaders( qt6_add_shaders(
cockatrice cockatrice
"onboarding_shaders" "onboarding_shaders"
PREFIX PREFIX
"/onboarding/shaders" "/onboarding/shaders"
BASE BASE
"src/interface/widgets/onboarding/shaders" "src/interface/widgets/onboarding/shaders"
FILES FILES
src/interface/widgets/onboarding/shaders/brand_banner.frag src/interface/widgets/onboarding/shaders/brand_banner.frag
) )
qt6_add_resources( qt6_add_resources(
cockatrice cockatrice
"onboarding_qml" "onboarding_qml"
PREFIX PREFIX
"/onboarding/qml" "/onboarding/qml"
BASE BASE
"src/interface/widgets/onboarding/qml" "src/interface/widgets/onboarding/qml"
FILES FILES
src/interface/widgets/onboarding/qml/BrandBanner.qml src/interface/widgets/onboarding/qml/BrandBanner.qml
) )
target_link_libraries( target_link_libraries(

34
cockatrice/src/interface/widgets/onboarding/pages/preferences_setup_page.cpp
View file

@ -1,6 +1,9 @@
#include "preferences_setup_page.h" #include "preferences_setup_page.h"
#include "../../client/settings/cache_settings.h" #include "../../client/settings/cache_settings.h"
#include "libcockatrice/settings/appearance_settings.h"
#include "libcockatrice/settings/download_settings.h"
#include "libcockatrice/settings/network_settings.h"
#include <QCheckBox> #include <QCheckBox>
#include <QGroupBox> #include <QGroupBox>
@ -80,7 +83,7 @@ PreferencesSetupPage::PreferencesSetupPage(QWidget *parent) : FirstRunWizardPage
SettingsCache &settings = SettingsCache::instance(); SettingsCache &settings = SettingsCache::instance();
connect(styleUserListCheckBox, &QCheckBox::toggled, &settings.interface(), &InterfaceSettings::setStyleUserList); connect(styleUserListCheckBox, &QCheckBox::toggled, &settings.appearance(), &AppearanceSettings::setStyleUserList);
connect(cardScalingCheckBox, &QCheckBox::toggled, &settings.cardsDisplay(), &CardsDisplaySettings::setCardScaling); connect(cardScalingCheckBox, &QCheckBox::toggled, &settings.cardsDisplay(), &CardsDisplaySettings::setCardScaling);
connect(roundCardCornersCheckBox, &QCheckBox::toggled, &settings.cardsDisplay(), connect(roundCardCornersCheckBox, &QCheckBox::toggled, &settings.cardsDisplay(),
&CardsDisplaySettings::setRoundCardCorners); &CardsDisplaySettings::setRoundCardCorners);
@ -91,19 +94,20 @@ PreferencesSetupPage::PreferencesSetupPage(QWidget *parent) : FirstRunWizardPage
connect(tapAnimationCheckBox, &QCheckBox::toggled, &settings.cardsDisplay(), connect(tapAnimationCheckBox, &QCheckBox::toggled, &settings.cardsDisplay(),
&CardsDisplaySettings::setTapAnimation); &CardsDisplaySettings::setTapAnimation);
connect(notificationsEnabledCheckBox, &QCheckBox::toggled, &settings.interface(), connect(notificationsEnabledCheckBox, &QCheckBox::toggled, &settings.userInterface(),
&InterfaceSettings::setNotificationsEnabled); &InterfaceSettings::setNotificationsEnabled);
connect(soundEnabledCheckBox, &QCheckBox::toggled, &settings.sound(), &SoundSettings::setSoundEnabled); connect(soundEnabledCheckBox, &QCheckBox::toggled, &settings.sound(), &SoundSettings::setSoundEnabled);
connect(doubleClickToPlayCheckBox, &QCheckBox::toggled, &settings.interface(), connect(doubleClickToPlayCheckBox, &QCheckBox::toggled, &settings.userInterface(),
&InterfaceSettings::setDoubleClickToPlay); &InterfaceSettings::setDoubleClickToPlay);
connect(horizontalHandCheckBox, &QCheckBox::toggled, &settings.interface(), &InterfaceSettings::setHorizontalHand); connect(horizontalHandCheckBox, &QCheckBox::toggled, &settings.userInterface(),
connect(playToStackCheckBox, &QCheckBox::toggled, &settings.interface(), &InterfaceSettings::setPlayToStack); &InterfaceSettings::setHorizontalHand);
connect(playToStackCheckBox, &QCheckBox::toggled, &settings.userInterface(), &InterfaceSettings::setPlayToStack);
connect(showShortcutsCheckBox, &QCheckBox::toggled, &settings.cardsDisplay(), connect(showShortcutsCheckBox, &QCheckBox::toggled, &settings.userInterface(),
&CardsDisplaySettings::setShowShortcuts); &InterfaceSettings::setShowShortcuts);
connect(picDownloadCheckBox, &QCheckBox::toggled, &settings.personal(), &PersonalSettings::setPicDownload); connect(picDownloadCheckBox, &QCheckBox::toggled, &settings.downloads(), &DownloadSettings::setPicDownload);
connect(checkUpdatesOnStartupCheckBox, &QCheckBox::toggled, &settings.updates(), connect(checkUpdatesOnStartupCheckBox, &QCheckBox::toggled, &settings.updates(),
&UpdatesSettings::setCheckUpdatesOnStartup); &UpdatesSettings::setCheckUpdatesOnStartup);
connect(showTipsOnStartupCheckBox, &QCheckBox::toggled, &settings.personal(), connect(showTipsOnStartupCheckBox, &QCheckBox::toggled, &settings.personal(),
@ -116,23 +120,23 @@ void PreferencesSetupPage::initializePage()
{ {
SettingsCache &settings = SettingsCache::instance(); SettingsCache &settings = SettingsCache::instance();
styleUserListCheckBox->setChecked(settings.interface().getStyleUserList()); styleUserListCheckBox->setChecked(settings.appearance().getStyleUserList());
cardScalingCheckBox->setChecked(settings.cardsDisplay().getScaleCards()); cardScalingCheckBox->setChecked(settings.cardsDisplay().getScaleCards());
roundCardCornersCheckBox->setChecked(settings.cardsDisplay().getRoundCardCorners()); roundCardCornersCheckBox->setChecked(settings.cardsDisplay().getRoundCardCorners());
displayCardNamesCheckBox->setChecked(settings.cardsDisplay().getDisplayCardNames()); displayCardNamesCheckBox->setChecked(settings.cardsDisplay().getDisplayCardNames());
autoRotateCardsCheckBox->setChecked(settings.cardsDisplay().getAutoRotateSidewaysLayoutCards()); autoRotateCardsCheckBox->setChecked(settings.cardsDisplay().getAutoRotateSidewaysLayoutCards());
tapAnimationCheckBox->setChecked(settings.cardsDisplay().getTapAnimation()); tapAnimationCheckBox->setChecked(settings.cardsDisplay().getTapAnimation());
notificationsEnabledCheckBox->setChecked(settings.interface().getNotificationsEnabled()); notificationsEnabledCheckBox->setChecked(settings.userInterface().getNotificationsEnabled());
soundEnabledCheckBox->setChecked(settings.sound().getSoundEnabled()); soundEnabledCheckBox->setChecked(settings.sound().getSoundEnabled());
doubleClickToPlayCheckBox->setChecked(settings.interface().getDoubleClickToPlay()); doubleClickToPlayCheckBox->setChecked(settings.userInterface().getDoubleClickToPlay());
horizontalHandCheckBox->setChecked(settings.interface().getHorizontalHand()); horizontalHandCheckBox->setChecked(settings.userInterface().getHorizontalHand());
playToStackCheckBox->setChecked(settings.interface().getPlayToStack()); playToStackCheckBox->setChecked(settings.userInterface().getPlayToStack());
showShortcutsCheckBox->setChecked(settings.cardsDisplay().getShowShortcuts()); showShortcutsCheckBox->setChecked(settings.userInterface().getShowShortcuts());
picDownloadCheckBox->setChecked(settings.personal().getPicDownload()); picDownloadCheckBox->setChecked(settings.downloads().getPicDownload());
checkUpdatesOnStartupCheckBox->setChecked(settings.updates().getCheckUpdatesOnStartup()); checkUpdatesOnStartupCheckBox->setChecked(settings.updates().getCheckUpdatesOnStartup());
showTipsOnStartupCheckBox->setChecked(settings.personal().getShowTipsOnStartup()); showTipsOnStartupCheckBox->setChecked(settings.personal().getShowTipsOnStartup());
} }

5
cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.cpp
View file

@ -5,6 +5,7 @@
#include "../../interface/palette_editor/quick_setup_panel.h" #include "../../interface/palette_editor/quick_setup_panel.h"
#include "../../interface/theme_manager.h" #include "../../interface/theme_manager.h"
#include "../../interface/widgets/general/background_sources.h" #include "../../interface/widgets/general/background_sources.h"
#include "libcockatrice/settings/appearance_settings.h"
#include <QComboBox> #include <QComboBox>
#include <QDir> #include <QDir>
@ -95,7 +96,7 @@ void ThemeSetupPage::initializePage()
schemeCombo->blockSignals(false); schemeCombo->blockSignals(false);
homeTabBackgroundCombo->blockSignals(true); homeTabBackgroundCombo->blockSignals(true);
QString homeTabSource = SettingsCache::instance().personal().getHomeTabBackgroundSource(); QString homeTabSource = SettingsCache::instance().appearance().getHomeTabBackgroundSource();
int homeTabIdx = homeTabBackgroundCombo->findData(BackgroundSources::fromId(homeTabSource)); int homeTabIdx = homeTabBackgroundCombo->findData(BackgroundSources::fromId(homeTabSource));
homeTabBackgroundCombo->setCurrentIndex(homeTabIdx >= 0 ? homeTabIdx : 0); homeTabBackgroundCombo->setCurrentIndex(homeTabIdx >= 0 ? homeTabIdx : 0);
homeTabBackgroundCombo->blockSignals(false); homeTabBackgroundCombo->blockSignals(false);
@ -142,7 +143,7 @@ void ThemeSetupPage::onHomeTabBackgroundChanged(int index)
return; return;
} }
auto type = homeTabBackgroundCombo->currentData().value<BackgroundSources::Type>(); auto type = homeTabBackgroundCombo->currentData().value<BackgroundSources::Type>();
SettingsCache::instance().personal().setHomeTabBackgroundSource(BackgroundSources::toId(type)); SettingsCache::instance().appearance().setHomeTabBackgroundSource(BackgroundSources::toId(type));
} }
void ThemeSetupPage::onGenerateFromAccent(const QColor &accent, int intensity) void ThemeSetupPage::onGenerateFromAccent(const QColor &accent, int intensity)