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>

1 files changed, 4 insertions, 4 deletions

diff --git a/desktop-widgets/printer.cpp b/desktop-widgets/printer.cpp
index 6d3af39e9..780dce2ba 100644
--- a/desktop-widgets/printer.cpp
+++ b/desktop-widgets/printer.cpp
@@ -3,7 +3,7 @@
 #include "templatelayout.h"
 #include "core/statistics.h"
 #include "core/qthelper.h"
-#include "core/settings/qPrefAnimations.h"
+#include "core/settings/qPrefDisplay.h"
 
 #include <algorithm>
 #include <QPainter>
@@ -136,7 +136,7 @@ void Printer::render(int Pages = 0)
 	// keep original preferences
 	QPointer<ProfileWidget2> profile = MainWindow::instance()->graphics();
 	int profileFrameStyle = profile->frameStyle();
-	int animationOriginal = qPrefAnimations::animation_speed();
+	int animationOriginal = qPrefDisplay::animation_speed();
 	double fontScale = profile->getFontPrintScale();
 	double printFontScale = 1.0;
 
@@ -144,7 +144,7 @@ void Printer::render(int Pages = 0)
 	profile->setFrameStyle(QFrame::NoFrame);
 	profile->setPrintMode(true, !printOptions->color_selected);
 	profile->setToolTipVisibile(false);
-	qPrefAnimations::set_animation_speed(0);
+	qPrefDisplay::set_animation_speed(0);
 
 	// render the Qwebview
 	QPainter painter;
@@ -202,7 +202,7 @@ void Printer::render(int Pages = 0)
 #else
 	profile->resize(originalSize);
 #endif
-	qPrefAnimations::set_animation_speed(animationOriginal);
+	qPrefDisplay::set_animation_speed(animationOriginal);
 
 	//replot the dive after returning the settings
 	profile->plotDive(0, true, true);