[PATCH] QML UI: dive edit, treat numeric input of duration as full minutes

Joakim Bygdell j.bygdell at gmail.com
Tue Feb 9 13:00:56 PST 2016


When editing the duration of a dive, if only numbers are entered they are
treated as full miuntes.

Signed-off-by: Joakim Bygdell <j.bygdell at gmail.com>
---
 qt-mobile/qmlmanager.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/qt-mobile/qmlmanager.cpp b/qt-mobile/qmlmanager.cpp
index a73c49f..ad9aefd 100644
--- a/qt-mobile/qmlmanager.cpp
+++ b/qt-mobile/qmlmanager.cpp
@@ -435,6 +435,7 @@ QString QMLManager::commitChanges(QString diveId, QString date, QString location
 		QRegExp r3(QStringLiteral("(\\d*)\\s*%1").arg(tr("min")), Qt::CaseInsensitive);
 		QRegExp r4(QStringLiteral("(\\d*):(\\d*):(\\d*)"));
 		QRegExp r5(QStringLiteral("(\\d*):(\\d*)"));
+		QRegExp r6(QStringLiteral("(\\d*)"));
 		if (r1.indexIn(duration) >= 0) {
 			h = r1.cap(1).toInt();
 			m = r1.cap(2).toInt();
@@ -451,6 +452,8 @@ QString QMLManager::commitChanges(QString diveId, QString date, QString location
 		} else if (r5.indexIn(duration) >= 0) {
 			h = r5.cap(1).toInt();
 			m = r5.cap(2).toInt();
+		} else if (r6.indexIn(duration) >= 0) {
+			m = r6.cap(1).toInt();
 		}
 		d->dc.duration.seconds = d->duration.seconds = h * 3600 + m * 60 + s;
 	}
-- 
2.4.9 (Apple Git-60)



More information about the subsurface mailing list