mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-19 14:25:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix incorrect behavior in preference window

Browse source 
When doing some changes in the preference window and clicking "Apply", the
'Close without saving' button is supposed to restore the previous values.
However some fields were not restored correctly.

- The Animations Slider was never restored to its initial value.
  (A new member in the pref struct was added - pref.animation)

- The 'Font' and 'Font size' were restored correctly to the previous
  values but their effects weren't restored to the UI and that required to
  open the prefrences window again and press ok.

Fixes #481

Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Gehad 2014-04-07 19:12:34 +02:00 • committed by Dirk Hohndel
parent 0bf79e216f
commit 3125e0e695
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pref.h
View file

@ -33,6 +33,7 @@ struct preferences {
short calc_ndl_tts;
short gflow;
short gfhigh;
short animation;
bool gf_low_at_maxdepth;
short display_invalid_dives;
short unit_system;

8
qt-ui/preferences.cpp
View file

@ -90,6 +90,7 @@ void PreferencesDialog::setUiFromPrefs()
ui.show_average_depth->setChecked(prefs.show_average_depth);
ui.vertical_speed_minutes->setChecked(prefs.units.vertical_speed_time == units::MINUTES);
ui.vertical_speed_seconds->setChecked(prefs.units.vertical_speed_time == units::SECONDS);
ui.velocitySlider->setValue(prefs.animation);
QSortFilterProxyModel *filterModel = new QSortFilterProxyModel();
filterModel->setSourceModel(LanguageModel::instance());
@ -107,9 +108,6 @@ void PreferencesDialog::setUiFromPrefs()
ui.languageView->setCurrentIndex(languages.first());
s.endGroup();
s.beginGroup("Animations");
int animVelocity = s.value("animation_speed",500).toInt();
ui.velocitySlider->setValue(animVelocity);
}
void PreferencesDialog::restorePrefs()
@ -298,8 +296,7 @@ void PreferencesDialog::loadSettings()
s.endGroup();
s.beginGroup("Animations");
int animVelocity = s.value("animation_speed",500).toInt();
ui.velocitySlider->setValue(animVelocity);
GET_INT("animation_speed", animation);
}
void PreferencesDialog::buttonClicked(QAbstractButton *button)
@ -307,6 +304,7 @@ void PreferencesDialog::buttonClicked(QAbstractButton *button)
switch (ui.buttonBox->standardButton(button)) {
case QDialogButtonBox::Discard:
restorePrefs();
syncSettings();
close();
break;
case QDialogButtonBox::Apply: