diff options
Diffstat (limited to 'desktop-widgets')
| -rw-r--r-- | desktop-widgets/downloadfromdivecomputer.cpp | 2 | ||||
| -rw-r--r-- | desktop-widgets/plugins/facebook/facebookconnectwidget.cpp | 2 | ||||
| -rw-r--r-- | desktop-widgets/tab-widgets/TabDiveInformation.cpp | 8 | ||||
| -rw-r--r-- | desktop-widgets/tab-widgets/TabDiveStatistics.cpp | 13 | ||||
| -rw-r--r-- | desktop-widgets/templatelayout.h | 3 |
5 files changed, 17 insertions, 11 deletions
diff --git a/desktop-widgets/downloadfromdivecomputer.cpp b/desktop-widgets/downloadfromdivecomputer.cpp index 76796b781..14583ff1d 100644 --- a/desktop-widgets/downloadfromdivecomputer.cpp +++ b/desktop-widgets/downloadfromdivecomputer.cpp @@ -703,7 +703,7 @@ QVariant DiveImportedModel::data(const QModelIndex &index, int role) const case 0: return QVariant(get_short_dive_date_string(d->when)); case 1: - return QVariant(get_dive_duration_string(d->duration.seconds, tr("h:"), tr("min"))); + return QVariant(get_dive_duration_string(d->duration.seconds, tr("h"), tr("min"))); case 2: return QVariant(get_depth_string(d->maxdepth.mm, true, false)); } diff --git a/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp b/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp index f5861775a..e01f2b3fb 100644 --- a/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp +++ b/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp @@ -306,7 +306,7 @@ void SocialNetworkDialog::selectionChanged() } if (ui->duration->isChecked()) { fullText += tr("Duration: %1 \n").arg(get_dive_duration_string(d->duration.seconds, - tr("h:", "abbreviation for hours plus separator"), + tr("h", "abbreviation for hours"), tr("min", "abbreviation for minutes"))); } if (ui->Location->isChecked()) { diff --git a/desktop-widgets/tab-widgets/TabDiveInformation.cpp b/desktop-widgets/tab-widgets/TabDiveInformation.cpp index 8410c022c..d687cdcd7 100644 --- a/desktop-widgets/tab-widgets/TabDiveInformation.cpp +++ b/desktop-widgets/tab-widgets/TabDiveInformation.cpp @@ -74,15 +74,15 @@ void TabDiveInformation::updateData() ui->gasUsedText->setText(volumes); ui->oxygenHeliumText->setText(gaslist); - int sum = displayed_dive.dc.divemode != FREEDIVE ? 30 : 0; - ui->diveTimeText->setText(get_time_string_s(displayed_dive.duration.seconds + sum, 0, false)); + ui->diveTimeText->setText(get_dive_duration_string(displayed_dive.duration.seconds, tr("h"), tr("min"), tr("sec"), + " ", displayed_dive.dc.divemode == FREEDIVE)); struct dive *prevd; process_all_dives(&displayed_dive, &prevd); if (prevd) - ui->surfaceIntervalText->setText(get_time_string_s(displayed_dive.when - (prevd->when + prevd->duration.seconds), 4, - (displayed_dive.dc.divemode == FREEDIVE))); + ui->surfaceIntervalText->setText(get_dive_surfint_string(displayed_dive.when - (prevd->when + prevd->duration.seconds), tr("d"), tr("h"), tr("min"))); + else ui->surfaceIntervalText->clear(); diff --git a/desktop-widgets/tab-widgets/TabDiveStatistics.cpp b/desktop-widgets/tab-widgets/TabDiveStatistics.cpp index e05f076a9..53bab0ef5 100644 --- a/desktop-widgets/tab-widgets/TabDiveStatistics.cpp +++ b/desktop-widgets/tab-widgets/TabDiveStatistics.cpp @@ -84,14 +84,19 @@ void TabDiveStatistics::updateData() ui->divesAllText->setText(QString::number(stats_selection.selection_size)); - ui->totalTimeAllText->setText(get_time_string_s(stats_selection.total_time.seconds, 0, (displayed_dive.dc.divemode == FREEDIVE))); + ui->totalTimeAllText->setText(get_dive_duration_string(stats_selection.total_time.seconds, tr("h"), tr("min"), tr("sec"), + " ", displayed_dive.dc.divemode == FREEDIVE)); + int seconds = stats_selection.total_time.seconds; if (stats_selection.selection_size) seconds /= stats_selection.selection_size; - ui->timeLimits->setAverage(get_time_string_s(seconds, 0,(displayed_dive.dc.divemode == FREEDIVE))); + ui->timeLimits->setAverage(get_dive_duration_string(seconds, tr("h"), tr("min"), tr("sec"), + " ", displayed_dive.dc.divemode == FREEDIVE)); if (amount_selected > 1) { - ui->timeLimits->setMaximum(get_time_string_s(stats_selection.longest_time.seconds, 0, (displayed_dive.dc.divemode == FREEDIVE))); - ui->timeLimits->setMinimum(get_time_string_s(stats_selection.shortest_time.seconds, 0, (displayed_dive.dc.divemode == FREEDIVE))); + ui->timeLimits->setMaximum(get_dive_duration_string(stats_selection.longest_time.seconds, tr("h"), tr("min"), tr("sec"), + " ", displayed_dive.dc.divemode == FREEDIVE)); + ui->timeLimits->setMinimum(get_dive_duration_string(stats_selection.shortest_time.seconds, tr("h"), tr("min"), tr("sec"), + " ", displayed_dive.dc.divemode == FREEDIVE)); } else { ui->timeLimits->setMaximum(""); ui->timeLimits->setMinimum(""); 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") { |