From e6d884cf26161df65c2b4b8c39d6b4133760537b Mon Sep 17 00:00:00 2001 From: Stefan Fuchs Date: Thu, 11 May 2017 22:43:36 +0200 Subject: Creation of dive duration string and surface interval string Update the function to create the dive duration string in a way that it can be used also in info and stats tab and added some more flexibility. Changed layout for <1h freedives to "0:05:35" (w/o units) or "5:35min" (with units and :) or "5min 35sec" (with units with space). Add a new function to create the surface interval string. Completely remove old function get_time_string() and get_time_string_s(). Signed-off-by: Stefan Fuchs --- desktop-widgets/templatelayout.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'desktop-widgets/templatelayout.h') diff --git a/desktop-widgets/templatelayout.h b/desktop-widgets/templatelayout.h index b4f197c64..9c24d096d 100644 --- a/desktop-widgets/templatelayout.h +++ b/desktop-widgets/templatelayout.h @@ -109,7 +109,8 @@ if (property == "year") { double temp = get_temp_units(object.year->max_temp, &unit); return object.year->max_temp == 0 ? "0" : QString::number(temp, 'g', 2) + unit; } else if (property == "total_time") { - return get_time_string(object.year->total_time.seconds, 0); + return get_dive_duration_string(object.year->total_time.seconds, QObject::tr("h"), + QObject::tr("min"), QObject::tr("sec"), " "); } else if (property == "avg_time") { return get_minutes(object.year->total_time.seconds / object.year->selection_size); } else if (property == "shortest_time") { -- cgit v1.2.3-70-g09d2