From ebc0e6d3f3edb90851295399dd22e081fe00a0c8 Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Mon, 20 Aug 2018 11:51:48 +0200 Subject: core/tests: merge Animations and add vars. to qPrefDisplay Add class variable tooltip_position to qPrefDisplay Add class variable lastDir to qPrefDisplay qPrefDisplay is updated to use new qPrefPrivate functions Adjust test cases incl. qml tests qPrefAnimations only has 1 variable, that really is a display variable Merge the variable into qPrefDisplay, to simplify setup (and avoid loading extra page in qml). correct theme to save in correct place, and make it a static class variable Signed-off-by: Jan Iversen --- profile-widget/animationfunctions.cpp | 12 ++++++------ profile-widget/divetooltipitem.cpp | 6 +++--- profile-widget/profilewidget2.cpp | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'profile-widget') diff --git a/profile-widget/animationfunctions.cpp b/profile-widget/animationfunctions.cpp index 0b84fbcd5..89779e3a8 100644 --- a/profile-widget/animationfunctions.cpp +++ b/profile-widget/animationfunctions.cpp @@ -1,14 +1,14 @@ // SPDX-License-Identifier: GPL-2.0 #include "profile-widget/animationfunctions.h" #include "core/pref.h" -#include "core/settings/qPrefAnimations.h" +#include "core/settings/qPrefDisplay.h" #include namespace Animations { void hide(QObject *obj) { - if (qPrefAnimations::animation_speed() != 0) { + if (qPrefDisplay::animation_speed() != 0) { QPropertyAnimation *animation = new QPropertyAnimation(obj, "opacity"); animation->setStartValue(1); animation->setEndValue(0); @@ -20,7 +20,7 @@ namespace Animations { void show(QObject *obj) { - if (qPrefAnimations::animation_speed() != 0) { + if (qPrefDisplay::animation_speed() != 0) { QPropertyAnimation *animation = new QPropertyAnimation(obj, "opacity"); animation->setStartValue(0); animation->setEndValue(1); @@ -32,7 +32,7 @@ namespace Animations { void animDelete(QObject *obj) { - if (qPrefAnimations::animation_speed() != 0) { + if (qPrefDisplay::animation_speed() != 0) { QPropertyAnimation *animation = new QPropertyAnimation(obj, "opacity"); obj->connect(animation, &QPropertyAnimation::finished, &QObject::deleteLater); animation->setStartValue(1); @@ -45,7 +45,7 @@ namespace Animations { void moveTo(QObject *obj, qreal x, qreal y) { - if (qPrefAnimations::animation_speed() != 0) { + if (qPrefDisplay::animation_speed() != 0) { QPropertyAnimation *animation = new QPropertyAnimation(obj, "pos"); animation->setDuration(prefs.animation_speed); animation->setStartValue(obj->property("pos").toPointF()); @@ -58,7 +58,7 @@ namespace Animations { void scaleTo(QObject *obj, qreal scale) { - if (qPrefAnimations::animation_speed() != 0) { + if (qPrefDisplay::animation_speed() != 0) { QPropertyAnimation *animation = new QPropertyAnimation(obj, "scale"); animation->setDuration(prefs.animation_speed); animation->setStartValue(obj->property("scale").toReal()); diff --git a/profile-widget/divetooltipitem.cpp b/profile-widget/divetooltipitem.cpp index 21bf82c13..363382324 100644 --- a/profile-widget/divetooltipitem.cpp +++ b/profile-widget/divetooltipitem.cpp @@ -4,7 +4,7 @@ #include "core/profile.h" #include "core/membuffer.h" #include "core/metrics.h" -#include "core/settings/qPrefAnimations.h" +#include "core/settings/qPrefDisplay.h" #include #include #include @@ -62,7 +62,7 @@ void ToolTipItem::collapse() { int dim = defaultIconMetrics().sz_small; - if (qPrefAnimations::animation_speed()) { + if (qPrefDisplay::animation_speed()) { QPropertyAnimation *animation = new QPropertyAnimation(this, "rect"); animation->setDuration(100); animation->setStartValue(nextRectangle); @@ -120,7 +120,7 @@ void ToolTipItem::expand() nextRectangle.setHeight(height); if (nextRectangle != rect()) { - if (qPrefAnimations::animation_speed()) { + if (qPrefDisplay::animation_speed()) { QPropertyAnimation *animation = new QPropertyAnimation(this, "rect", this); animation->setDuration(prefs.animation_speed); animation->setStartValue(rect()); diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp index a40908e5c..9155b7511 100644 --- a/profile-widget/profilewidget2.cpp +++ b/profile-widget/profilewidget2.cpp @@ -4,7 +4,7 @@ #include "core/subsurface-string.h" #include "core/qthelper.h" #include "core/profile.h" -#include "core/settings/qPrefAnimations.h" +#include "core/settings/qPrefDisplay.h" #include "core/settings/qPrefTechnicalDetails.h" #include "core/settings/qPrefPartialPressureGas.h" #include "profile-widget/diveeventitem.h" @@ -596,8 +596,8 @@ void ProfileWidget2::plotDive(struct dive *d, bool force, bool doClearPictures) // special handling for the first time we display things int animSpeedBackup = 0; if (firstCall && haveFilesOnCommandLine()) { - animSpeedBackup = qPrefAnimations::animation_speed(); - qPrefAnimations::set_animation_speed(0); + animSpeedBackup = qPrefDisplay::animation_speed(); + qPrefDisplay::set_animation_speed(0); firstCall = false; } @@ -806,7 +806,7 @@ void ProfileWidget2::plotDive(struct dive *d, bool force, bool doClearPictures) #endif diveComputerText->setText(dcText); if (haveFilesOnCommandLine() && animSpeedBackup != 0) { - qPrefAnimations::set_animation_speed(animSpeedBackup); + qPrefDisplay::set_animation_speed(animSpeedBackup); } #ifndef SUBSURFACE_MOBILE -- cgit v1.2.3-70-g09d2