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 --- desktop-widgets/preferences/preferences_defaults.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'desktop-widgets/preferences') diff --git a/desktop-widgets/preferences/preferences_defaults.cpp b/desktop-widgets/preferences/preferences_defaults.cpp index cf7b03c9e..b8af84b91 100644 --- a/desktop-widgets/preferences/preferences_defaults.cpp +++ b/desktop-widgets/preferences/preferences_defaults.cpp @@ -74,7 +74,7 @@ void PreferencesDefaults::refreshSettings() ui->default_cylinder->setCurrentIndex(i); } ui->displayinvalid->setChecked(qPrefDisplay::display_invalid_dives()); - ui->velocitySlider->setValue(qPrefAnimations::animation_speed()); + ui->velocitySlider->setValue(qPrefDisplay::animation_speed()); ui->btnUseDefaultFile->setChecked(qPrefGeneral::use_default_file()); if (qPrefCloudStorage::cloud_verification_status() == qPref::CS_VERIFIED) { @@ -117,5 +117,5 @@ void PreferencesDefaults::syncSettings() qPrefDisplay::set_divelist_font(ui->font->currentFont().toString()); qPrefDisplay::set_font_size(ui->fontsize->value()); qPrefDisplay::set_display_invalid_dives(ui->displayinvalid->isChecked()); - qPrefAnimations::set_animation_speed(ui->velocitySlider->value()); + qPrefDisplay::set_animation_speed(ui->velocitySlider->value()); } -- cgit v1.2.3-70-g09d2