diff options
| author |  jan Iversen <jani@apache.org> | 2018-08-20 11:51:48 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-08-25 11:49:47 -0700 |
| commit | ebc0e6d3f3edb90851295399dd22e081fe00a0c8 (patch) | |
| tree | 5d08f827e6ed92eb26a778b540e132dbfad5742a /profile-widget/profilewidget2.cpp | |
| parent | 82b626b3fdd82bbe251d56a9972941ed207825a3 (diff) | |
| download | subsurface-ebc0e6d3f3edb90851295399dd22e081fe00a0c8.tar.gz | |
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 <jani@apache.org>
Diffstat (limited to 'profile-widget/profilewidget2.cpp')
| -rw-r--r-- | profile-widget/profilewidget2.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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 |