Add support for Splitter

extensionplugin/extensionplugin_plugin.cpp

@@ -63,6 +63,8 @@
 #include "scrollareawidgetcontainer_p.h"
 #include "stackedwidgetwidgetcontainer_p.h"
 #include "toolbarwidgetcontainer_p.h"
+#include "splitterwidgetcontainer_p.h"
+#include "declarativesplitter_p.h"
 
 #include <QButtonGroup>
 #include <QCalendarWidget>
@@ -188,4 +190,5 @@ void ExtensionpluginPlugin::registerTypes(const char *uri)
   qmlRegisterExtendedType<QWebEngineView, DeclarativeWidgetExtension>(uri, 1, 0, "WebEngineView");
 #endif
   qmlRegisterExtendedType<QWidget, DeclarativeWidgetExtension>(uri, 1, 0, "Widget");
+  qmlRegisterExtendedType<DeclarativeSplitter, DeclarativeContainerWidgetExtension<SplitterWidgetContainer>>(uri, 1, 0, "Splitter");
 }

lib/declarativesplitter.cpp

@@ -0,0 +1,88 @@
+/*
+  declarativesplitter.cpp
+
+  This file is part of DeclarativeWidgets, library and tools for creating QtWidget UIs with QML.
+
+  Copyright (C) 2013-2017 Klarälvdalens Datakonsult AB, a KDAB Group company, [email protected]
+  Author: Lova Widmark <[email protected]>
+
+  Licensees holding valid commercial KDAB DeclarativeWidgets licenses may use this file in
+  accordance with DeclarativeWidgets Commercial License Agreement provided with the Software.
+
+  Contact [email protected] if any conditions of this licensing are not clear to you.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "declarativesplitter_p.h"
+
+#include <QPointer>
+#include <QWidget>
+#include <QQmlInfo>
+
+class DeclarativeSplitterAttached::Private
+{
+  public:
+    Private(QWidget *w)
+      : stretch(0)
+      , widget(w)
+    {
+    }
+
+    int stretch;
+
+    QPointer<QWidget> widget;
+};
+
+DeclarativeSplitterAttached::DeclarativeSplitterAttached(QWidget *widget, QObject *parent)
+  : QObject(parent)
+  , d(new Private(widget))
+{
+}
+
+DeclarativeSplitterAttached::~DeclarativeSplitterAttached()
+{
+  delete d;
+}
+
+void DeclarativeSplitterAttached::setStretch(int stretch)
+{
+  if (stretch == d->stretch)
+    return;
+
+  d->stretch = stretch;
+
+  emit stretchChanged(stretch);
+}
+
+int DeclarativeSplitterAttached::stretch() const
+{
+  return d->stretch;
+}
+
+DeclarativeSplitter::DeclarativeSplitter(QWidget *parent)
+  : QSplitter(parent)
+{
+}
+
+DeclarativeSplitterAttached *DeclarativeSplitter::qmlAttachedProperties(QObject *parent)
+{
+  QWidget *widget = qobject_cast<QWidget*>(parent);
+  if (widget)
+    return new DeclarativeSplitterAttached(widget, parent);
+
+  qmlInfo(parent) << "Can only attach Splitter to widgets";
+
+  return Q_NULLPTR;
+}

lib/declarativesplitter_p.h

@@ -0,0 +1,67 @@
+/*
+  declarativesplitter_p.h
+
+  This file is part of DeclarativeWidgets, library and tools for creating QtWidget UIs with QML.
+
+  Copyright (C) 2013-2017 Klarälvdalens Datakonsult AB, a KDAB Group company, [email protected]
+  Author: Lova Widmark <[email protected]>
+
+  Licensees holding valid commercial KDAB DeclarativeWidgets licenses may use this file in
+  accordance with DeclarativeWidgets Commercial License Agreement provided with the Software.
+
+  Contact [email protected] if any conditions of this licensing are not clear to you.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef DECLARATIVESPLITTER_P_H
+#define DECLARATIVESPLITTER_P_H
+
+#include <QtGlobal>
+#include <QObject>
+#include <QSplitter>
+#include <QtQml>
+
+class DeclarativeSplitterAttached : public QObject
+{
+  Q_OBJECT
+
+  Q_PROPERTY(int stretch READ stretch WRITE setStretch NOTIFY stretchChanged)
+
+  public:
+    DeclarativeSplitterAttached(QWidget *widget, QObject *parent);
+    ~DeclarativeSplitterAttached();
+
+    void setStretch(int stretch);
+    int stretch() const;
+
+  Q_SIGNALS:
+    void stretchChanged(int stretch);
+
+  private:
+    class Private;
+    Private *const d;
+};
+
+class DeclarativeSplitter : public QSplitter
+{
+  public:
+    DeclarativeSplitter(QWidget *parent = Q_NULLPTR);
+
+    static DeclarativeSplitterAttached *qmlAttachedProperties(QObject *parent);
+};
+
+QML_DECLARE_TYPEINFO(DeclarativeSplitter, QML_HAS_ATTACHED_PROPERTIES)
+
+#endif // DECLARATIVESPLITTER_P_H

lib/lib.pro

@@ -66,11 +66,13 @@ HEADERS = \
   staticdialogmethodattached_p.h \
   toolbarwidgetcontainer_p.h \
   widgetcontainerinterface_p.h \
-    declarativeloaderwidget_p.h \
-    declarativespaceritem_p.h \
-    declarativeline_p.h \
-    declarativelabelextension_p.h \
-    declarativetabstops_p.h
+  declarativeloaderwidget_p.h \
+  declarativespaceritem_p.h \
+  declarativeline_p.h \
+  declarativelabelextension_p.h \
+  declarativetabstops_p.h \
+  splitterwidgetcontainer_p.h \
+  declarativesplitter_p.h
 
 SOURCES = \
   abstractdeclarativeobject.cpp \
@@ -116,8 +118,11 @@ SOURCES = \
   stackedwidgetwidgetcontainer.cpp \
   staticdialogmethodattached.cpp \
   toolbarwidgetcontainer.cpp \
-    declarativeloaderwidget.cpp \
-    declarativespaceritem.cpp \
-    declarativeline.cpp \
-    declarativelabelextension.cpp \
-    declarativetabstops.cpp
+  declarativeloaderwidget.cpp \
+  declarativespaceritem.cpp \
+  declarativeline.cpp \
+  declarativelabelextension.cpp \
+  declarativetabstops.cpp \
+  splitterwidgetcontainer.cpp \
+  declarativesplitter.cpp
+

lib/splitterwidgetcontainer.cpp

@@ -0,0 +1,65 @@
+/*
+  splitterwidgetcontainer.cpp
+
+  This file is part of DeclarativeWidgets, library and tools for creating QtWidget UIs with QML.
+
+  Copyright (C) 2013-2017 Klarälvdalens Datakonsult AB, a KDAB Group company, [email protected]
+  Author: Lova Widmark <[email protected]>
+
+  Licensees holding valid commercial KDAB DeclarativeWidgets licenses may use this file in
+  accordance with DeclarativeWidgets Commercial License Agreement provided with the Software.
+
+  Contact [email protected] if any conditions of this licensing are not clear to you.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "splitterwidgetcontainer_p.h"
+
+#include "declarativesplitter_p.h"
+
+#include <QSplitter>
+#include <QQmlInfo>
+#include <QQmlEngine>
+
+SplitterWidgetContainer::SplitterWidgetContainer(QObject *parent)
+  : DefaultWidgetContainer(qobject_cast<QSplitter*>(parent))
+{
+  Q_ASSERT(m_widget);
+}
+
+void SplitterWidgetContainer::setLayout(QLayout *layout)
+{
+  Q_UNUSED(layout);
+  qmlInfo(m_widget) << "Can not set a Layout to a Splitter";
+}
+
+void SplitterWidgetContainer::addWidget(QWidget *widget)
+{
+  QObject *attachedProperties = qmlAttachedPropertiesObject<QSplitter>(widget, false);
+  DeclarativeSplitterAttached *properties = qobject_cast<DeclarativeSplitterAttached*>(attachedProperties);
+  if (properties) {
+    QSizePolicy policy = widget->sizePolicy();
+    policy.setHorizontalStretch(properties->stretch());
+    policy.setVerticalStretch(properties->stretch());
+    widget->setSizePolicy(policy);
+  }
+
+  extendedSplitter()->addWidget(widget);
+}
+
+QSplitter *SplitterWidgetContainer::extendedSplitter() const
+{
+  return static_cast<QSplitter*>(m_widget);
+}

lib/splitterwidgetcontainer_p.h

@@ -0,0 +1,52 @@
+/*
+  splitterwidgetcontainer_p.h
+
+  This file is part of DeclarativeWidgets, library and tools for creating QtWidget UIs with QML.
+
+  Copyright (C) 2013-2017 Klarälvdalens Datakonsult AB, a KDAB Group company, [email protected]
+  Author: Lova Widmark <[email protected]>
+
+  Licensees holding valid commercial KDAB DeclarativeWidgets licenses may use this file in
+  accordance with DeclarativeWidgets Commercial License Agreement provided with the Software.
+
+  Contact [email protected] if any conditions of this licensing are not clear to you.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef SPLITTERWIDGETCONTAINER_P_H
+#define SPLITTERWIDGETCONTAINER_P_H
+
+#include <QtGlobal>
+
+#include "defaultwidgetcontainer.h"
+
+QT_BEGIN_NAMESPACE
+class QSplitter;
+class QObject;
+QT_END_NAMESPACE
+
+class SplitterWidgetContainer : public DefaultWidgetContainer
+{
+  public:
+    explicit SplitterWidgetContainer(QObject *parent = Q_NULLPTR);
+
+    void setLayout(QLayout *layout) Q_DECL_OVERRIDE;
+    void addWidget(QWidget *widget) Q_DECL_OVERRIDE;
+
+  private:
+    QSplitter *extendedSplitter() const;
+};
+
+#endif // SPLITTERWIDGETCONTAINER_P_H

tests/auto/instantiatetypes/qml.qrc

@@ -66,5 +66,6 @@
         <file>qml/uncreatable/ItemSelectionModel.qml</file>
         <file>qml/uncreatable/TextDocument.qml</file>
         <file>qml/creatable/webenginewidgets/WebEngineView.qml</file>
+        <file>qml/creatable/widgets/Splitter.qml</file>
     </qresource>
 </RCC>

tests/auto/instantiatetypes/qml/creatable/widgets/Splitter.qml

@@ -0,0 +1,32 @@
+/*
+  Splitter.qml
+
+  This file is part of DeclarativeWidgets, library and tools for creating QtWidget UIs with QML.
+
+  Copyright (C) 2017 Klarälvdalens Datakonsult AB, a KDAB Group company, [email protected]
+  Author: Lova Widmark <[email protected]>
+
+  Licensees holding valid commercial KDAB DeclarativeWidgets licenses may use this file in
+  accordance with DeclarativeWidgets Commercial License Agreement provided with the Software.
+
+  Contact [email protected] if any conditions of this licensing are not clear to you.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import QtWidgets 1.0
+
+Splitter {
+
+}