mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename the model column from NITROX to GAS

Browse source 
The column isn't just about NITROX, there might be air and trimix in
there too.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Anton Lundin 2014-07-20 15:07:56 +02:00 • committed by Dirk Hohndel
parent e07d23f806
commit 619c1b3ec9
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qt-ui/divelistview.cpp
View file

@ -383,7 +383,7 @@ void DiveListView::reloadHeaderActions()
QString settingName = QString("showColumn%1").arg(i); QString settingName = QString("showColumn%1").arg(i);
QAction *a = new QAction(title, header()); QAction *a = new QAction(title, header());
bool showHeaderFirstRun = !( bool showHeaderFirstRun = !(
i == DiveTripModel::MAXCNS || i == DiveTripModel::NITROX || i == DiveTripModel::OTU || i == DiveTripModel::TEMPERATURE || i == DiveTripModel::TOTALWEIGHT || i == DiveTripModel::SUIT || i == DiveTripModel::CYLINDER || i == DiveTripModel::SAC); i == DiveTripModel::MAXCNS || i == DiveTripModel::GAS || i == DiveTripModel::OTU || i == DiveTripModel::TEMPERATURE || i == DiveTripModel::TOTALWEIGHT || i == DiveTripModel::SUIT || i == DiveTripModel::CYLINDER || i == DiveTripModel::SAC);
bool shown = s.value(settingName, showHeaderFirstRun).toBool(); bool shown = s.value(settingName, showHeaderFirstRun).toBool();
a->setCheckable(true); a->setCheckable(true);
a->setChecked(shown); a->setChecked(shown);

6
qt-ui/models.cpp
View file

@ -1102,7 +1102,7 @@ QVariant DiveItem::data(int column, int role) const
case CYLINDER: case CYLINDER:
retVal = QString(dive->cylinder[0].type.description); retVal = QString(dive->cylinder[0].type.description);
break; break;
case NITROX: case GAS:
retVal = nitrox_sort_value(dive); retVal = nitrox_sort_value(dive);
break; break;
case SAC: case SAC:
@ -1146,7 +1146,7 @@ QVariant DiveItem::data(int column, int role) const
case CYLINDER: case CYLINDER:
retVal = QString(dive->cylinder[0].type.description); retVal = QString(dive->cylinder[0].type.description);
break; break;
case NITROX: case GAS:
retVal = QString(get_nitrox_string(dive)); retVal = QString(get_nitrox_string(dive));
break; break;
case SAC: case SAC:
@ -1338,7 +1338,7 @@ QVariant DiveTripModel::headerData(int section, Qt::Orientation orientation, int
case CYLINDER: case CYLINDER:
ret = tr("Cyl"); ret = tr("Cyl");
break; break;
case NITROX: case GAS:
ret = tr("Gas"); ret = tr("Gas");
break; break;
case SAC: case SAC:

4
qt-ui/models.h
View file

@ -191,7 +191,7 @@ struct DiveItem : public TreeItem {
TOTALWEIGHT, TOTALWEIGHT,
SUIT, SUIT,
CYLINDER, CYLINDER,
NITROX, GAS,
SAC, SAC,
OTU, OTU,
MAXCNS, MAXCNS,
@ -245,7 +245,7 @@ public:
TOTALWEIGHT, TOTALWEIGHT,
SUIT, SUIT,
CYLINDER, CYLINDER,
NITROX, GAS,
SAC, SAC,
OTU, OTU,
MAXCNS, MAXCNS,