diff --git a/modules/dashboard/Media.qml b/modules/dashboard/Media.qml index 29de3934..3cc17d57 100644 --- a/modules/dashboard/Media.qml +++ b/modules/dashboard/Media.qml @@ -402,7 +402,7 @@ Item { height: visualiser.height * 0.75 playing: Players.active?.isPlaying ?? false - speed: Audio.beatTracker.bpm / Tokens.anim.mediaGifSpeedAdjustment // qmllint disable unresolved-type + speed: Audio.beatTracker.bpm / Config.general.mediaGifSpeedAdjustment // qmllint disable unresolved-type source: Paths.absolutePath(Config.paths.mediaGif) asynchronous: true fillMode: AnimatedImage.PreserveAspectFit diff --git a/modules/dashboard/dash/Media.qml b/modules/dashboard/dash/Media.qml index 07d2352e..0788d380 100644 --- a/modules/dashboard/dash/Media.qml +++ b/modules/dashboard/dash/Media.qml @@ -213,7 +213,7 @@ Item { anchors.margins: Tokens.padding.large * 2 playing: Players.active?.isPlaying ?? false - speed: Audio.beatTracker.bpm / Tokens.anim.mediaGifSpeedAdjustment // qmllint disable unresolved-type + speed: Audio.beatTracker.bpm / Config.general.mediaGifSpeedAdjustment // qmllint disable unresolved-type source: Paths.absolutePath(Config.paths.mediaGif) asynchronous: true fillMode: AnimatedImage.PreserveAspectFit diff --git a/modules/dashboard/dash/Resources.qml b/modules/dashboard/dash/Resources.qml index f492cc58..17d0f4a2 100644 --- a/modules/dashboard/dash/Resources.qml +++ b/modules/dashboard/dash/Resources.qml @@ -53,7 +53,7 @@ Row { anchors.bottom: icon.top anchors.bottomMargin: Tokens.spacing.small - implicitWidth: Tokens.sizes.dashboard.resourceProgessThickness + implicitWidth: Tokens.sizes.dashboard.resourceProgressThickness color: Colours.layer(Colours.palette.m3surfaceContainerHigh, 2) radius: Tokens.rounding.full diff --git a/modules/session/Content.qml b/modules/session/Content.qml index 45fc0283..48dd9c5b 100644 --- a/modules/session/Content.qml +++ b/modules/session/Content.qml @@ -53,7 +53,7 @@ Column { playing: visible asynchronous: true - speed: Tokens.anim.sessionGifSpeed + speed: Config.general.sessionGifSpeed source: Paths.absolutePath(Config.paths.sessionGif) } diff --git a/plugin/src/Caelestia/Config/appearanceconfig.hpp b/plugin/src/Caelestia/Config/appearanceconfig.hpp index c13d0779..c58105a7 100644 --- a/plugin/src/Caelestia/Config/appearanceconfig.hpp +++ b/plugin/src/Caelestia/Config/appearanceconfig.hpp @@ -204,8 +204,6 @@ class AppearanceAnim : public ConfigObject { Q_OBJECT QML_ANONYMOUS - CONFIG_PROPERTY(qreal, mediaGifSpeedAdjustment, 300) - CONFIG_PROPERTY(qreal, sessionGifSpeed, 0.7) CONFIG_SUBOBJECT(AnimDurations, durations) public: diff --git a/plugin/src/Caelestia/Config/generalconfig.hpp b/plugin/src/Caelestia/Config/generalconfig.hpp index 88bb7ebf..24982e61 100644 --- a/plugin/src/Caelestia/Config/generalconfig.hpp +++ b/plugin/src/Caelestia/Config/generalconfig.hpp @@ -53,6 +53,8 @@ class GeneralConfig : public ConfigObject { CONFIG_PROPERTY(QString, logo) CONFIG_PROPERTY(QStringList, excludedScreens) + CONFIG_PROPERTY(qreal, mediaGifSpeedAdjustment, 300) + CONFIG_PROPERTY(qreal, sessionGifSpeed, 0.7) CONFIG_SUBOBJECT(GeneralApps, apps) CONFIG_SUBOBJECT(GeneralIdle, idle) CONFIG_SUBOBJECT(GeneralBattery, battery)