From 92d24a2912d1e9302b86d74a13a9bc124e7b380c Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 6 May 2017 17:43:32 -0700 Subject: 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 --- core/helpers.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/helpers.h') 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); -- cgit v1.2.3-70-g09d2