diff options
Diffstat (limited to 'qt-ui/models.cpp')
| -rw-r--r-- | qt-ui/models.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index 36ee916e3..9be7dc5d9 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -62,7 +62,7 @@ void CleanerTableModel::setHeaderDataStrings(const QStringList& newHeaders) CylindersModel::CylindersModel(QObject* parent): current(0), rows(0) { // enum{REMOVE, TYPE, SIZE, WORKINGPRESS, START, END, O2, HE, DEPTH}; - setHeaderDataStrings( QStringList() << "" << tr("Type") << tr("Size") << tr("WorkPress") << tr("StartPress") << tr("EndPress") << tr("O2%") << tr("HE") << tr("Switch at")); + setHeaderDataStrings( QStringList() << "" << tr("Type") << tr("Size") << tr("WorkPress") << tr("StartPress") << tr("EndPress") << tr("O2%") << tr("He%") << tr("Switch at")); } CylindersModel *CylindersModel::instance() @@ -1137,19 +1137,19 @@ QVariant DiveTripModel::headerData(int section, Qt::Orientation orientation, int case Qt::DisplayRole : switch (section) { case NR: ret = tr("#"); break; - case DATE: ret = tr("Date"); break; + case DATE: ret = tr("date"); break; case RATING: ret = UTF8_BLACKSTAR; break; case DEPTH: ret = (get_units()->length == units::METERS) ? tr("m") : tr("ft"); break; case DURATION: ret = tr("min"); break; case TEMPERATURE:ret = QString("%1%2").arg(UTF8_DEGREE).arg((get_units()->temperature == units::CELSIUS) ? "C" : "F"); break; case TOTALWEIGHT:ret = (get_units()->weight == units::KG) ? tr("kg") : tr("lbs"); break; - case SUIT: ret = tr("Suit"); break; - case CYLINDER: ret = tr("Cyl"); break; + case SUIT: ret = tr("suit"); break; + case CYLINDER: ret = tr("cyl"); break; case NITROX: ret = QString("O%1%").arg(UTF8_SUBSCRIPT_2); break; case SAC: ret = tr("SAC"); break; case OTU: ret = tr("OTU"); break; case MAXCNS: ret = tr("maxCNS"); break; - case LOCATION: ret = tr("Location"); break; + case LOCATION: ret = tr("location"); break; }break; } @@ -1448,7 +1448,7 @@ void YearlyStatisticsModel::update_yearly_stats() } - if (stats_by_trip != NULL ) { + if (stats_by_trip != NULL && stats_by_trip[0].is_trip == TRUE) { YearStatisticsItem *item = new YearStatisticsItem(stats_by_trip[0]); for (i = 1; stats_by_trip != NULL && stats_by_trip[i].is_trip; ++i) { YearStatisticsItem *iChild = new YearStatisticsItem(stats_by_trip[i]); |