mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Animation speed is a value, not a boolean

Browse source 
This breaks compatibility with old preferences, but it's a single
key and not that very important so I don't think it's a bigger issue
I've renamed prefs.animation to prefs.animation_speed to denote
that it's a value, and not a state.

Also, fixed the places that were treating it as a state (on/off)
to treat it like a correct value.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2014-07-21 19:10:31 -03:00 • committed by Dirk Hohndel
parent 82bcb1767c
commit 65eefe7b59
6 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
qt-ui/profile/profilewidget2.cpp
View file

@ -386,10 +386,10 @@ void ProfileWidget2::plotDive(struct dive *d, bool force)
}
// special handling for the first time we display things
int animSpeedBackup = -1;
int animSpeedBackup = 0;
if (firstCall && MainWindow::instance()->filesFromCommandLine()) {
animSpeedBackup = prefs.animation;
prefs.animation = 0;
animSpeedBackup = prefs.animation_speed;
prefs.animation_speed = 0;
firstCall = false;
}
@ -518,8 +518,8 @@ void ProfileWidget2::plotDive(struct dive *d, bool force)
if ((nr = number_of_computers(&displayed_dive)) > 1)
dcText += tr(" (#%1 of %2)").arg(dc_number + 1).arg(nr);
diveComputerText->setText(dcText);
if (MainWindow::instance()->filesFromCommandLine() && animSpeedBackup != -1) {
prefs.animation = animSpeedBackup;
if (MainWindow::instance()->filesFromCommandLine() && animSpeedBackup != 0) {
prefs.animation_speed = animSpeedBackup;
}
if (currentState == ADD || currentState == PLAN) { // TODO: figure a way to move this from here.