added alias support

src/mvvmquick/Switch.qml

@@ -0,0 +1,7 @@
+import QtQuick 2.10
+import QtQuick.Controls 2.3
+
+Switch {
+	id: _edit
+	property alias inputValue: _edit.checked
+}

src/mvvmquick/inputviewfactory.cpp

@@ -38,23 +38,17 @@ InputViewFactory::InputViewFactory() :
 
 InputViewFactory::~InputViewFactory() {}
 
-//int InputViewFactory::metaTypeId(const QByteArray &type, const QVariantMap &properties)
-//{
-//	if(type == "string")
-//		return QMetaType::QString;
-//	else if(type == "list")
-//		return metaTypeId(properties.value(QStringLiteral("_list_data"), QByteArray("string")).toByteArray(), properties);
-//	else
-//		return QMetaType::type(type);
-//}
-
 QUrl InputViewFactory::getInputUrl(const QByteArray &type, const QVariantMap &viewProperties)
 {
 	Q_UNUSED(viewProperties)
+	if(d->aliases.contains(type))
+		return getInputUrl(d->aliases.value(type), viewProperties);
 	if(d->simpleViews.contains(type))
 		return d->simpleViews.value(type);
 	else if(type == QMetaType::typeName(QMetaType::Bool))
 		return QStringLiteral("qrc:/de/skycoder42/qtmvvm/quick/inputs/CheckBox.qml");
+	else if(type == "switch")
+		return QStringLiteral("qrc:/de/skycoder42/qtmvvm/quick/inputs/Switch.qml");
 	else if(type == QMetaType::typeName(QMetaType::QString) || type == "string")
 		return QStringLiteral("qrc:/de/skycoder42/qtmvvm/quick/inputs/TextField.qml");
 	else if(type == QMetaType::typeName(QMetaType::Int))
@@ -79,15 +73,20 @@ QUrl InputViewFactory::getInputUrl(const QByteArray &type, const QVariantMap &vi
 	}
 }
 
-bool InputViewFactory::addSimpleView(const QByteArray &type, const QUrl &qmlFileUrl)
+void InputViewFactory::addSimpleView(const QByteArray &type, const QUrl &qmlFileUrl)
 {
 	d->simpleViews.insert(type, qmlFileUrl);
-	return true;
+}
+
+void InputViewFactory::addAlias(const QByteArray &alias, const QByteArray &targetType)
+{
+	d->aliases.insert(alias, targetType);
 }
 
 // ------------- Private Implementation -------------
 
 InputViewFactoryPrivate::InputViewFactoryPrivate() :
-	simpleViews()
+	simpleViews(),
+	aliases()
 {}
 

src/mvvmquick/inputviewfactory.h

@@ -19,21 +19,30 @@ public:
 	InputViewFactory();
 	virtual ~InputViewFactory();
 
-	//virtual int metaTypeId(const QByteArray &type, const QVariantMap &properties);
 	Q_INVOKABLE virtual QUrl getInputUrl(const QByteArray &type, const QVariantMap &viewProperties);
 
-	Q_INVOKABLE virtual bool addSimpleView(const QByteArray &type, const QUrl &qmlFileUrl);
+	Q_INVOKABLE virtual void addSimpleView(const QByteArray &type, const QUrl &qmlFileUrl);
-	template <typename T>
+	template <typename TType>
-	bool addSimpleView(const QUrl &qmlFileUrl);
+	inline void addSimpleView(const QUrl &qmlFileUrl);
+
+	Q_INVOKABLE virtual void addAlias(const QByteArray &alias, const QByteArray &targetType);
+	template <typename TAliasType, typename TTargetType>
+	inline void addAlias();
 
 private:
 	QScopedPointer<InputViewFactoryPrivate> d;
 };
 
-template<typename T>
+template<typename TType>
-bool InputViewFactory::addSimpleView(const QUrl &qmlFileUrl)
+inline void InputViewFactory::addSimpleView(const QUrl &qmlFileUrl)
+{
+	addSimpleView(QMetaType::typeName(qMetaTypeId<TType>()), qmlFileUrl);
+}
+
+template<typename TAliasType, typename TTargetType>
+inline void InputViewFactory::addAlias()
 {
-	return addSimpleView(QMetaType::typeName(qMetaTypeId<T>()), qmlFileUrl);
+	addAlias(QMetaType::typeName(qMetaTypeId<TAliasType>()), QMetaType::typeName(qMetaTypeId<TTargetType>()));
 }
 
 }

src/mvvmquick/inputviewfactory_p.h

@@ -12,6 +12,7 @@ public:
 	InputViewFactoryPrivate();
 
 	QHash<QByteArray, QUrl> simpleViews;
+	QHash<QByteArray, QByteArray> aliases;
 };
 
 }

src/mvvmquick/qtmvvmquick_module.qrc

@@ -7,5 +7,6 @@
         <file>DoubleSpinBox.qml</file>
         <file>FontEdit.qml</file>
         <file>UrlField.qml</file>
+        <file>Switch.qml</file>
     </qresource>
 </RCC>

src/mvvmwidgets/inputwidgetfactory.cpp

@@ -24,6 +24,8 @@ InputWidgetFactory::~InputWidgetFactory() {}
 QWidget *InputWidgetFactory::createInput(const QByteArray &type, QWidget *parent, const QVariantMap &viewProperties)
 {
 	QWidget *widget = nullptr;
+	if(d->aliases.contains(type))
+		return createInput(d->aliases.value(type), parent, viewProperties);
 	if(d->simpleWidgets.contains(type))
 		widget = d->simpleWidgets.value(type)(parent);
 	else if(type == QMetaType::typeName(QMetaType::Bool))
@@ -78,8 +80,14 @@ void InputWidgetFactory::addSimpleWidget(const QByteArray &type, const std::func
 	d->simpleWidgets.insert(type, creator);
 }
 
+void InputWidgetFactory::addAlias(const QByteArray &alias, const QByteArray &targetType)
+{
+	d->aliases.insert(alias, targetType);
+}
+
 // ------------- Private Implementation -------------
 
 InputWidgetFactoryPrivate::InputWidgetFactoryPrivate() :
-	simpleWidgets()
+	simpleWidgets(),
+	aliases()
 {}

src/mvvmwidgets/inputwidgetfactory.h

@@ -22,20 +22,30 @@ public:
 
 	virtual void addSimpleWidget(const QByteArray &type, const std::function<QWidget*(QWidget*)> &creator);
 	template <typename TType, typename TWidget>
-	void addSimpleWidget();
+	inline void addSimpleWidget();
+
+	virtual void addAlias(const QByteArray &alias, const QByteArray &targetType);
+	template <typename TAliasType, typename TTargetType>
+	inline void addAlias();
 
 private:
 	QScopedPointer<InputWidgetFactoryPrivate> d;
 };
 
 template<typename TType, typename TWidget>
-void InputWidgetFactory::addSimpleWidget()
+inline void InputWidgetFactory::addSimpleWidget()
 {
 	addSimpleWidget(QMetaType::typeName(qMetaTypeId<TType>()), [](QWidget *parent){
 		return new TWidget(parent);
 	});
 }
 
+template<typename TAliasType, typename TTargetType>
+inline void InputWidgetFactory::addAlias()
+{
+	addAlias(QMetaType::typeName(qMetaTypeId<TAliasType>()), QMetaType::typeName(qMetaTypeId<TTargetType>()));
+}
+
 }
 
 #endif // QTMVVM_INPUTWIDGETFACTORY_H

src/mvvmwidgets/inputwidgetfactory_p.h

@@ -12,6 +12,7 @@ public:
 	InputWidgetFactoryPrivate();
 
 	QHash<QByteArray, std::function<QWidget*(QWidget*)>> simpleWidgets;
+	QHash<QByteArray, QByteArray> aliases;
 };
 
 }