diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2017-05-06 17:43:32 -0700 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2017-05-06 17:43:32 -0700 |
commit | 92d24a2912d1e9302b86d74a13a9bc124e7b380c (patch) | |
tree | 230a01f62aa4111cb7b6b459fddad66fd9c22446 /core/helpers.h | |
parent | 876b479d695acda652e7b6c81c6b899946d42a85 (diff) | |
download | subsurface-92d24a2912d1e9302b86d74a13a9bc124e7b380c.tar.gz |
Consistently show dive duration based on preferences
We now respect the settings in the preferences and also only show
the duration as minutes and seconds if the dive is a free dive.
Fixes #361
Fixes #362
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'core/helpers.h')
-rw-r--r-- | core/helpers.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/helpers.h b/core/helpers.h index d694be941..a6e152cbf 100644 --- a/core/helpers.h +++ b/core/helpers.h @@ -36,7 +36,7 @@ int parseWeightToGrams(const QString &text); int parsePressureToMbar(const QString &text); int parseGasMixO2(const QString &text); int parseGasMixHE(const QString &text); -QString get_dive_duration_string(timestamp_t when, QString hourText, QString minutesText); +QString get_dive_duration_string(timestamp_t when, QString hourText, QString minutesText, QString secondsText = "", bool isFreeDive = false); QString get_dive_date_string(timestamp_t when); QString get_short_dive_date_string(timestamp_t when); bool is_same_day (timestamp_t trip_when, timestamp_t dive_when); |