mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use 'Temp.' for abbreviations.

Browse source
This commit is contained in:
Martin Měřinský 2017-03-06 13:05:13 +01:00 committed by Dirk Hohndel
parent de73cf8ac4
commit bdb83fd9b5
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
desktop-widgets/divelogimportdialog.cpp
View file

@ -480,9 +480,9 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy)
QString units = "Metric";
dl7 = true;
while ((firstLine = f.readLine().trimmed()).length() > 0 && !f.atEnd()) {
/* DL7 actually defines individual units (e.g. depth, temp, pressure, etc.)
* and there are quite a few other options as well, but let's use metric
* unless depth unit is clearly Imperial. */
/* DL7 actually defines individual units (e.g. depth, temperature,
* pressure, etc.) and there are quite a few other options as well,
* but let's use metric unless depth unit is clearly Imperial. */
if (firstLine.contains("ThFt")) {
units = "Imperial";

6
qt-models/divetripmodel.cpp
View file

@ -223,7 +223,7 @@ QVariant DiveItem::data(int column, int role) const
retVal = tr("Duration");
break;
case TEMPERATURE:
retVal = tr("Temp(%1%2)").arg(UTF8_DEGREE).arg((get_units()->temperature == units::CELSIUS) ? "C" : "F");
retVal = tr("Temp.(%1%2)").arg(UTF8_DEGREE).arg((get_units()->temperature == units::CELSIUS) ? "C" : "F");
break;
case TOTALWEIGHT:
retVal = tr("Weight(%1)").arg((get_units()->weight == units::KG) ? tr("kg") : tr("lbs"));
@ -445,7 +445,7 @@ QVariant DiveTripModel::headerData(int section, Qt::Orientation orientation, int
ret = tr("Duration");
break;
case TEMPERATURE:
ret = tr("Temp");
ret = tr("Temp.");
break;
case TOTALWEIGHT:
ret = tr("Weight");
@ -494,7 +494,7 @@ QVariant DiveTripModel::headerData(int section, Qt::Orientation orientation, int
ret = tr("Duration");
break;
case TEMPERATURE:
ret = tr("Temp(%1%2)").arg(UTF8_DEGREE).arg((get_units()->temperature == units::CELSIUS) ? "C" : "F");
ret = tr("Temp.(%1%2)").arg(UTF8_DEGREE).arg((get_units()->temperature == units::CELSIUS) ? "C" : "F");
break;
case TOTALWEIGHT:
ret = tr("Weight(%1)").arg((get_units()->weight == units::KG) ? tr("kg") : tr("lbs"));