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 /core/settings/qPrefAnimations.h | |
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 'core/settings/qPrefAnimations.h')
-rw-r--r-- | core/settings/qPrefAnimations.h | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/core/settings/qPrefAnimations.h b/core/settings/qPrefAnimations.h deleted file mode 100644 index 450e854f9..000000000 --- a/core/settings/qPrefAnimations.h +++ /dev/null @@ -1,35 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#ifndef QPREFANIMATIONS_H -#define QPREFANIMATIONS_H -#include "core/pref.h" - -#include <QObject> - -class qPrefAnimations : public QObject { - Q_OBJECT - Q_PROPERTY(int animation_speed READ animation_speed WRITE set_animation_speed NOTIFY animation_speed_changed); - -public: - qPrefAnimations(QObject *parent = NULL); - static qPrefAnimations *instance(); - - // Load/Sync local settings (disk) and struct preference - static void loadSync(bool doSync); - static void load() { loadSync(false); } - static void sync() { loadSync(true); } - -public: - static int animation_speed() { return prefs.animation_speed; } - -public slots: - static void set_animation_speed(int value); - -signals: - void animation_speed_changed(int value); - -private: - // functions to load/sync variable with disk - static void disk_animation_speed(bool doSync); -}; - -#endif |