From a86a15df5f7c2dbe5efeca46cff2f96bccae0bf0 Mon Sep 17 00:00:00 2001
From: Skycoder42 <Skycoder42@users.noreply.github.com>
Date: Mon, 25 Jun 2018 18:26:52 +0200
Subject: [PATCH] added configurable sections to timeedit

---
 examples/mvvmcore/SampleCore/settings.xml |  2 +-
 src/imports/mvvmcore/mvvmcore.pro         |  4 +--
 src/imports/mvvmquick/TimeEdit.qml        | 42 +++++++++++++++++++----
 src/mvvmquick/formatters_p.h              | 18 ++++++++++
 src/mvvmquick/inputviewfactory.cpp        |  5 ++-
 5 files changed, 60 insertions(+), 11 deletions(-)

diff --git a/examples/mvvmcore/SampleCore/settings.xml b/examples/mvvmcore/SampleCore/settings.xml
index e814756..0fdb18c 100644
--- a/examples/mvvmcore/SampleCore/settings.xml
+++ b/examples/mvvmcore/SampleCore/settings.xml
@@ -139,7 +139,7 @@
 			   title="Choose a date"
 			   default="2018-10-10">
 			<Property key="qtmvvm_preview" type="string">Selected date: %1</Property>
-			<Property key="qtmvvm_dateformat" type="string">dd.MM.yyyy</Property>
+			<Property key="qtmvvm_dateformat" type="string">dd. MMMM yyyy</Property>
 		</Entry>
 		<Entry key="prop15"
 			   type="QDateTime"
diff --git a/src/imports/mvvmcore/mvvmcore.pro b/src/imports/mvvmcore/mvvmcore.pro
index 36e2f4a..e22a65b 100644
--- a/src/imports/mvvmcore/mvvmcore.pro
+++ b/src/imports/mvvmcore/mvvmcore.pro
@@ -11,14 +11,14 @@ HEADERS += \
 	qqmlmvvmbinding.h \
 	qqmlmvvmmessage.h \
 	qqmlserviceregistry.h \
-    qqmlcoreapp.h
+	qqmlcoreapp.h
 
 SOURCES += \
 	qtmvvmcore_plugin.cpp \
 	qqmlmvvmbinding.cpp \
 	qqmlmvvmmessage.cpp \
 	qqmlserviceregistry.cpp \
-    qqmlcoreapp.cpp
+	qqmlcoreapp.cpp
 
 OTHER_FILES += qmldir
 
diff --git a/src/imports/mvvmquick/TimeEdit.qml b/src/imports/mvvmquick/TimeEdit.qml
index adc172b..5ab8904 100644
--- a/src/imports/mvvmquick/TimeEdit.qml
+++ b/src/imports/mvvmquick/TimeEdit.qml
@@ -14,6 +14,10 @@ RowLayout {
 
 	property var _forceTime: new Date()
 
+	property bool showHours: true
+	property bool showMinutes: true
+	property bool showSeconds: false
+
 	readonly property bool is24Hours: {
 		var fmStr = Qt.locale().timeFormat(Locale.LongFormat);
 		var isApPm = false;
@@ -24,17 +28,17 @@ RowLayout {
 		return !isApPm;
 	}
 
-	readonly property int hours: _hourTumbler.currentIndex + (!is24Hours && _amPmTumbler.currentIndex === 1 ? 12 : 0);
-	readonly property int minutes: _minuteTumbler.currentIndex;
+	readonly property int hours: showHours ? (_hourTumbler.currentIndex + (!is24Hours && _amPmTumbler.currentIndex === 1 ? 12 : 0)) : 0
+	readonly property int minutes: showMinutes ? _minuteTumbler.currentIndex : 0
+	readonly property int seconds: showSeconds ? _secondsTumbler.currentIndex : 0
 	property bool _skipChange: false
 
 	function recalcTime() {
-		var hours = _hourTumbler.currentIndex + (!is24Hours && _amPmTumbler.currentIndex === 1 ? 12 : 0);
-		var minutes = _minuteTumbler.currentIndex;
 		if(_forceTime.getHours() !== hours ||
-		   _forceTime.getMinutes() !== minutes) {
+		   _forceTime.getMinutes() !== minutes ||
+		   _forceTime.getSeconds() !== seconds) {
 			_skipChange = true;
-			time = new Date(0, 0, 0, hours, minutes);
+			time = new Date(0, 0, 0, hours, minutes, seconds);
 			_skipChange = false;
 		}
 	}
@@ -48,6 +52,7 @@ RowLayout {
 
 	TimeTumbler {
 		id: _hourTumbler
+		visible: showHours
 		model: {
 			var model = new Array(is24Hours ? 24 : 12);
 			for(var i = 0; i < model.length; i++)
@@ -63,10 +68,12 @@ RowLayout {
 	Label {
 		text: qsTr(":")
 		Layout.minimumWidth: implicitWidth
+		visible: showHours && showMinutes
 	}
 
 	TimeTumbler {
 		id: _minuteTumbler
+		visible: showMinutes
 		model: {
 			var mod = new Array(60)
 			for(var i = 0; i < mod.length; i++) {
@@ -79,9 +86,30 @@ RowLayout {
 		onCurrentIndexChanged: Qt.callLater(recalcTime)
 	}
 
+	Label {
+		text: qsTr(":")
+		Layout.minimumWidth: implicitWidth
+		visible: showSeconds && (showMinutes || showHours)
+	}
+
+	TimeTumbler {
+		id: _secondsTumbler
+		visible: showSeconds
+		model: {
+			var mod = new Array(60)
+			for(var i = 0; i < mod.length; i++) {
+				var data = i.toString();
+				mod[i] = data.length < 2 ? Qt.locale().zeroDigit + data : data;
+			}
+			return mod;
+		}
+		currentIndex: _forceTime.getSeconds()
+		onCurrentIndexChanged: Qt.callLater(recalcTime)
+	}
+
 	TimeTumbler {
 		id: _amPmTumbler
-		visible: !is24Hours
+		visible: !is24Hours && showHours
 		model: [
 			Qt.locale().amText,
 			Qt.locale().pmText,
diff --git a/src/mvvmquick/formatters_p.h b/src/mvvmquick/formatters_p.h
index 50e9cc8..6dcd80b 100644
--- a/src/mvvmquick/formatters_p.h
+++ b/src/mvvmquick/formatters_p.h
@@ -2,6 +2,7 @@
 #define QTMVVM_FORMATTERS_P_H
 
 #include <QtCore/QCoreApplication>
+#include <QtCore/QDateTime>
 
 #include "inputviewfactory.h"
 
@@ -36,6 +37,23 @@ public:
 	}
 };
 
+template <typename T>
+class DateTimeFormatter : public Formatter
+{
+public:
+	QString format(const QString &formatString, const QVariant &value, const QVariantMap &viewProperties) const override {
+		auto formatType = viewProperties.value(QStringLiteral("qtmvvm_dateformat"));
+		QString dateStr;
+		if(formatType.type() == QVariant::Int)
+			dateStr = value.template value<T>().toString(static_cast<Qt::DateFormat>(formatType.toInt()));
+		else if(formatType.type() == QVariant::String)
+			dateStr = value.template value<T>().toString(formatType.toString());
+		else
+			dateStr = value.template value<T>().toString(Qt::DefaultLocaleShortDate);
+		return formatString.arg(dateStr);
+	}
+};
+
 }
 
 #endif // QTMVVM_FORMATTERS_P_H
diff --git a/src/mvvmquick/inputviewfactory.cpp b/src/mvvmquick/inputviewfactory.cpp
index d3ccd00..5080b37 100644
--- a/src/mvvmquick/inputviewfactory.cpp
+++ b/src/mvvmquick/inputviewfactory.cpp
@@ -131,7 +131,10 @@ InputViewFactoryPrivate::InputViewFactoryPrivate() :
 		{"range", QStringLiteral("qrc:/qtmvvm/delegates/RangeDelegate.qml")}
 	},
 	formatters{
-		{QMetaType::typeName(QMetaType::Int), QSharedPointer<IntFormatter>::create()}
+		{QMetaType::typeName(QMetaType::Int), QSharedPointer<IntFormatter>::create()},
+		{QMetaType::typeName(QMetaType::QTime), QSharedPointer<DateTimeFormatter<QTime>>::create()},
+		{QMetaType::typeName(QMetaType::QDate), QSharedPointer<DateTimeFormatter<QDate>>::create()},
+		{QMetaType::typeName(QMetaType::QDateTime), QSharedPointer<DateTimeFormatter<QDateTime>>::create()}
 	}
 {
 	auto dblFormatter = QSharedPointer<SimpleFormatter<double>>::create();