From 65deea0f16a7c06b954300a6ce743dec9bc3913d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Mon, 27 Jul 2026 09:38:55 +0200 Subject: [PATCH] Adjust to rebase. Took 11 minutes --- .../src/interface/widgets/replay/replay_manager.cpp | 2 +- .../widgets/replay/replay_quick_settings_widget.cpp | 9 ++++++--- .../interfaces/interface_interface_settings_provider.h | 1 + .../libcockatrice/settings/interface_settings.cpp | 10 ++++++++++ .../libcockatrice/settings/interface_settings.h | 2 ++ 5 files changed, 20 insertions(+), 4 deletions(-) diff --git a/cockatrice/src/interface/widgets/replay/replay_manager.cpp b/cockatrice/src/interface/widgets/replay/replay_manager.cpp index 273253e46..4719d10aa 100644 --- a/cockatrice/src/interface/widgets/replay/replay_manager.cpp +++ b/cockatrice/src/interface/widgets/replay/replay_manager.cpp @@ -125,7 +125,7 @@ void ReplayManager::replayPlayButtonToggled(bool checked) void ReplayManager::updateTimeScaleFactor(bool isFastForward) { - qreal factor = isFastForward ? SettingsCache::instance().getFastForwardSpeed() : 1.0; + qreal factor = isFastForward ? SettingsCache::instance().interface().getFastForwardSpeed() : 1.0; timelineWidget->setTimeScaleFactor(factor); } diff --git a/cockatrice/src/interface/widgets/replay/replay_quick_settings_widget.cpp b/cockatrice/src/interface/widgets/replay/replay_quick_settings_widget.cpp index 8ecd74312..446427e26 100644 --- a/cockatrice/src/interface/widgets/replay/replay_quick_settings_widget.cpp +++ b/cockatrice/src/interface/widgets/replay/replay_quick_settings_widget.cpp @@ -5,6 +5,8 @@ #include #include #include +#include +#include ReplayQuickSettingsWidget::ReplayQuickSettingsWidget(QWidget *parent) : SettingsButtonWidget(parent) { @@ -12,7 +14,7 @@ ReplayQuickSettingsWidget::ReplayQuickSettingsWidget(QWidget *parent) : Settings fastForwardSpeedBox.setMinimum(1); fastForwardSpeedBox.setMaximum(99.9); fastForwardSpeedBox.setDecimals(1); - fastForwardSpeedBox.setValue(SettingsCache::instance().getFastForwardSpeed()); + fastForwardSpeedBox.setValue(SettingsCache::instance().interface().getFastForwardSpeed()); connect(&fastForwardSpeedBox, qOverload(&QDoubleSpinBox::valueChanged), this, &ReplayQuickSettingsWidget::actUpdateFastForwardSpeed); @@ -25,7 +27,8 @@ ReplayQuickSettingsWidget::ReplayQuickSettingsWidget(QWidget *parent) : Settings this->addSettingsWidget(widget); - connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &ReplayQuickSettingsWidget::retranslateUi); + connect(&SettingsCache::instance().personal(), &PersonalSettings::langChanged, this, + &ReplayQuickSettingsWidget::retranslateUi); retranslateUi(); } @@ -37,6 +40,6 @@ void ReplayQuickSettingsWidget::retranslateUi() void ReplayQuickSettingsWidget::actUpdateFastForwardSpeed(qreal value) { - SettingsCache::instance().setFastForwardSpeed(value); + SettingsCache::instance().interface().setFastForwardSpeed(value); emit fastForwardSpeedChanged(value); } diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/interface_interface_settings_provider.h b/libcockatrice_interfaces/libcockatrice/interfaces/interface_interface_settings_provider.h index c35a784f2..e4c8677c8 100644 --- a/libcockatrice_interfaces/libcockatrice/interfaces/interface_interface_settings_provider.h +++ b/libcockatrice_interfaces/libcockatrice/interfaces/interface_interface_settings_provider.h @@ -31,6 +31,7 @@ public: [[nodiscard]] virtual int getMinPlayersForMultiColumnLayout() const = 0; [[nodiscard]] virtual bool getOpenDeckInNewTab() const = 0; [[nodiscard]] virtual int getRewindBufferingMs() const = 0; + [[nodiscard]] virtual qreal getFastForwardSpeed() const = 0; [[nodiscard]] virtual bool getStyleUserList() const = 0; [[nodiscard]] virtual bool getLeftJustified() const = 0; [[nodiscard]] virtual int getZoneViewGroupByIndex() const = 0; diff --git a/libcockatrice_settings/libcockatrice/settings/interface_settings.cpp b/libcockatrice_settings/libcockatrice/settings/interface_settings.cpp index f9ab94a50..b0d1d523d 100644 --- a/libcockatrice_settings/libcockatrice/settings/interface_settings.cpp +++ b/libcockatrice_settings/libcockatrice/settings/interface_settings.cpp @@ -120,6 +120,11 @@ int InterfaceSettings::getRewindBufferingMs() const return getValue("rewindBufferingMs", "replay", QString(), 200).toInt(); } +qreal InterfaceSettings::getFastForwardSpeed() const +{ + return getValue("fastForwardSpeed", "replay", QString(), 10).toReal(); +} + bool InterfaceSettings::getStyleUserList() const { return getValue("styleUserList", "appearance", QString(), true).toBool(); @@ -274,6 +279,11 @@ void InterfaceSettings::setRewindBufferingMs(int _rewindBufferingMs) setValue(_rewindBufferingMs, "rewindBufferingMs", "replay"); } +void InterfaceSettings::setFastForwardSpeed(qreal _value) +{ + setValue(_value, "fastForwardSpeed", "replay"); +} + void InterfaceSettings::setStyleUserList(bool _styleUserList) { setValue(_styleUserList, "styleUserList", "appearance"); diff --git a/libcockatrice_settings/libcockatrice/settings/interface_settings.h b/libcockatrice_settings/libcockatrice/settings/interface_settings.h index a0c94d4b2..9d3fec496 100644 --- a/libcockatrice_settings/libcockatrice/settings/interface_settings.h +++ b/libcockatrice_settings/libcockatrice/settings/interface_settings.h @@ -34,6 +34,7 @@ public: [[nodiscard]] int getMinPlayersForMultiColumnLayout() const override; [[nodiscard]] bool getOpenDeckInNewTab() const override; [[nodiscard]] int getRewindBufferingMs() const override; + [[nodiscard]] qreal getFastForwardSpeed() const override; [[nodiscard]] bool getStyleUserList() const override; [[nodiscard]] bool getLeftJustified() const override; [[nodiscard]] int getZoneViewGroupByIndex() const override; @@ -64,6 +65,7 @@ public: void setMinPlayersForMultiColumnLayout(int _minPlayersForMultiColumnLayout); void setOpenDeckInNewTab(bool _openDeckInNewTab); void setRewindBufferingMs(int _rewindBufferingMs); + void setFastForwardSpeed(qreal _value); void setStyleUserList(bool _styleUserList); void setLeftJustified(bool _leftJustified); void setZoneViewGroupByIndex(int _zoneViewGroupByIndex);