[PATCH 09/14] diverplanner capitalisation consitency

Tim Wootton tim at tee-jay.demon.co.uk
Fri Jul 11 01:21:42 PDT 2014


Signed-off-by: Tim Wootton <tim at tee-jay.demon.co.uk>
---
 qt-ui/diveplanner.cpp | 16 ++++++++--------
 qt-ui/diveplanner.ui  |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp
index dded7cb..ce403d3 100644
--- a/qt-ui/diveplanner.cpp
+++ b/qt-ui/diveplanner.cpp
@@ -207,7 +207,7 @@ void DiveHandler::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
 		m.addAction(action);
 	}
 	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());
 }
 
@@ -249,11 +249,11 @@ void DiveHandler::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 DivePlannerWidget::DivePlannerWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, f)
 {
 	ui.setupUi(this);
-	ui.tableWidget->setTitle(tr("Dive Planner Points"));
+	ui.tableWidget->setTitle(tr("Dive planner points"));
 	ui.tableWidget->setModel(DivePlannerPointsModel::instance());
 	DivePlannerPointsModel::instance()->setRecalc(true);
 	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());
 	QTableView *view = ui.cylinderTableWidget->view();
 	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)),
 		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.dateEdit, SIGNAL(dateChanged(QDate)), plannerModel, SLOT(setStartDate(QDate)));
 	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) {
 		switch (section) {
 		case DEPTH:
-			return tr("Final Depth");
+			return tr("Final depth");
 		case RUNTIME:
 			return tr("Run time");
 		case DURATION:
 			return tr("Duration");
 		case GAS:
-			return tr("Used Gas");
+			return tr("Used gas");
 		case CCSETPOINT:
-			return tr("CC Set Point");
+			return tr("CC set point");
 		}
 	} else if (role == Qt::FontRole) {
 		return defaultModelFont();
@@ -884,7 +884,7 @@ struct diveplan &DivePlannerPointsModel::getDiveplan()
 void DivePlannerPointsModel::cancelPlan()
 {
 	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.")),
 					 QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Discard) != QMessageBox::Discard) {
 			return;
diff --git a/qt-ui/diveplanner.ui b/qt-ui/diveplanner.ui
index 90c9fda..7759be8 100644
--- a/qt-ui/diveplanner.ui
+++ b/qt-ui/diveplanner.ui
@@ -50,7 +50,7 @@
        </rect>
       </property>
       <layout class="QGridLayout" name="gridLayout_2">
-       <property name="leftMargin">
+-       <property name="leftMargin">
         <number>0</number>
        </property>
        <property name="topMargin">
@@ -103,7 +103,7 @@
           <sizepolicy hsizetype="Expanding" vsizetype="Preferred"/>
          </property>
          <property name="text">
-          <string>Planned Dive Time</string>
+          <string>Planned dive time</string>
          </property>
         </widget>
        </item>
@@ -138,7 +138,7 @@
        <item row="2" column="1">
         <widget class="QLabel" name="label_2">
          <property name="text">
-          <string>ATM Pressure</string>
+          <string>ATM pressure</string>
          </property>
         </widget>
        </item>
-- 
2.0.0



More information about the subsurface mailing list