diff options
| author |  Stefan Fuchs <sfuchs@gmx.de> | 2017-05-11 22:43:36 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-05-26 15:50:52 -0700 |
| commit | e6d884cf26161df65c2b4b8c39d6b4133760537b (patch) | |
| tree | 2b9132e7d057c514c852a7cf7bed39fa67455a6f /desktop-widgets/templatelayout.h | |
| parent | 53a8075bd8d7231f2bb483b9adca0fc60d4446f1 (diff) | |
| download | subsurface-e6d884cf26161df65c2b4b8c39d6b4133760537b.tar.gz | |
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 <sfuchs@gmx.de>
Diffstat (limited to 'desktop-widgets/templatelayout.h')
| -rw-r--r-- | desktop-widgets/templatelayout.h | 3 |
1 files changed, 2 insertions, 1 deletions
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") { |