diverplanner capitalisation consitency

Signed-off-by: Tim Wootton <tim@tee-jay.demon.co.uk>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tim Wootton 2014-07-11 00:06:46 +01:00 committed by Dirk Hohndel
parent 91ead05dbf
commit 7680863c0e
2 changed files with 10 additions and 10 deletions

View file

@ -207,7 +207,7 @@ void DiveHandler::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
m.addAction(action); m.addAction(action);
} }
m.addSeparator(); m.addSeparator();
m.addAction(QObject::tr("Remove this Point"), this, SLOT(selfRemove())); m.addAction(QObject::tr("Remove this point"), this, SLOT(selfRemove()));
m.exec(event->screenPos()); m.exec(event->screenPos());
} }
@ -249,11 +249,11 @@ void DiveHandler::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
DivePlannerWidget::DivePlannerWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, f) DivePlannerWidget::DivePlannerWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, f)
{ {
ui.setupUi(this); ui.setupUi(this);
ui.tableWidget->setTitle(tr("Dive Planner Points")); ui.tableWidget->setTitle(tr("Dive planner points"));
ui.tableWidget->setModel(DivePlannerPointsModel::instance()); ui.tableWidget->setModel(DivePlannerPointsModel::instance());
DivePlannerPointsModel::instance()->setRecalc(true); DivePlannerPointsModel::instance()->setRecalc(true);
ui.tableWidget->view()->setItemDelegateForColumn(DivePlannerPointsModel::GAS, new AirTypesDelegate(this)); ui.tableWidget->view()->setItemDelegateForColumn(DivePlannerPointsModel::GAS, new AirTypesDelegate(this));
ui.cylinderTableWidget->setTitle(tr("Available Gases")); ui.cylinderTableWidget->setTitle(tr("Available gases"));
ui.cylinderTableWidget->setModel(CylindersModel::instance()); ui.cylinderTableWidget->setModel(CylindersModel::instance());
QTableView *view = ui.cylinderTableWidget->view(); QTableView *view = ui.cylinderTableWidget->view();
view->setColumnHidden(CylindersModel::START, true); view->setColumnHidden(CylindersModel::START, true);
@ -276,7 +276,7 @@ DivePlannerWidget::DivePlannerWidget(QWidget *parent, Qt::WindowFlags f) : QWidg
connect(CylindersModel::instance(), SIGNAL(rowsRemoved(QModelIndex, int, int)), connect(CylindersModel::instance(), SIGNAL(rowsRemoved(QModelIndex, int, int)),
plannerModel, SIGNAL(cylinderModelEdited())); plannerModel, SIGNAL(cylinderModelEdited()));
ui.tableWidget->setBtnToolTip(tr("add dive data point")); ui.tableWidget->setBtnToolTip(tr("Add dive data point"));
connect(ui.startTime, SIGNAL(timeChanged(QTime)), plannerModel, SLOT(setStartTime(QTime))); connect(ui.startTime, SIGNAL(timeChanged(QTime)), plannerModel, SLOT(setStartTime(QTime)));
connect(ui.dateEdit, SIGNAL(dateChanged(QDate)), plannerModel, SLOT(setStartDate(QDate))); connect(ui.dateEdit, SIGNAL(dateChanged(QDate)), plannerModel, SLOT(setStartDate(QDate)));
connect(ui.ATMPressure, SIGNAL(valueChanged(int)), this, SLOT(atmPressureChanged(int))); connect(ui.ATMPressure, SIGNAL(valueChanged(int)), this, SLOT(atmPressureChanged(int)));
@ -583,15 +583,15 @@ QVariant DivePlannerPointsModel::headerData(int section, Qt::Orientation orienta
if (role == Qt::DisplayRole && orientation == Qt::Horizontal) { if (role == Qt::DisplayRole && orientation == Qt::Horizontal) {
switch (section) { switch (section) {
case DEPTH: case DEPTH:
return tr("Final Depth"); return tr("Final depth");
case RUNTIME: case RUNTIME:
return tr("Run time"); return tr("Run time");
case DURATION: case DURATION:
return tr("Duration"); return tr("Duration");
case GAS: case GAS:
return tr("Used Gas"); return tr("Used gas");
case CCSETPOINT: case CCSETPOINT:
return tr("CC Set Point"); return tr("CC set point");
} }
} else if (role == Qt::FontRole) { } else if (role == Qt::FontRole) {
return defaultModelFont(); return defaultModelFont();
@ -884,7 +884,7 @@ struct diveplan &DivePlannerPointsModel::getDiveplan()
void DivePlannerPointsModel::cancelPlan() void DivePlannerPointsModel::cancelPlan()
{ {
if (mode == PLAN && rowCount()) { if (mode == PLAN && rowCount()) {
if (QMessageBox::warning(MainWindow::instance(), TITLE_OR_TEXT(tr("Discard the Plan?"), if (QMessageBox::warning(MainWindow::instance(), TITLE_OR_TEXT(tr("Discard the plan?"),
tr("You are about to discard your plan.")), tr("You are about to discard your plan.")),
QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Discard) != QMessageBox::Discard) { QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Discard) != QMessageBox::Discard) {
return; return;

View file

@ -103,7 +103,7 @@
<sizepolicy hsizetype="Expanding" vsizetype="Preferred"/> <sizepolicy hsizetype="Expanding" vsizetype="Preferred"/>
</property> </property>
<property name="text"> <property name="text">
<string>Planned Dive Time</string> <string>Planned dive time</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -138,7 +138,7 @@
<item row="2" column="1"> <item row="2" column="1">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">
<string>ATM Pressure</string> <string>ATM pressure</string>
</property> </property>
</widget> </widget>
</item> </item>