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 /desktop-widgets/preferences | |
| 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 'desktop-widgets/preferences')
| -rw-r--r-- | desktop-widgets/preferences/preferences_defaults.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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()); } |