diff options
Diffstat (limited to 'examples/quick/tableview')
10 files changed, 26 insertions, 21 deletions
diff --git a/examples/quick/tableview/gameoflife/doc/src/gameoflife.qdoc b/examples/quick/tableview/gameoflife/doc/src/gameoflife.qdoc index 069513636a..b61ba90a58 100644 --- a/examples/quick/tableview/gameoflife/doc/src/gameoflife.qdoc +++ b/examples/quick/tableview/gameoflife/doc/src/gameoflife.qdoc @@ -50,9 +50,6 @@ the view should be scrolled to. \snippet tableview/gameoflife/main.qml model - The model that we use is a custom C++ class that we register - in the QML system: - \snippet tableview/gameoflife/main.cpp registertype \section1 The C++ Model @@ -61,7 +58,8 @@ used as the model of our TableView component. Therefore, it needs to implement some functions so the TableView component can interact with the model. As you can see in the \c private part of the class, the model - uses a fixed-size array to store the current state of all the cells. + uses a fixed-size array to store the current state of all the cells. We + also use the QML_ELEMENT macro in order to expose the class to QML. \snippet tableview/gameoflife/gameoflifemodel.cpp modelsize Here, the \c rowCount and \c columnCount methods are implemented so diff --git a/examples/quick/tableview/gameoflife/gameoflife.pro b/examples/quick/tableview/gameoflife/gameoflife.pro index 98050b0d79..9c47a9b530 100644 --- a/examples/quick/tableview/gameoflife/gameoflife.pro +++ b/examples/quick/tableview/gameoflife/gameoflife.pro @@ -1,6 +1,11 @@ TEMPLATE = app QT += quick qml + +CONFIG += qmltypes +QML_IMPORT_NAME = GameOfLifeModel +QML_IMPORT_MAJOR_VERSION = 1 + SOURCES += \ main.cpp \ gameoflifemodel.cpp diff --git a/examples/quick/tableview/gameoflife/gameoflifemodel.h b/examples/quick/tableview/gameoflife/gameoflifemodel.h index 3ea1469861..161e0b2cfc 100644 --- a/examples/quick/tableview/gameoflife/gameoflifemodel.h +++ b/examples/quick/tableview/gameoflife/gameoflifemodel.h @@ -54,11 +54,13 @@ #include <array> #include <QAbstractTableModel> #include <QPoint> +#include <QtQml/qqml.h> //! [modelclass] class GameOfLifeModel : public QAbstractTableModel { Q_OBJECT + QML_ELEMENT Q_ENUMS(Roles) public: diff --git a/examples/quick/tableview/gameoflife/main.cpp b/examples/quick/tableview/gameoflife/main.cpp index 5101880b06..1500efdcca 100644 --- a/examples/quick/tableview/gameoflife/main.cpp +++ b/examples/quick/tableview/gameoflife/main.cpp @@ -58,10 +58,6 @@ int main(int argc, char *argv[]) QGuiApplication app(argc, argv); QQmlApplicationEngine engine; - //! [registertype] - qmlRegisterType<GameOfLifeModel>("GameOfLifeModel", 1, 0, "GameOfLifeModel"); - //! [registertype] - engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); if (engine.rootObjects().isEmpty()) return -1; diff --git a/examples/quick/tableview/gameoflife/main.qml b/examples/quick/tableview/gameoflife/main.qml index 90be69b9c0..fb3195892f 100644 --- a/examples/quick/tableview/gameoflife/main.qml +++ b/examples/quick/tableview/gameoflife/main.qml @@ -48,6 +48,7 @@ ** ****************************************************************************/ +import QtQml 2.12 import QtQuick 2.12 import QtQuick.Window 2.3 import QtQuick.Controls 2.2 @@ -81,11 +82,14 @@ ApplicationWindow { implicitWidth: 15 implicitHeight: 15 - color: model.value ? "#f3f3f4" : "#b5b7bf" + required property var model + required property bool value + + color: value ? "#f3f3f4" : "#b5b7bf" MouseArea { anchors.fill: parent - onClicked: model.value = !model.value + onClicked: parent.model.value = !parent.value } } //! [tableview] diff --git a/examples/quick/tableview/pixelator/doc/src/pixelator.qdoc b/examples/quick/tableview/pixelator/doc/src/pixelator.qdoc index 9e199a5347..88b28769cd 100644 --- a/examples/quick/tableview/pixelator/doc/src/pixelator.qdoc +++ b/examples/quick/tableview/pixelator/doc/src/pixelator.qdoc @@ -42,6 +42,7 @@ TableView. We use the \l{The Property System}{Qt Property System} and a source property as \c QString to set the path of the image. + We also add the QML_ELEMENT macro to expose the model to QML. \snippet tableview/pixelator/imagemodel.cpp setsource @@ -59,11 +60,6 @@ When we call this function with the display role, we return the pixel's gray value. - \snippet tableview/pixelator/main.cpp registertype - - We need to register our model in the QML type system to be able to use it - from the QML side. - \snippet tableview/pixelator/main.qml pixelcomponent Each pixel in the \c TableView is displayed via a delegate component. diff --git a/examples/quick/tableview/pixelator/imagemodel.h b/examples/quick/tableview/pixelator/imagemodel.h index bf0ec90da4..de8ad7cd8d 100644 --- a/examples/quick/tableview/pixelator/imagemodel.h +++ b/examples/quick/tableview/pixelator/imagemodel.h @@ -53,12 +53,14 @@ #include <QAbstractTableModel> #include <QImage> +#include <QtQml/qqml.h> //! [model] class ImageModel : public QAbstractTableModel { Q_OBJECT Q_PROPERTY(QString source READ source WRITE setSource NOTIFY sourceChanged) + QML_ELEMENT public: ImageModel(QObject *parent = nullptr); diff --git a/examples/quick/tableview/pixelator/main.cpp b/examples/quick/tableview/pixelator/main.cpp index c57039556a..c07f43dc27 100644 --- a/examples/quick/tableview/pixelator/main.cpp +++ b/examples/quick/tableview/pixelator/main.cpp @@ -59,10 +59,6 @@ int main(int argc, char *argv[]) QQmlApplicationEngine engine; - //! [registertype] - qmlRegisterType<ImageModel>("ImageModel", 1, 0, "ImageModel"); - //! [registertype] - engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); if (engine.rootObjects().isEmpty()) return -1; diff --git a/examples/quick/tableview/pixelator/main.qml b/examples/quick/tableview/pixelator/main.qml index 38a25f439f..a5edefae90 100644 --- a/examples/quick/tableview/pixelator/main.qml +++ b/examples/quick/tableview/pixelator/main.qml @@ -65,7 +65,9 @@ Window { id: pixelDelegate Item { - readonly property real gray: model.display / 255.0 + required property real display + + readonly property real gray: display / 255.0 readonly property real size: 16 implicitWidth: size @@ -77,7 +79,7 @@ Window { id: rect anchors.centerIn: parent color: "#09102b" - radius: size - gray * size + radius: parent.size - parent.gray * parent.size implicitWidth: radius implicitHeight: radius //! [rectshape] diff --git a/examples/quick/tableview/pixelator/pixelator.pro b/examples/quick/tableview/pixelator/pixelator.pro index 6c863cb304..f27303b56b 100644 --- a/examples/quick/tableview/pixelator/pixelator.pro +++ b/examples/quick/tableview/pixelator/pixelator.pro @@ -5,6 +5,10 @@ HEADERS += imagemodel.h SOURCES += main.cpp \ imagemodel.cpp +CONFIG += qmltypes +QML_IMPORT_NAME = ImageModel +QML_IMPORT_MAJOR_VERSION = 1 + RESOURCES += qt.png main.qml target.path = $$[QT_INSTALL_EXAMPLES]/quick/tableview/pixelator |