diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-09-23 15:23:39 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-09-23 14:02:27 +0000 |
commit | 8b349ca9d2d4b08fe8f0453c75586fe1fcd482f7 (patch) | |
tree | 5ed250352b9e1c5edce2ba8639cd310c229127a5 /src | |
parent | 8a5f6de53fbde11a7075fdfed4436dfbe21acaa0 (diff) |
Templatize the former extras
Change-Id: Ief9ee07d1f5f6c80500bfa611bace860481e2a3f
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/controls/Dial.qml | 3 | ||||
-rw-r--r-- | src/imports/controls/Drawer.qml | 3 | ||||
-rw-r--r-- | src/imports/controls/SwipeView.qml | 3 | ||||
-rw-r--r-- | src/imports/controls/Tumbler.qml | 5 | ||||
-rw-r--r-- | src/imports/controls/controls.pro | 10 | ||||
-rw-r--r-- | src/imports/controls/qtquickcontrols2plugin.cpp | 33 | ||||
-rw-r--r-- | src/imports/templates/qtquicktemplates2plugin.cpp | 12 | ||||
-rw-r--r-- | src/templates/qquickdial.cpp (renamed from src/imports/controls/qquickdial.cpp) | 0 | ||||
-rw-r--r-- | src/templates/qquickdial_p.h (renamed from src/imports/controls/qquickdial_p.h) | 2 | ||||
-rw-r--r-- | src/templates/qquickdrawer.cpp (renamed from src/imports/controls/qquickdrawer.cpp) | 0 | ||||
-rw-r--r-- | src/templates/qquickdrawer_p.h (renamed from src/imports/controls/qquickdrawer_p.h) | 2 | ||||
-rw-r--r-- | src/templates/qquickswipeview.cpp (renamed from src/imports/controls/qquickswipeview.cpp) | 0 | ||||
-rw-r--r-- | src/templates/qquickswipeview_p.h (renamed from src/imports/controls/qquickswipeview_p.h) | 4 | ||||
-rw-r--r-- | src/templates/qquicktumbler.cpp (renamed from src/imports/controls/qquicktumbler.cpp) | 0 | ||||
-rw-r--r-- | src/templates/qquicktumbler_p.h (renamed from src/imports/controls/qquicktumbler_p.h) | 4 | ||||
-rw-r--r-- | src/templates/templates.pri | 12 |
16 files changed, 38 insertions, 55 deletions
diff --git a/src/imports/controls/Dial.qml b/src/imports/controls/Dial.qml index 1d546a5e..e09638cd 100644 --- a/src/imports/controls/Dial.qml +++ b/src/imports/controls/Dial.qml @@ -36,8 +36,9 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 +import QtQuick.Templates 2.0 as T -AbstractDial { +T.Dial { id: control implicitWidth: 100 diff --git a/src/imports/controls/Drawer.qml b/src/imports/controls/Drawer.qml index 57db687d..671a6365 100644 --- a/src/imports/controls/Drawer.qml +++ b/src/imports/controls/Drawer.qml @@ -36,8 +36,9 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 +import QtQuick.Templates 2.0 as T -AbstractDrawer { +T.Drawer { id: control width: parent ? parent.width : 0 // TODO: Window.width diff --git a/src/imports/controls/SwipeView.qml b/src/imports/controls/SwipeView.qml index 63274f20..fb401137 100644 --- a/src/imports/controls/SwipeView.qml +++ b/src/imports/controls/SwipeView.qml @@ -36,8 +36,9 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 +import QtQuick.Templates 2.0 as T -AbstractSwipeView { +T.SwipeView { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, diff --git a/src/imports/controls/Tumbler.qml b/src/imports/controls/Tumbler.qml index 500d59db..feacb721 100644 --- a/src/imports/controls/Tumbler.qml +++ b/src/imports/controls/Tumbler.qml @@ -36,8 +36,9 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 +import QtQuick.Templates 2.0 as T -AbstractTumbler { +T.Tumbler { id: control implicitWidth: 60 implicitHeight: 200 @@ -47,7 +48,7 @@ AbstractTumbler { id: label text: modelData color: "#666666" - opacity: 0.4 + Math.max(0, 1 - Math.abs(AbstractTumbler.displacement)) * 0.6 + opacity: 0.4 + Math.max(0, 1 - Math.abs(T.Tumbler.displacement)) * 0.6 horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter } diff --git a/src/imports/controls/controls.pro b/src/imports/controls/controls.pro index efea03ef..241f1727 100644 --- a/src/imports/controls/controls.pro +++ b/src/imports/controls/controls.pro @@ -39,20 +39,12 @@ QML_FILES = \ Tumbler.qml HEADERS += \ - $$PWD/qquickdial_p.h \ - $$PWD/qquickdrawer_p.h \ - $$PWD/qquickswipeview_p.h \ - $$PWD/qquicktheme_p.h \ $$PWD/qquickthemedata_p.h \ - $$PWD/qquicktumbler_p.h + $$PWD/qquicktheme_p.h SOURCES += \ - $$PWD/qquickdial.cpp \ - $$PWD/qquickdrawer.cpp \ - $$PWD/qquickswipeview.cpp \ $$PWD/qquicktheme.cpp \ $$PWD/qquickthemedata.cpp \ - $$PWD/qquicktumbler.cpp \ $$PWD/qtquickcontrols2plugin.cpp RESOURCES += \ diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp index f572590c..a2b76387 100644 --- a/src/imports/controls/qtquickcontrols2plugin.cpp +++ b/src/imports/controls/qtquickcontrols2plugin.cpp @@ -38,32 +38,7 @@ #include <QtCore/qdir.h> #include <QtQuickTemplates/private/qquickexclusivegroup_p.h> -#include <QtQuickTemplates/private/qquickapplicationwindow_p.h> -#include <QtQuickTemplates/private/qquickbusyindicator_p.h> -#include <QtQuickTemplates/private/qquickbutton_p.h> -#include <QtQuickTemplates/private/qquickcheckbox_p.h> -#include <QtQuickTemplates/private/qquickframe_p.h> -#include <QtQuickTemplates/private/qquickgroupbox_p.h> -#include <QtQuickTemplates/private/qquicklabel_p.h> -#include <QtQuickTemplates/private/qquickpageindicator_p.h> -#include <QtQuickTemplates/private/qquickprogressbar_p.h> -#include <QtQuickTemplates/private/qquickradiobutton_p.h> -#include <QtQuickTemplates/private/qquickscrollbar_p.h> -#include <QtQuickTemplates/private/qquickscrollindicator_p.h> -#include <QtQuickTemplates/private/qquickslider_p.h> -#include <QtQuickTemplates/private/qquickstackview_p.h> -#include <QtQuickTemplates/private/qquickswitch_p.h> -#include <QtQuickTemplates/private/qquicktabbar_p.h> -#include <QtQuickTemplates/private/qquicktabbutton_p.h> -#include <QtQuickTemplates/private/qquicktextarea_p.h> -#include <QtQuickTemplates/private/qquicktextfield_p.h> -#include <QtQuickTemplates/private/qquicktogglebutton_p.h> -#include <QtQuickTemplates/private/qquicktoolbar_p.h> -#include <QtQuickTemplates/private/qquicktoolbutton_p.h> -#include "qquickdial_p.h" -#include "qquickdrawer_p.h" -#include "qquickswipeview_p.h" -#include "qquicktumbler_p.h" + #include "qquicktheme_p.h" void initResources() @@ -87,14 +62,8 @@ void QtQuickControls2Plugin::registerTypes(const char *uri) { qmlRegisterUncreatableType<QQuickThemeAttached>(uri, 2, 0, "Theme", "Theme is an attached property"); - qmlRegisterType<QQuickDial>(uri, 2, 0, "AbstractDial"); - qmlRegisterType<QQuickDrawer>(uri, 2, 0, "AbstractDrawer"); qmlRegisterType<QQuickExclusiveGroup>(uri, 2, 0, "ExclusiveGroup"); qmlRegisterType<QQuickExclusiveGroupAttached>(); - qmlRegisterType<QQuickSwipeView>(uri, 2, 0, "AbstractSwipeView"); - qmlRegisterType<QQuickSwipeViewAttached>(); - qmlRegisterType<QQuickTumbler>(uri, 2, 0, "AbstractTumbler"); - qmlRegisterType<QQuickTumblerAttached>(); QDir baseDir(baseUrl().toLocalFile()); qmlRegisterType(QUrl::fromLocalFile(baseDir.filePath(QStringLiteral("ApplicationWindow.qml"))), uri, 2, 0, "ApplicationWindow"); diff --git a/src/imports/templates/qtquicktemplates2plugin.cpp b/src/imports/templates/qtquicktemplates2plugin.cpp index 8d76c86b..6ce40e99 100644 --- a/src/imports/templates/qtquicktemplates2plugin.cpp +++ b/src/imports/templates/qtquicktemplates2plugin.cpp @@ -42,6 +42,8 @@ #include <QtQuickTemplates/private/qquickcheckbox_p.h> #include <QtQuickTemplates/private/qquickcontrol_p.h> #include <QtQuickTemplates/private/qquickcontainer_p.h> +#include <QtQuickTemplates/private/qquickdial_p.h> +#include <QtQuickTemplates/private/qquickdrawer_p.h> #include <QtQuickTemplates/private/qquickframe_p.h> #include <QtQuickTemplates/private/qquickgroupbox_p.h> #include <QtQuickTemplates/private/qquicklabel_p.h> @@ -52,6 +54,7 @@ #include <QtQuickTemplates/private/qquickscrollindicator_p.h> #include <QtQuickTemplates/private/qquickslider_p.h> #include <QtQuickTemplates/private/qquickstackview_p.h> +#include <QtQuickTemplates/private/qquickswipeview_p.h> #include <QtQuickTemplates/private/qquickswitch_p.h> #include <QtQuickTemplates/private/qquicktabbar_p.h> #include <QtQuickTemplates/private/qquicktabbutton_p.h> @@ -60,6 +63,7 @@ #include <QtQuickTemplates/private/qquicktogglebutton_p.h> #include <QtQuickTemplates/private/qquicktoolbar_p.h> #include <QtQuickTemplates/private/qquicktoolbutton_p.h> +#include <QtQuickTemplates/private/qquicktumbler_p.h> QT_BEGIN_NAMESPACE @@ -78,8 +82,10 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri) qmlRegisterType<QQuickBusyIndicator>(uri, 2, 0, "BusyIndicator"); qmlRegisterType<QQuickButton>(uri, 2, 0, "Button"); qmlRegisterType<QQuickCheckBox>(uri, 2, 0, "CheckBox"); - qmlRegisterType<QQuickControl>(uri, 2, 0, "Control"); qmlRegisterType<QQuickContainer>(uri, 2, 0, "Container"); + qmlRegisterType<QQuickControl>(uri, 2, 0, "Control"); + qmlRegisterType<QQuickDial>(uri, 2, 0, "Dial"); + qmlRegisterType<QQuickDrawer>(uri, 2, 0, "Drawer"); qmlRegisterType<QQuickFrame>(uri, 2, 0, "Frame"); qmlRegisterType<QQuickGroupBox>(uri, 2, 0, "GroupBox"); qmlRegisterType<QQuickLabel>(uri, 2, 0, "Label"); @@ -90,6 +96,8 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri) qmlRegisterType<QQuickScrollIndicator>(uri, 2, 0, "ScrollIndicator"); qmlRegisterType<QQuickSlider>(uri, 2, 0, "Slider"); qmlRegisterType<QQuickStackView>(uri, 2, 0, "StackView"); + qmlRegisterType<QQuickSwipeViewAttached>(); + qmlRegisterType<QQuickSwipeView>(uri, 2, 0, "SwipeView"); qmlRegisterType<QQuickSwitch>(uri, 2, 0, "Switch"); qmlRegisterType<QQuickTabBar>(uri, 2, 0, "TabBar"); qmlRegisterType<QQuickTabButton>(uri, 2, 0, "TabButton"); @@ -98,6 +106,8 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri) qmlRegisterType<QQuickToggleButton>(uri, 2, 0, "ToggleButton"); qmlRegisterType<QQuickToolBar>(uri, 2, 0, "ToolBar"); qmlRegisterType<QQuickToolButton>(uri, 2, 0, "ToolButton"); + qmlRegisterType<QQuickTumblerAttached>(); + qmlRegisterType<QQuickTumbler>(uri, 2, 0, "Tumbler"); qmlRegisterRevision<QQuickText, 6>(uri, 2, 0); qmlRegisterRevision<QQuickTextInput, 6>(uri, 2, 0); diff --git a/src/imports/controls/qquickdial.cpp b/src/templates/qquickdial.cpp index 4bc62f02..4bc62f02 100644 --- a/src/imports/controls/qquickdial.cpp +++ b/src/templates/qquickdial.cpp diff --git a/src/imports/controls/qquickdial_p.h b/src/templates/qquickdial_p.h index a31ad09f..738d9b58 100644 --- a/src/imports/controls/qquickdial_p.h +++ b/src/templates/qquickdial_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE class QQuickDialAttached; class QQuickDialPrivate; -class QQuickDial : public QQuickControl +class Q_QUICKTEMPLATES_EXPORT QQuickDial : public QQuickControl { Q_OBJECT Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged FINAL) diff --git a/src/imports/controls/qquickdrawer.cpp b/src/templates/qquickdrawer.cpp index 23988432..23988432 100644 --- a/src/imports/controls/qquickdrawer.cpp +++ b/src/templates/qquickdrawer.cpp diff --git a/src/imports/controls/qquickdrawer_p.h b/src/templates/qquickdrawer_p.h index 1fd8b21a..42c55481 100644 --- a/src/imports/controls/qquickdrawer_p.h +++ b/src/templates/qquickdrawer_p.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE class QQuickPropertyAnimation; class QQuickDrawerPrivate; -class QQuickDrawer : public QQuickControl +class Q_QUICKTEMPLATES_EXPORT QQuickDrawer : public QQuickControl { Q_OBJECT Q_PROPERTY(Qt::Edge edge READ edge WRITE setEdge NOTIFY edgeChanged FINAL) diff --git a/src/imports/controls/qquickswipeview.cpp b/src/templates/qquickswipeview.cpp index c0def1c8..c0def1c8 100644 --- a/src/imports/controls/qquickswipeview.cpp +++ b/src/templates/qquickswipeview.cpp diff --git a/src/imports/controls/qquickswipeview_p.h b/src/templates/qquickswipeview_p.h index e7e1600c..19eceafc 100644 --- a/src/imports/controls/qquickswipeview_p.h +++ b/src/templates/qquickswipeview_p.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE class QQuickSwipeViewAttached; class QQuickSwipeViewPrivate; -class QQuickSwipeView : public QQuickContainer +class Q_QUICKTEMPLATES_EXPORT QQuickSwipeView : public QQuickContainer { Q_OBJECT @@ -77,7 +77,7 @@ private: class QQuickSwipeViewAttachedPrivate; -class QQuickSwipeViewAttached : public QObject +class Q_QUICKTEMPLATES_EXPORT QQuickSwipeViewAttached : public QObject { Q_OBJECT Q_PROPERTY(int index READ index NOTIFY indexChanged FINAL) diff --git a/src/imports/controls/qquicktumbler.cpp b/src/templates/qquicktumbler.cpp index 73358b75..73358b75 100644 --- a/src/imports/controls/qquicktumbler.cpp +++ b/src/templates/qquicktumbler.cpp diff --git a/src/imports/controls/qquicktumbler_p.h b/src/templates/qquicktumbler_p.h index 46c683e8..ff8d2b4a 100644 --- a/src/imports/controls/qquicktumbler_p.h +++ b/src/templates/qquicktumbler_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE class QQuickTumblerAttached; class QQuickTumblerPrivate; -class QQuickTumbler : public QQuickControl +class Q_QUICKTEMPLATES_EXPORT QQuickTumbler : public QQuickControl { Q_OBJECT Q_PROPERTY(QVariant model READ model WRITE setModel NOTIFY modelChanged FINAL) @@ -114,7 +114,7 @@ Q_DECLARE_TYPEINFO(QQuickTumbler, Q_COMPLEX_TYPE); class QQuickTumblerAttachedPrivate; -class QQuickTumblerAttached : public QObject +class Q_QUICKTEMPLATES_EXPORT QQuickTumblerAttached : public QObject { Q_OBJECT Q_PROPERTY(QQuickTumbler *tumbler READ tumbler CONSTANT) diff --git a/src/templates/templates.pri b/src/templates/templates.pri index 60edac78..3c3cd3d9 100644 --- a/src/templates/templates.pri +++ b/src/templates/templates.pri @@ -13,6 +13,8 @@ HEADERS += \ $$PWD/qquickcontainer_p_p.h \ $$PWD/qquickcontrol_p.h \ $$PWD/qquickcontrol_p_p.h \ + $$PWD/qquickdial_p.h \ + $$PWD/qquickdrawer_p.h \ $$PWD/qquickexclusivegroup_p.h \ $$PWD/qquickframe_p.h \ $$PWD/qquickframe_p_p.h \ @@ -28,6 +30,7 @@ HEADERS += \ $$PWD/qquickslider_p.h \ $$PWD/qquickstackview_p.h \ $$PWD/qquickstackview_p_p.h \ + $$PWD/qquickswipeview_p.h \ $$PWD/qquickswitch_p.h \ $$PWD/qquicktabbar_p.h \ $$PWD/qquicktabbutton_p.h \ @@ -37,7 +40,8 @@ HEADERS += \ $$PWD/qquicktextfield_p_p.h \ $$PWD/qquicktogglebutton_p.h \ $$PWD/qquicktoolbar_p.h \ - $$PWD/qquicktoolbutton_p.h + $$PWD/qquicktoolbutton_p.h \ + $$PWD/qquicktumbler_p.h SOURCES += \ $$PWD/qquickabstractbutton.cpp \ @@ -48,6 +52,8 @@ SOURCES += \ $$PWD/qquickcheckbox.cpp \ $$PWD/qquickcontainer.cpp \ $$PWD/qquickcontrol.cpp \ + $$PWD/qquickdial.cpp \ + $$PWD/qquickdrawer.cpp \ $$PWD/qquickexclusivegroup.cpp \ $$PWD/qquickframe.cpp \ $$PWD/qquickgroupbox.cpp \ @@ -61,6 +67,7 @@ SOURCES += \ $$PWD/qquickslider.cpp \ $$PWD/qquickstackview.cpp \ $$PWD/qquickstackview_p.cpp \ + $$PWD/qquickswipeview.cpp \ $$PWD/qquickswitch.cpp \ $$PWD/qquicktabbar.cpp \ $$PWD/qquicktabbutton.cpp \ @@ -68,4 +75,5 @@ SOURCES += \ $$PWD/qquicktextfield.cpp \ $$PWD/qquicktogglebutton.cpp \ $$PWD/qquicktoolbar.cpp \ - $$PWD/qquicktoolbutton.cpp + $$PWD/qquicktoolbutton.cpp \ + $$PWD/qquicktumbler.cpp |