diff options
author | Juergen Beisert <jbe@pengutronix.de> | 2011-11-24 22:15:59 +0100 |
---|---|---|
committer | Juergen Beisert <jbe@pengutronix.de> | 2012-07-17 16:52:50 +0200 |
commit | 5c2d144e8dfdf4ed7d981f80e17642fd21c78a62 (patch) | |
tree | df80096317c2537bb11442954f8442e9310acd71 /local_src | |
parent | 3db0b065e2ca7d455dadc9b7ad60f9e9ea274100 (diff) | |
download | OSELAS.BSP-Pengutronix-Mini6410-5c2d144e8dfdf4ed7d981f80e17642fd21c78a62.tar.gz OSELAS.BSP-Pengutronix-Mini6410-5c2d144e8dfdf4ed7d981f80e17642fd21c78a62.tar.xz |
QML demo: add QML demo from the Mini2440 project
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
Diffstat (limited to 'local_src')
-rw-r--r-- | local_src/qml-demo-master/init/systemd/qmldemo.service | 10 | ||||
-rw-r--r-- | local_src/qml-demo-master/init/sysv/startup | 12 | ||||
-rw-r--r-- | local_src/qml-demo-master/qml-demo.pro | 15 | ||||
-rw-r--r-- | local_src/qml-demo-master/qml/main.qml | 157 | ||||
-rw-r--r-- | local_src/qml-demo-master/src/main.cpp | 34 | ||||
-rw-r--r-- | local_src/qt4-demo-master/config.ui (renamed from local_src/qt4-demo-2011.11.0/config.ui) | 0 | ||||
-rw-r--r-- | local_src/qt4-demo-master/configdialog.cpp (renamed from local_src/qt4-demo-2011.11.0/configdialog.cpp) | 0 | ||||
-rw-r--r-- | local_src/qt4-demo-master/configdialog.h (renamed from local_src/qt4-demo-2011.11.0/configdialog.h) | 0 | ||||
-rw-r--r-- | local_src/qt4-demo-master/init/systemd/qt4demo.service | 10 | ||||
-rw-r--r-- | local_src/qt4-demo-master/init/sysv/startup | 12 | ||||
-rw-r--r-- | local_src/qt4-demo-master/main.cpp (renamed from local_src/qt4-demo-2011.11.0/main.cpp) | 0 | ||||
-rw-r--r-- | local_src/qt4-demo-master/mainwindow.ui (renamed from local_src/qt4-demo-2011.11.0/mainwindow.ui) | 0 | ||||
-rw-r--r-- | local_src/qt4-demo-master/plotdata.cpp (renamed from local_src/qt4-demo-2011.11.0/plotdata.cpp) | 0 | ||||
-rw-r--r-- | local_src/qt4-demo-master/plotdata.h (renamed from local_src/qt4-demo-2011.11.0/plotdata.h) | 0 | ||||
-rw-r--r-- | local_src/qt4-demo-master/plothandler.cpp (renamed from local_src/qt4-demo-2011.11.0/plothandler.cpp) | 0 | ||||
-rw-r--r-- | local_src/qt4-demo-master/plothandler.h (renamed from local_src/qt4-demo-2011.11.0/plothandler.h) | 0 | ||||
-rw-r--r-- | local_src/qt4-demo-master/qt4-demo-load (renamed from local_src/qt4-demo-2011.11.0/qt4-demo-load) | 0 | ||||
-rw-r--r-- | local_src/qt4-demo-master/qt4-demo.pro (renamed from local_src/qt4-demo-2011.11.0/qt4-demo.pro) | 0 |
18 files changed, 250 insertions, 0 deletions
diff --git a/local_src/qml-demo-master/init/systemd/qmldemo.service b/local_src/qml-demo-master/init/systemd/qmldemo.service new file mode 100644 index 0000000..cb0fbf9 --- /dev/null +++ b/local_src/qml-demo-master/init/systemd/qmldemo.service @@ -0,0 +1,10 @@ +[Unit] +Description=QML Demo Application +After=dev-input-event1.device + +[Service] +Environment=QWS_MOUSE_PROTO=Tslib:/dev/input/touchscreen +ExecStart=/usr/bin/qml-demo -qws + +[Install] +WantedBy=multi-user.target diff --git a/local_src/qml-demo-master/init/sysv/startup b/local_src/qml-demo-master/init/sysv/startup new file mode 100644 index 0000000..26ca4db --- /dev/null +++ b/local_src/qml-demo-master/init/sysv/startup @@ -0,0 +1,12 @@ +#! /bin/sh + +# get important environment variables first +. /etc/profile.environment + +case $1 in + + start) + /usr/bin/qml-demo -qws & + ;; + +esac diff --git a/local_src/qml-demo-master/qml-demo.pro b/local_src/qml-demo-master/qml-demo.pro new file mode 100644 index 0000000..87b13a2 --- /dev/null +++ b/local_src/qml-demo-master/qml-demo.pro @@ -0,0 +1,15 @@ +CONFIG += qt + +TARGET = qml-demo + +SOURCES = src/main.cpp +FORMS = +HEADERS = + +QT += declarative + +MOC_DIR = moc + +OTHER_FILES += \ + qml/main.qml + diff --git a/local_src/qml-demo-master/qml/main.qml b/local_src/qml-demo-master/qml/main.qml new file mode 100644 index 0000000..c2c7e62 --- /dev/null +++ b/local_src/qml-demo-master/qml/main.qml @@ -0,0 +1,157 @@ +/* + * Copyright 2011 Josef Holzmayr, holzmayr@rsi-elektrotechnik.de + * + * 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. + */ + +import QtQuick 1.0 + +Rectangle { + id: page + color: "grey" + width: 320 + height: 240 + + property int boxsize: 50 + property int markersize: 30 + property int borderoffset: 10 + property int boxoffset: (boxsize - markersize) / 2 + + Rectangle { + id: rectTL + width: boxsize + height: boxsize + color: "#00000000" + anchors.left: parent.left + anchors.leftMargin: borderoffset + anchors.top: parent.top + anchors.topMargin: borderoffset + border.color: "#000000" + + MouseArea { + anchors.fill: parent + onClicked: page.state = 'TL' + } + } + Rectangle { + id: rectTR + width: boxsize + height: boxsize + color: "#00000000" + anchors.top: parent.top + anchors.topMargin: borderoffset + anchors.right: parent.right + anchors.rightMargin: borderoffset + border.color: "#000000" + + MouseArea { + anchors.fill: parent + onClicked: page.state = 'TR' + } + } + Rectangle { + id: rectBL + width: boxsize + height: boxsize + color: "#00000000" + anchors.left: parent.left + anchors.leftMargin: borderoffset + anchors.bottom: parent.bottom + anchors.bottomMargin: borderoffset + border.color: "#000000" + + MouseArea { + anchors.fill: parent + onClicked: page.state = 'BL' + } + } + Rectangle { + id: rectBR + width: boxsize + height: boxsize + color: "#00000000" + anchors.bottom: parent.bottom + anchors.bottomMargin: borderoffset + anchors.right: parent.right + anchors.rightMargin: borderoffset + border.color: "#000000" + + MouseArea { + anchors.fill: parent + onClicked: page.state = 'BR' + } + } + + Rectangle { + id: marker + x: (page.width / 2) - (marker.width / 2) + y: (page.height / 2) - (marker.height / 2) + width: markersize + height: markersize + color: "#ff0000" + } + + Text { + id: text1 + text: qsTr("Touch the black squares to move the red marker.") + anchors.right: parent.right + anchors.rightMargin: borderoffset + anchors.left: parent.left + anchors.leftMargin: borderoffset + anchors.bottom: parent.bottom + anchors.bottomMargin: (borderoffset * 2) + boxsize + anchors.top: parent.top + anchors.topMargin: (borderoffset * 2) + boxsize + wrapMode: Text.WordWrap + horizontalAlignment: Text.AlignHCenter + font.family: "Arial Black" + font.underline: true + font.pixelSize: 12 + } + states: [ + State { + name: "TL" + + PropertyChanges { + target: marker + x: rectTL.x + boxoffset + y: rectTL.y + boxoffset + } + }, + State { + name: "TR" + PropertyChanges { + target: marker + x: rectTR.x + boxoffset + y: rectTR.y + boxoffset + } + }, + State { + name: "BL" + PropertyChanges { + target: marker + x: rectBL.x + boxoffset + y: rectBL.y + boxoffset + } + }, + State { + name: "BR" + PropertyChanges { + target: marker + x: rectBR.x + boxoffset + y: rectBR.y + boxoffset + } + } + ] + + transitions: Transition { + NumberAnimation { properties: "x, y"; easing.type: Easing.InOutQuad; duration: 500 } + } +} diff --git a/local_src/qml-demo-master/src/main.cpp b/local_src/qml-demo-master/src/main.cpp new file mode 100644 index 0000000..8036f8b --- /dev/null +++ b/local_src/qml-demo-master/src/main.cpp @@ -0,0 +1,34 @@ +/* + * Copyright 2011 Josef Holzmayr, holzmayr@rsi-elektrotechnik.de + * + * 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. + */ + +#include <QtGui/QApplication> +#include <QDeclarativeView> +#include <QWSServer> + +int main(int argc, char **argv) +{ + + QApplication app(argc, argv); + +/* Hide the mouse cursor. Guards are there to enable compileability on non-embedded qt systems*/ +#ifdef Q_WS_QWS + QWSServer::setCursorVisible( false ); +#endif + + QDeclarativeView *qdv = new QDeclarativeView; + qdv->setSource(QUrl::fromLocalFile("/usr/lib/qml-demo/main.qml")); + qdv->setResizeMode(QDeclarativeView::SizeRootObjectToView); + qdv->showFullScreen(); + + return app.exec();; +} diff --git a/local_src/qt4-demo-2011.11.0/config.ui b/local_src/qt4-demo-master/config.ui index bc5c272..bc5c272 100644 --- a/local_src/qt4-demo-2011.11.0/config.ui +++ b/local_src/qt4-demo-master/config.ui diff --git a/local_src/qt4-demo-2011.11.0/configdialog.cpp b/local_src/qt4-demo-master/configdialog.cpp index 10e265e..10e265e 100644 --- a/local_src/qt4-demo-2011.11.0/configdialog.cpp +++ b/local_src/qt4-demo-master/configdialog.cpp diff --git a/local_src/qt4-demo-2011.11.0/configdialog.h b/local_src/qt4-demo-master/configdialog.h index 8fc9b29..8fc9b29 100644 --- a/local_src/qt4-demo-2011.11.0/configdialog.h +++ b/local_src/qt4-demo-master/configdialog.h diff --git a/local_src/qt4-demo-master/init/systemd/qt4demo.service b/local_src/qt4-demo-master/init/systemd/qt4demo.service new file mode 100644 index 0000000..63ec836 --- /dev/null +++ b/local_src/qt4-demo-master/init/systemd/qt4demo.service @@ -0,0 +1,10 @@ +[Unit] +Description=Qt4 Demo Application +After=dev-input-event1.device + +[Service] +Environment=QWS_MOUSE_PROTO=Tslib:/dev/input/touchscreen +ExecStart=/usr/bin/qt4-demo -qws + +[Install] +WantedBy=multi-user.target diff --git a/local_src/qt4-demo-master/init/sysv/startup b/local_src/qt4-demo-master/init/sysv/startup new file mode 100644 index 0000000..3b27a32 --- /dev/null +++ b/local_src/qt4-demo-master/init/sysv/startup @@ -0,0 +1,12 @@ +#! /bin/sh + +# get important environment variables first +. /etc/profile.environment + +case $1 in + + start) + /usr/bin/qt4-demo -qws & + ;; + +esac diff --git a/local_src/qt4-demo-2011.11.0/main.cpp b/local_src/qt4-demo-master/main.cpp index d7dc180..d7dc180 100644 --- a/local_src/qt4-demo-2011.11.0/main.cpp +++ b/local_src/qt4-demo-master/main.cpp diff --git a/local_src/qt4-demo-2011.11.0/mainwindow.ui b/local_src/qt4-demo-master/mainwindow.ui index 1fafb5d..1fafb5d 100644 --- a/local_src/qt4-demo-2011.11.0/mainwindow.ui +++ b/local_src/qt4-demo-master/mainwindow.ui diff --git a/local_src/qt4-demo-2011.11.0/plotdata.cpp b/local_src/qt4-demo-master/plotdata.cpp index 6ef1bcf..6ef1bcf 100644 --- a/local_src/qt4-demo-2011.11.0/plotdata.cpp +++ b/local_src/qt4-demo-master/plotdata.cpp diff --git a/local_src/qt4-demo-2011.11.0/plotdata.h b/local_src/qt4-demo-master/plotdata.h index f2ebc38..f2ebc38 100644 --- a/local_src/qt4-demo-2011.11.0/plotdata.h +++ b/local_src/qt4-demo-master/plotdata.h diff --git a/local_src/qt4-demo-2011.11.0/plothandler.cpp b/local_src/qt4-demo-master/plothandler.cpp index 90d3924..90d3924 100644 --- a/local_src/qt4-demo-2011.11.0/plothandler.cpp +++ b/local_src/qt4-demo-master/plothandler.cpp diff --git a/local_src/qt4-demo-2011.11.0/plothandler.h b/local_src/qt4-demo-master/plothandler.h index d860d39..d860d39 100644 --- a/local_src/qt4-demo-2011.11.0/plothandler.h +++ b/local_src/qt4-demo-master/plothandler.h diff --git a/local_src/qt4-demo-2011.11.0/qt4-demo-load b/local_src/qt4-demo-master/qt4-demo-load index 929c288..929c288 100644 --- a/local_src/qt4-demo-2011.11.0/qt4-demo-load +++ b/local_src/qt4-demo-master/qt4-demo-load diff --git a/local_src/qt4-demo-2011.11.0/qt4-demo.pro b/local_src/qt4-demo-master/qt4-demo.pro index 2f00dc7..2f00dc7 100644 --- a/local_src/qt4-demo-2011.11.0/qt4-demo.pro +++ b/local_src/qt4-demo-master/qt4-demo.pro |