From 40a1d5ce549b9cbdc0df883a343289cc21f88a10 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Fri, 23 May 2014 10:19:15 +0200 Subject: Doc: Document Qt WebEngine demo Task-number: QTEE-570 Change-Id: Ib2896470f31ff1dbd2c7860c8f8c96badd854c8b Reviewed-by: Samuli Piippo --- doc/b2qt-demos.qdoc | 12 ++++++++++++ doc/images/b2qt-demo-webengine.jpg | Bin 0 -> 18081 bytes 2 files changed, 12 insertions(+) create mode 100644 doc/images/b2qt-demo-webengine.jpg diff --git a/doc/b2qt-demos.qdoc b/doc/b2qt-demos.qdoc index d7498fa..3bfb6d6 100644 --- a/doc/b2qt-demos.qdoc +++ b/doc/b2qt-demos.qdoc @@ -243,3 +243,15 @@ \ingroup b2qt-demos \brief Displays information and settings available for the Boot to Qt launcher. */ + +/*! + \example webengine + \title Qt WebEngine Browser Demo + \ingroup b2qt-demos + \brief This example demonstrates the use of the QtWebEngine WebView with Qt Quick. + + \image b2qt-demo-webengine.jpg + + The example can be used to browse the internet (working network connection + required) or run the off-line WebGL demo. +*/ diff --git a/doc/images/b2qt-demo-webengine.jpg b/doc/images/b2qt-demo-webengine.jpg new file mode 100644 index 0000000..963258a Binary files /dev/null and b/doc/images/b2qt-demo-webengine.jpg differ -- cgit v1.2.3 From 1ce9c5aa3d911963b05daf1194f2ad7daab8e491 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Tue, 10 Jun 2014 13:46:52 +0200 Subject: sensors: Display only 2 decimals Currently on Nexus2013 there are so many decimals printed that the label for the value is out of the screen. Change-Id: Ic6bb1a265a978cfbab0f42d6237b22e42b460818 Reviewed-by: Gatis Paeglis --- basicsuite/sensors/Light.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basicsuite/sensors/Light.qml b/basicsuite/sensors/Light.qml index f997efd..0cff8e6 100644 --- a/basicsuite/sensors/Light.qml +++ b/basicsuite/sensors/Light.qml @@ -83,7 +83,7 @@ Item { LightSensor { active: true onReadingChanged: { - illuminanceLevel.text = "Illuminance: " + reading.illuminance + illuminanceLevel.text = "Illuminance: " + reading.illuminance.toFixed(2); } } } -- cgit v1.2.3 From 0d56278af6eace6747bd7c91215f6e5daef8b84e Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Wed, 11 Jun 2014 11:25:47 +0200 Subject: Show sensors example in landscape view Show sensors example in landscape view to match the way all the other examples are presented in the qtlauncher. Also the calculation is more pysically correct. Task-number: QTEE-569 Change-Id: I12e1b27e62dfa082d9d768598891a5ce91109436 Reviewed-by: Gatis Paeglis --- basicsuite/sensors/Accelbubble.qml | 116 +++++++++++++++---------------------- basicsuite/sensors/Light.qml | 77 ++++++++++++------------ basicsuite/sensors/main.qml | 34 ++++++----- basicsuite/sensors/preview_l.jpg | Bin 19464 -> 16715 bytes 4 files changed, 103 insertions(+), 124 deletions(-) diff --git a/basicsuite/sensors/Accelbubble.qml b/basicsuite/sensors/Accelbubble.qml index c5aeefc..f70aa32 100644 --- a/basicsuite/sensors/Accelbubble.qml +++ b/basicsuite/sensors/Accelbubble.qml @@ -41,90 +41,68 @@ import QtQuick 2.0 import QtSensors 5.0 -Item { - function calc() { - if (xAnimation.running || yAnimation.running) - return +Rectangle { + id: area + color: "lightblue" + border.width: 1 + border.color: "darkblue" + property real velocityX: 0 + property real velocityY: 0 - var newX = (bubble.x + calcRoll(accel.reading.x, accel.reading.y, accel.reading.z) * .8) - var newY = (bubble.y - calcPitch(accel.reading.x, accel.reading.y, accel.reading.z) * .8) + function updatePosition() { + velocityX += accel.reading.y + velocityY += accel.reading.x - if (newX < 0) + velocityX *= 0.95 + velocityY *= 0.95 + + var newX = bubble.x + velocityX + var newY = bubble.y + velocityY + var right = area.width - bubble.width + var bottom = area.height - bubble.height + + if (newX < 0) { newX = 0 - if (newY < 0) + velocityX = -velocityX * 0.9 + } + if (newY < 0) { newY = 0 + velocityY = -velocityY * 0.9 + } - var right = field.width - bubble.width - var bottom = field.height - bubble.height - - if (newX > right) + if (newX > right) { newX = right - if (newY > bottom) + velocityX = -velocityX * 0.9 + } + if (newY > bottom) { newY = bottom + velocityY = -velocityY * 0.9 + } bubble.x = newX bubble.y = newY - - yBehavior.enabled = true - xBehavior.enabled = true } - Rectangle { - id: field - color: "lightblue" - border.width: 1 - border.color: "darkblue" - width: parent.width - height: parent.height - Accelerometer { - id: accel - active:true - } - - Timer { - interval: 100 - running: true - repeat: true - onTriggered: calc() - } + Accelerometer { + id: accel + active:true + } - Image { - id: bubble - source: "bluebubble.png" - property real centerX: parent.width / 2 - property real centerY: parent.height / 2; - property real bubbleCenter: bubble.width / 2 - x: centerX - bubbleCenter - y: centerY - bubbleCenter - smooth: true + Component.onCompleted: timer.running = true - Behavior on y { - id: yBehavior - enabled: false - SmoothedAnimation { - id: yAnimation - easing.type: Easing.Linear - duration: 40 - onRunningChanged: calc() - } - } - Behavior on x { - id: xBehavior - enabled: false - SmoothedAnimation { - id: xAnimation - easing.type: Easing.Linear - duration: 40 - onRunningChanged: calc() - } - } - } + Timer { + id: timer + interval: 16 + running: false + repeat: true + onTriggered: updatePosition() } - function calcPitch(x,y,z) { - return Math.atan(y / Math.sqrt(x*x + z*z)) * 57.2957795; - } - function calcRoll(x,y,z) { - return Math.atan(x / Math.sqrt(y*y + z*z)) * 57.2957795; + Image { + id: bubble + source: "bluebubble.png" + smooth: true + x: parent.width/2 - bubble.width/2 + y: parent.height/2 - bubble.height/2 } } diff --git a/basicsuite/sensors/Light.qml b/basicsuite/sensors/Light.qml index 0cff8e6..24f3bd9 100644 --- a/basicsuite/sensors/Light.qml +++ b/basicsuite/sensors/Light.qml @@ -41,50 +41,47 @@ import QtQuick 2.0 import QtSensors 5.0 -Item { - rotation: 180 - Rectangle { - id: bg - width: parent.width - height: parent.height - Text { - id: illuminanceLevel - anchors.horizontalCenter: parent.horizontalCenter - font.pointSize: 26 - anchors.top: parent.top - } - Image { - id: avatar - anchors.top: illuminanceLevel.bottom - anchors.topMargin: 30 - anchors.centerIn: parent - } +Rectangle { + id: bg + Image { + id: avatar + width: parent.width * 0.9 + height: parent.height * 0.9 + fillMode: Image.PreserveAspectFit + anchors.centerIn: parent + } + Text { + id: illuminanceLevel + font.pointSize: 20 + anchors.horizontalCenter: parent.horizontalCenter + anchors.bottom: parent.bottom + anchors.bottomMargin: 60 + } - AmbientLightSensor { - active: true - onReadingChanged: { - if (reading.lightLevel === AmbientLightReading.Dark) { - avatar.source = "3.png" - bg.color = "midnightblue" - } else if (reading.lightLevel === AmbientLightReading.Twilight - || reading.lightLevel === AmbientLightReading.Light) { - avatar.source = "2.png" - bg.color = "steelblue" - } else if (reading.lightLevel === AmbientLightReading.Bright - || reading.lightLevel === AmbientLightReading.Sunny) { - avatar.source = "1.png" - bg.color = "yellow" - } else { - avatar.text = "Unknown light level" - } + AmbientLightSensor { + active: true + onReadingChanged: { + if (reading.lightLevel === AmbientLightReading.Dark) { + avatar.source = "3.png" + bg.color = "#1947A3" + } else if (reading.lightLevel === AmbientLightReading.Twilight + || reading.lightLevel === AmbientLightReading.Light) { + avatar.source = "2.png" + bg.color = "steelblue" + } else if (reading.lightLevel === AmbientLightReading.Bright + || reading.lightLevel === AmbientLightReading.Sunny) { + avatar.source = "1.png" + bg.color = "#FFFF75" + } else { + avatar.text = "Unknown light level" } } + } - LightSensor { - active: true - onReadingChanged: { - illuminanceLevel.text = "Illuminance: " + reading.illuminance.toFixed(2); - } + LightSensor { + active: true + onReadingChanged: { + illuminanceLevel.text = "Illuminance: " + reading.illuminance.toFixed(2); } } } diff --git a/basicsuite/sensors/main.qml b/basicsuite/sensors/main.qml index b5a1207..d6e0e9d 100644 --- a/basicsuite/sensors/main.qml +++ b/basicsuite/sensors/main.qml @@ -42,30 +42,30 @@ import QtQuick 2.0 import QtSensors 5.0 import QtSensors 5.0 as Sensors -Item { +Rectangle { id: root - width: 800 - height: 1280 + anchors.fill: parent Component { id: sensorExample Rectangle { id: main - width: root.height - height: root.width - rotation: 90 + width: root.width + height: root.height + anchors.centerIn: parent + color: "blue" border.width: 1 + Accelbubble { + id: bubble + width: parent.width / 2 + height: parent.height + } Light { - id: lys - width: main.width - height: main.height / 2 + anchors.left: bubble.right + width: parent.width / 2 + height: parent.height } - Accelbubble { - width: main.width - height: main.height / 2 - anchors.top: lys.bottom - } } } @@ -74,10 +74,14 @@ Item { Rectangle { width: root.width height: root.height + color: "black" Text { - font.pixelSize: 22 + font.pixelSize: 80 + width: parent.width * 0.8 anchors.centerIn: parent + color: "white" text: "It appears that this device doesn't provide the required sensors!" + wrapMode: Text.WordWrap } } } diff --git a/basicsuite/sensors/preview_l.jpg b/basicsuite/sensors/preview_l.jpg index 7ce979d..d87d757 100644 Binary files a/basicsuite/sensors/preview_l.jpg and b/basicsuite/sensors/preview_l.jpg differ -- cgit v1.2.3 From 79fcd4fefc090c79c4fa088d4d0ba24b60c1b4e7 Mon Sep 17 00:00:00 2001 From: Zeno Albisser Date: Mon, 16 Jun 2014 06:04:01 -0700 Subject: Replace PageView with index.html page. This way the start page will also be contained in the browsing history. Change-Id: Icd185a398c5dae622703a6dc9693ed4769d241ae Reviewed-by: Andras Becsi --- basicsuite/webengine/content/index.html | 34 ++++++++ basicsuite/webengine/main.qml | 22 +---- basicsuite/webengine/ui/PageView.qml | 147 -------------------------------- 3 files changed, 38 insertions(+), 165 deletions(-) create mode 100644 basicsuite/webengine/content/index.html delete mode 100644 basicsuite/webengine/ui/PageView.qml diff --git a/basicsuite/webengine/content/index.html b/basicsuite/webengine/content/index.html new file mode 100644 index 0000000..d1cf160 --- /dev/null +++ b/basicsuite/webengine/content/index.html @@ -0,0 +1,34 @@ + + + + + Qt WebEngine Demo + + + + + + diff --git a/basicsuite/webengine/main.qml b/basicsuite/webengine/main.qml index 2295ea4..dcf40d7 100644 --- a/basicsuite/webengine/main.qml +++ b/basicsuite/webengine/main.qml @@ -55,13 +55,13 @@ Rectangle { width: 1280 height: 800 - property url defaultUrl: "about:blank" + property url defaultUrl: Qt.resolvedUrl("content/index.html") function load(url) { mainWebView.url = url } WebEngineView { id: mainWebView anchors.fill: parent - url: Qt.resolvedUrl(defaultUrl) + url: defaultUrl onLoadingChanged: { if (!loading) { addressBar.cursorPosition = 0 @@ -70,15 +70,6 @@ Rectangle { } } - PageView { - id: pageView - visible: true - opacity: 1 - Behavior on opacity { - NumberAnimation { duration: 250 } - } - } - MultiPointTouchArea { z: showToolBarButton.z width: parent.width @@ -180,13 +171,9 @@ Rectangle { id: homeButton width: 20 Layout.fillHeight: true - iconSource: pageView.enabled ? "ui/icons/window.png" : "ui/icons/home.png" + iconSource: "ui/icons/home.png" onClicked: { - if (pageView.enabled) { - pageView.hide() - } else { - pageView.show() - } + load(defaultUrl) } } TextField { @@ -211,7 +198,6 @@ Rectangle { Layout.fillWidth: true text: mainWebView.url onAccepted: { - pageView.hide() mainWebView.url = engine.fromUserInput(text) } } diff --git a/basicsuite/webengine/ui/PageView.qml b/basicsuite/webengine/ui/PageView.qml deleted file mode 100644 index 778fcd7..0000000 --- a/basicsuite/webengine/ui/PageView.qml +++ /dev/null @@ -1,147 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: For any questions to Digia, please use the contact form at -** http://qt.digia.com/ -** -** This file is part of the examples of the Qt Enterprise Embedded. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.1 -import QtQuick.Layouts 1.1 - -Rectangle { - id: root - color: "#AAAAAA" - visible: true - - property real fontPointSize: 13 - - function show() { - enabled = true - opacity = 1 - } - function hide() { - enabled = false - opacity = 0 - } - anchors { - fill: parent - } - ColumnLayout { - id: links - anchors { - bottom: parent.bottom - top: parent.top - horizontalCenter: parent.horizontalCenter - margins: 50 - } - Text { - text: "http://www.google.com" - font.pointSize: fontPointSize - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - Layout.fillWidth: true - Layout.preferredHeight: 60 - MouseArea { - anchors.fill: parent - onClicked: { - load(Qt.resolvedUrl(parent.text)) - hide() - } - } - } - Text { - text: "http://qt.digia.com" - font.pointSize: fontPointSize - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - Layout.fillWidth: true - Layout.preferredHeight: 60 - MouseArea { - anchors.fill: parent - onClicked: { - load(Qt.resolvedUrl(parent.text)) - hide() - } - } - } - Text { - text: "http://qt-project.org/doc/qt-5" - font.pointSize: fontPointSize - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - Layout.fillWidth: true - Layout.preferredHeight: 60 - MouseArea { - anchors.fill: parent - onClicked: { - load(Qt.resolvedUrl(parent.text)) - hide() - } - } - } - RowLayout { - id: localContent - anchors { - margins: 50 - } - Image { - sourceSize.width: 300 - sourceSize.height: 175 - source: "../content/webgl/screenshot.png" - MouseArea { - anchors.fill: parent - onClicked: { - load(Qt.resolvedUrl("../content/webgl/helloqt.html")) - hide() - } - } - } - Image { - sourceSize.width: 300 - sourceSize.height: 175 - source: "../content/csstetrahedron/screenshot.png" - MouseArea { - anchors.fill: parent - onClicked: { - load(Qt.resolvedUrl("../content/csstetrahedron/index.html")) - hide() - } - } - } - } // RowLayout - } // ColumnLayout -} -- cgit v1.2.3 From 52f7c8b3c40e0d73200436530e8d91a1c07d61f1 Mon Sep 17 00:00:00 2001 From: Pierre Rossi Date: Wed, 18 Jun 2014 16:30:24 +0200 Subject: Add the loading error page to make it clearer when the connectivity is a problem. Change-Id: I828d75baf31d5333a3cb727a0baa8447e56f30d4 Reviewed-by: Andras Becsi --- basicsuite/webengine/ErrorPage.qml | 71 ++++++++++++++++++++++++++++++++++++++ basicsuite/webengine/main.qml | 23 ++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 basicsuite/webengine/ErrorPage.qml diff --git a/basicsuite/webengine/ErrorPage.qml b/basicsuite/webengine/ErrorPage.qml new file mode 100644 index 0000000..daa25d0 --- /dev/null +++ b/basicsuite/webengine/ErrorPage.qml @@ -0,0 +1,71 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtWebEngine module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.1 + +Rectangle { + id: errorPage + property alias mainMessage: errorMessage.text; + property bool displayingError: false; + anchors.fill: parent + color: "lightgray" + visible: displayingError + + Rectangle { + color: "white" + anchors.centerIn: parent + height: parent.height / 3 + width: Math.max(parent.width / 2, errorMessage.width + 20) + + border { + color: "dimgray" + width: 0.5 + } + + radius: 20 + Text { + id: errorMessage + color: "dimgray" + font.pixelSize: 20 + anchors.centerIn: parent + } + } + +} diff --git a/basicsuite/webengine/main.qml b/basicsuite/webengine/main.qml index dcf40d7..30365ce 100644 --- a/basicsuite/webengine/main.qml +++ b/basicsuite/webengine/main.qml @@ -58,15 +58,38 @@ Rectangle { property url defaultUrl: Qt.resolvedUrl("content/index.html") function load(url) { mainWebView.url = url } + ErrorPage { + id: errorPage + anchors.fill: parent + displayingError: false + } + WebEngineView { id: mainWebView anchors.fill: parent url: defaultUrl + visible: !errorPage.displayingError onLoadingChanged: { if (!loading) { addressBar.cursorPosition = 0 toolBar.state = "address" } + var loadError = loadRequest.errorDomain + if (loadError == WebEngineView.NoErrorDomain) { + errorPage.displayingError = false + return; + } + errorPage.displayingError = true + if (loadError == WebEngineView.InternalErrorDomain) + errorPage.mainMessage = "Internal error" + else if (loadError == WebEngineView.ConnectionErrorDomain) + errorPage.mainMessage = "Unable to connect to the Internet" + else if (loadError == WebEngineView.CertificateErrorDomain) + errorPage.mainMessage = "Certificate error" + else if (loadError == WebEngineView.DnsErrorDomain) + errorPage.mainMessage = "Unable to resolve the server's DNS address" + else // HTTP and FTP + errorPage.mainMessage = "Protocol error" } } -- cgit v1.2.3 From 46a7bf5976cc88e66f21bdd571a819aa57bd11de Mon Sep 17 00:00:00 2001 From: Zeno Albisser Date: Wed, 18 Jun 2014 02:25:21 -0700 Subject: Remove obsolete png files. Change-Id: I60f1fb9ad1184a40f39634fbe7e415394b79af40 Reviewed-by: Andras Becsi --- basicsuite/webengine/ui/icons/busy.png | Bin 547 -> 0 bytes basicsuite/webengine/ui/icons/cube.png | Bin 635 -> 0 bytes basicsuite/webengine/ui/icons/grid.png | Bin 516 -> 0 bytes basicsuite/webengine/ui/icons/list.png | Bin 383 -> 0 bytes basicsuite/webengine/ui/icons/pin-checked.png | Bin 601 -> 0 bytes basicsuite/webengine/ui/icons/pin-unchecked.png | Bin 455 -> 0 bytes basicsuite/webengine/ui/icons/pin.png | Bin 667 -> 0 bytes basicsuite/webengine/ui/icons/plus.png | Bin 724 -> 0 bytes basicsuite/webengine/ui/icons/settings.png | Bin 675 -> 0 bytes basicsuite/webengine/ui/icons/stack.png | Bin 820 -> 0 bytes basicsuite/webengine/ui/icons/wifi-off.png | Bin 2866 -> 0 bytes basicsuite/webengine/ui/icons/wifi-on.png | Bin 2844 -> 0 bytes basicsuite/webengine/ui/icons/wifi.png | Bin 617 -> 0 bytes basicsuite/webengine/ui/icons/window.png | Bin 309 -> 0 bytes 14 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 basicsuite/webengine/ui/icons/busy.png delete mode 100644 basicsuite/webengine/ui/icons/cube.png delete mode 100644 basicsuite/webengine/ui/icons/grid.png delete mode 100644 basicsuite/webengine/ui/icons/list.png delete mode 100644 basicsuite/webengine/ui/icons/pin-checked.png delete mode 100644 basicsuite/webengine/ui/icons/pin-unchecked.png delete mode 100644 basicsuite/webengine/ui/icons/pin.png delete mode 100644 basicsuite/webengine/ui/icons/plus.png delete mode 100644 basicsuite/webengine/ui/icons/settings.png delete mode 100644 basicsuite/webengine/ui/icons/stack.png delete mode 100644 basicsuite/webengine/ui/icons/wifi-off.png delete mode 100644 basicsuite/webengine/ui/icons/wifi-on.png delete mode 100644 basicsuite/webengine/ui/icons/wifi.png delete mode 100644 basicsuite/webengine/ui/icons/window.png diff --git a/basicsuite/webengine/ui/icons/busy.png b/basicsuite/webengine/ui/icons/busy.png deleted file mode 100644 index 3b60d26..0000000 Binary files a/basicsuite/webengine/ui/icons/busy.png and /dev/null differ diff --git a/basicsuite/webengine/ui/icons/cube.png b/basicsuite/webengine/ui/icons/cube.png deleted file mode 100644 index a5b337b..0000000 Binary files a/basicsuite/webengine/ui/icons/cube.png and /dev/null differ diff --git a/basicsuite/webengine/ui/icons/grid.png b/basicsuite/webengine/ui/icons/grid.png deleted file mode 100644 index 2959d1d..0000000 Binary files a/basicsuite/webengine/ui/icons/grid.png and /dev/null differ diff --git a/basicsuite/webengine/ui/icons/list.png b/basicsuite/webengine/ui/icons/list.png deleted file mode 100644 index 6cbc8b3..0000000 Binary files a/basicsuite/webengine/ui/icons/list.png and /dev/null differ diff --git a/basicsuite/webengine/ui/icons/pin-checked.png b/basicsuite/webengine/ui/icons/pin-checked.png deleted file mode 100644 index aa50f2b..0000000 Binary files a/basicsuite/webengine/ui/icons/pin-checked.png and /dev/null differ diff --git a/basicsuite/webengine/ui/icons/pin-unchecked.png b/basicsuite/webengine/ui/icons/pin-unchecked.png deleted file mode 100644 index c11411b..0000000 Binary files a/basicsuite/webengine/ui/icons/pin-unchecked.png and /dev/null differ diff --git a/basicsuite/webengine/ui/icons/pin.png b/basicsuite/webengine/ui/icons/pin.png deleted file mode 100644 index 4439f04..0000000 Binary files a/basicsuite/webengine/ui/icons/pin.png and /dev/null differ diff --git a/basicsuite/webengine/ui/icons/plus.png b/basicsuite/webengine/ui/icons/plus.png deleted file mode 100644 index 33b03d2..0000000 Binary files a/basicsuite/webengine/ui/icons/plus.png and /dev/null differ diff --git a/basicsuite/webengine/ui/icons/settings.png b/basicsuite/webengine/ui/icons/settings.png deleted file mode 100644 index 347a0e5..0000000 Binary files a/basicsuite/webengine/ui/icons/settings.png and /dev/null differ diff --git a/basicsuite/webengine/ui/icons/stack.png b/basicsuite/webengine/ui/icons/stack.png deleted file mode 100644 index d631adc..0000000 Binary files a/basicsuite/webengine/ui/icons/stack.png and /dev/null differ diff --git a/basicsuite/webengine/ui/icons/wifi-off.png b/basicsuite/webengine/ui/icons/wifi-off.png deleted file mode 100644 index 4c0490d..0000000 Binary files a/basicsuite/webengine/ui/icons/wifi-off.png and /dev/null differ diff --git a/basicsuite/webengine/ui/icons/wifi-on.png b/basicsuite/webengine/ui/icons/wifi-on.png deleted file mode 100644 index 8bdc553..0000000 Binary files a/basicsuite/webengine/ui/icons/wifi-on.png and /dev/null differ diff --git a/basicsuite/webengine/ui/icons/wifi.png b/basicsuite/webengine/ui/icons/wifi.png deleted file mode 100644 index 8a0d9e0..0000000 Binary files a/basicsuite/webengine/ui/icons/wifi.png and /dev/null differ diff --git a/basicsuite/webengine/ui/icons/window.png b/basicsuite/webengine/ui/icons/window.png deleted file mode 100644 index a06602b..0000000 Binary files a/basicsuite/webengine/ui/icons/window.png and /dev/null differ -- cgit v1.2.3 From e6a47635dc438ba896a180423bc714ccd59f4f8f Mon Sep 17 00:00:00 2001 From: Zeno Albisser Date: Wed, 18 Jun 2014 03:25:27 -0700 Subject: Update icons with newly created ones. Change-Id: Icad6f597f969a01d3ddb8c586993c0de808e2f0d Reviewed-by: Andras Becsi --- basicsuite/webengine/ui/icons/down.png | Bin 883 -> 6275 bytes basicsuite/webengine/ui/icons/go-next.png | Bin 581 -> 6729 bytes basicsuite/webengine/ui/icons/go-previous.png | Bin 585 -> 6737 bytes basicsuite/webengine/ui/icons/home.png | Bin 596 -> 4504 bytes basicsuite/webengine/ui/icons/process-stop.png | Bin 657 -> 9423 bytes basicsuite/webengine/ui/icons/up.png | Bin 885 -> 6257 bytes basicsuite/webengine/ui/icons/view-refresh.png | Bin 786 -> 12593 bytes 7 files changed, 0 insertions(+), 0 deletions(-) diff --git a/basicsuite/webengine/ui/icons/down.png b/basicsuite/webengine/ui/icons/down.png index cabd356..ec246e7 100644 Binary files a/basicsuite/webengine/ui/icons/down.png and b/basicsuite/webengine/ui/icons/down.png differ diff --git a/basicsuite/webengine/ui/icons/go-next.png b/basicsuite/webengine/ui/icons/go-next.png index c8b9b76..6ba21f8 100644 Binary files a/basicsuite/webengine/ui/icons/go-next.png and b/basicsuite/webengine/ui/icons/go-next.png differ diff --git a/basicsuite/webengine/ui/icons/go-previous.png b/basicsuite/webengine/ui/icons/go-previous.png index 7a71d7d..e0753dd 100644 Binary files a/basicsuite/webengine/ui/icons/go-previous.png and b/basicsuite/webengine/ui/icons/go-previous.png differ diff --git a/basicsuite/webengine/ui/icons/home.png b/basicsuite/webengine/ui/icons/home.png index 92d01d1..b241e02 100644 Binary files a/basicsuite/webengine/ui/icons/home.png and b/basicsuite/webengine/ui/icons/home.png differ diff --git a/basicsuite/webengine/ui/icons/process-stop.png b/basicsuite/webengine/ui/icons/process-stop.png index 8399059..c71d5a7 100644 Binary files a/basicsuite/webengine/ui/icons/process-stop.png and b/basicsuite/webengine/ui/icons/process-stop.png differ diff --git a/basicsuite/webengine/ui/icons/up.png b/basicsuite/webengine/ui/icons/up.png index 8a2e626..5d33c4a 100644 Binary files a/basicsuite/webengine/ui/icons/up.png and b/basicsuite/webengine/ui/icons/up.png differ diff --git a/basicsuite/webengine/ui/icons/view-refresh.png b/basicsuite/webengine/ui/icons/view-refresh.png index 265585b..e7af6b3 100644 Binary files a/basicsuite/webengine/ui/icons/view-refresh.png and b/basicsuite/webengine/ui/icons/view-refresh.png differ -- cgit v1.2.3 From 60355c949c4c8bf438465eaef0c0cc28a51fab53 Mon Sep 17 00:00:00 2001 From: Zeno Albisser Date: Fri, 20 Jun 2014 01:27:43 -0700 Subject: Optimize behavior for hiding the address bar. The address bar is only hidden, when the WebEngineView gains focus. It is hidden with a delay of 2 seconds. This usually gives the impression the address bar hides when the page loaded. Change-Id: I3d62406b3de7219d831d195fd961d71c3debb767 Reviewed-by: Andras Becsi --- basicsuite/webengine/main.qml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/basicsuite/webengine/main.qml b/basicsuite/webengine/main.qml index 30365ce..abcfe09 100644 --- a/basicsuite/webengine/main.qml +++ b/basicsuite/webengine/main.qml @@ -72,7 +72,6 @@ Rectangle { onLoadingChanged: { if (!loading) { addressBar.cursorPosition = 0 - toolBar.state = "address" } var loadError = loadRequest.errorDomain if (loadError == WebEngineView.NoErrorDomain) { @@ -91,6 +90,7 @@ Rectangle { else // HTTP and FTP errorPage.mainMessage = "Protocol error" } + onActiveFocusChanged: activeFocus ? hideTimer.running = true : toolBar.state = "address" } MultiPointTouchArea { @@ -134,13 +134,12 @@ Rectangle { Timer { id: hideTimer - interval: 3000 - running: (toolBar.state == "address" || toolBar.state == "") && !addressBar.activeFocus + interval: 2000 onTriggered: { - if (toolBar.state == "address") - toolBar.state = "hidden" - if (toolBar.state == "") - toolBar.state = "address" + if (addressBar.activeFocus) + return; + toolBar.state = "hidden" + running = false } } @@ -231,9 +230,11 @@ Rectangle { height: 25 iconSource: (toolBar.state == "hidden") ? "ui/icons/down.png" : "ui/icons/up.png" onClicked: { - if (toolBar.state == "hidden") + if (toolBar.state == "hidden") { toolBar.state = "address" - else + addressBar.forceActiveFocus() + addressBar.selectAll() + } else toolBar.state = "hidden" } anchors { -- cgit v1.2.3 From d1e02fea9e1e8adee6046cba5cefd5231d762716 Mon Sep 17 00:00:00 2001 From: Zeno Albisser Date: Fri, 20 Jun 2014 03:56:22 -0700 Subject: Adjust the size of the address bar and the ToolButtons. Use a Component for styling the buttons to allow scaling. Change-Id: I2fb421e8d663832c919c3439c7431fe403c318d4 Reviewed-by: Andras Becsi --- basicsuite/webengine/main.qml | 45 +++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/basicsuite/webengine/main.qml b/basicsuite/webengine/main.qml index abcfe09..fbcf6b0 100644 --- a/basicsuite/webengine/main.qml +++ b/basicsuite/webengine/main.qml @@ -41,6 +41,7 @@ import QtQuick 2.1 import QtQuick.Controls 1.1 +import QtQuick.Controls.Styles 1.2 import QtQuick.Layouts 1.1 import QtWebEngine 0.9 @@ -114,7 +115,7 @@ Rectangle { color: "black" opacity: 1 - height: addressBar.height + showToolBarButton.height + 50 + height: addressBar.height + showToolBarButton.height + 60 y: 0 Behavior on y { @@ -135,6 +136,7 @@ Rectangle { Timer { id: hideTimer interval: 2000 + running: false onTriggered: { if (addressBar.activeFocus) return; @@ -160,7 +162,22 @@ Rectangle { RowLayout { id: addressRow - height: 65 + + Component { + id: navigationButtonStyle + ButtonStyle { + background: Rectangle { + anchors.fill: parent + color: control.pressed ? "grey" : "transparent" + radius: 5 + Image { + anchors.fill: parent + anchors.margins: 6 + source: control.icon + } + } + } + } anchors { top: parent.top bottom: showToolBarButton.top @@ -172,31 +189,37 @@ Rectangle { ToolButton { id: backButton Layout.fillHeight: true - iconSource: "ui/icons/go-previous.png" + Layout.minimumWidth: height + property string icon: "ui/icons/go-previous.png" onClicked: mainWebView.goBack() enabled: mainWebView.canGoBack + style: navigationButtonStyle } ToolButton { id: forwardButton Layout.fillHeight: true - iconSource: "ui/icons/go-next.png" + Layout.minimumWidth: height + property string icon: "ui/icons/go-next.png" onClicked: mainWebView.goForward() enabled: mainWebView.canGoForward + style: navigationButtonStyle } ToolButton { id: reloadButton Layout.fillHeight: true - iconSource: mainWebView.loading ? "ui/icons/process-stop.png" : "ui/icons/view-refresh.png" + Layout.minimumWidth: height + property string icon: mainWebView.loading ? "ui/icons/process-stop.png" : "ui/icons/view-refresh.png" onClicked: mainWebView.loading ? mainWebView.stop() : mainWebView.reload() + style: navigationButtonStyle } ToolButton { id: homeButton width: 20 Layout.fillHeight: true - iconSource: "ui/icons/home.png" - onClicked: { - load(defaultUrl) - } + Layout.minimumWidth: height + property string icon: "ui/icons/home.png" + onClicked: load(defaultUrl) + style: navigationButtonStyle } TextField { id: addressBar @@ -228,7 +251,9 @@ Rectangle { ToolButton { id: showToolBarButton height: 25 - iconSource: (toolBar.state == "hidden") ? "ui/icons/down.png" : "ui/icons/up.png" + width: height + property string icon: (toolBar.state == "hidden") ? "ui/icons/down.png" : "ui/icons/up.png" + style: navigationButtonStyle onClicked: { if (toolBar.state == "hidden") { toolBar.state = "address" -- cgit v1.2.3 From 775c9ef760d56a11156151777deb3142c201c6f8 Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Mon, 23 Jun 2014 11:18:59 +0200 Subject: webengine: Make the address bar size similar across devices Use pixelSize for the font and make the TextField height enough, the hide button big enough to be able to acurately press it on the new Nexus as well. Change-Id: If683e533639a46534fca8bab1489b2c034477698 Reviewed-by: Eirik Aavitsland --- basicsuite/webengine/main.qml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/basicsuite/webengine/main.qml b/basicsuite/webengine/main.qml index fbcf6b0..c8ea895 100644 --- a/basicsuite/webengine/main.qml +++ b/basicsuite/webengine/main.qml @@ -115,7 +115,7 @@ Rectangle { color: "black" opacity: 1 - height: addressBar.height + showToolBarButton.height + 60 + height: addressBar.height + showToolBarButton.height + 40 y: 0 Behavior on y { @@ -184,7 +184,7 @@ Rectangle { left: parent.left right: parent.right margins: 10 - topMargin: 40 + topMargin: 30 } ToolButton { id: backButton @@ -225,8 +225,8 @@ Rectangle { id: addressBar focus: true textColor: "black" - implicitHeight: 40 - font.pointSize: 10 + implicitHeight: 50 + font.pixelSize: 25 inputMethodHints: Qt.ImhUrlCharactersOnly | Qt.ImhNoPredictiveText Image { anchors { @@ -250,7 +250,7 @@ Rectangle { ToolButton { id: showToolBarButton - height: 25 + height: 30 width: height property string icon: (toolBar.state == "hidden") ? "ui/icons/down.png" : "ui/icons/up.png" style: navigationButtonStyle -- cgit v1.2.3 From ee0818e6892bda96b7dc9fc8046f876285c0914a Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Mon, 23 Jun 2014 11:19:37 +0200 Subject: webengine: Update the example description and make the home page unscalable Change-Id: I68efc715d931fe14f4042b8590c1fff6249840bf Reviewed-by: Laszlo Agocs --- basicsuite/webengine/content/index.html | 1 + basicsuite/webengine/description.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/basicsuite/webengine/content/index.html b/basicsuite/webengine/content/index.html index d1cf160..f5a2bf4 100644 --- a/basicsuite/webengine/content/index.html +++ b/basicsuite/webengine/content/index.html @@ -2,6 +2,7 @@ + Qt WebEngine Demo + + + + +
+

Animations, Transitions and 3D Transforms

+

This demo shows some more interesting content using 3D transforms, animations and transitions. + Note that you can still select the text on the the elements, even while they are rotating. Transforms elements remain + fully interactive.

+

Click Toggle Shape to switch between nested cubes and one big ring. Note how the planes move smoothly to their new locations, + even while the whole shape is rotating. You can even interrupt this transition by clicking again, and they move back smoothly.

+

Toggle the Backfaces Visible checkbox to turn backfaces on and off using -webkit-backface-visibility.

+
+
+
+ +
+
+
+
1
+
2
+
3
+
4
+
5
+
6
+
7
+
8
+
9
+
10
+
11
+
12
+
+
+
+ + + + diff --git a/basicsuite/webengine/content/morphingcubes/screenshot.png b/basicsuite/webengine/content/morphingcubes/screenshot.png new file mode 100644 index 0000000..9d36114 Binary files /dev/null and b/basicsuite/webengine/content/morphingcubes/screenshot.png differ -- cgit v1.2.3 From e6253b8d140a98f3d2327b2d028b237480378637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pasi=20Pet=C3=A4j=C3=A4j=C3=A4rvi?= Date: Thu, 19 Jun 2014 17:32:08 +0300 Subject: Delete obsoleted demos from Boot2Qt launcher * Qt5 Launch Presentation * Photogallery Task-number: QTEE-656 Change-Id: I5e71e38fd318a0934285dfa82873279c7fadd31d Reviewed-by: Kalle Viironen --- basicsuite/photogallery/description.txt | 1 - basicsuite/photogallery/main.qml | 295 ----------- basicsuite/photogallery/photogallery.pro | 13 - basicsuite/photogallery/preview_l.jpg | Bin 55274 -> 0 bytes basicsuite/photogallery/title.txt | 1 - basicsuite/qt5-launchpresentation/Button.qml | 78 --- basicsuite/qt5-launchpresentation/CameraSlide.qml | 92 ---- basicsuite/qt5-launchpresentation/CanvasSlide.qml | 161 ------ basicsuite/qt5-launchpresentation/DemoMain.qml | 139 ----- basicsuite/qt5-launchpresentation/EffectsSlide.qml | 203 ------- .../qt5-launchpresentation/ExamplesSlide.qml | 89 ---- basicsuite/qt5-launchpresentation/FontSlide.qml | 98 ---- .../qt5-launchpresentation/NoisyGradient.qml | 92 ---- .../qt5-launchpresentation/NormalMapGenerator.qml | 92 ---- .../OpacityTransitionPresentation.qml | 104 ---- .../qt5-launchpresentation/ParticleSlide.qml | 86 --- basicsuite/qt5-launchpresentation/README | 51 -- basicsuite/qt5-launchpresentation/ShaderSlide.qml | 197 ------- basicsuite/qt5-launchpresentation/SlideDeck.qml | 232 -------- basicsuite/qt5-launchpresentation/Swirl.qml | 116 ---- basicsuite/qt5-launchpresentation/VideoSlide.qml | 116 ---- .../qt5-launchpresentation/WebKitSlideContent.qml | 124 ----- basicsuite/qt5-launchpresentation/WebkitSlide.qml | 59 --- basicsuite/qt5-launchpresentation/WidgetsSlide.qml | 152 ------ .../qt5-launchpresentation/calqlatr/.DS_Store | Bin 6148 -> 0 bytes .../qt5-launchpresentation/calqlatr/Calqlatr.qml | 110 ---- .../calqlatr/content/Button.qml | 80 --- .../calqlatr/content/Display.qml | 124 ----- .../calqlatr/content/NumberPad.qml | 69 --- .../calqlatr/content/StyleLabel.qml | 50 -- .../calqlatr/content/audio/touch.wav | Bin 950 -> 0 bytes .../calqlatr/content/calculator.js | 143 ----- .../calqlatr/content/images/icon-back.png | Bin 328 -> 0 bytes .../calqlatr/content/images/icon-close.png | Bin 488 -> 0 bytes .../calqlatr/content/images/icon-settings.png | Bin 503 -> 0 bytes .../calqlatr/content/images/logo.png | Bin 5950 -> 0 bytes .../calqlatr/content/images/paper-edge-left.png | Bin 12401 -> 0 bytes .../calqlatr/content/images/paper-edge-right.png | Bin 12967 -> 0 bytes .../calqlatr/content/images/paper-grip.png | Bin 298 -> 0 bytes .../content/images/settings-selected-a.png | Bin 2326 -> 0 bytes .../content/images/settings-selected-b.png | Bin 2334 -> 0 bytes .../calqlatr/content/images/touch-green.png | Bin 4808 -> 0 bytes .../calqlatr/content/images/touch-white.png | Bin 4601 -> 0 bytes basicsuite/qt5-launchpresentation/demo.qmlproject | 18 - basicsuite/qt5-launchpresentation/description.txt | 5 - basicsuite/qt5-launchpresentation/images/ally.png | Bin 1907941 -> 0 bytes .../qt5-launchpresentation/images/butterfly.png | Bin 18668 -> 0 bytes .../qt5-launchpresentation/images/displace.png | Bin 20269 -> 0 bytes basicsuite/qt5-launchpresentation/images/fog.png | Bin 225653 -> 0 bytes .../qt5-launchpresentation/images/particle.png | Bin 861 -> 0 bytes .../qt5-launchpresentation/images/qt-logo.png | Bin 49656 -> 0 bytes .../images/widgets_boxes.png | Bin 589779 -> 0 bytes .../images/widgets_chips.png | Bin 211342 -> 0 bytes .../images/widgets_mainwindows.png | Bin 95685 -> 0 bytes .../images/widgets_styles_fusion.png | Bin 65678 -> 0 bytes .../images/widgets_styles_macstyle.png | Bin 70514 -> 0 bytes basicsuite/qt5-launchpresentation/main.qml | 63 --- basicsuite/qt5-launchpresentation/main_hifi.qml | 43 -- basicsuite/qt5-launchpresentation/maroon/.DS_Store | Bin 6148 -> 0 bytes .../qt5-launchpresentation/maroon/Maroon.qml | 233 --------- .../maroon/content/BuildButton.qml | 90 ---- .../maroon/content/GameCanvas.qml | 240 --------- .../maroon/content/GameOverScreen.qml | 115 ---- .../maroon/content/InfoBar.qml | 84 --- .../maroon/content/NewGameScreen.qml | 111 ---- .../maroon/content/SoundEffect.qml | 53 -- .../maroon/content/audio/bomb-action.wav | Bin 20972 -> 0 bytes .../maroon/content/audio/catch-action.wav | Bin 13274 -> 0 bytes .../maroon/content/audio/catch.wav | Bin 8638 -> 0 bytes .../maroon/content/audio/currency.wav | Bin 15790 -> 0 bytes .../maroon/content/audio/factory-action.wav | Bin 4936 -> 0 bytes .../maroon/content/audio/melee-action.wav | Bin 17798 -> 0 bytes .../maroon/content/audio/projectile-action.wav | Bin 2562 -> 0 bytes .../maroon/content/audio/shooter-action.wav | Bin 27554 -> 0 bytes .../maroon/content/gfx/background.png | Bin 5802 -> 0 bytes .../maroon/content/gfx/bomb-action.png | Bin 23974 -> 0 bytes .../maroon/content/gfx/bomb-idle.png | Bin 12238 -> 0 bytes .../maroon/content/gfx/bomb.png | Bin 4067 -> 0 bytes .../maroon/content/gfx/button-help.png | Bin 8916 -> 0 bytes .../maroon/content/gfx/button-play.png | Bin 13945 -> 0 bytes .../maroon/content/gfx/catch-action.png | Bin 6760 -> 0 bytes .../maroon/content/gfx/catch.png | Bin 4771 -> 0 bytes .../maroon/content/gfx/cloud.png | Bin 3398 -> 0 bytes .../maroon/content/gfx/currency.png | Bin 1889 -> 0 bytes .../maroon/content/gfx/dialog-bomb.png | Bin 3751 -> 0 bytes .../maroon/content/gfx/dialog-factory.png | Bin 3946 -> 0 bytes .../maroon/content/gfx/dialog-melee.png | Bin 4392 -> 0 bytes .../maroon/content/gfx/dialog-pointer.png | Bin 911 -> 0 bytes .../maroon/content/gfx/dialog-shooter.png | Bin 3737 -> 0 bytes .../maroon/content/gfx/dialog.png | Bin 3362 -> 0 bytes .../maroon/content/gfx/factory-action.png | Bin 22440 -> 0 bytes .../maroon/content/gfx/factory-idle.png | Bin 12729 -> 0 bytes .../maroon/content/gfx/factory.png | Bin 4138 -> 0 bytes .../maroon/content/gfx/grid.png | Bin 2830 -> 0 bytes .../maroon/content/gfx/help.png | Bin 38255 -> 0 bytes .../maroon/content/gfx/lifes.png | Bin 1675 -> 0 bytes .../maroon/content/gfx/logo-bubble.png | Bin 7706 -> 0 bytes .../maroon/content/gfx/logo-fish.png | Bin 3477 -> 0 bytes .../maroon/content/gfx/logo.png | Bin 18332 -> 0 bytes .../maroon/content/gfx/melee-action.png | Bin 7797 -> 0 bytes .../maroon/content/gfx/melee-idle.png | Bin 22832 -> 0 bytes .../maroon/content/gfx/melee.png | Bin 4046 -> 0 bytes .../maroon/content/gfx/mob-idle.png | Bin 6181 -> 0 bytes .../maroon/content/gfx/mob.png | Bin 2391 -> 0 bytes .../maroon/content/gfx/points.png | Bin 1561 -> 0 bytes .../maroon/content/gfx/projectile-action.png | Bin 6257 -> 0 bytes .../maroon/content/gfx/projectile.png | Bin 801 -> 0 bytes .../maroon/content/gfx/scores.png | Bin 1535 -> 0 bytes .../maroon/content/gfx/shooter-action.png | Bin 18121 -> 0 bytes .../maroon/content/gfx/shooter-idle.png | Bin 11929 -> 0 bytes .../maroon/content/gfx/shooter.png | Bin 4137 -> 0 bytes .../maroon/content/gfx/sunlight.png | Bin 248412 -> 0 bytes .../maroon/content/gfx/text-1.png | Bin 2777 -> 0 bytes .../maroon/content/gfx/text-2.png | Bin 4959 -> 0 bytes .../maroon/content/gfx/text-3.png | Bin 5063 -> 0 bytes .../maroon/content/gfx/text-blank.png | Bin 1326 -> 0 bytes .../maroon/content/gfx/text-gameover.png | Bin 1515 -> 0 bytes .../maroon/content/gfx/text-go.png | Bin 4230 -> 0 bytes .../maroon/content/gfx/wave.png | Bin 2763 -> 0 bytes .../qt5-launchpresentation/maroon/content/logic.js | 264 ---------- .../maroon/content/mobs/MobBase.qml | 262 ---------- .../maroon/content/towers/Bomb.qml | 133 ----- .../maroon/content/towers/Factory.qml | 114 ---- .../maroon/content/towers/Melee.qml | 83 --- .../maroon/content/towers/Ranged.qml | 128 ----- .../maroon/content/towers/TowerBase.qml | 72 --- .../particles/customemitter.qml | 91 ---- .../qt5-launchpresentation/particles/emitmask.qml | 76 --- .../qt5-launchpresentation/particles/particle.png | Bin 861 -> 0 bytes .../qt5-launchpresentation/particles/particle4.png | Bin 1799 -> 0 bytes .../qt5-launchpresentation/particles/star.png | Bin 1550 -> 0 bytes .../particles/starfish_mask.png | Bin 11301 -> 0 bytes .../particles/velocityfrommotion.qml | 306 ----------- .../qt5-launchpresentation/presentation/Clock.qml | 77 --- .../presentation/CodeSlide.qml | 162 ------ .../presentation/Presentation.qml | 196 ------- .../qt5-launchpresentation/presentation/Slide.qml | 186 ------- .../presentation/SlideCounter.qml | 61 --- basicsuite/qt5-launchpresentation/preview_l.jpg | Bin 16252 -> 0 bytes .../qt5-launchpresentation.pro | 18 - .../qt5-launchpresentation/samegame/.DS_Store | Bin 6148 -> 0 bytes .../qt5-launchpresentation/samegame/Samegame.qml | 371 ------------- .../samegame/content/Block.qml | 114 ---- .../samegame/content/BlockEmitter.qml | 57 -- .../samegame/content/Button.qml | 70 --- .../samegame/content/GameArea.qml | 226 -------- .../samegame/content/LogoAnimation.qml | 102 ---- .../samegame/content/MenuEmitter.qml | 53 -- .../samegame/content/PaintEmitter.qml | 98 ---- .../samegame/content/PrimaryPack.qml | 122 ----- .../samegame/content/PuzzleBlock.qml | 111 ---- .../samegame/content/SamegameText.qml | 49 -- .../samegame/content/SimpleBlock.qml | 108 ---- .../samegame/content/SmokeText.qml | 83 --- .../samegame/content/gfx/background-puzzle.png | Bin 86666 -> 0 bytes .../samegame/content/gfx/background.png | Bin 101018 -> 0 bytes .../samegame/content/gfx/bar.png | Bin 10970 -> 0 bytes .../samegame/content/gfx/blue-puzzle.png | Bin 2219 -> 0 bytes .../samegame/content/gfx/blue.png | Bin 1018 -> 0 bytes .../samegame/content/gfx/bubble-highscore.png | Bin 2276 -> 0 bytes .../samegame/content/gfx/bubble-puzzle.png | Bin 2811 -> 0 bytes .../samegame/content/gfx/but-game-1.png | Bin 2728 -> 0 bytes .../samegame/content/gfx/but-game-2.png | Bin 3378 -> 0 bytes .../samegame/content/gfx/but-game-3.png | Bin 1423 -> 0 bytes .../samegame/content/gfx/but-game-4.png | Bin 2096 -> 0 bytes .../samegame/content/gfx/but-game-new.png | Bin 3662 -> 0 bytes .../samegame/content/gfx/but-menu.png | Bin 2391 -> 0 bytes .../samegame/content/gfx/but-puzzle-next.png | Bin 3658 -> 0 bytes .../samegame/content/gfx/but-quit.png | Bin 2100 -> 0 bytes .../samegame/content/gfx/green-puzzle.png | Bin 2271 -> 0 bytes .../samegame/content/gfx/green.png | Bin 1024 -> 0 bytes .../samegame/content/gfx/icon-fail.png | Bin 6549 -> 0 bytes .../samegame/content/gfx/icon-ok.png | Bin 7190 -> 0 bytes .../samegame/content/gfx/icon-time.png | Bin 1159 -> 0 bytes .../samegame/content/gfx/logo-a.png | Bin 1814 -> 0 bytes .../samegame/content/gfx/logo-e.png | Bin 1725 -> 0 bytes .../samegame/content/gfx/logo-g.png | Bin 1765 -> 0 bytes .../samegame/content/gfx/logo-m.png | Bin 1743 -> 0 bytes .../samegame/content/gfx/logo-s.png | Bin 1791 -> 0 bytes .../samegame/content/gfx/logo.png | Bin 3608 -> 0 bytes .../samegame/content/gfx/particle-brick.png | Bin 861 -> 0 bytes .../samegame/content/gfx/particle-paint.png | Bin 714 -> 0 bytes .../samegame/content/gfx/particle-smoke.png | Bin 5409 -> 0 bytes .../samegame/content/gfx/red-puzzle.png | Bin 2218 -> 0 bytes .../samegame/content/gfx/red.png | Bin 1018 -> 0 bytes .../samegame/content/gfx/text-highscore-new.png | Bin 6767 -> 0 bytes .../samegame/content/gfx/text-highscore.png | Bin 3179 -> 0 bytes .../samegame/content/gfx/text-no-winner.png | Bin 6321 -> 0 bytes .../samegame/content/gfx/text-p1-go.png | Bin 5395 -> 0 bytes .../samegame/content/gfx/text-p1-won.png | Bin 5618 -> 0 bytes .../samegame/content/gfx/text-p1.png | Bin 1751 -> 0 bytes .../samegame/content/gfx/text-p2-go.png | Bin 5874 -> 0 bytes .../samegame/content/gfx/text-p2-won.png | Bin 6177 -> 0 bytes .../samegame/content/gfx/text-p2.png | Bin 2381 -> 0 bytes .../samegame/content/gfx/yellow-puzzle.png | Bin 2239 -> 0 bytes .../samegame/content/gfx/yellow.png | Bin 1008 -> 0 bytes .../samegame/content/levels/TemplateBase.qml | 70 --- .../samegame/content/levels/level0.qml | 59 --- .../samegame/content/levels/level1.qml | 59 --- .../samegame/content/levels/level2.qml | 61 --- .../samegame/content/levels/level3.qml | 60 --- .../samegame/content/levels/level4.qml | 58 -- .../samegame/content/levels/level5.qml | 59 --- .../samegame/content/levels/level6.qml | 60 --- .../samegame/content/levels/level7.qml | 58 -- .../samegame/content/levels/level8.qml | 59 --- .../samegame/content/levels/level9.qml | 62 --- .../samegame/content/samegame.js | 581 --------------------- .../qt5-launchpresentation/samegame/settings.js | 56 -- basicsuite/qt5-launchpresentation/title.txt | 1 - 210 files changed, 9318 deletions(-) delete mode 100644 basicsuite/photogallery/description.txt delete mode 100644 basicsuite/photogallery/main.qml delete mode 100644 basicsuite/photogallery/photogallery.pro delete mode 100644 basicsuite/photogallery/preview_l.jpg delete mode 100644 basicsuite/photogallery/title.txt delete mode 100644 basicsuite/qt5-launchpresentation/Button.qml delete mode 100644 basicsuite/qt5-launchpresentation/CameraSlide.qml delete mode 100644 basicsuite/qt5-launchpresentation/CanvasSlide.qml delete mode 100644 basicsuite/qt5-launchpresentation/DemoMain.qml delete mode 100644 basicsuite/qt5-launchpresentation/EffectsSlide.qml delete mode 100644 basicsuite/qt5-launchpresentation/ExamplesSlide.qml delete mode 100644 basicsuite/qt5-launchpresentation/FontSlide.qml delete mode 100644 basicsuite/qt5-launchpresentation/NoisyGradient.qml delete mode 100644 basicsuite/qt5-launchpresentation/NormalMapGenerator.qml delete mode 100644 basicsuite/qt5-launchpresentation/OpacityTransitionPresentation.qml delete mode 100644 basicsuite/qt5-launchpresentation/ParticleSlide.qml delete mode 100644 basicsuite/qt5-launchpresentation/README delete mode 100644 basicsuite/qt5-launchpresentation/ShaderSlide.qml delete mode 100644 basicsuite/qt5-launchpresentation/SlideDeck.qml delete mode 100644 basicsuite/qt5-launchpresentation/Swirl.qml delete mode 100644 basicsuite/qt5-launchpresentation/VideoSlide.qml delete mode 100644 basicsuite/qt5-launchpresentation/WebKitSlideContent.qml delete mode 100644 basicsuite/qt5-launchpresentation/WebkitSlide.qml delete mode 100644 basicsuite/qt5-launchpresentation/WidgetsSlide.qml delete mode 100644 basicsuite/qt5-launchpresentation/calqlatr/.DS_Store delete mode 100644 basicsuite/qt5-launchpresentation/calqlatr/Calqlatr.qml delete mode 100644 basicsuite/qt5-launchpresentation/calqlatr/content/Button.qml delete mode 100644 basicsuite/qt5-launchpresentation/calqlatr/content/Display.qml delete mode 100644 basicsuite/qt5-launchpresentation/calqlatr/content/NumberPad.qml delete mode 100644 basicsuite/qt5-launchpresentation/calqlatr/content/StyleLabel.qml delete mode 100644 basicsuite/qt5-launchpresentation/calqlatr/content/audio/touch.wav delete mode 100644 basicsuite/qt5-launchpresentation/calqlatr/content/calculator.js delete mode 100644 basicsuite/qt5-launchpresentation/calqlatr/content/images/icon-back.png delete mode 100644 basicsuite/qt5-launchpresentation/calqlatr/content/images/icon-close.png delete mode 100644 basicsuite/qt5-launchpresentation/calqlatr/content/images/icon-settings.png delete mode 100644 basicsuite/qt5-launchpresentation/calqlatr/content/images/logo.png delete mode 100644 basicsuite/qt5-launchpresentation/calqlatr/content/images/paper-edge-left.png delete mode 100644 basicsuite/qt5-launchpresentation/calqlatr/content/images/paper-edge-right.png delete mode 100644 basicsuite/qt5-launchpresentation/calqlatr/content/images/paper-grip.png delete mode 100644 basicsuite/qt5-launchpresentation/calqlatr/content/images/settings-selected-a.png delete mode 100644 basicsuite/qt5-launchpresentation/calqlatr/content/images/settings-selected-b.png delete mode 100644 basicsuite/qt5-launchpresentation/calqlatr/content/images/touch-green.png delete mode 100644 basicsuite/qt5-launchpresentation/calqlatr/content/images/touch-white.png delete mode 100644 basicsuite/qt5-launchpresentation/demo.qmlproject delete mode 100644 basicsuite/qt5-launchpresentation/description.txt delete mode 100644 basicsuite/qt5-launchpresentation/images/ally.png delete mode 100644 basicsuite/qt5-launchpresentation/images/butterfly.png delete mode 100644 basicsuite/qt5-launchpresentation/images/displace.png delete mode 100644 basicsuite/qt5-launchpresentation/images/fog.png delete mode 100644 basicsuite/qt5-launchpresentation/images/particle.png delete mode 100644 basicsuite/qt5-launchpresentation/images/qt-logo.png delete mode 100644 basicsuite/qt5-launchpresentation/images/widgets_boxes.png delete mode 100644 basicsuite/qt5-launchpresentation/images/widgets_chips.png delete mode 100644 basicsuite/qt5-launchpresentation/images/widgets_mainwindows.png delete mode 100644 basicsuite/qt5-launchpresentation/images/widgets_styles_fusion.png delete mode 100644 basicsuite/qt5-launchpresentation/images/widgets_styles_macstyle.png delete mode 100644 basicsuite/qt5-launchpresentation/main.qml delete mode 100644 basicsuite/qt5-launchpresentation/main_hifi.qml delete mode 100644 basicsuite/qt5-launchpresentation/maroon/.DS_Store delete mode 100644 basicsuite/qt5-launchpresentation/maroon/Maroon.qml delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/BuildButton.qml delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/GameCanvas.qml delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/GameOverScreen.qml delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/InfoBar.qml delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/NewGameScreen.qml delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/SoundEffect.qml delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/audio/bomb-action.wav delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/audio/catch-action.wav delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/audio/catch.wav delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/audio/currency.wav delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/audio/factory-action.wav delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/audio/melee-action.wav delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/audio/projectile-action.wav delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/audio/shooter-action.wav delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/background.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/bomb-action.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/bomb-idle.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/bomb.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/button-help.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/button-play.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/catch-action.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/catch.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/cloud.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/currency.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/dialog-bomb.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/dialog-factory.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/dialog-melee.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/dialog-pointer.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/dialog-shooter.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/dialog.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/factory-action.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/factory-idle.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/factory.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/grid.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/help.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/lifes.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/logo-bubble.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/logo-fish.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/logo.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/melee-action.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/melee-idle.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/melee.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/mob-idle.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/mob.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/points.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/projectile-action.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/projectile.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/scores.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/shooter-action.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/shooter-idle.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/shooter.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/sunlight.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/text-1.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/text-2.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/text-3.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/text-blank.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/text-gameover.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/text-go.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/gfx/wave.png delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/logic.js delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/mobs/MobBase.qml delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/towers/Bomb.qml delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/towers/Factory.qml delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/towers/Melee.qml delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/towers/Ranged.qml delete mode 100644 basicsuite/qt5-launchpresentation/maroon/content/towers/TowerBase.qml delete mode 100644 basicsuite/qt5-launchpresentation/particles/customemitter.qml delete mode 100644 basicsuite/qt5-launchpresentation/particles/emitmask.qml delete mode 100644 basicsuite/qt5-launchpresentation/particles/particle.png delete mode 100644 basicsuite/qt5-launchpresentation/particles/particle4.png delete mode 100644 basicsuite/qt5-launchpresentation/particles/star.png delete mode 100644 basicsuite/qt5-launchpresentation/particles/starfish_mask.png delete mode 100644 basicsuite/qt5-launchpresentation/particles/velocityfrommotion.qml delete mode 100644 basicsuite/qt5-launchpresentation/presentation/Clock.qml delete mode 100644 basicsuite/qt5-launchpresentation/presentation/CodeSlide.qml delete mode 100644 basicsuite/qt5-launchpresentation/presentation/Presentation.qml delete mode 100644 basicsuite/qt5-launchpresentation/presentation/Slide.qml delete mode 100644 basicsuite/qt5-launchpresentation/presentation/SlideCounter.qml delete mode 100644 basicsuite/qt5-launchpresentation/preview_l.jpg delete mode 100644 basicsuite/qt5-launchpresentation/qt5-launchpresentation.pro delete mode 100644 basicsuite/qt5-launchpresentation/samegame/.DS_Store delete mode 100644 basicsuite/qt5-launchpresentation/samegame/Samegame.qml delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/Block.qml delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/BlockEmitter.qml delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/Button.qml delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/GameArea.qml delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/LogoAnimation.qml delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/MenuEmitter.qml delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/PaintEmitter.qml delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/PrimaryPack.qml delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/PuzzleBlock.qml delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/SamegameText.qml delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/SimpleBlock.qml delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/SmokeText.qml delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/background-puzzle.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/background.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/bar.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/blue-puzzle.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/blue.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/bubble-highscore.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/bubble-puzzle.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/but-game-1.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/but-game-2.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/but-game-3.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/but-game-4.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/but-game-new.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/but-menu.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/but-puzzle-next.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/but-quit.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/green-puzzle.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/green.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/icon-fail.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/icon-ok.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/icon-time.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/logo-a.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/logo-e.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/logo-g.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/logo-m.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/logo-s.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/logo.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/particle-brick.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/particle-paint.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/particle-smoke.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/red-puzzle.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/red.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/text-highscore-new.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/text-highscore.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/text-no-winner.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/text-p1-go.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/text-p1-won.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/text-p1.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/text-p2-go.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/text-p2-won.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/text-p2.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/yellow-puzzle.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/gfx/yellow.png delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/levels/TemplateBase.qml delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/levels/level0.qml delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/levels/level1.qml delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/levels/level2.qml delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/levels/level3.qml delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/levels/level4.qml delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/levels/level5.qml delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/levels/level6.qml delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/levels/level7.qml delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/levels/level8.qml delete mode 100644 basicsuite/qt5-launchpresentation/samegame/content/levels/level9.qml delete mode 100755 basicsuite/qt5-launchpresentation/samegame/content/samegame.js delete mode 100644 basicsuite/qt5-launchpresentation/samegame/settings.js delete mode 100644 basicsuite/qt5-launchpresentation/title.txt diff --git a/basicsuite/photogallery/description.txt b/basicsuite/photogallery/description.txt deleted file mode 100644 index f47f907..0000000 --- a/basicsuite/photogallery/description.txt +++ /dev/null @@ -1 +0,0 @@ -This is a simple photo gallery, showing images found in /data/images. Images captured with the Camera demo will also appear in this folder. diff --git a/basicsuite/photogallery/main.qml b/basicsuite/photogallery/main.qml deleted file mode 100644 index a7f114e..0000000 --- a/basicsuite/photogallery/main.qml +++ /dev/null @@ -1,295 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: For any questions to Digia, please use the contact form at -** http://qt.digia.com/ -** -** This file is part of the examples of the Qt Enterprise Embedded. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -import QtQuick 2.0 -import Qt.labs.folderlistmodel 1.0 - -Item { - id: root - - width: 320 - height: 480 - - Rectangle { - anchors.fill: parent - color: "black" - } - - FolderListModel { - id: imageList - folder: "/data/images" - nameFilters: ["*.png", "*.jpg"] - - showDirs: false - } - - Text { - id: noImages - color: "white" - visible: grid.count == 0 - text: "No images in " + imageList.folder - anchors.centerIn: parent - } - - GridView { - id: grid - - anchors.fill: parent - - cellHeight: root.width / 3 - cellWidth: cellHeight - - model: imageList - -// NumberAnimation on contentY { from: 0; to: 2000; duration: 3000; loops: 1; easing.type: Easing.InOutCubic } - - delegate: Rectangle { - - id: box - color: "white" - width: grid.cellWidth - height: grid.cellHeight - scale: 0.97 - rotation: 2; - antialiasing: true - - Rectangle { - id: sepia - color: "#b08050" - width: image.width - height: image.height - anchors.centerIn: parent - - property real fakeOpacity: image.status == Image.Ready ? 1.5 : 0 - Behavior on fakeOpacity { NumberAnimation { duration: 1000 } } - - opacity: fakeOpacity - visible: image.opacity <= 0.99; - antialiasing: true - } - - Image { - id: image - source: filePath - width: grid.cellWidth * 0.9 - height: grid.cellHeight * 0.9 - anchors.centerIn: sepia - asynchronous: true - opacity: sepia.fakeOpacity - .5 - sourceSize.width: width; - antialiasing: true - } - - MouseArea { - anchors.fill: parent - onClicked: { - root.showBigImage(filePath, box.x - grid.contentX, box.y - grid.contentY, image); - } - } - } - } - - function showBigImage(filePath, itemX, itemY, image) { - fakeBigImage.x = itemX; - fakeBigImage.y = itemY; - fakeBigImage.sourceSize = image.sourceSize; - fakeBigImage.source = filePath; - - beginEnterLargeAnimation.running = true; - } - - property int time: 500; - property real xPos: width < height ? 0 : width / 2 - height / 2; - property real yPos: width < height ? height / 2 - width / 2: 0; - property real size: Math.min(width, height); - - states: [ - State { name: "grid" }, - State { name: "enter-large" }, - State { name: "large" }, - State { name: "exit-large" } - ] - - SequentialAnimation { - id: beginEnterLargeAnimation - PropertyAction { target: mouseArea; property: "enabled"; value: "true" } - PropertyAction { target: fakeBigImage; property: "rotation"; value: 2; } - PropertyAction { target: fakeBigImage; property: "scale"; value: 0.97 * 0.9; } - PropertyAction { target: fakeBigImage; property: "width"; value: grid.cellWidth; } - PropertyAction { target: fakeBigImage; property: "height"; value: grid.cellHeight; } - PropertyAction { target: fakeBigImage; property: "visible"; value: true; } - - ParallelAnimation { - NumberAnimation { target: fakeBigImage; property: "rotation"; to: 0; duration: root.time; easing.type: Easing.InOutCubic } - NumberAnimation { target: fakeBigImage; property: "scale"; to: 1; duration: root.time; easing.type: Easing.InOutCubic } - NumberAnimation { target: fakeBigImage; property: "x"; to: root.xPos; duration: root.time; easing.type: Easing.InOutCubic } - NumberAnimation { target: fakeBigImage; property: "y"; to: root.yPos; duration: root.time; easing.type: Easing.InOutCubic } - NumberAnimation { target: fakeBigImage; property: "width"; to: root.size; duration: root.time; easing.type: Easing.InOutCubic } - NumberAnimation { target: fakeBigImage; property: "height"; to: root.size; duration: root.time; easing.type: Easing.InOutCubic } - NumberAnimation { target: grid; property: "opacity"; to: 0; duration: root.time; easing.type: Easing.InOutCubic } - } - ScriptAction { - script: { - - bigImage = realBigImageComponent.createObject(root); - bigImage.source = fakeBigImage.source; - } - } - } - - property Item bigImage; - property real targetRotation: 0; - property real targetWidth: 0 - property real targetHeight: 0 - property bool bigImageShowing: false; - - SequentialAnimation { - id: finalizeEnterLargeAnimation - ScriptAction { script: { - fakeBigImage.anchors.centerIn = root; - } - } - ParallelAnimation { - NumberAnimation { target: bigImage; property: "opacity"; to: 1; duration: root.time; easing.type: Easing.InOutCubic } - NumberAnimation { target: fakeBigImage; property: "rotation"; to: root.targetRotation; duration: root.time; easing.type: Easing.InOutCubic } - NumberAnimation { target: bigImage; property: "rotation"; to: root.targetRotation; duration: root.time; easing.type: Easing.InOutCubic } - NumberAnimation { target: fakeBigImage; property: "width"; to: root.targetWidth; duration: root.time; easing.type: Easing.InOutCubic } - NumberAnimation { target: fakeBigImage; property: "height"; to: root.targetHeight; duration: root.time; easing.type: Easing.InOutCubic } - NumberAnimation { target: bigImage; property: "width"; to: root.targetWidth; duration: root.time; easing.type: Easing.InOutCubic } - NumberAnimation { target: bigImage; property: "height"; to: root.targetHeight; duration: root.time; easing.type: Easing.InOutCubic } - } - PropertyAction { target: fakeBigImage; property: "visible"; value: false } - PropertyAction { target: root; property: "bigImageShowing"; value: true } - } - - SequentialAnimation { - id: backToGridAnimation - ParallelAnimation { - NumberAnimation { target: bigImage; property: "opacity"; to: 0; duration: root.time; easing.type: Easing.InOutCubic } - NumberAnimation { target: grid; property: "opacity"; to: 1; duration: root.time; easing.type: Easing.InOutCubic } - } - PropertyAction { target: fakeBigImage; property: "source"; value: "" } - PropertyAction { target: root; property: "bigImageShowing"; value: false } - PropertyAction { target: mouseArea; property: "enabled"; value: false } - ScriptAction { script: { - bigImage.destroy(); - fakeBigImage.anchors.centerIn = undefined - } - } - } - - Image { - id: fakeBigImage - width: grid.cellWidth - height: grid.cellHeight - visible: false - antialiasing: true - } - - Component { - id: realBigImageComponent - - Image { - id: realBigImage - - anchors.centerIn: parent; - - asynchronous: true; - - // Bound size to the current display size, to try to avoid any GL_MAX_TEXTURE_SIZE issues. - sourceSize: Qt.size(Math.max(root.width, root.height), Math.max(root.width, root.height)); - - opacity: 0 - onStatusChanged: { - - if (status != Image.Ready) - return; - - var imageIsLandscape = width > height; - var screenIsLandscape = root.width > root.height; - - var targetScale; - - // Rotation needed... - if (imageIsLandscape != screenIsLandscape && width != height) { - root.targetRotation = 90; - var aspect = width / height - var screenAspect = root.height / root.width - - if (aspect > screenAspect) { - targetScale = root.height / width - } else { - targetScale = root.width / height; - } - } else { - root.targetRotation = 0; - var aspect = height / width; - var screenAspect = root.height / root.width - - if (aspect > screenAspect) { - targetScale = root.height / height - } else { - targetScale = root.width / width; - } - } - - root.targetWidth = width * targetScale - root.targetHeight = height * targetScale; - - width = root.size - height = root.size; - - finalizeEnterLargeAnimation.running = true; - } - } - } - - MouseArea { - id: mouseArea - anchors.fill: parent - enabled: false - - onClicked: { - if (root.bigImageShowing) - backToGridAnimation.running = true; - } - } - -} diff --git a/basicsuite/photogallery/photogallery.pro b/basicsuite/photogallery/photogallery.pro deleted file mode 100644 index 3b1476a..0000000 --- a/basicsuite/photogallery/photogallery.pro +++ /dev/null @@ -1,13 +0,0 @@ -TARGET = photogallery - -include(../shared/shared.pri) -b2qtdemo_deploy_defaults() - -content.files = \ - *.qml \ - *.png -content.path = $$DESTPATH - -OTHER_FILES += $${content.files} - -INSTALLS += target content \ No newline at end of file diff --git a/basicsuite/photogallery/preview_l.jpg b/basicsuite/photogallery/preview_l.jpg deleted file mode 100644 index 0b67f1d..0000000 Binary files a/basicsuite/photogallery/preview_l.jpg and /dev/null differ diff --git a/basicsuite/photogallery/title.txt b/basicsuite/photogallery/title.txt deleted file mode 100644 index eda05c5..0000000 --- a/basicsuite/photogallery/title.txt +++ /dev/null @@ -1 +0,0 @@ -120. Photo Gallery diff --git a/basicsuite/qt5-launchpresentation/Button.qml b/basicsuite/qt5-launchpresentation/Button.qml deleted file mode 100644 index 6d6bf6e..0000000 --- a/basicsuite/qt5-launchpresentation/Button.qml +++ /dev/null @@ -1,78 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt 5 launch demo. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 - -Rectangle { - - id: root; - - border.width: (pressed ? 1.5 : 1) * height / 20; - border.color: Qt.rgba(1, 1, 1, 0.4); - radius: height / 4; - - antialiasing: true - - gradient: Gradient { - GradientStop { position: 0; color: Qt.rgba(0.5, 0.5, 0.5, pressed ? 0.7 : 0.5); } - GradientStop { position: 1; color: Qt.rgba(0.2, 0.2, 0.2, pressed ? 0.7 : 0.5); } - } - - Behavior on color { ColorAnimation { duration: 100 } } - - property bool pressed; - property alias label: textItem.text; - - Text { - id: textItem - anchors.centerIn: parent - color: "white" - font.pixelSize: parent.height / 3; - font.bold: true - } - - MouseArea { - id: mouse - anchors.fill: parent - onPressed: root.pressed = !root.pressed; - - } - -} diff --git a/basicsuite/qt5-launchpresentation/CameraSlide.qml b/basicsuite/qt5-launchpresentation/CameraSlide.qml deleted file mode 100644 index a253c08..0000000 --- a/basicsuite/qt5-launchpresentation/CameraSlide.qml +++ /dev/null @@ -1,92 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt 5 launch demo. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtMultimedia 5.0 -import "presentation" - -import QtGraphicalEffects 1.0 - -Slide { - - id: slide - - title: "Qt Multimedia - Camera" - - Camera { - id: camera - Component.onCompleted: camera.stop(); - } - - VideoOutput { - id: videoOut - anchors.fill: parent - source: camera - layer.enabled: true; - layer.effect: ZoomBlur { - samples: 16 - length: button.pressed ? parent.height / 5 : 0 - Behavior on length { - NumberAnimation { duration: 250 } - } - } - } - - onVisibleChanged: { - if (slide.visible) - camera.start(); - else - camera.stop(); - } - - Button { - id: button - anchors.bottom: videoOut.bottom - anchors.horizontalCenter: videoOut.horizontalCenter - anchors.bottomMargin: height / 2; -// anchors.bottom: slide.top; -// anchors.right: slide.right; -// anchors.bottomMargin: height; - label: pressed ? "Remove Effect" : "Zoom Effect"; - width: height * 4; - height: parent.height * 0.1 - } - -} diff --git a/basicsuite/qt5-launchpresentation/CanvasSlide.qml b/basicsuite/qt5-launchpresentation/CanvasSlide.qml deleted file mode 100644 index 46f98ed..0000000 --- a/basicsuite/qt5-launchpresentation/CanvasSlide.qml +++ /dev/null @@ -1,161 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt 5 launch demo. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Particles 2.0 -import "presentation" - -Slide { - id: slide - - title: "Qt Quick - Canvas" - - - - Rectangle { - height: parent.height - width: parent.width * 0.45 - anchors.right: parent.right; - antialiasing: true - radius: slide.height * 0.03; - color: Qt.rgba(0.0, 0.0, 0.0, 0.2); - Canvas { - id:canvas - anchors.fill: parent; - - renderTarget: Canvas.Image; - antialiasing: true; - onPaint: { - eval(editor.text); - } - } - } - - Rectangle { - height: parent.height - width: parent.width * 0.45 - anchors.left: parent.left - antialiasing: true - radius: slide.height * 0.03; - color: Qt.rgba(0.0, 0.0, 0.0, 0.2); - - clip: true; - - TextEdit { - id: editor - anchors.fill: parent; - anchors.margins: 10 - - font.pixelSize: 16 - color: "white" - font.family: "courier" - font.bold: true - - text: -"var ctx = canvas.getContext('2d'); -ctx.save(); -ctx.clearRect(0, 0, canvas.width, canvas.height); -ctx.strokeStyle = 'palegreen' -ctx.fillStyle = 'limegreen'; -ctx.lineWidth = 5; - -ctx.beginPath(); -ctx.moveTo(100, 100); -ctx.lineTo(300, 100); -ctx.lineTo(100, 200); -ctx.closePath(); -ctx.fill(); -ctx.stroke(); - -ctx.fillStyle = 'aquamarine' -ctx.font = '20px sans-serif' -ctx.fillText('HTML Canvas API!', 100, 300); -ctx.fillText('Imperative Drawing!', 100, 340); - -ctx.restore(); -" - onTextChanged: canvas.requestPaint(); - - onCursorRectangleChanged: { - emitter.burst(10) - - } - - ParticleSystem { - id: sys1 - running: slide.visible - } - - ImageParticle { - system: sys1 - source: "images/particle.png" - color: "white" - colorVariation: 0.2 - alpha: 0 - } - - Emitter { - id: emitter - system: sys1 - - x: editor.cursorRectangle.x - editor.cursorRectangle.height / 2; - y: editor.cursorRectangle.y - width: editor.cursorRectangle.height - height: editor.cursorRectangle.height - enabled: false - - lifeSpan: 1000 - - velocity: PointDirection { xVariation: 30; yVariation: 30; } - acceleration: PointDirection {xVariation: 30; yVariation: 30; y: 100 } - - endSize: 0 - - size: 4 - sizeVariation: 2 - } - - } - - - - - } -} diff --git a/basicsuite/qt5-launchpresentation/DemoMain.qml b/basicsuite/qt5-launchpresentation/DemoMain.qml deleted file mode 100644 index 05454be..0000000 --- a/basicsuite/qt5-launchpresentation/DemoMain.qml +++ /dev/null @@ -1,139 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt 5 launch demo. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -import QtQuick 2.0 -import QtGraphicalEffects 1.0 - -Item { - id: demoMain; - - property bool useDropShadow: true; - property bool useSwirls: true; - property bool useSimpleGradient: false; - property bool autorun: false; - - width: 1280 - height: 720 - - NoisyGradient { - anchors.fill: parent; - gradient: Gradient { - GradientStop { position: 0.0; color: Qt.rgba(0.64 * 0.6, 0.82 * 0.6, 0.15 * 0.6) } - GradientStop { position: 1.0; color: "black" } - } - visible: !parent.useSimpleGradient - } - - Rectangle { - anchors.fill: parent; - gradient: Gradient { - GradientStop { position: 0.0; color: Qt.rgba(0.64, 0.82, 0.15) } - GradientStop { position: 1.0; color: "black" } - } - visible: parent.useSimpleGradient; - } - - Rectangle { - id: colorTable - width: 1 - height: 46 - color: "transparent" - - Column { - spacing: 2 - y: 1 - Rectangle { width: 1; height: 10; color: "white" } - Rectangle { width: 1; height: 10; color: Qt.rgba(0.64 * 1.4, 0.82 * 1.4, 0.15 * 1.4, 1); } - Rectangle { width: 1; height: 10; color: Qt.rgba(0.64, 0.82, 0.15); } - Rectangle { width: 1; height: 10; color: Qt.rgba(0.64 * 0.7, 0.82 * 0.7, 0.15 * 0.7); } - } - - layer.enabled: true - layer.smooth: true - visible: false; - } - - - Swirl - { - x: 0; - width: parent.width - height: parent.height * 0.2 - anchors.bottom: parent.bottom; - amplitude: height * 0.2; - colorTable: colorTable; - speed: 0.2; - opacity: 0.3 - visible: parent.useSwirls; - } - - Timer { - interval: 20000 - running: parent.autorun - repeat: true - - onTriggered: { - var from = slides.currentSlide; - var to = from == slides.slides.length - 1 ? 1 : from + 1; - slides.switchSlides(slides.slides[from], slides.slides[to], true); - slides.currentSlide = to; - } - } - - SlideDeck { - id: slides - titleColor: "white" - textColor: "white" - anchors.fill: parent - layer.enabled: parent.useDropShadow - layer.effect: DropShadow { - horizontalOffset: slides.width * 0.005; - verticalOffset: slides.width * 0.005; - radius: 16.0 - samples: 16 - fast: true - color: Qt.rgba(0.0, 0.0, 0.0, 0.7); - } - } - - - -} diff --git a/basicsuite/qt5-launchpresentation/EffectsSlide.qml b/basicsuite/qt5-launchpresentation/EffectsSlide.qml deleted file mode 100644 index 0355284..0000000 --- a/basicsuite/qt5-launchpresentation/EffectsSlide.qml +++ /dev/null @@ -1,203 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt 5 launch demo. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -import QtQuick 2.0 -import QtGraphicalEffects 1.0 - -import "presentation" - -Slide { - id: slide - - title: "Qt Graphical Effects" - writeInText: "The Qt Graphical Effects module includes a wide range of effects:" - - property real t; - SequentialAnimation on t { - NumberAnimation { from: 0; to: 1; duration: 5000; easing.type: Easing.InOutCubic } - NumberAnimation { from: 1; to: 0; duration: 5000; easing.type: Easing.InOutCubic } - loops: Animation.Infinite - running: slide.visible; - } - - SequentialAnimation { - PropertyAction { target: grid; property: "opacity"; value: 0 } - PauseAnimation { duration: 1500 } - NumberAnimation { target: grid; property: "opacity"; to: 1; duration: 2000; easing.type: Easing.InOutCubic } - running: slide.visible; - } - - Grid { - id: grid; - - opacity: 0; - - width: parent.width - height: parent.height * 0.84 - anchors.bottom: parent.bottom; - - property real cw: width / columns - property real ch: height / rows; - - property int fontSize: slide.baseFontSize * 0.5 - - columns: 4 - rows: 2 - - Item { - width: grid.cw - height: grid.ch - Text { text: "Original"; color: "white"; font.pixelSize: grid.fontSize; anchors.horizontalCenter: noEffect.horizontalCenter } - Image { - id: noEffect; - source: "images/butterfly.png" - width: grid.cw * 0.9 - fillMode: Image.PreserveAspectFit - } - } - - Column { - Glow { - id: glowEffect - radius: 4 - samples: 4 - spread: slide.t - source: noEffect - width: grid.cw * 0.9 - height: width; - Text { text: "Glow"; color: "white"; font.pixelSize: grid.fontSize; anchors.top: parent.top; anchors.horizontalCenter: parent.horizontalCenter; } - } - } - - Column { - InnerShadow { - id: innerShadowEffect - radius: slide.t * 16; - samples: 16 - color: "black" - source: noEffect - width: grid.cw * 0.9 - height: width; - Text { text: "InnerShadow"; color: "white"; font.pixelSize: grid.fontSize; anchors.top: parent.top; anchors.horizontalCenter: parent.horizontalCenter; } - } - } - - Column { - GaussianBlur { - id: blurEffect - radius: slide.t * samples; - samples: 8 - source: noEffect - width: grid.cw * 0.9 - height: width; - Text { text: "GaussianBlur"; color: "white"; font.pixelSize: grid.fontSize; anchors.top: parent.top; anchors.horizontalCenter: parent.horizontalCenter; } - } - } - - Column { - ThresholdMask { - id: thresholdEffect - maskSource: Image { source: "images/fog.png" } - threshold: slide.t * 0.5 + 0.2; - spread: 0.2 - source: noEffect - width: grid.cw * 0.9 - height: width; - Text { text: "ThresholdMask"; color: "white"; font.pixelSize: grid.fontSize; anchors.top: parent.top; anchors.horizontalCenter: parent.horizontalCenter; } - } - } - - Column { - BrightnessContrast { - id: brightnessEffect - brightness: Math.sin(slide.t * 2 * Math.PI) * 0.5; - contrast: Math.sin(slide.t * 4 * Math.PI) * 0.5; - source: noEffect - width: grid.cw * 0.9 - height: width; - Text { text: "BrightnessContrast"; color: "white"; font.pixelSize: grid.fontSize; anchors.top: parent.top; anchors.horizontalCenter: parent.horizontalCenter; } - } - } - - Column { - Colorize { - id: colorizeEffect - hue: slide.t - source: noEffect - width: grid.cw * 0.9 - height: width; - Text { text: "Colorize"; color: "white"; font.pixelSize: grid.fontSize; anchors.top: parent.top; anchors.horizontalCenter: parent.horizontalCenter; } - } - } - - Column { - OpacityMask { - - Item { - id: maskSource; - anchors.fill: parent; - Rectangle { - anchors.fill: parent; - opacity: slide.t; - } - - Text { - text: "Qt 5" - font.pixelSize: parent.height * 0.15 - font.bold: true; - font.underline: true; - anchors.centerIn: parent; - rotation: 70 - } - visible: false; - } - - id: opacityMaskEffect - source: noEffect - maskSource: maskSource; - width: grid.cw * 0.9 - height: width; - Text { text: "OpacityMask"; color: "white"; font.pixelSize: grid.fontSize; anchors.top: parent.top; anchors.horizontalCenter: parent.horizontalCenter; } - } - } - } - -} diff --git a/basicsuite/qt5-launchpresentation/ExamplesSlide.qml b/basicsuite/qt5-launchpresentation/ExamplesSlide.qml deleted file mode 100644 index 4540532..0000000 --- a/basicsuite/qt5-launchpresentation/ExamplesSlide.qml +++ /dev/null @@ -1,89 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt 5 launch demo. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import "presentation" - -Slide -{ - id: slide - - title: "Qt Quick 2" - - Row { - anchors.fill: parent - - spacing: (width - 320 * 3) / 2 - - Item { - width: 320 - height: 480 - clip: true - Loader { - id: load1 - } - } - - Item { - width: 320 - height: 480 - clip: true; - Loader { - id: load2 - } - } - - Loader { - id: load3 - } - } - - onVisibleChanged: { - if (visible) { - load1.source = "maroon/Maroon.qml" - load2.source = "samegame/Samegame.qml" - load3.source = "calqlatr/Calqlatr.qml" - } else { - load1.source = "" - load2.source = "" - load3.source = "" - } - } -} diff --git a/basicsuite/qt5-launchpresentation/FontSlide.qml b/basicsuite/qt5-launchpresentation/FontSlide.qml deleted file mode 100644 index ce98779..0000000 --- a/basicsuite/qt5-launchpresentation/FontSlide.qml +++ /dev/null @@ -1,98 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt 5 launch demo. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import "presentation" - -Slide { - id: fontSlide; - title: "Qt Quick - Fonts" - writeInText: "The default font rendering in Qt Quick 2.0 uses distance fields, making\nit possible to do fully transformable text with subpixel positioning and\nsubpixel antialiasing. - -Native font rendering is also an option for applications that want to look native." - - Rectangle { - id: textRoot - anchors.centerIn: parent - anchors.horizontalCenterOffset: parent.width * 0.2 - anchors.verticalCenterOffset: parent.width * 0.1 - - width: 120 - height: 40 - - color: "transparent" - border.color: "white" - border.width: 1 - - Text { - anchors.centerIn: parent - - text: "Awesome!" - color: "white" - - font.pixelSize: 20; - - SequentialAnimation on scale { - NumberAnimation { to: 4; duration: 2508; easing.type: Easing.OutElastic } - NumberAnimation { to: 1; duration: 2508; easing.type: Easing.OutElastic } - PauseAnimation { duration: 1000 } - loops: Animation.Infinite - running: fontSlide.visible - } - - NumberAnimation on rotation { from: 0; to: 360; duration: 10000; loops: Animation.Infinite; easing.type: Easing.InOutCubic; running: fontSlide.visible } - } - } - - ShaderEffectSource { - width: textRoot.width - height: textRoot.height - sourceItem: textRoot - anchors.bottom: parent.bottom; - anchors.left: parent.left; - smooth: false - transformOrigin: Item.BottomLeft; - - visible: true - - scale: 4; - } - -} diff --git a/basicsuite/qt5-launchpresentation/NoisyGradient.qml b/basicsuite/qt5-launchpresentation/NoisyGradient.qml deleted file mode 100644 index 904f14e..0000000 --- a/basicsuite/qt5-launchpresentation/NoisyGradient.qml +++ /dev/null @@ -1,92 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt 5 launch demo. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 - -ShaderEffect { - - id: effectRoot; - - width: 1280 - height: 720 - - property Gradient gradient: Gradient { - GradientStop { position: 0; color: "white" } - GradientStop { position: 0.4; color: "blue" } - GradientStop { position: 1.0; color: "black" } - } - - Rectangle { - id: colorTable - width: 1 - height: 128; - - gradient: effectRoot.gradient; - - layer.enabled: true - layer.smooth: true - - visible: false; - } - - property variant source: colorTable; - - blending: false; - - fragmentShader:" - #ifdef GL_ES - precision lowp float; - #endif - - uniform lowp sampler2D source; - uniform lowp float qt_Opacity; - varying highp vec2 qt_TexCoord0; - - // Noise function from: http://stackoverflow.com/questions/4200224/random-noise-functions-for-glsl - float rand(vec2 n) { - return 0.5 + 0.5 * fract(sin(dot(n.xy, vec2(12.9898, 78.233))) * 43758.5453); - } - - void main() { - lowp float len = clamp(length(vec2(0.5, 0.0) - qt_TexCoord0), 0.0, 1.0); - gl_FragColor = texture2D(source, vec2(0, len)) * qt_Opacity + rand(qt_TexCoord0) * 0.05; - } -" -} diff --git a/basicsuite/qt5-launchpresentation/NormalMapGenerator.qml b/basicsuite/qt5-launchpresentation/NormalMapGenerator.qml deleted file mode 100644 index c6f55c7..0000000 --- a/basicsuite/qt5-launchpresentation/NormalMapGenerator.qml +++ /dev/null @@ -1,92 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt 5 launch demo. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtGraphicalEffects 1.0 - -ShaderEffect { - id: effectRoot; - - property alias source: blurShader.source; - - GaussianBlur - { - id: blurShader; - width: source != undefined ? source.width : 0 - height: source != undefined ? source.height : 0 - samples: 8 - radius: 8 - - layer.enabled: true; - layer.smooth: true; - - visible: false; - } - - width: 256 - height: 128 - - property variant tex: blurShader; - property size pixelSize: Qt.size(1 / blurShader.width, 1 / blurShader.height); - - fragmentShader: " - #ifdef GL_ES - precision lowp float; - #endif - - uniform lowp float qt_Opacity; - uniform lowp sampler2D tex; - uniform highp vec2 pixelSize; - varying highp vec2 qt_TexCoord0; - void main() { - - lowp vec2 xps = vec2(pixelSize.x, 0.0); - vec3 vx = vec3(1, 0, texture2D(tex, qt_TexCoord0 + xps).x - texture2D(tex, qt_TexCoord0 - xps).x); - - lowp vec2 yps = vec2(0.0, pixelSize.y); - vec3 vy = vec3(0, 1, texture2D(tex, qt_TexCoord0 + yps).x - texture2D(tex, qt_TexCoord0 - yps).x); - - vec3 n = normalize(cross(vx, vy)) * 0.5 + 0.5; - - gl_FragColor = vec4(n, 1); - } - " - -} diff --git a/basicsuite/qt5-launchpresentation/OpacityTransitionPresentation.qml b/basicsuite/qt5-launchpresentation/OpacityTransitionPresentation.qml deleted file mode 100644 index 542ec6f..0000000 --- a/basicsuite/qt5-launchpresentation/OpacityTransitionPresentation.qml +++ /dev/null @@ -1,104 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt 5 launch demo. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -import QtQuick 2.0 -import "presentation" - -Presentation { - - id: deck - - width: 1280 - height: 720 - - property bool inTransition: false; - - property variant fromSlide: Item { } - property variant toSlide: Item { } - - property int transitionTime: 500; - - SequentialAnimation { - id: forwardTransition - PropertyAction { target: deck; property: "inTransition"; value: true } - PropertyAction { target: toSlide; property: "visible"; value: true } - ParallelAnimation { - NumberAnimation { target: fromSlide; property: "opacity"; from: 1; to: 0; duration: deck.transitionTime; easing.type: Easing.OutQuart } - NumberAnimation { target: fromSlide; property: "scale"; from: 1; to: 1.1; duration: deck.transitionTime; easing.type: Easing.InOutQuart } - NumberAnimation { target: toSlide; property: "opacity"; from: 0; to: 1; duration: deck.transitionTime; easing.type: Easing.InQuart } - NumberAnimation { target: toSlide; property: "scale"; from: 0.7; to: 1; duration: deck.transitionTime; easing.type: Easing.InOutQuart } - } - PropertyAction { target: fromSlide; property: "visible"; value: false } - PropertyAction { target: fromSlide; property: "scale"; value: 1 } - PropertyAction { target: deck; property: "inTransition"; value: false } - } - SequentialAnimation { - id: backwardTransition - running: false - PropertyAction { target: deck; property: "inTransition"; value: true } - PropertyAction { target: toSlide; property: "visible"; value: true } - ParallelAnimation { - NumberAnimation { target: fromSlide; property: "opacity"; from: 1; to: 0; duration: deck.transitionTime; easing.type: Easing.OutQuart } - NumberAnimation { target: fromSlide; property: "scale"; from: 1; to: 0.7; duration: deck.transitionTime; easing.type: Easing.InOutQuart } - NumberAnimation { target: toSlide; property: "opacity"; from: 0; to: 1; duration: deck.transitionTime; easing.type: Easing.InQuart } - NumberAnimation { target: toSlide; property: "scale"; from: 1.1; to: 1; duration: deck.transitionTime; easing.type: Easing.InOutQuart } - } - PropertyAction { target: fromSlide; property: "visible"; value: false } - PropertyAction { target: fromSlide; property: "scale"; value: 1 } - PropertyAction { target: deck; property: "inTransition"; value: false } - } - - function switchSlides(from, to, forward) - { - if (deck.inTransition) - return false - - deck.fromSlide = from - deck.toSlide = to - - if (forward) - forwardTransition.running = true - else - backwardTransition.running = true - - return true - } -} diff --git a/basicsuite/qt5-launchpresentation/ParticleSlide.qml b/basicsuite/qt5-launchpresentation/ParticleSlide.qml deleted file mode 100644 index 2569a17..0000000 --- a/basicsuite/qt5-launchpresentation/ParticleSlide.qml +++ /dev/null @@ -1,86 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt 5 launch demo. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import "presentation" - -Slide -{ - id: slide - - title: "Qt Quick - Particle System" - - Row { - anchors.fill: parent - - SequentialAnimation on opacity { - running: slide.visible; - PropertyAction { value: 0 } - PauseAnimation { duration: 2000; } - NumberAnimation { to: 1; duration: 1000 } - } - - spacing: (width - 320 * 3) / 2 - - Loader { - id: load1 - } - - Loader { - id: load2 - } - - Loader { - id: load3 - } - } - - onVisibleChanged: { - if (visible) { - load1.source = "particles/velocityfrommotion.qml" - load2.source = "particles/customemitter.qml" - load3.source = "particles/emitmask.qml" - } else { - load1.source = "" - load2.source = "" - load3.source = "" - } - } -} diff --git a/basicsuite/qt5-launchpresentation/README b/basicsuite/qt5-launchpresentation/README deleted file mode 100644 index 6b3f927..0000000 --- a/basicsuite/qt5-launchpresentation/README +++ /dev/null @@ -1,51 +0,0 @@ -This project contains quick tour of Qt 5.0, primarily focusing on its -graphical capabilities. - - - ------------------------------------------------------------------------- - Requirements: - - - Qt 5, including QtDeclarative, QtGraphicalEffects and QtMultimedia. - Commercial URL: http://qt.digia.com - Open Source URL: http://qt-project.org - - - The QML Presentation System: - URL: https://qt.gitorious.org/qt-labs/qml-presentation-system - git: git clone https://git.gitorious.org/qt-labs/qml-presentation-system.git - - - A movie file called 'bunny.mov' in the same directory as the - main.qml file. The demo will run without, but the Video slide will - not show anything. - - - ------------------------------------------------------------------------- - Running: - -To run the demo, start it using the Qt Quick 2.0 'qmlscene' tool. - -> qmlscene main.qml - -The demo includes a slightly fancy fullscreen gradient and a rather -computationally intensive drop shadow which can be too much for -low-end GPUs. On these systems, one could try to use the 'lofi' -launcher instead. - -> qmlscene main_lofi.qml - -It is possible to tweak the parameters of the main file also. - - - ------------------------------------------------------------------------- - Troubleshooting: - -For a -developer-build of Qt, the webkit plugin and QtWebProcess will -be located inside the qtwebkit module, rather than inside QtBase, the plugin -must be added to the QML import path and the path to QtWebProcess must be -added to PATH for the demo to run. - -The slides have been written for the resolution 1280x720. When resized -some of the spacing and content will look a bit odd. Any patches to -fix this will be welcomed :) \ No newline at end of file diff --git a/basicsuite/qt5-launchpresentation/ShaderSlide.qml b/basicsuite/qt5-launchpresentation/ShaderSlide.qml deleted file mode 100644 index 206cd9e..0000000 --- a/basicsuite/qt5-launchpresentation/ShaderSlide.qml +++ /dev/null @@ -1,197 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt 5 launch demo. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import "presentation" - - -Slide { - id: slide - - title: "Qt Quick - ShaderEffect" - - writeInText: "Harness the raw power of the graphics processor. The ShaderEffect\nelement lets you write GLSL inline in your QML files." - - Image { - id: sourceItem - source: "images/ally.png" - visible: false - } - - SequentialAnimation { - id: kickoffAnimation - - // setup - PropertyAction { target: rotationAnimation; property: "running"; value: false } - PropertyAction { target: timeAnimation; property: "running"; value: false } - PropertyAction { target: shader; property: "amp"; value: 0 } - PropertyAction { target: shader; property: "xrot"; value: 0 } - PropertyAction { target: shader; property: "zrot"; value: 0 } - PropertyAction { target: shader; property: "time"; value: 0 } - PropertyAction { target: shader; property: "scale"; value: 1; } - PropertyAction { target: rotationAnimation; property: "running"; value: false } - PropertyAction { target: timeAnimation; property: "running"; value: false } - // short pause - PauseAnimation { duration: 2000 } - // get started... - ParallelAnimation { - NumberAnimation { target: shader; property: "xrot"; to: 2 * Math.PI / 8; duration: 1000; easing.type: Easing.InOutCubic } - NumberAnimation { target: shader; property: "amp"; to: 0.1; duration: 1000; easing.type: Easing.InOutCubic } -// NumberAnimation { target: shader; property: "scale"; to: 1.5; duration: 1000; easing.type: Easing.InOutCubic } - PropertyAction { target: rotationAnimation; property: "running"; value: true } - PropertyAction { target: timeAnimation; property: "running"; value: true } - } - - running: slide.visible; - } - - - ShaderEffect { - id: shader - width: height - height: parent.height - anchors.centerIn: parent; - anchors.verticalCenterOffset: slide.height * 0.1 - - blending: true - - mesh: "50x50" - - property variant size: Qt.size(width, height); - - property variant source: sourceItem; - - property real amp: 0 - - property real xrot: 0; // 2 * Math.PI / 8; -// NumberAnimation on xrot { from: 0; to: Math.PI * 2; duration: 3000; loops: Animation.Infinite } - - property real zrot: 0 - NumberAnimation on zrot { - id: rotationAnimation - from: 0; - to: Math.PI * 2; - duration: 20000; - loops: Animation.Infinite - easing.type: Easing.InOutCubic - running: false; - } - - property real time: 0 - NumberAnimation on time { - id: timeAnimation - from: 0; - to: Math.PI * 2; - duration: 3457; - loops: Animation.Infinite - running: false; - } - - vertexShader: " - attribute highp vec4 qt_Vertex; - attribute highp vec2 qt_MultiTexCoord0; - uniform highp mat4 qt_Matrix; - uniform highp float xrot; - uniform highp float zrot; - uniform highp vec2 size; - uniform highp float time; - uniform highp float amp; - varying lowp vec2 v_TexCoord; - varying lowp float v_light; - void main() { - highp float xcosa = cos(xrot); - highp float xsina = sin(xrot); - - highp mat4 xrot = mat4(1, 0, 0, 0, - 0, xcosa, xsina, 0, - 0, -xsina, xcosa, 0, - 0, 0, 0, 1); - - highp float zcosa = cos(zrot); - highp float zsina = sin(zrot); - - highp mat4 zrot = mat4(zcosa, zsina, 0, 0, - -zsina, zcosa, 0, 0, - 0, 0, 1, 0, - 0, 0, 0, 1); - - highp float near = 2.; - highp float far = 6.; - highp float fmn = far - near; - - highp mat4 proj = mat4(near, 0, 0, 0, - 0, near, 0, 0, - 0, 0, -(far + near) / fmn, -1., - 0, 0, -2. * far * near / fmn, 1); - - highp mat4 model = mat4(2, 0, 0, 0, - 0, 2, 0, 0, - 0, 0, 2, 0, - 0, -.5, -4, 1); - - vec4 nLocPos = vec4(qt_Vertex.xy * 2.0 / size - 1.0, 0, 1); - nLocPos.z = cos(nLocPos.x * 5. + time) * amp; - - vec4 pos = proj * model * xrot * zrot * nLocPos; - pos = vec4(pos.xyx/pos.w, 1); - - gl_Position = qt_Matrix * vec4((pos.xy + 1.0) / 2.0 * size , 0, 1); - - v_TexCoord = qt_MultiTexCoord0; - - - v_light = dot(normalize(vec3(-sin(nLocPos.x * 5.0 + time) * 5.0 * amp, 0, -1)), vec3(0, 0, -1)); - } - " - - fragmentShader: " - uniform lowp sampler2D source; - uniform lowp float qt_Opacity; - varying highp vec2 v_TexCoord; - varying lowp float v_light; - void main() { - highp vec4 c = texture2D(source, v_TexCoord); - gl_FragColor = (vec4(pow(v_light, 16.0)) * 0.3 + c) * qt_Opacity; - } - " - - } - -} diff --git a/basicsuite/qt5-launchpresentation/SlideDeck.qml b/basicsuite/qt5-launchpresentation/SlideDeck.qml deleted file mode 100644 index d9b76ce..0000000 --- a/basicsuite/qt5-launchpresentation/SlideDeck.qml +++ /dev/null @@ -1,232 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt 5 launch demo. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -import QtQuick 2.0 -import QtGraphicalEffects 1.0 - -import "presentation" - -OpacityTransitionPresentation { - id: presentation - - width: 1280 - height: 720 - - transitionTime: 2000 - - - /******************************************************************************** - * - * Introduction - * - */ - -/* - Rectangle { - id: openingSlideBlackout - color: "black" - anchors.fill: parent; - Behavior on opacity { NumberAnimation { duration: 1000 } } - } - - onCurrentSlideChanged: { - if (currentSlide < 2) - openingSlideBlackout.opacity = 1; - else - openingSlideBlackout.opacity = 0; - } - - - Slide { - - } -*/ - - Slide { - id: introSlide - - writeInText: "The following is a quick tour of what is new in Qt 5. - -It is an application written with Qt Quick, based on Qt 5. The source code is available from: -https://qt.gitorious.org/qt-labs/qt5-launch-demo - -We hope you will enjoy Qt 5 as much as we have enjoyed creating it. - -[tap to advance]" - -// Image { -// source: "images/qt-logo.png" -// opacity: 0.4 -// z: -1 -// anchors.centerIn: parent -// } - } - - Slide { - centeredText: "Introducing" - fontScale: 2 - } - - Slide { - centeredText: "Qt 5" - fontScale: 4; - } - - - Slide { - writeInText: "OpenGL-based scene graph for Qt Quick 2.0 - providing velvet animations, particles and impressive graphical effects - -Multimedia - Audio, Video and Camera support on all major platforms - -WebKit - Full HTML 5 support from the world's most popular web engine" - - } - - Slide { - writeInText: "C++ language features - template-based connect(), C++11 support - -Connectivity and Networking - DNS lookup, improved IPv6 support - -JSON Support - Fast parser and writer, binary format support" - } - - Slide { - writeInText: "Modularization of the Qt libraries - sanitizing our codebase and simplifying deployment - -Qt Platform Abstraction - Unifying the Qt codebase across platforms, minimizing the porting effort for new platforms - -Wayland support - Wayland-compatible Qt backend and compositor framework" - } - - - WidgetsSlide { } - - - - - /******************************************************************************** - * - * Qt Quick Graphics Stack - * - */ - ExamplesSlide { } - - FontSlide { } - CanvasSlide { } - ParticleSlide { } - ShaderSlide { } - - - - /******************************************************************************** - * - * Qt Graphical Effects - * - */ - - EffectsSlide {} - -// /******************************************************************************** -// * -// * Multimedia -// * -// */ - -// Slide { -// title: "Qt Multimedia" -// writeInText: "The Qt Multmedia module is implemented on all our major platforms, including Windows, Mac OS X and Linux. - -//It contains both a C++ API for use with existing Qt Widgets based applications and a QML API for use with Qt Quick 2.0. - -//The features include recording and playback of video and audio and also use of camera. - -//It also integrates nicely with the Qt Graphical Effects module." -// } - -// VideoSlide { } -// CameraSlide { } - - - - - /******************************************************************************** - * - * WebKit - * - */ - -// WebkitSlide { } - - - - /******************************************************************************** - * - * The End - * - */ - - Slide { - title: "Links" - content: [ - "Qt Project: qt-project.org", - "Qt by Digia: qt.digia.com", - "Follow us on Twitter", - " @QtProject", - " @QtCommercial", - "Find us on Facebook:", - " Qt Project", - " Qt by Digia", - "This demo: https://qt.gitorious.org/qt-labs/qt5-launch-demo" - ]; - - Image { - z: -1 - opacity: 0.7 - source: "images/qt-logo.png" - anchors.top: parent.top - anchors.right: parent.right - anchors.rightMargin: parent.width * 0.15 - fillMode: Image.PreserveAspectFit - } - - } - -} diff --git a/basicsuite/qt5-launchpresentation/Swirl.qml b/basicsuite/qt5-launchpresentation/Swirl.qml deleted file mode 100644 index 710f04b..0000000 --- a/basicsuite/qt5-launchpresentation/Swirl.qml +++ /dev/null @@ -1,116 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt 5 launch demo. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 - -ShaderEffect { - id: shader - - width: 400 - height: 300 - - property real speed: 1 - - property color d: Qt.rgba(Math.random() * 0.7, - Math.random() * 0.5, - Math.random() * 0.7, - Math.random() * 0.5) - property real tx - NumberAnimation on tx { from: 0; to: Math.PI * 2; duration: (Math.random() * 30 + 30) * 1000 / speed; loops: Animation.Infinite } - property real ty - NumberAnimation on ty { from: 0; to: Math.PI * 2; duration: (Math.random() * 30 + 30) * 1000 / speed; loops: Animation.Infinite } - property real tz - NumberAnimation on tz { from: 0; to: Math.PI * 2; duration: (Math.random() * 30 + 30) * 1000 / speed; loops: Animation.Infinite } - property real tw - NumberAnimation on tw { from: 0; to: Math.PI * 2; duration: (Math.random() * 30 + 30) * 1000 / speed; loops: Animation.Infinite } - - property real amplitude: height / 2 - - property variant colorTable: ShaderEffectSource { sourceItem: Rectangle { width: 4; height: 4; color: "green" } } - - fragmentShader: " - uniform lowp float qt_Opacity; - uniform lowp sampler2D colorTable; - varying highp vec2 qt_TexCoord0; - varying lowp float xx; - - void main() { - gl_FragColor = texture2D(colorTable, qt_TexCoord0); - gl_FragColor.xyz += xx * 0.1; - gl_FragColor *= qt_Opacity; - } - " - - vertexShader: " - uniform lowp vec4 d; - uniform highp float tx; - uniform highp float ty; - uniform highp float tz; - uniform highp float tw; - uniform highp float amplitude; - uniform highp mat4 qt_Matrix; - attribute highp vec4 qt_Vertex; - attribute highp vec2 qt_MultiTexCoord0; - varying highp vec2 qt_TexCoord0; - varying lowp float xx; - void main() { - highp vec4 pos = qt_Vertex; - - highp float y = sin(-tx + d.x * qt_MultiTexCoord0.x * 57. + 12. * d.y) - + sin(ty * 2.0 + d.z * qt_MultiTexCoord0.x * 21. + 5. * d.w) - + sin(tz * 4.0 + d.y * qt_MultiTexCoord0.x * 13. + 7.0 * d.x) - + sin(-ty * 8.0 + d.w * qt_MultiTexCoord0.x * 29. + 15. * d.z); - highp float x = sin(-tx + d.x * qt_MultiTexCoord0.x * 213. + 15. * d.y) - + sin(ty * 2.0 + d.z * qt_MultiTexCoord0.x * 107. + 12. * d.w) - + sin(tz * 4.0 + d.y * qt_MultiTexCoord0.x * 13. + 5. * d.x) - + sin(-ty * 8.0 + d.w * qt_MultiTexCoord0.x * 15. + 7. * d.z); - xx = x; - - pos.xy += vec2(x * sin(qt_MultiTexCoord0.x * 3.14152) * 0.3, - y * (1.0 - qt_MultiTexCoord0.y)) * amplitude; - - gl_Position = qt_Matrix * pos; - qt_TexCoord0 = qt_MultiTexCoord0; - } - " - - mesh: GridMesh { resolution: Qt.size(width / 10, 4) } - -} diff --git a/basicsuite/qt5-launchpresentation/VideoSlide.qml b/basicsuite/qt5-launchpresentation/VideoSlide.qml deleted file mode 100644 index a7aac8a..0000000 --- a/basicsuite/qt5-launchpresentation/VideoSlide.qml +++ /dev/null @@ -1,116 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt 5 launch demo. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtMultimedia 5.0 -import "presentation" - -import QtGraphicalEffects 1.0 - -Slide { - - id: slide - - title: "Qt Multimedia - Video" - - Video { - id: video - - anchors.fill: parent - source: "bunny.mov" - autoLoad: true; - - layer.enabled: true; - layer.smooth: true; - layer.effect: Displace { - displacementSource: normalMap - displacement: button.pressed ? 1.0 : 0.0 - Behavior on displacement { - NumberAnimation { duration: 1000 } - } - } - } - - Rectangle { - id: theItem; - width: 256 - height: 128 - color: "transparent" - Text { - id: label - color: "white" - text: "Qt 5" -// font.family: "Times New Roman" - font.bold: true; - font.pixelSize: 80 - anchors.centerIn: parent - } - visible: false; - } - - NormalMapGenerator { - anchors.left: theItem.right - width: 256 - height: 128 - id: normalMap - source: theItem; - visible: false - } - - centeredText: video.hasVideo ? "" : "'bunny.mov' is not found or cannot be played: " + video.errorString - - onVisibleChanged: { - if (slide.visible) - video.play(); - else - video.pause(); - } - - Button { - id: button - anchors.bottom: video.bottom - anchors.horizontalCenter: video.horizontalCenter - anchors.bottomMargin: height / 2; - label: pressed ? "Remove Effect" : "Displacement Effect"; - width: height * 4; - height: parent.height * 0.1 - } - -} diff --git a/basicsuite/qt5-launchpresentation/WebKitSlideContent.qml b/basicsuite/qt5-launchpresentation/WebKitSlideContent.qml deleted file mode 100644 index ceb103f..0000000 --- a/basicsuite/qt5-launchpresentation/WebKitSlideContent.qml +++ /dev/null @@ -1,124 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: For any questions to Digia, please use the contact form at -** http://qt.digia.com/ -** -** This file is part of the examples of the Qt Enterprise Embedded. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Particles 2.0 -import QtWebKit 3.0 - -Item { - id: slide - - anchors.fill: parent; - - WebView { - id: browser - anchors.fill: parent - url: editor.text - - // This works around rendering bugs in webkit. CSS animations - // and webGL content gets a bad offset, but this hack - // clips it so it is not visible. Not ideal, but it kinda works - // for now. - layer.enabled: true - layer.smooth: true - } - - Rectangle { - border.width: 2 - border.color: "black" - opacity: 0.5 - color: "black" - anchors.fill: editor - anchors.margins: -editor.height * 0.2; - - radius: -anchors.margins - antialiasing: true - } - - TextInput { - id: editor - anchors.top: browser.bottom; - anchors.horizontalCenter: browser.horizontalCenter - font.pixelSize: slide.height * 0.05; - text: "http://qt.digia.com" - onAccepted: browser.reload(); - color: "white" - - onCursorPositionChanged: { - var rect = positionToRectangle(cursorPosition); - emitter.x = rect.x; - emitter.y = rect.y; - emitter.width = rect.width; - emitter.height = rect.height; - emitter.burst(10); - } - - ParticleSystem { - id: sys1 - running: slide.visible - } - - ImageParticle { - system: sys1 - source: "images/particle.png" - color: "white" - colorVariation: 0.2 - alpha: 0 - } - - Emitter { - id: emitter - system: sys1 - - enabled: false - - lifeSpan: 2000 - - velocity: PointDirection { xVariation: 30; yVariation: 30; } - acceleration: PointDirection {xVariation: 30; yVariation: 30; y: 100 } - - endSize: 0 - - size: 8 - sizeVariation: 2 - } - } - -} diff --git a/basicsuite/qt5-launchpresentation/WebkitSlide.qml b/basicsuite/qt5-launchpresentation/WebkitSlide.qml deleted file mode 100644 index 9febcdf..0000000 --- a/basicsuite/qt5-launchpresentation/WebkitSlide.qml +++ /dev/null @@ -1,59 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: For any questions to Digia, please use the contact form at -** http://qt.digia.com/ -** -** This file is part of the examples of the Qt Enterprise Embedded. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -import QtQuick 2.0 -import "presentation" - -Slide { - id: slide - - title: "Qt WebKit - WebView" - - Loader { - id: webkitLoader - - anchors.fill: parent - - source: "WebKitSlideContent.qml" - } - - centeredText: webkitLoader.status == Loader.Error ? "Qt WebKit not installed or otherwise failed to load" : "" -} - diff --git a/basicsuite/qt5-launchpresentation/WidgetsSlide.qml b/basicsuite/qt5-launchpresentation/WidgetsSlide.qml deleted file mode 100644 index 20f0770..0000000 --- a/basicsuite/qt5-launchpresentation/WidgetsSlide.qml +++ /dev/null @@ -1,152 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt 5 launch demo. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import "presentation" - -Slide { - id: slide - - writeInText: "The Qt Widgets are working better than ever with accessibility\nimprovements and retina display support." - - property int slamTime: 800; - property int waitTime: 500; - - y: parent.height * 0.1 - - SequentialAnimation { - id: widgetAnimation - ScriptAction { script: { - boxesImage.opacity = 0; - mainwindowsImage.opacity = 0; - chipsWindow.opacity = 0; - stylesWindow.opacity = 0; - } - } - PauseAnimation { duration: 3000 } - ParallelAnimation { - NumberAnimation { target: boxesImage; property: "opacity"; from: 0; to: 1; duration: slide.slamTime; easing.type: Easing.OutBack } - NumberAnimation { target: boxesImage; property: "rotation"; from: 20; to: 10; duration: slide.slamTime; easing.type: Easing.OutBack } - NumberAnimation { target: boxesImage; property: "scale"; from: 2; to: 1.5; duration: slide.slamTime; easing.type: Easing.OutBack } - } - PauseAnimation { duration: slide.waitTime } - ParallelAnimation { - NumberAnimation { target: mainwindowsImage; property: "opacity"; from: 0; to: 1; duration: slide.slamTime; easing.type: Easing.OutBack } - NumberAnimation { target: mainwindowsImage; property: "rotation"; from: -35; to: -20; duration: slide.slamTime; easing.type: Easing.OutBack} - NumberAnimation { target: mainwindowsImage; property: "scale"; from: 2; to: 1.5; duration: slide.slamTime; easing.type: Easing.OutBack } - } - PauseAnimation { duration: slide.waitTime } - ParallelAnimation { - NumberAnimation { target: chipsWindow; property: "opacity"; from: 0; to: 1; duration: slide.slamTime; easing.type: Easing.InOutCubic } - NumberAnimation { target: chipsWindow; property: "rotation"; from: 10; to: 25; duration: slide.slamTime; easing.type: Easing.OutBack} - NumberAnimation { target: chipsWindow; property: "scale"; from: 2.5; to: 1.6; duration: slide.slamTime; easing.type: Easing.OutBack } - } - PauseAnimation { duration: slide.waitTime } - ParallelAnimation { - NumberAnimation { target: stylesWindow; property: "opacity"; from: 0; to: 1; duration: slide.slamTime; easing.type: Easing.InOutCubic } - NumberAnimation { target: stylesWindow; property: "rotation"; from: 30; to: -15; duration: slide.slamTime; easing.type: Easing.OutBack} - NumberAnimation { target: stylesWindow; property: "scale"; from: 1.8; to: 1.4; duration: slide.slamTime; easing.type: Easing.OutBack } - } - running: false - } - - onVisibleChanged: { - widgetAnimation.running = slide.visible; - } - - Row { - x: slide.width * 0.05 - y: slide.height * 0.65; - width: parent.width - Image { - id: boxesImage; - source: "images/widgets_boxes.png" - fillMode: Image.PreserveAspectFit - width: slide.width * .2 - antialiasing: true - opacity: 0; - y: -slide.height * 0.2 - rotation: 10 - scale: 1.5; - } - Image { - id: mainwindowsImage - source: "images/widgets_mainwindows.png" - fillMode: Image.PreserveAspectFit - width: slide.width * .2 - antialiasing: true - opacity: 0 - } - Image { - id: chipsWindow - source: "images/widgets_chips.png" - fillMode: Image.PreserveAspectFit - width: slide.width * .2 - x: slide.width * -0.05 - y: -slide.height * 0.2 - antialiasing: true - opacity: 0 - } - - Image { - id: stylesWindow - source: "images/widgets_styles_fusion.png" - fillMode: Image.PreserveAspectFit - width: slide.width * .2 - - x: slide.width * 1 - y: -slide.height * 0.1 - antialiasing: true - opacity: 0 - - Image { - source: "images/widgets_styles_macstyle.png" - fillMode: Image.PreserveAspectFit - width: slide.width * .2 - - x: parent.width * 0.3 - y: parent.width * 0.1 - rotation: -20 - antialiasing: true - } - } - } -} - diff --git a/basicsuite/qt5-launchpresentation/calqlatr/.DS_Store b/basicsuite/qt5-launchpresentation/calqlatr/.DS_Store deleted file mode 100644 index fe95b02..0000000 Binary files a/basicsuite/qt5-launchpresentation/calqlatr/.DS_Store and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/calqlatr/Calqlatr.qml b/basicsuite/qt5-launchpresentation/calqlatr/Calqlatr.qml deleted file mode 100644 index 7640fbd..0000000 --- a/basicsuite/qt5-launchpresentation/calqlatr/Calqlatr.qml +++ /dev/null @@ -1,110 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import "content" -import "content/calculator.js" as CalcEngine - - -Rectangle { - id: window - width: 320 - height: 480 - focus: true - color: "#272822" - - onWidthChanged: controller.reload() - - function operatorPressed(operator) { CalcEngine.operatorPressed(operator) } - function digitPressed(digit) { CalcEngine.digitPressed(digit) } - - Item { - id: pad - width: window.width * 0.58 - NumberPad { y: 10; anchors.horizontalCenter: parent.horizontalCenter } - } - - AnimationController { - id: controller - animation: ParallelAnimation { - id: anim - NumberAnimation { target: display; property: "x"; duration: 400; from: -16; to: window.width - display.width; easing.type: Easing.InOutQuad } - NumberAnimation { target: pad; property: "x"; duration: 400; from: window.width - pad.width; to: 0; easing.type: Easing.InOutQuad } - SequentialAnimation { - NumberAnimation { target: pad; property: "scale"; duration: 200; from: 1; to: 0.97; easing.type: Easing.InOutQuad } - NumberAnimation { target: pad; property: "scale"; duration: 200; from: 0.97; to: 1; easing.type: Easing.InOutQuad } - } - } - } - - Display { - id: display - x: -16 - width: window.width * 0.42 - height: parent.height - - MouseArea { - property real startX: 0 - property real oldP: 0 - property bool rewind: false - - anchors.fill: parent - onPositionChanged: { - var reverse = startX > window.width / 2 - var mx = mapToItem(window, mouse.x).x - var p = Math.abs((mx - startX) / (window.width - display.width)) - if (p < oldP) - rewind = reverse ? false : true - else - rewind = reverse ? true : false - controller.progress = reverse ? 1 - p : p - oldP = p - } - onPressed: startX = mapToItem(window, mouse.x).x - onReleased: { - if (rewind) - controller.completeToBeginning() - else - controller.completeToEnd() - } - } - } - -} diff --git a/basicsuite/qt5-launchpresentation/calqlatr/content/Button.qml b/basicsuite/qt5-launchpresentation/calqlatr/content/Button.qml deleted file mode 100644 index c355c2d..0000000 --- a/basicsuite/qt5-launchpresentation/calqlatr/content/Button.qml +++ /dev/null @@ -1,80 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 - -Item { - property alias text: textItem.text - property alias color: textItem.color - - property bool operator: false - - signal clicked - - width: 30 - height: 50 - - Text { - id: textItem - font.pixelSize: 48 - wrapMode: Text.WordWrap - lineHeight: 0.75 - color: "white" - } - -// Rectangle { -// color: "red" -// opacity: 0.2 -// anchors.fill: mouse -// } - - MouseArea { - id: mouse - anchors.fill: parent - anchors.margins: -5 - onClicked: { - //parent.clicked() - if (operator) - window.operatorPressed(parent.text) - else - window.digitPressed(parent.text) - } - } -} diff --git a/basicsuite/qt5-launchpresentation/calqlatr/content/Display.qml b/basicsuite/qt5-launchpresentation/calqlatr/content/Display.qml deleted file mode 100644 index 3c1d9c0..0000000 --- a/basicsuite/qt5-launchpresentation/calqlatr/content/Display.qml +++ /dev/null @@ -1,124 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 - -Item { - id: display - - function displayOperator(operator) - { - listView.model.append({ "operator": operator, "operand": "" }) - } - - function newLine(operator, operand) - { - listView.model.append({ "operator": operator, "operand": operand }) - } - - function appendDigit(digit) - { - if (!listView.model.count) - listView.model.append({ "operator": "", "operand": "" }) - var i = listView.model.count - 1; - listView.model.get(i).operand = listView.model.get(i).operand + digit; - } - - Item { - id: theItem - width: parent.width + 32 - height: parent.height - - Rectangle { - id: rect - x: 16 - color: "white" - height: parent.height - width: display.width - 16 - } - Image { - anchors.right: rect.left - source: "images/paper-edge-left.png" - height: parent.height - fillMode: Image.TileVertically - } - Image { - anchors.left: rect.right - source: "images/paper-edge-right.png" - height: parent.height - fillMode: Image.TileVertically - } - - Image { - source: "images/paper-grip.png" - anchors.horizontalCenter: parent.horizontalCenter - anchors.bottom: parent.bottom - anchors.bottomMargin: 20 - } - - ListView { - id: listView - x: 16; y: 30 - width: display.width - height: display.height - delegate: Item { - height: 20 - width: parent.width - Text { - id: operator - x: 8 - font.pixelSize: 18 - color: "#6da43d" - text: model.operator - } - Text { - id: operand - font.pixelSize: 18 - anchors.right: parent.right - anchors.rightMargin: 26 - text: model.operand - } - } - model: ListModel { } - } - - } - -} diff --git a/basicsuite/qt5-launchpresentation/calqlatr/content/NumberPad.qml b/basicsuite/qt5-launchpresentation/calqlatr/content/NumberPad.qml deleted file mode 100644 index 853c763..0000000 --- a/basicsuite/qt5-launchpresentation/calqlatr/content/NumberPad.qml +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 - -Grid { - columns: 3 - columnSpacing: 32 - rowSpacing: 16 - - Button { text: "7" } - Button { text: "8" } - Button { text: "9" } - Button { text: "4" } - Button { text: "5" } - Button { text: "6" } - Button { text: "1" } - Button { text: "2" } - Button { text: "3" } - Button { text: "0" } - Button { text: "." } - Button { text: " " } - Button { text: "±"; color: "#6da43d"; operator: true } - Button { text: "−"; color: "#6da43d"; operator: true } - Button { text: "+"; color: "#6da43d"; operator: true } - Button { text: " "; color: "#6da43d"; operator: true } - Button { text: "÷"; color: "#6da43d"; operator: true } - Button { text: "×"; color: "#6da43d"; operator: true } - Button { text: "C"; color: "#6da43d"; operator: true } - Button { text: " "; color: "#6da43d"; operator: true } - Button { text: "="; color: "#6da43d"; operator: true } -} diff --git a/basicsuite/qt5-launchpresentation/calqlatr/content/StyleLabel.qml b/basicsuite/qt5-launchpresentation/calqlatr/content/StyleLabel.qml deleted file mode 100644 index 3bdea86..0000000 --- a/basicsuite/qt5-launchpresentation/calqlatr/content/StyleLabel.qml +++ /dev/null @@ -1,50 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 - -Text { - width: 64 - font.pixelSize: 14 - font.bold: false - wrapMode: Text.WordWrap - lineHeight: 0.75 - color: "#676764" -} diff --git a/basicsuite/qt5-launchpresentation/calqlatr/content/audio/touch.wav b/basicsuite/qt5-launchpresentation/calqlatr/content/audio/touch.wav deleted file mode 100644 index 94cccb7..0000000 Binary files a/basicsuite/qt5-launchpresentation/calqlatr/content/audio/touch.wav and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/calqlatr/content/calculator.js b/basicsuite/qt5-launchpresentation/calqlatr/content/calculator.js deleted file mode 100644 index 843ef39..0000000 --- a/basicsuite/qt5-launchpresentation/calqlatr/content/calculator.js +++ /dev/null @@ -1,143 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -var curVal = 0 -var memory = 0 -var lastOp = "" -var previousOperator = "" -var digits = "" - -function disabled(op) { - if (op == "." && digits.toString().search(/\./) != -1) { - return true - } else if (op == window.squareRoot && digits.toString().search(/-/) != -1) { - return true - } else { - return false - } -} - -function digitPressed(op) -{ - if (disabled(op)) - return - if (digits.toString().length >= 14) - return - if (lastOp.toString().length == 1 && ((lastOp >= "0" && lastOp <= "9") || lastOp == ".") ) { - digits = digits + op.toString() - display.appendDigit(op.toString()) - } else { - digits = op - display.appendDigit(op.toString()) - } - lastOp = op -} - -function operatorPressed(op) -{ - if (disabled(op)) - return - lastOp = op - - if (previousOperator == "+") { - digits = Number(digits.valueOf()) + Number(curVal.valueOf()) - } else if (previousOperator == "−") { - digits = Number(curVal) - Number(digits.valueOf()) - } else if (previousOperator == "×") { - digits = Number(curVal) * Number(digits.valueOf()) - } else if (previousOperator == "÷") { - digits = Number(Number(curVal) / Number(digits.valueOf())).toString() - } else if (previousOperator == "=") { - } - - if (op == "+" || op == "−" || op == "×" || op == "÷") { - previousOperator = op - curVal = digits.valueOf() - display.displayOperator(previousOperator) - return - } - - if (op == "=") { - display.newLine("=", digits.toString()) - } - - curVal = 0 - previousOperator = "" - - if (op == "1/x") { - digits = (1 / digits.valueOf()).toString() - } else if (op == "x^2") { - digits = (digits.valueOf() * digits.valueOf()).toString() - } else if (op == "Abs") { - digits = (Math.abs(digits.valueOf())).toString() - } else if (op == "Int") { - digits = (Math.floor(digits.valueOf())).toString() - } else if (op == window.plusminus) { - digits = (digits.valueOf() * -1).toString() - } else if (op == window.squareRoot) { - digits = (Math.sqrt(digits.valueOf())).toString() - } else if (op == "mc") { - memory = 0; - } else if (op == "m+") { - memory += digits.valueOf() - } else if (op == "mr") { - digits = memory.toString() - } else if (op == "m-") { - memory = digits.valueOf() - } else if (op == window.leftArrow) { - digits = digits.toString().slice(0, -1) - if (digits.length == 0) { - digits = "0" - } - } else if (op == "Off") { - Qt.quit(); - } else if (op == "C") { - digits = "0" - } else if (op == "AC") { - curVal = 0 - memory = 0 - lastOp = "" - digits ="0" - } - - -} - diff --git a/basicsuite/qt5-launchpresentation/calqlatr/content/images/icon-back.png b/basicsuite/qt5-launchpresentation/calqlatr/content/images/icon-back.png deleted file mode 100644 index 2989ee2..0000000 Binary files a/basicsuite/qt5-launchpresentation/calqlatr/content/images/icon-back.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/calqlatr/content/images/icon-close.png b/basicsuite/qt5-launchpresentation/calqlatr/content/images/icon-close.png deleted file mode 100644 index 3e21248..0000000 Binary files a/basicsuite/qt5-launchpresentation/calqlatr/content/images/icon-close.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/calqlatr/content/images/icon-settings.png b/basicsuite/qt5-launchpresentation/calqlatr/content/images/icon-settings.png deleted file mode 100644 index 98e662f..0000000 Binary files a/basicsuite/qt5-launchpresentation/calqlatr/content/images/icon-settings.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/calqlatr/content/images/logo.png b/basicsuite/qt5-launchpresentation/calqlatr/content/images/logo.png deleted file mode 100644 index 6bc6561..0000000 Binary files a/basicsuite/qt5-launchpresentation/calqlatr/content/images/logo.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/calqlatr/content/images/paper-edge-left.png b/basicsuite/qt5-launchpresentation/calqlatr/content/images/paper-edge-left.png deleted file mode 100644 index ca29a3a..0000000 Binary files a/basicsuite/qt5-launchpresentation/calqlatr/content/images/paper-edge-left.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/calqlatr/content/images/paper-edge-right.png b/basicsuite/qt5-launchpresentation/calqlatr/content/images/paper-edge-right.png deleted file mode 100644 index 7c2da7b..0000000 Binary files a/basicsuite/qt5-launchpresentation/calqlatr/content/images/paper-edge-right.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/calqlatr/content/images/paper-grip.png b/basicsuite/qt5-launchpresentation/calqlatr/content/images/paper-grip.png deleted file mode 100644 index 953c408..0000000 Binary files a/basicsuite/qt5-launchpresentation/calqlatr/content/images/paper-grip.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/calqlatr/content/images/settings-selected-a.png b/basicsuite/qt5-launchpresentation/calqlatr/content/images/settings-selected-a.png deleted file mode 100644 index e08ddfa..0000000 Binary files a/basicsuite/qt5-launchpresentation/calqlatr/content/images/settings-selected-a.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/calqlatr/content/images/settings-selected-b.png b/basicsuite/qt5-launchpresentation/calqlatr/content/images/settings-selected-b.png deleted file mode 100644 index d9aa7e3..0000000 Binary files a/basicsuite/qt5-launchpresentation/calqlatr/content/images/settings-selected-b.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/calqlatr/content/images/touch-green.png b/basicsuite/qt5-launchpresentation/calqlatr/content/images/touch-green.png deleted file mode 100644 index 64dbde6..0000000 Binary files a/basicsuite/qt5-launchpresentation/calqlatr/content/images/touch-green.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/calqlatr/content/images/touch-white.png b/basicsuite/qt5-launchpresentation/calqlatr/content/images/touch-white.png deleted file mode 100644 index bb02b00..0000000 Binary files a/basicsuite/qt5-launchpresentation/calqlatr/content/images/touch-white.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/demo.qmlproject b/basicsuite/qt5-launchpresentation/demo.qmlproject deleted file mode 100644 index eed1c97..0000000 --- a/basicsuite/qt5-launchpresentation/demo.qmlproject +++ /dev/null @@ -1,18 +0,0 @@ -/* File generated by Qt Creator, version 2.6.1 */ - -import QmlProject 1.1 - -Project { - mainFile: "main.qml" - - /* Include .qml, .js, and image files from current directory and subdirectories */ - QmlFiles { - directory: "." - } - JavaScriptFiles { - directory: "." - } - ImageFiles { - directory: "images" - } -} diff --git a/basicsuite/qt5-launchpresentation/description.txt b/basicsuite/qt5-launchpresentation/description.txt deleted file mode 100644 index 6ad8936..0000000 --- a/basicsuite/qt5-launchpresentation/description.txt +++ /dev/null @@ -1,5 +0,0 @@ -The following is a quick tour of what is new in Qt 5. It is an application written with Qt Quick, based on Qt 5, the source code is available from [1]. The demo makes use of the QML Presentation System, available from [2]. Qt5 launch demo has been modified slightly to run in this launcher. - -[1] https://qt.gitorious.org/qt-labs/qt5-launch-demo -[2] ssh://codereview.qt-project.org/qt-labs/qml-presentation-system.git - diff --git a/basicsuite/qt5-launchpresentation/images/ally.png b/basicsuite/qt5-launchpresentation/images/ally.png deleted file mode 100644 index 05b405b..0000000 Binary files a/basicsuite/qt5-launchpresentation/images/ally.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/images/butterfly.png b/basicsuite/qt5-launchpresentation/images/butterfly.png deleted file mode 100644 index b8cc35c..0000000 Binary files a/basicsuite/qt5-launchpresentation/images/butterfly.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/images/displace.png b/basicsuite/qt5-launchpresentation/images/displace.png deleted file mode 100644 index 440e8cb..0000000 Binary files a/basicsuite/qt5-launchpresentation/images/displace.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/images/fog.png b/basicsuite/qt5-launchpresentation/images/fog.png deleted file mode 100644 index f462222..0000000 Binary files a/basicsuite/qt5-launchpresentation/images/fog.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/images/particle.png b/basicsuite/qt5-launchpresentation/images/particle.png deleted file mode 100644 index 5c83896..0000000 Binary files a/basicsuite/qt5-launchpresentation/images/particle.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/images/qt-logo.png b/basicsuite/qt5-launchpresentation/images/qt-logo.png deleted file mode 100644 index 7f2c662..0000000 Binary files a/basicsuite/qt5-launchpresentation/images/qt-logo.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/images/widgets_boxes.png b/basicsuite/qt5-launchpresentation/images/widgets_boxes.png deleted file mode 100644 index 3115255..0000000 Binary files a/basicsuite/qt5-launchpresentation/images/widgets_boxes.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/images/widgets_chips.png b/basicsuite/qt5-launchpresentation/images/widgets_chips.png deleted file mode 100644 index 4ef1664..0000000 Binary files a/basicsuite/qt5-launchpresentation/images/widgets_chips.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/images/widgets_mainwindows.png b/basicsuite/qt5-launchpresentation/images/widgets_mainwindows.png deleted file mode 100644 index 5ce5416..0000000 Binary files a/basicsuite/qt5-launchpresentation/images/widgets_mainwindows.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/images/widgets_styles_fusion.png b/basicsuite/qt5-launchpresentation/images/widgets_styles_fusion.png deleted file mode 100644 index d94f859..0000000 Binary files a/basicsuite/qt5-launchpresentation/images/widgets_styles_fusion.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/images/widgets_styles_macstyle.png b/basicsuite/qt5-launchpresentation/images/widgets_styles_macstyle.png deleted file mode 100644 index 033f43b..0000000 Binary files a/basicsuite/qt5-launchpresentation/images/widgets_styles_macstyle.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/main.qml b/basicsuite/qt5-launchpresentation/main.qml deleted file mode 100644 index 627ec48..0000000 --- a/basicsuite/qt5-launchpresentation/main.qml +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt 5 launch demo. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 - -Item { - id: root - - width: 1280 - height: 720 - - property real widthFactor: root.width / root.height; - - DemoMain { - width: 720 * root.widthFactor - height: 720 - - anchors.centerIn: parent - - scale: root.height / height - - useDropShadow: false; - useSimpleGradient: true; - } - -} diff --git a/basicsuite/qt5-launchpresentation/main_hifi.qml b/basicsuite/qt5-launchpresentation/main_hifi.qml deleted file mode 100644 index 19e006b..0000000 --- a/basicsuite/qt5-launchpresentation/main_hifi.qml +++ /dev/null @@ -1,43 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt 5 launch demo. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -DemoMain { - autorun: true -} diff --git a/basicsuite/qt5-launchpresentation/maroon/.DS_Store b/basicsuite/qt5-launchpresentation/maroon/.DS_Store deleted file mode 100644 index b5c859b..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/.DS_Store and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/Maroon.qml b/basicsuite/qt5-launchpresentation/maroon/Maroon.qml deleted file mode 100644 index d7bfcb6..0000000 --- a/basicsuite/qt5-launchpresentation/maroon/Maroon.qml +++ /dev/null @@ -1,233 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Particles 2.0 -import "content" -import "content/logic.js" as Logic - -Item { - id: root - width: 320 - height: 480 - property var gameState: Logic.newGameState(canvas); - property bool passedSplash: false - - Image { - source:"content/gfx/background.png" - anchors.bottom: view.bottom - - ParticleSystem { - id: particles - anchors.fill: parent - - ImageParticle { - id: bubble - anchors.fill: parent - source: "content/gfx/catch.png" - opacity: 0.25 - } - - Wander { - xVariance: 25; - pace: 25; - } - - Emitter { - width: parent.width - height: 150 - anchors.bottom: parent.bottom - anchors.bottomMargin: 3 - startTime: 15000 - - emitRate: 2 - lifeSpan: 15000 - - acceleration: PointDirection{ y: -6; xVariation: 2; yVariation: 2 } - - size: 24 - sizeVariation: 16 - } - } - } - - Column { - id: view - y: -(height - 480) - width: 320 - - GameOverScreen { gameCanvas: canvas } - - Item { - id: canvasArea - width: 320 - height: 480 - - Row { - height: childrenRect.height - Image { - id: wave - y: 30 - source:"content/gfx/wave.png" - } - Image { - y: 30 - source:"content/gfx/wave.png" - } - NumberAnimation on x { from: 0; to: -(wave.width); duration: 16000; loops: Animation.Infinite } - SequentialAnimation on y { - loops: Animation.Infinite - NumberAnimation { from: y - 2; to: y + 2; duration: 1600; easing.type: Easing.InOutQuad } - NumberAnimation { from: y + 2; to: y - 2; duration: 1600; easing.type: Easing.InOutQuad } - } - } - - Row { - opacity: 0.5 - Image { - id: wave2 - y: 25 - source: "content/gfx/wave.png" - } - Image { - y: 25 - source: "content/gfx/wave.png" - } - NumberAnimation on x { from: -(wave2.width); to: 0; duration: 32000; loops: Animation.Infinite } - SequentialAnimation on y { - loops: Animation.Infinite - NumberAnimation { from: y + 2; to: y - 2; duration: 1600; easing.type: Easing.InOutQuad } - NumberAnimation { from: y - 2; to: y + 2; duration: 1600; easing.type: Easing.InOutQuad } - } - } - - Image { - source: "content/gfx/sunlight.png" - opacity: 0.02 - y: 0 - anchors.horizontalCenter: parent.horizontalCenter - transformOrigin: Item.Top - SequentialAnimation on rotation { - loops: Animation.Infinite - NumberAnimation { from: -10; to: 10; duration: 8000; easing.type: Easing.InOutSine } - NumberAnimation { from: 10; to: -10; duration: 8000; easing.type: Easing.InOutSine } - } - } - - Image { - source: "content/gfx/sunlight.png" - opacity: 0.04 - y: 20 - anchors.horizontalCenter: parent.horizontalCenter - transformOrigin: Item.Top - SequentialAnimation on rotation { - loops: Animation.Infinite - NumberAnimation { from: 10; to: -10; duration: 8000; easing.type: Easing.InOutSine } - NumberAnimation { from: -10; to: 10; duration: 8000; easing.type: Easing.InOutSine } - } - } - - Image { - source: "content/gfx/grid.png" - opacity: 0.5 - } - - GameCanvas { - id: canvas - anchors.bottom: parent.bottom - anchors.bottomMargin: 20 - x: 32 - focus: true - } - - InfoBar { anchors.bottom: canvas.top; anchors.bottomMargin: 6; width: parent.width } - - //3..2..1..go - Timer { - id: countdownTimer - interval: 1000 - running: root.countdown < 5 - repeat: true - onTriggered: root.countdown++ - } - Repeater { - model: ["content/gfx/text-blank.png", "content/gfx/text-3.png", "content/gfx/text-2.png", "content/gfx/text-1.png", "content/gfx/text-go.png"] - delegate: Image { - visible: root.countdown <= index - opacity: root.countdown == index ? 0.5 : 0.1 - scale: root.countdown >= index ? 1.0 : 0.0 - source: modelData - Behavior on opacity { NumberAnimation {} } - Behavior on scale { NumberAnimation {} } - } - } - } - - NewGameScreen { - onStartButtonClicked: root.passedSplash = true - } - } - - property int countdown: 10 - Timer { - id: gameStarter - interval: 4000 - running: false - repeat: false - onTriggered: Logic.startGame(canvas); - } - - states: [ - State { - name: "gameOn"; when: gameState.gameOver == false && passedSplash - PropertyChanges { target: view; y: -(height - 960) } - StateChangeScript { script: root.countdown = 0; } - PropertyChanges { target: gameStarter; running: true } - }, - State { - name: "gameOver"; when: gameState.gameOver == true - PropertyChanges { target: view; y: 0 } - } - ] - - transitions: Transition { - NumberAnimation { properties: "x,y"; duration: 1200; easing.type: Easing.OutQuad } - } -} diff --git a/basicsuite/qt5-launchpresentation/maroon/content/BuildButton.qml b/basicsuite/qt5-launchpresentation/maroon/content/BuildButton.qml deleted file mode 100644 index 49641fc..0000000 --- a/basicsuite/qt5-launchpresentation/maroon/content/BuildButton.qml +++ /dev/null @@ -1,90 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import "logic.js" as Logic - -Item { - id: container - width: 64 - height: 64 - property alias source: img.source - property int index - property int row: 0 - property int col: 0 - property int towerType - property bool canBuild: true - property Item gameCanvas: parent.parent.parent - signal clicked() - - Image { - id: img - opacity: (canBuild && gameCanvas.coins >= Logic.towerData[towerType-1].cost) ? 1.0 : 0.4 - } - Text { - anchors.right: parent.right - font.pointSize: 14 - font.bold: true - color: "#ffffff" - text: Logic.towerData[towerType - 1].cost - } - MouseArea { - anchors.fill: parent - onClicked: { - Logic.buildTower(towerType, col, row) - container.clicked() - } - } - Image { - visible: col == index && row != 0 - source: "gfx/dialog-pointer.png" - anchors.top: parent.bottom - anchors.topMargin: 4 - anchors.horizontalCenter: parent.horizontalCenter - } - Image { - visible: col == index && row == 0 - source: "gfx/dialog-pointer.png" - rotation: 180 - anchors.bottom: parent.top - anchors.bottomMargin: 6 - anchors.horizontalCenter: parent.horizontalCenter - } -} diff --git a/basicsuite/qt5-launchpresentation/maroon/content/GameCanvas.qml b/basicsuite/qt5-launchpresentation/maroon/content/GameCanvas.qml deleted file mode 100644 index 5e6e963..0000000 --- a/basicsuite/qt5-launchpresentation/maroon/content/GameCanvas.qml +++ /dev/null @@ -1,240 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import "logic.js" as Logic -import "towers" as Towers - -Item { - id: grid - - property int squareSize: 64 - property int rows: 6 - property int cols: 4 - property Item canvas: grid - property int score: 0 - property int coins: 100 - property int lives: 3 - property int waveNumber: 0 - property int waveProgress: 0 - property var towers - property var mobs - property bool gameRunning: false - property bool gameOver: false - property bool errored: false - property string errorString: "" - - width: cols * squareSize - height: rows * squareSize - - function freshState() { - lives = 3 - coins = 100 - score = 0 - waveNumber = 0 - waveProgress = 0 - gameOver = false - gameRunning = false - towerMenu.shown = false - helpButton.comeBack(); - } - - Text { - id: errorText // Mostly for debug purposes - text: errorString - visible: errored - color: "red" - font.pixelSize: 18 - wrapMode: Text.WordWrap - width: parent.width / 1.2 - height: parent.height / 1.2 - anchors.centerIn: parent - z: 1000 - } - - Timer { - interval: 16 - running: true - repeat: true - onTriggered: Logic.tick() - } - - MouseArea { - id: ma - anchors.fill: parent - onClicked: { - if (towerMenu.visible) - towerMenu.finish() - else - towerMenu.open(mouse.x, mouse.y) - } - } - - Image { - id: towerMenu - visible: false - z: 1500 - scale: 0.9 - opacity: 0.7 - property int dragDistance: 16 - property int targetRow: 0 - property int targetCol: 0 - property bool shown: false - property bool towerExists: false - - function finish() { - shown = false - } - - function open(xp,yp) { - if (!grid.gameRunning) - return - targetRow = Logic.row(yp) - targetCol = Logic.col(xp) - if (targetRow == 0) - towerMenu.y = (targetRow + 1) * grid.squareSize - else - towerMenu.y = (targetRow - 1) * grid.squareSize - towerExists = (grid.towers[Logic.towerIdx(targetCol, targetRow)] != null) - shown = true - helpButton.goAway(); - } - - states: State { - name: "shown"; when: towerMenu.shown && !grid.gameOver - PropertyChanges { target: towerMenu; visible: true; scale: 1; opacity: 1 } - } - - transitions: Transition { - PropertyAction { property: "visible" } - NumberAnimation { properties: "opacity,scale"; duration: 500; easing.type: Easing.OutElastic } - } - - x: -32 - source: "gfx/dialog.png" - Row { - id: buttonRow - height: 100 - anchors.centerIn: parent - spacing: 8 - BuildButton { - row: towerMenu.targetRow; col: towerMenu.targetCol - anchors.verticalCenter: parent.verticalCenter - towerType: 1; index: 0 - canBuild: !towerMenu.towerExists - source: "gfx/dialog-melee.png" - onClicked: towerMenu.finish() - } - BuildButton { - row: towerMenu.targetRow; col: towerMenu.targetCol - anchors.verticalCenter: parent.verticalCenter - towerType: 2; index: 1 - canBuild: !towerMenu.towerExists - source: "gfx/dialog-shooter.png" - onClicked: towerMenu.finish() - } - BuildButton { - row: towerMenu.targetRow; col: towerMenu.targetCol - anchors.verticalCenter: parent.verticalCenter - towerType: 3; index: 2 - canBuild: !towerMenu.towerExists - source: "gfx/dialog-bomb.png" - onClicked: towerMenu.finish() - } - BuildButton { - row: towerMenu.targetRow; col: towerMenu.targetCol - anchors.verticalCenter: parent.verticalCenter - towerType: 4; index: 3 - canBuild: !towerMenu.towerExists - source: "gfx/dialog-factory.png" - onClicked: towerMenu.finish() - } - } - } - - - Keys.onPressed: { // Cheat Codes while Testing - if (event.key == Qt.Key_Up && (event.modifiers & Qt.ShiftModifier)) - grid.coins += 10; - if (event.key == Qt.Key_Left && (event.modifiers & Qt.ShiftModifier)) - grid.lives += 1; - if (event.key == Qt.Key_Down && (event.modifiers & Qt.ShiftModifier)) - Logic.gameState.waveProgress += 1000; - if (event.key == Qt.Key_Right && (event.modifiers & Qt.ShiftModifier)) - Logic.endGame(); - } - - Image { - id: helpButton - z: 1010 - source: "gfx/button-help.png" - function goAway() { - helpMA.enabled = false; - helpButton.opacity = 0; - } - function comeBack() { - helpMA.enabled = true; - helpButton.opacity = 1; - } - Behavior on opacity { NumberAnimation {} } - MouseArea { - id: helpMA - anchors.fill: parent - onClicked: {helpImage.visible = true; helpButton.visible = false;} - } - - anchors.horizontalCenter: parent.horizontalCenter - anchors.bottom: parent.bottom - anchors.bottomMargin: 0 - } - - Image { - id: helpImage - z: 1010 - source: "gfx/help.png" - anchors.fill: parent - visible: false - MouseArea { - anchors.fill: parent - onClicked: helpImage.visible = false; - } - } - -} diff --git a/basicsuite/qt5-launchpresentation/maroon/content/GameOverScreen.qml b/basicsuite/qt5-launchpresentation/maroon/content/GameOverScreen.qml deleted file mode 100644 index dfb439f..0000000 --- a/basicsuite/qt5-launchpresentation/maroon/content/GameOverScreen.qml +++ /dev/null @@ -1,115 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Particles 2.0 -import "logic.js" as Logic - -Item { - id: gameOverScreen - width: 320 - height: 400 - property GameCanvas gameCanvas - - Image { - id: img - source: "gfx/text-gameover.png" - anchors.centerIn: parent - } - - ParticleSystem { - anchors.fill: parent - ImageParticle { - id: cloud - source: "gfx/cloud.png" - alphaVariation: 0.25 - opacity: 0.25 - } - - Wander { - xVariance: 100; - pace: 1; - } - - Emitter { - id: cloudLeft - width: 160 - height: 160 - anchors.right: parent.left - emitRate: 0.5 - lifeSpan: 12000 - velocity: PointDirection{ x: 64; xVariation: 2; yVariation: 2 } - size: 160 - } - - Emitter { - id: cloudRight - width: 160 - height: 160 - anchors.left: parent.right - emitRate: 0.5 - lifeSpan: 12000 - velocity: PointDirection{ x: -64; xVariation: 2; yVariation: 2 } - size: 160 - } - } - - - Text { - visible: gameCanvas != undefined - text: "You saved " + gameCanvas.score + " fishes!" - anchors.top: img.bottom - anchors.topMargin: 12 - anchors.horizontalCenter: parent.horizontalCenter - font.bold: true - color: "#000000" - opacity: 0.5 - } - - Image { - source: "gfx/button-play.png" - anchors.bottom: parent.bottom - anchors.bottomMargin: 0 - MouseArea { - anchors.fill: parent - onClicked: gameCanvas.gameOver = false//This will actually trigger the state change in main.qml - } - } -} diff --git a/basicsuite/qt5-launchpresentation/maroon/content/InfoBar.qml b/basicsuite/qt5-launchpresentation/maroon/content/InfoBar.qml deleted file mode 100644 index 36303fc..0000000 --- a/basicsuite/qt5-launchpresentation/maroon/content/InfoBar.qml +++ /dev/null @@ -1,84 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 - -Item { - height: childrenRect.height - - // Display the number of lives - Row { - anchors.left: parent.left - anchors.leftMargin: 10 - spacing: 5 - Repeater { - id: rep - model: Math.min(10, canvas.lives) - delegate: Image { source: "gfx/lifes.png" } - } - } - - // Display the number of fishes saved - Row { - anchors.right: points.left - anchors.rightMargin: 20 - spacing: 5 - Image { source: "gfx/scores.png" } - Text { - text: canvas.score - font.bold: true - } - } - - // Display the number of coins - Row { - id: points - anchors.right: parent.right - anchors.rightMargin: 10 - spacing: 5 - Image { source: "gfx/points.png" } - Text { - id: pointsLabel - text: canvas.coins - font.bold: true - } - } -} - diff --git a/basicsuite/qt5-launchpresentation/maroon/content/NewGameScreen.qml b/basicsuite/qt5-launchpresentation/maroon/content/NewGameScreen.qml deleted file mode 100644 index 495e3aa..0000000 --- a/basicsuite/qt5-launchpresentation/maroon/content/NewGameScreen.qml +++ /dev/null @@ -1,111 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 - -// This is the first screen. -// It shows the logo and emit a startButtonClicked signal -// when the user press the "PLAY" button. - -Item { - id: newGameScreen - width: 320 - height: 480 - - signal startButtonClicked - - Image { - source: "gfx/logo.png" - anchors.top: parent.top - anchors.topMargin: 60 - } - - Image { - source: "gfx/logo-fish.png" - anchors.top: parent.top - - SequentialAnimation on x { - loops: Animation.Infinite - NumberAnimation { from: x + 148; to: x + 25; duration: 2000; easing.type: Easing.InOutQuad } - NumberAnimation { from: x + 25; to: x + 148; duration: 1600; easing.type: Easing.InOutQuad } - } - SequentialAnimation on anchors.topMargin { - loops: Animation.Infinite - NumberAnimation { from: 100; to: 60; duration: 1600; easing.type: Easing.InOutQuad } - NumberAnimation { from: 60; to: 100; duration: 2000; easing.type: Easing.InOutQuad } - } - } - - Image { - source: "gfx/logo-bubble.png" - anchors.top: parent.top - - SequentialAnimation on x { - loops: Animation.Infinite - NumberAnimation { from: x + 140; to: x + 40; duration: 2000; easing.type: Easing.InOutQuad } - NumberAnimation { from: x + 40; to: x + 140; duration: 1600; easing.type: Easing.InOutQuad } - } - SequentialAnimation on anchors.topMargin { - loops: Animation.Infinite - NumberAnimation { from: 100; to: 60; duration: 1600; easing.type: Easing.InOutQuad } - NumberAnimation { from: 60; to: 100; duration: 2000; easing.type: Easing.InOutQuad } - } - SequentialAnimation on width { - loops: Animation.Infinite - NumberAnimation { from: 140; to: 160; duration: 1000; easing.type: Easing.InOutQuad } - NumberAnimation { from: 160; to: 140; duration: 800; easing.type: Easing.InOutQuad } - } - SequentialAnimation on height { - loops: Animation.Infinite - NumberAnimation { from: 150; to: 140; duration: 800; easing.type: Easing.InOutQuad } - NumberAnimation { from: 140; to: 150; duration: 1000; easing.type: Easing.InOutQuad } - } - } - - Image { - source: "gfx/button-play.png" - anchors.bottom: parent.bottom - anchors.bottomMargin: 60 - MouseArea { - anchors.fill: parent - onClicked: newGameScreen.startButtonClicked() - } - } -} diff --git a/basicsuite/qt5-launchpresentation/maroon/content/SoundEffect.qml b/basicsuite/qt5-launchpresentation/maroon/content/SoundEffect.qml deleted file mode 100644 index d286a39..0000000 --- a/basicsuite/qt5-launchpresentation/maroon/content/SoundEffect.qml +++ /dev/null @@ -1,53 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -//Proxies a SoundEffect if QtMultimedia is installed -Item { - id: container - property QtObject effect: Qt.createQmlObject("import QtMultimedia 5.0; SoundEffect{ source: '" + container.source + "' }", container); - property url source: "" - onSourceChanged: if (effect != null) effect.source = source; - function play() { - if (effect != null) - effect.play(); - } - -} diff --git a/basicsuite/qt5-launchpresentation/maroon/content/audio/bomb-action.wav b/basicsuite/qt5-launchpresentation/maroon/content/audio/bomb-action.wav deleted file mode 100644 index b334dc1..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/audio/bomb-action.wav and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/audio/catch-action.wav b/basicsuite/qt5-launchpresentation/maroon/content/audio/catch-action.wav deleted file mode 100644 index 3e22124..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/audio/catch-action.wav and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/audio/catch.wav b/basicsuite/qt5-launchpresentation/maroon/content/audio/catch.wav deleted file mode 100644 index d3eade8..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/audio/catch.wav and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/audio/currency.wav b/basicsuite/qt5-launchpresentation/maroon/content/audio/currency.wav deleted file mode 100644 index 0d9ef2c..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/audio/currency.wav and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/audio/factory-action.wav b/basicsuite/qt5-launchpresentation/maroon/content/audio/factory-action.wav deleted file mode 100644 index a2ace6c..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/audio/factory-action.wav and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/audio/melee-action.wav b/basicsuite/qt5-launchpresentation/maroon/content/audio/melee-action.wav deleted file mode 100644 index d325af4..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/audio/melee-action.wav and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/audio/projectile-action.wav b/basicsuite/qt5-launchpresentation/maroon/content/audio/projectile-action.wav deleted file mode 100644 index 4e2284f..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/audio/projectile-action.wav and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/audio/shooter-action.wav b/basicsuite/qt5-launchpresentation/maroon/content/audio/shooter-action.wav deleted file mode 100644 index 3e12b94..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/audio/shooter-action.wav and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/background.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/background.png deleted file mode 100644 index d548b93..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/background.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/bomb-action.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/bomb-action.png deleted file mode 100644 index 42da5d7..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/bomb-action.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/bomb-idle.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/bomb-idle.png deleted file mode 100644 index 3bd62e2..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/bomb-idle.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/bomb.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/bomb.png deleted file mode 100644 index 380da7d..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/bomb.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/button-help.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/button-help.png deleted file mode 100644 index aecebc1..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/button-help.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/button-play.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/button-play.png deleted file mode 100644 index 6cdad6c..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/button-play.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/catch-action.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/catch-action.png deleted file mode 100644 index 78ca9fe..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/catch-action.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/catch.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/catch.png deleted file mode 100644 index b7620fe..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/catch.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/cloud.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/cloud.png deleted file mode 100644 index d7c35f8..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/cloud.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/currency.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/currency.png deleted file mode 100644 index 1571341..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/currency.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/dialog-bomb.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/dialog-bomb.png deleted file mode 100644 index 708d916..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/dialog-bomb.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/dialog-factory.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/dialog-factory.png deleted file mode 100644 index d2e2a48..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/dialog-factory.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/dialog-melee.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/dialog-melee.png deleted file mode 100644 index 069d18d..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/dialog-melee.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/dialog-pointer.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/dialog-pointer.png deleted file mode 100644 index 9b51a09..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/dialog-pointer.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/dialog-shooter.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/dialog-shooter.png deleted file mode 100644 index af980ca..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/dialog-shooter.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/dialog.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/dialog.png deleted file mode 100644 index d528ba7..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/dialog.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/factory-action.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/factory-action.png deleted file mode 100644 index 8981678..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/factory-action.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/factory-idle.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/factory-idle.png deleted file mode 100644 index a145582..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/factory-idle.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/factory.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/factory.png deleted file mode 100644 index bfb9f3f..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/factory.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/grid.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/grid.png deleted file mode 100644 index b595552..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/grid.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/help.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/help.png deleted file mode 100644 index 4654e4c..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/help.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/lifes.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/lifes.png deleted file mode 100644 index 135310b..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/lifes.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/logo-bubble.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/logo-bubble.png deleted file mode 100644 index 136151c..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/logo-bubble.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/logo-fish.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/logo-fish.png deleted file mode 100644 index c41833a..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/logo-fish.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/logo.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/logo.png deleted file mode 100644 index 787ac99..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/logo.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/melee-action.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/melee-action.png deleted file mode 100644 index c53873b..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/melee-action.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/melee-idle.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/melee-idle.png deleted file mode 100644 index 621d9df..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/melee-idle.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/melee.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/melee.png deleted file mode 100644 index ab24015..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/melee.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/mob-idle.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/mob-idle.png deleted file mode 100644 index dedacc7..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/mob-idle.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/mob.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/mob.png deleted file mode 100644 index 7569c35..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/mob.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/points.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/points.png deleted file mode 100644 index 1d2386d..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/points.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/projectile-action.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/projectile-action.png deleted file mode 100644 index aa2e650..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/projectile-action.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/projectile.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/projectile.png deleted file mode 100644 index c25a0c3..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/projectile.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/scores.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/scores.png deleted file mode 100644 index af757fe..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/scores.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/shooter-action.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/shooter-action.png deleted file mode 100644 index 08e7e30..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/shooter-action.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/shooter-idle.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/shooter-idle.png deleted file mode 100644 index 663098d..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/shooter-idle.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/shooter.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/shooter.png deleted file mode 100644 index d44401e..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/shooter.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/sunlight.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/sunlight.png deleted file mode 100644 index d1c7042..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/sunlight.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/text-1.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/text-1.png deleted file mode 100644 index 3ea399c..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/text-1.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/text-2.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/text-2.png deleted file mode 100644 index 934a481..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/text-2.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/text-3.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/text-3.png deleted file mode 100644 index 47523f5..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/text-3.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/text-blank.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/text-blank.png deleted file mode 100644 index 4a687b2..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/text-blank.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/text-gameover.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/text-gameover.png deleted file mode 100644 index 4f53ef0..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/text-gameover.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/text-go.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/text-go.png deleted file mode 100644 index bfc26f7..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/text-go.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/gfx/wave.png b/basicsuite/qt5-launchpresentation/maroon/content/gfx/wave.png deleted file mode 100644 index f97426c..0000000 Binary files a/basicsuite/qt5-launchpresentation/maroon/content/gfx/wave.png and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/maroon/content/logic.js b/basicsuite/qt5-launchpresentation/maroon/content/logic.js deleted file mode 100644 index dd76b7e..0000000 --- a/basicsuite/qt5-launchpresentation/maroon/content/logic.js +++ /dev/null @@ -1,264 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -.pragma library // Shared game state -.import QtQuick 2.0 as QQ - -// Game Stuff -var gameState // Local reference -function getGameState() { return gameState; } - -var towerData = [ // Name and cost, stats are in the delegate per instance - { "name": "Melee", "cost": 20 }, - { "name": "Ranged", "cost": 50 }, - { "name": "Bomb", "cost": 75 }, - { "name": "Factory", "cost": 25 } -] - -var waveBaseData = [300, 290, 280, 270, 220, 180, 160, 80, 80, 80, 30, 30, 30, 30]; -var waveData = []; - -var towerComponents = new Array(towerData.length); -var mobComponent = Qt.createComponent("mobs/MobBase.qml"); - -function endGame() -{ - gameState.gameRunning = false; - gameState.gameOver = true; - for (var i = 0; i < gameState.cols; i++) { - for (var j = 0; j < gameState.rows; j++) { - if (gameState.towers[towerIdx(i, j)]) { - gameState.towers[towerIdx(i, j)].destroy(); - gameState.towers[towerIdx(i, j)] = null; - } - } - for (var j in gameState.mobs[i]) - gameState.mobs[i][j].destroy(); - gameState.mobs[i].splice(0,gameState.mobs[i].length); //Leaves queue reusable - } -} - -function startGame(gameCanvas) -{ - waveData = new Array(); - for (var i in waveBaseData) - waveData[i] = waveBaseData[i]; - gameState.freshState(); - for (var i = 0; i < gameCanvas.cols; i++) { - for (var j = 0; j < gameCanvas.rows; j++) - gameState.towers[towerIdx(i, j)] = null; - gameState.mobs[i] = new Array(); - } - gameState.towers[towerIdx(0, 0)] = newTower(3, 0, 0);//Start with a starfish in the corner - gameState.gameRunning = true; - gameState.gameOver = false; -} - -function newGameState(gameCanvas) -{ - for (var i = 0; i < towerComponents.length; i++) { - towerComponents[i] = Qt.createComponent("towers/" + towerData[i].name + ".qml"); - if (towerComponents[i].status == QQ.Component.Error) { - gameCanvas.errored = true; - gameCanvas.errorString += "Loading Tower " + towerData[i].name + "\n" + (towerComponents[i].errorString()); - console.log(towerComponents[i].errorString()); - } - } - gameState = gameCanvas; - gameState.freshState(); - gameState.towers = new Array(gameCanvas.rows * gameCanvas.cols); - gameState.mobs = new Array(gameCanvas.cols); - return gameState; -} - -function row(y) -{ - return Math.floor(y / gameState.squareSize); -} - -function col(x) -{ - return Math.floor(x / gameState.squareSize); -} - -function towerIdx(x, y) -{ - return y + (x * gameState.rows); -} - -function newMob(col) -{ - var ret = mobComponent.createObject(gameState.canvas, - { "col" : col, - "speed" : (Math.min(2.0, 0.10 * (gameState.waveNumber + 1))), - "y" : gameState.canvas.height }); - gameState.mobs[col].push(ret); - return ret; -} - -function newTower(type, row, col) -{ - var ret = towerComponents[type].createObject(gameState.canvas); - ret.row = row; - ret.col = col; - ret.fireCounter = ret.rof; - ret.spawn(); - return ret; -} - -function buildTower(type, x, y) -{ - if (gameState.towers[towerIdx(x,y)] != null) { - if (type <= 0) { - gameState.towers[towerIdx(x,y)].sell(); - gameState.towers[towerIdx(x,y)] = null; - } - } else { - if (gameState.coins < towerData[type - 1].cost) - return; - gameState.towers[towerIdx(x, y)] = newTower(type - 1, y, x); - gameState.coins -= towerData[type - 1].cost; - } -} - -function killMob(col, mob) -{ - if (!mob) - return; - var idx = gameState.mobs[col].indexOf(mob); - if (idx == -1 || !mob.hp) - return; - mob.hp = 0; - mob.die(); - gameState.mobs[col].splice(idx,1); -} - -function killTower(row, col) -{ - var tower = gameState.towers[towerIdx(col, row)]; - if (!tower) - return; - tower.hp = 0; - tower.die(); - gameState.towers[towerIdx(col, row)] = null; -} - -function tick() -{ - if (!gameState.gameRunning) - return; - - // Spawn - gameState.waveProgress += 1; - var i = gameState.waveProgress; - var j = 0; - while (i > 0 && j < waveData.length) - i -= waveData[j++]; - if ( i == 0 ) // Spawn a mob - newMob(Math.floor(Math.random() * gameState.cols)); - if ( j == waveData.length ) { // Next Wave - gameState.waveNumber += 1; - gameState.waveProgress = 0; - var waveModifier = 10; // Constant governing how much faster the next wave is to spawn (not fish speed) - for (var k in waveData ) // Slightly faster - if (waveData[k] > waveModifier) - waveData[k] -= waveModifier; - } - - // Towers Attack - for (var j in gameState.towers) { - var tower = gameState.towers[j]; - if (tower == null) - continue; - if (tower.fireCounter > 0) { - tower.fireCounter -= 1; - continue; - } - var column = tower.col; - for (var k in gameState.mobs[column]) { - var conflict = gameState.mobs[column][k]; - if (conflict.y <= gameState.canvas.height && conflict.y + conflict.height > tower.y - && conflict.y - ((tower.row + 1) * gameState.squareSize) < gameState.squareSize * tower.range) { // In Range - tower.fire(); - tower.fireCounter = tower.rof; - conflict.hit(tower.damage); - } - } - - // Income - if (tower.income) { - gameState.coins += tower.income; - tower.fire(); - tower.fireCounter = tower.rof; - } - } - - // Mobs move - for (var i = 0; i < gameState.cols; i++) { - for (var j = 0; j < gameState.mobs[i].length; j++) { - var mob = gameState.mobs[i][j]; - var newPos = gameState.mobs[i][j].y - gameState.mobs[i][j].speed; - if (newPos < 0) { - gameState.lives -= 1; - killMob(i, mob); - if (gameState.lives <= 0) - endGame(); - continue; - } - var conflict = gameState.towers[towerIdx(i, row(newPos))]; - if (conflict != null) { - if (mob.y < conflict.y + gameState.squareSize) - gameState.mobs[i][j].y += gameState.mobs[i][j].speed * 10; // Moved inside tower, now hurry back out - if (mob.fireCounter > 0) { - mob.fireCounter--; - } else { - gameState.mobs[i][j].fire(); - conflict.hp -= mob.damage; - if (conflict.hp <= 0) - killTower(conflict.row, conflict.col); - mob.fireCounter = mob.rof; - } - } else { - gameState.mobs[i][j].y = newPos; - } - } - } - -} diff --git a/basicsuite/qt5-launchpresentation/maroon/content/mobs/MobBase.qml b/basicsuite/qt5-launchpresentation/maroon/content/mobs/MobBase.qml deleted file mode 100644 index d4ece66..0000000 --- a/basicsuite/qt5-launchpresentation/maroon/content/mobs/MobBase.qml +++ /dev/null @@ -1,262 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import "../logic.js" as Logic -import ".." - -Item { - id: container - property string name: "Fish" - property int col: 0 - property real hp: 3 - property real damage: 1 - property real speed: 0.25 - property int rof: 30 //In ticks - property int fireCounter: 0 - property bool dying: false - width: parent ? parent.squareSize : 0 - height: parent ? parent.squareSize : 0 - x: col * width - z: 1001 - function fire() { } - - function die() { - if (dying) - return; - dying = true; - bubble.jumpTo("burst"); - if (fishSprite.currentSprite == "front") - fishSprite.jumpTo(Math.random() > 0.5 ? "left" : "right" ); - fishSwim.start(); - Logic.gameState.score += 1; - killedSound.play(); - bubble.scale = 0.9 - destroy(350); - } - - function inked() { - if (hp > 0) - ink.jumpTo("dirty"); - } - - function hit(dmg) { - hp -= dmg; - - if (hp <= 0) - Logic.killMob(col, container); - } - - Component.onCompleted: spawnSound.play() - - SoundEffect { - id: spawnSound - source: "../audio/catch.wav" - } - SoundEffect { - id: killedSound - source: "../audio/catch-action.wav" - } - - SpriteSequence { - id: fishSprite - width: 64 - height: 64 - interpolate: false - goalSprite: "" - - Sprite { - name: "left" - source: "../gfx/mob-idle.png" - frameWidth: 64 - frameHeight: 64 - frameCount: 1 - frameDuration: 800 - frameDurationVariation: 400 - to: { "front" : 1 } - } - - Sprite { - name: "front" - source: "../gfx/mob-idle.png" - frameCount: 1 - frameX: 64 - frameWidth: 64 - frameHeight: 64 - frameDuration: 800 - frameDurationVariation: 400 - to: { "left" : 1, "right" : 1 } - } - - Sprite { - name: "right" - source: "../gfx/mob-idle.png" - frameCount: 1 - frameX: 128 - frameWidth: 64 - frameHeight: 64 - frameDuration: 800 - frameDurationVariation: 400 - to: { "front" : 1 } - } - - - Sprite { //WORKAROUND: This prevents the triggering of a rendering error which is currently under investigation. - name: "dummy" - source: "../gfx/melee-idle.png" - frameCount: 8 - frameWidth: 64 - frameHeight: 64 - frameX: 0 - frameDuration: 200 - } - - NumberAnimation on x { - id: fishSwim - running: false - property bool goingLeft: fishSprite.currentSprite == "right" - to: goingLeft ? -360 : 360 - duration: 300 - } - } - - SpriteSequence { - id: bubble - width: 64 - height: 64 - scale: 0.4 + (0.2 * hp) - interpolate: false - goalSprite: "" - - Behavior on scale { - NumberAnimation { duration: 150; easing.type: Easing.OutBack } - } - - Sprite { - name: "big" - source: "../gfx/catch.png" - frameCount: 1 - to: { "burst" : 0 } - } - - Sprite { - name: "burst" - source: "../gfx/catch-action.png" - frameCount: 3 - frameX: 64 - frameDuration: 200 - } - - Sprite { //WORKAROUND: This prevents the triggering of a rendering error which is currently under investigation. - name: "dummy" - source: "../gfx/melee-idle.png" - frameCount: 8 - frameWidth: 64 - frameHeight: 64 - frameX: 0 - frameDuration: 200 - } - SequentialAnimation on width { - loops: Animation.Infinite - NumberAnimation { from: width * 1; to: width * 1.1; duration: 800; easing.type: Easing.InOutQuad } - NumberAnimation { from: width * 1.1; to: width * 1; duration: 1000; easing.type: Easing.InOutQuad } - } - SequentialAnimation on height { - loops: Animation.Infinite - NumberAnimation { from: height * 1; to: height * 1.15; duration: 1200; easing.type: Easing.InOutQuad } - NumberAnimation { from: height * 1.15; to: height * 1; duration: 1000; easing.type: Easing.InOutQuad } - } - } - - SpriteSequence { - id: ink - width: 64 - height: 64 - scale: bubble.scale - goalSprite: "" - - Sprite { - name: "clean" - source: "../gfx/projectile-action.png" - frameCount: 1 - frameX: 0 - frameWidth: 64 - frameHeight: 64 - } - Sprite { - name: "dirty" - source: "../gfx/projectile-action.png" - frameCount: 3 - frameX: 64 - frameWidth: 64 - frameHeight: 64 - frameDuration: 150 - to: {"clean":1} - } - - Sprite { //WORKAROUND: This prevents the triggering of a rendering error which is currently under investigation. - name: "dummy" - source: "../gfx/melee-idle.png" - frameCount: 8 - frameWidth: 64 - frameHeight: 64 - frameX: 0 - frameDuration: 200 - } - SequentialAnimation on width { - loops: Animation.Infinite - NumberAnimation { from: width * 1; to: width * 1.1; duration: 800; easing.type: Easing.InOutQuad } - NumberAnimation { from: width * 1.1; to: width * 1; duration: 1000; easing.type: Easing.InOutQuad } - } - SequentialAnimation on height { - loops: Animation.Infinite - NumberAnimation { from: height * 1; to: height * 1.15; duration: 1200; easing.type: Easing.InOutQuad } - NumberAnimation { from: height * 1.15; to: height * 1; duration: 1000; easing.type: Easing.InOutQuad } - } - - } - - SequentialAnimation on x { - loops: Animation.Infinite - NumberAnimation { from: x; to: x - 5; duration: 900; easing.type: Easing.InOutQuad } - NumberAnimation { from: x - 5; to: x; duration: 900; easing.type: Easing.InOutQuad } - } -} - diff --git a/basicsuite/qt5-launchpresentation/maroon/content/towers/Bomb.qml b/basicsuite/qt5-launchpresentation/maroon/content/towers/Bomb.qml deleted file mode 100644 index 00437f4..0000000 --- a/basicsuite/qt5-launchpresentation/maroon/content/towers/Bomb.qml +++ /dev/null @@ -1,133 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import "../logic.js" as Logic -import ".." - -TowerBase { - id: container - hp: 10 - range: 0.4 - rof: 10 - property real detonationRange: 2.5 - - function fire() { - sound.play() - sprite.jumpTo("shoot") - animDelay.start() - } - - function finishFire() { - var sCol = Math.max(0, col - 1) - var eCol = Math.min(Logic.gameState.cols - 1, col + 1) - var killList = new Array() - for (var i = sCol; i <= eCol; i++) { - for (var j = 0; j < Logic.gameState.mobs[i].length; j++) - if (Math.abs(Logic.gameState.mobs[i][j].y - container.y) < Logic.gameState.squareSize * detonationRange) - killList.push(Logic.gameState.mobs[i][j]) - while (killList.length > 0) - Logic.killMob(i, killList.pop()) - } - Logic.killTower(row, col); - } - - Timer { - id: animDelay - running: false - interval: shootState.frameCount * shootState.frameDuration - onTriggered: finishFire() - } - - function die() - { - destroy() // No blink, because we usually meant to die - } - - SoundEffect { - id: sound - source: "../audio/bomb-action.wav" - } - - SpriteSequence { - id: sprite - width: 64 - height: 64 - interpolate: false - goalSprite: "" - - Sprite { - name: "idle" - source: "../gfx/bomb-idle.png" - frameCount: 4 - frameDuration: 800 - } - - Sprite { - id: shootState - name: "shoot" - source: "../gfx/bomb-action.png" - frameCount: 6 - frameDuration: 155 - to: { "dying" : 1 } // So that if it takes a frame to clean up, it is on the last frame of the explosion - } - - Sprite { - name: "dying" - source: "../gfx/bomb-action.png" - frameCount: 1 - frameX: 64 * 5 - frameWidth: 64 - frameHeight: 64 - frameDuration: 155 - } - - SequentialAnimation on x { - loops: Animation.Infinite - NumberAnimation { from: x; to: x + 4; duration: 900; easing.type: Easing.InOutQuad } - NumberAnimation { from: x + 4; to: x; duration: 900; easing.type: Easing.InOutQuad } - } - SequentialAnimation on y { - loops: Animation.Infinite - NumberAnimation { from: y; to: y - 4; duration: 900; easing.type: Easing.InOutQuad } - NumberAnimation { from: y - 4; to: y; duration: 900; easing.type: Easing.InOutQuad } - } - } -} diff --git a/basicsuite/qt5-launchpresentation/maroon/content/towers/Factory.qml b/basicsuite/qt5-launchpresentation/maroon/content/towers/Factory.qml deleted file mode 100644 index b34a184..0000000 --- a/basicsuite/qt5-launchpresentation/maroon/content/towers/Factory.qml +++ /dev/null @@ -1,114 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import "../logic.js" as Logic -import ".." - -TowerBase { - id: container - rof: 160 - income: 5 - SpriteSequence { - id: sprite - width: 64 - height: 64 - interpolate: false - goalSprite: "" - - Sprite { - name: "idle" - source: "../gfx/factory-idle.png" - frameCount: 4 - frameDuration: 200 - } - - Sprite { - name: "action" - source: "../gfx/factory-action.png" - frameCount: 4 - frameDuration: 90 - to: { "idle" : 1 } - } - - SequentialAnimation on x { - loops: Animation.Infinite - NumberAnimation { from: x; to: x + 4; duration: 900; easing.type: Easing.InOutQuad } - NumberAnimation { from: x + 4; to: x; duration: 900; easing.type: Easing.InOutQuad } - } - SequentialAnimation on y { - loops: Animation.Infinite - NumberAnimation { from: y; to: y - 4; duration: 900; easing.type: Easing.InOutQuad } - NumberAnimation { from: y - 4; to: y; duration: 900; easing.type: Easing.InOutQuad } - } - } - - SoundEffect { - id: actionSound - source: "../audio/factory-action.wav" - } - - function fire() { - actionSound.play() - sprite.jumpTo("action") - coinLaunch.start() - } - - function spawn() { - coin.target = Logic.gameState.mapToItem(container, 240, -32) - } - - Image { - id: coin - property var target: { "x" : 0, "y" : 0 } - source: "../gfx/currency.png" - visible: false - } - - SequentialAnimation { - id: coinLaunch - PropertyAction { target: coin; property: "visible"; value: true } - ParallelAnimation { - NumberAnimation { target: coin; property: "x"; from: 16; to: coin.target.x } - NumberAnimation { target: coin; property: "y"; from: 16; to: coin.target.y } - } - PropertyAction { target: coin; property: "visible"; value: false } - } -} diff --git a/basicsuite/qt5-launchpresentation/maroon/content/towers/Melee.qml b/basicsuite/qt5-launchpresentation/maroon/content/towers/Melee.qml deleted file mode 100644 index 1b49a45..0000000 --- a/basicsuite/qt5-launchpresentation/maroon/content/towers/Melee.qml +++ /dev/null @@ -1,83 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import ".." - -TowerBase { - hp: 4 - range: 0.1 - damage: 1 - rof: 40 - income: 0 - - SpriteSequence { - id: sprite - width: 64 - height: 64 - interpolate: false - goalSprite: "" - - Sprite { - name: "idle" - source: "../gfx/melee-idle.png" - frameCount: 8 - frameDuration: 250 - } - - Sprite { - name: "shoot" - source: "../gfx/melee-action.png" - frameCount: 2 - frameDuration: 200 - to: { "idle" : 1 } - } - } - - function fire() { - shootSound.play() - sprite.jumpTo("shoot") - } - - SoundEffect { - id: shootSound - source: "../audio/melee-action.wav" - } -} diff --git a/basicsuite/qt5-launchpresentation/maroon/content/towers/Ranged.qml b/basicsuite/qt5-launchpresentation/maroon/content/towers/Ranged.qml deleted file mode 100644 index 33f3354..0000000 --- a/basicsuite/qt5-launchpresentation/maroon/content/towers/Ranged.qml +++ /dev/null @@ -1,128 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import "../logic.js" as Logic -import ".." - -TowerBase { - id: container - hp: 2 - range: 6 - damage: 0 // By projectile - rof: 40 - income: 0 - property var targetMob - property real realDamage: 1 - function fire() { - proj.x = 32 - proj.width / 2 - proj.y = 0 - targetMob = Logic.gameState.mobs[col][0] - projAnim.to = targetMob.y - container.y -10 - projAnim.start() - shootSound.play() - sprite.jumpTo("shoot") - } - - Image { - id: proj - y: 1000 - SequentialAnimation on y { - id: projAnim - running: false - property real to: 1000 - SmoothedAnimation { - to: projAnim.to - velocity: 400 - } - ScriptAction { - script: { - if (targetMob && targetMob.hit) { - targetMob.hit(realDamage) - targetMob.inked() - projSound.play() - } - } - } - PropertyAction { - value: 1000; - } - } - source: "../gfx/projectile.png" - } - - SoundEffect { - id: shootSound - source: "../audio/shooter-action.wav" - } - SoundEffect { - id: projSound - source: "../audio/projectile-action.wav" - } - - SpriteSequence { - id: sprite - width: 64 - height: 64 - interpolate: false - goalSprite: "" - - Sprite { - name: "idle" - source: "../gfx/shooter-idle.png" - frameCount: 4 - frameDuration: 250 - } - - Sprite { - name: "shoot" - source: "../gfx/shooter-action.png" - frameCount: 5 - frameDuration: 90 - to: { "idle" : 1 } - } - - SequentialAnimation on x { - loops: Animation.Infinite - NumberAnimation { from: x; to: x - 4; duration: 900; easing.type: Easing.InOutQuad } - NumberAnimation { from: x - 4; to: x; duration: 900; easing.type: Easing.InOutQuad } - } - } -} diff --git a/basicsuite/qt5-launchpresentation/maroon/content/towers/TowerBase.qml b/basicsuite/qt5-launchpresentation/maroon/content/towers/TowerBase.qml deleted file mode 100644 index 5c71cb0..0000000 --- a/basicsuite/qt5-launchpresentation/maroon/content/towers/TowerBase.qml +++ /dev/null @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 - -Item { - property real hp: 1 - property real range: 0 - property real damage: 0 - property int rof: 100 - property int fireCounter: 0 - property int income: 0 - property int row: 0 - property int col: 0 - - width: parent ? parent.squareSize : 0 - height: parent ? parent.squareSize : 0 - //This is how it is placed on the gameboard, do not modify/animate the X/Y/Z of a TowerBase please - x: col * width - y: row * height - z: 1000 - - function fire() { } - function spawn() { } //After all game properties are set - function die() { stdDeath.start(); destroy(1000); } - function sell() { destroy(); } - - SequentialAnimation on opacity { - id: stdDeath - running: false - loops: 2 - NumberAnimation { from: 1; to: 0; } - NumberAnimation { from: 0; to: 1; } - } -} diff --git a/basicsuite/qt5-launchpresentation/particles/customemitter.qml b/basicsuite/qt5-launchpresentation/particles/customemitter.qml deleted file mode 100644 index 270935d..0000000 --- a/basicsuite/qt5-launchpresentation/particles/customemitter.qml +++ /dev/null @@ -1,91 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Particles 2.0 - -ParticleSystem { - id: sys - width: 320 - height: 480 - running: true - - property real petalLength: 180 - property real petalRotation: 0 - NumberAnimation on petalRotation { - from: 0; - to: 360; - loops: -1; - running: true - duration: 24000 - } - - function convert(a) {return a*(Math.PI/180);} - Emitter { - lifeSpan: 4000 - emitRate: 120 - size: 12 - anchors.centerIn: parent - //! [0] - onEmitParticles: { - for (var i=0; i 0) { - root.currentSlide = 0; - root.slides[root.currentSlide].visible = true; - } - } - - function switchSlides(from, to, forward) { - from.visible = false - to.visible = true - return true - } - - function goToNextSlide() { - root._userNum = 0 - if (_faded) - return - if (root.currentSlide + 1 < root.slides.length) { - var from = slides[currentSlide] - var to = slides[currentSlide + 1] - if (switchSlides(from, to, true)) { - currentSlide = currentSlide + 1; - root.focus = true; - } - } - } - - function goToPreviousSlide() { - root._userNum = 0 - if (root._faded) - return - if (root.currentSlide - 1 >= 0) { - var from = slides[currentSlide] - var to = slides[currentSlide - 1] - if (switchSlides(from, to, false)) { - currentSlide = currentSlide - 1; - root.focus = true; - } - } - } - - function goToUserSlide() { - --_userNum; - if (root._faded || _userNum >= root.slides.length) - return - if (_userNum < 0) - goToNextSlide() - else if (root.currentSlide != _userNum) { - var from = slides[currentSlide] - var to = slides[_userNum] - if (switchSlides(from, to, _userNum > currentSlide)) { - currentSlide = _userNum; - root.focus = true; - } - } - } - - focus: true - - Keys.onSpacePressed: goToNextSlide() - Keys.onRightPressed: goToNextSlide() - Keys.onDownPressed: goToNextSlide() - Keys.onLeftPressed: goToPreviousSlide() - Keys.onUpPressed: goToPreviousSlide() - Keys.onEscapePressed: Qt.quit() - Keys.onPressed: { - if (event.key >= Qt.Key_0 && event.key <= Qt.Key_9) - _userNum = 10 * _userNum + (event.key - Qt.Key_0) - else { - if (event.key == Qt.Key_Return || event.key == Qt.Key_Enter) - goToUserSlide(); - else if (event.key == Qt.Key_Backspace) - goToPreviousSlide(); - else if (event.key == Qt.Key_C) - root._faded = !root._faded; - _userNum = 0; - } - } - - Rectangle { - z: 1000 - color: "black" - anchors.fill: parent - opacity: root._faded ? 1 : 0 - Behavior on opacity { NumberAnimation { duration: 250 } } - } - - MouseArea { - id: mouseArea - anchors.fill: parent - acceptedButtons: Qt.LeftButton | Qt.RightButton - onClicked: { - if (mouse.button == Qt.RightButton) - goToPreviousSlide() - else - goToNextSlide() - } - onPressAndHold: goToPreviousSlide(); //A back mechanism for touch only devices - } - - Window { - id: notesWindow; - width: 400 - height: 300 - - title: "QML Presentation: Notes" - visible: root.showNotes - - Text { - anchors.fill: parent - anchors.margins: parent.height * 0.1; - - font.pixelSize: 16 - wrapMode: Text.WordWrap - - property string notes: root.slides[root.currentSlide].notes; - text: notes == "" ? "Slide has no notes..." : notes; - font.italic: notes == ""; - } - } -} diff --git a/basicsuite/qt5-launchpresentation/presentation/Slide.qml b/basicsuite/qt5-launchpresentation/presentation/Slide.qml deleted file mode 100644 index 339298d..0000000 --- a/basicsuite/qt5-launchpresentation/presentation/Slide.qml +++ /dev/null @@ -1,186 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the QML Presentation System. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Digia. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -import QtQuick 2.0 - -Item { - /* - Slides can only be instantiated as a direct child of a Presentation {} as they rely on - several properties there. - */ - - id: slide - - property bool isSlide: true; - - property string title; - property variant content: [] - property string centeredText - property string writeInText; - property string notes; - - property real fontSize: parent.height * 0.05 - property real fontScale: 1 - - property real baseFontSize: fontSize * fontScale - property real titleFontSize: fontSize * 1.2 * fontScale - property real bulletSpacing: 1 - - property real contentWidth: width - - // Define the slide to be the "content area" - x: parent.width * 0.05 - y: parent.height * 0.2 - width: parent.width * 0.9 - height: parent.height * 0.7 - - property real masterWidth: parent.width - property real masterHeight: parent.height - - property color titleColor: parent.titleColor; - property color textColor: parent.textColor; - property string fontFamily: parent.fontFamily; - - visible: false - - Text { - id: titleText - font.pixelSize: titleFontSize - text: title; - anchors.horizontalCenter: parent.horizontalCenter - anchors.bottom: parent.top - anchors.bottomMargin: parent.fontSize * 1.5 - font.bold: true; - font.family: slide.fontFamily - color: slide.titleColor - horizontalAlignment: Text.Center - z: 1 - } - - Text { - id: centeredId - width: parent.width - anchors.centerIn: parent - anchors.verticalCenterOffset: - parent.y / 3 - text: centeredText - horizontalAlignment: Text.Center - font.pixelSize: baseFontSize - font.family: slide.fontFamily - color: slide.textColor - wrapMode: Text.Wrap - } - - Text { - id: writeInTextId - property int length; - font.family: slide.fontFamily - font.pixelSize: baseFontSize - color: slide.textColor - - anchors.fill: parent; - wrapMode: Text.Wrap - - text: slide.writeInText.substring(0, length); - - NumberAnimation on length { - from: 0; - to: slide.writeInText.length; - duration: slide.writeInText.length * 30; - running: slide.visible && parent.visible && slide.writeInText.length > 0 - } - - visible: slide.writeInText != undefined; - } - - - Column { - id: contentId - anchors.fill: parent - - Repeater { - model: content.length - - Row { - id: row - - function decideIndentLevel(s) { return s.charAt(0) == " " ? 1 + decideIndentLevel(s.substring(1)) : 0 } - property int indentLevel: decideIndentLevel(content[index]) - property int nextIndentLevel: index < content.length - 1 ? decideIndentLevel(content[index+1]) : 0 - property real indentFactor: (10 - row.indentLevel * 2) / 10; - - height: text.height + (nextIndentLevel == 0 ? 1 : 0.3) * slide.baseFontSize * slide.bulletSpacing - x: slide.baseFontSize * indentLevel - - Rectangle { - id: dot - y: baseFontSize * row.indentFactor / 2 - width: baseFontSize / 4 - height: baseFontSize / 4 - color: slide.textColor - radius: width / 2 - smooth: true - opacity: text.text.length == 0 ? 0 : 1 - } - - Rectangle { - id: space - width: dot.width * 2 - height: 1 - color: "#00ffffff" - } - - Text { - id: text - width: slide.contentWidth - parent.x - dot.width - space.width - font.pixelSize: baseFontSize * row.indentFactor - text: content[index] - textFormat: Text.PlainText - wrapMode: Text.WordWrap - color: slide.textColor - horizontalAlignment: Text.AlignLeft - font.family: slide.fontFamily - } - } - } - } - -} diff --git a/basicsuite/qt5-launchpresentation/presentation/SlideCounter.qml b/basicsuite/qt5-launchpresentation/presentation/SlideCounter.qml deleted file mode 100644 index 06e7542..0000000 --- a/basicsuite/qt5-launchpresentation/presentation/SlideCounter.qml +++ /dev/null @@ -1,61 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the QML Presentation System. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Digia. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -import QtQuick 2.0 - -Text { - id: counter; - - property real fontSize: parent.height * 0.05 - property real fontScale: 0.5; - property color textColor: parent.textColor != undefined ? parent.textColor : "black" - property string fontFamily: parent.fontFamily != undefined ? parent.fontFamily : "Helvetica" - - text: "# " + (parent.currentSlide + 1) + " / " + parent.slides.length; - color: counter.textColor; - font.family: counter.fontFamily; - font.pixelSize: fontSize * fontScale; - - anchors.right: parent.right; - anchors.bottom: parent.bottom; - anchors.margins: font.pixelSize; -} diff --git a/basicsuite/qt5-launchpresentation/preview_l.jpg b/basicsuite/qt5-launchpresentation/preview_l.jpg deleted file mode 100644 index 8decd76..0000000 Binary files a/basicsuite/qt5-launchpresentation/preview_l.jpg and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/qt5-launchpresentation.pro b/basicsuite/qt5-launchpresentation/qt5-launchpresentation.pro deleted file mode 100644 index c3aba46..0000000 --- a/basicsuite/qt5-launchpresentation/qt5-launchpresentation.pro +++ /dev/null @@ -1,18 +0,0 @@ -TARGET = qt5-launchpresentation - -include(../shared/shared.pri) -b2qtdemo_deploy_defaults() - -content.files = \ - *.qml \ - calqlatr \ - maroon \ - particles \ - presentation \ - samegame \ - images -content.path = $$DESTPATH - -OTHER_FILES += $${content.files} - -INSTALLS += target content \ No newline at end of file diff --git a/basicsuite/qt5-launchpresentation/samegame/.DS_Store b/basicsuite/qt5-launchpresentation/samegame/.DS_Store deleted file mode 100644 index 9805454..0000000 Binary files a/basicsuite/qt5-launchpresentation/samegame/.DS_Store and /dev/null differ diff --git a/basicsuite/qt5-launchpresentation/samegame/Samegame.qml b/basicsuite/qt5-launchpresentation/samegame/Samegame.qml deleted file mode 100644 index 2b0b82a..0000000 --- a/basicsuite/qt5-launchpresentation/samegame/Samegame.qml +++ /dev/null @@ -1,371 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Particles 2.0 -import "content/samegame.js" as Logic -import "settings.js" as Settings -import "content" - -Rectangle { - id: root - width: 320; height: 480 - property int acc: 0 - - - function loadPuzzle() { - if (gameCanvas.mode != "") - Logic.cleanUp(); - Logic.startNewGame(gameCanvas,"puzzle","levels/level"+acc+".qml") - } - function nextPuzzle() { - acc = (acc + 1) % 10; - loadPuzzle(); - } - Timer { - id: gameOverTimer - interval: 1500 - running : gameCanvas.gameOver && gameCanvas.mode == "puzzle" //mode will be reset by cleanUp(); - repeat : false - onTriggered: { - Logic.cleanUp(); - nextPuzzle(); - } - } - - Image { - source: "content/gfx/background.png" - anchors.fill: parent - } - - GameArea { - id: gameCanvas - z: 1 - y: Settings.headerHeight - - width: parent.width - height: parent.height - Settings.headerHeight - Settings.footerHeight - - backgroundVisible: root.state == "in-game" - onModeChanged: if (gameCanvas.mode != "puzzle") puzzleWon = false; //UI has stricter constraints on this variable than the game does - Age { - groups: ["redspots", "greenspots", "bluespots", "yellowspots"] - enabled: root.state == "" - system: gameCanvas.ps - } - - onPuzzleLost: acc--;//So that nextPuzzle() reloads the current one - - } - - Item { - id: menu - z: 2 - width: parent.width; - anchors.top: parent.top - anchors.bottom: bottomBar.top - - LogoAnimation { - x: 64 - y: Settings.headerHeight - particleSystem: gameCanvas.ps - running: root.state == "" - } - Row { - x: 112 - y: 20 - Image { source: "content/gfx/logo-a.png" } - Image { source: "content/gfx/logo-m.png" } - Image { source: "content/gfx/logo-e.png" } - } - - Column { - y: 100 + 40 - spacing: Settings.menuButtonSpacing - - Button { - width: root.width - rotatedButton: true - imgSrc: "content/gfx/but-game-1.png" - onClicked: { - if (root.state == "in-game") - return //Prevent double clicking - root.state = "in-game" - gameCanvas.blockFile = "Block.qml" - gameCanvas.background = "gfx/background.png" - arcadeTimer.start(); - } - //Emitted particles don't fade out, because ImageParticle is on the GameArea - system: gameCanvas.ps - group: "green" - Timer { - id: arcadeTimer - interval: Settings.menuDelay - running : false - repeat : false - onTriggered: Logic.startNewGame(gameCanvas) - } - } - - Button { - width: root.width - rotatedButton: true - imgSrc: "content/gfx/but-game-2.png" - onClicked: { - if (root.state == "in-game") - return - root.state = "in-game" - gameCanvas.blockFile = "Block.qml" - gameCanvas.background = "gfx/background.png" - twopTimer.start(); - } - system: gameCanvas.ps - group: "green" - Timer { - id: twopTimer - interval: Settings.menuDelay - running : false - repeat : false - onTriggered: Logic.startNewGame(gameCanvas, "multiplayer") - } - } - - Button { - width: root.width - rotatedButton: true - imgSrc: "content/gfx/but-game-3.png" - onClicked: { - if (root.state == "in-game") - return - root.state = "in-game" - gameCanvas.blockFile = "SimpleBlock.qml" - gameCanvas.background = "gfx/background.png" - endlessTimer.start(); - } - system: gameCanvas.ps - group: "blue" - Timer { - id: endlessTimer - interval: Settings.menuDelay - running : false - repeat : false - onTriggered: Logic.startNewGame(gameCanvas, "endless") - } - } - - Button { - width: root.width - rotatedButton: true - imgSrc: "content/gfx/but-game-4.png" - group: "yellow" - onClicked: { - if (root.state == "in-game") - return - root.state = "in-game" - gameCanvas.blockFile = "PuzzleBlock.qml" - gameCanvas.background = "gfx/background.png" - puzzleTimer.start(); - } - Timer { - id: puzzleTimer - interval: Settings.menuDelay - running : false - repeat : false - onTriggered: loadPuzzle(); - } - system: gameCanvas.ps - } - } - } - - Image { - id: scoreBar - source: "content/gfx/bar.png" - width: parent.width - z: 6 - y: -Settings.headerHeight - height: Settings.headerHeight - Behavior on opacity { NumberAnimation {} } - SamegameText { - id: arcadeScore - anchors { right: parent.right; topMargin: 3; rightMargin: 11; top: parent.top} - text: 'P1: ' + gameCanvas.score - font.pixelSize: Settings.fontPixelSize - textFormat: Text.StyledText - color: "white" - opacity: gameCanvas.mode == "arcade" ? 1 : 0 - Behavior on opacity { NumberAnimation {} } - } - SamegameText { - id: arcadeHighScore - anchors { left: parent.left; topMargin: 3; leftMargin: 11; top: parent.top} - text: 'Highscore: ' + gameCanvas.highScore - opacity: gameCanvas.mode == "arcade" ? 1 : 0 - } - SamegameText { - id: p1Score - anchors { right: parent.right; topMargin: 3; rightMargin: 11; top: parent.top} - text: 'P1: ' + gameCanvas.score - opacity: gameCanvas.mode == "multiplayer" ? 1 : 0 - } - SamegameText { - id: p2Score - anchors { left: parent.left; topMargin: 3; leftMargin: 11; top: parent.top} - text: 'P2: ' + gameCanvas.score2 - opacity: gameCanvas.mode == "multiplayer" ? 1 : 0 - rotation: 180 - } - SamegameText { - id: puzzleMoves - anchors { left: parent.left; topMargin: 3; leftMargin: 11; top: parent.top} - text: 'Moves: ' + gameCanvas.moves - opacity: gameCanvas.mode == "puzzle" ? 1 : 0 - } - SamegameText { - Image { - source: "content/gfx/icon-time.png" - x: -20 - } - id: puzzleTime - anchors { topMargin: 3; top: parent.top; horizontalCenter: parent.horizontalCenter; horizontalCenterOffset: 20} - text: "00:00" - opacity: gameCanvas.mode == "puzzle" ? 1 : 0 - Timer { - interval: 1000 - repeat: true - running: gameCanvas.mode == "puzzle" && !gameCanvas.gameOver - onTriggered: { - var elapsed = Math.floor((new Date() - Logic.gameDuration)/ 1000.0); - var mins = Math.floor(elapsed/60.0); - var secs = (elapsed % 60); - puzzleTime.text = (mins < 10 ? "0" : "") + mins + ":" + (secs < 10 ? "0" : "") + secs; - } - } - } - SamegameText { - id: puzzleScore - anchors { right: parent.right; topMargin: 3; rightMargin: 11; top: parent.top} - text: 'Score: ' + gameCanvas.score - opacity: gameCanvas.mode == "puzzle" ? 1 : 0 - } - } - - Image { - id: bottomBar - width: parent.width - height: Settings.footerHeight - source: "content/gfx/bar.png" - y: parent.height - Settings.footerHeight; - z: 2 - Button { - id: quitButton - height: Settings.toolButtonHeight - imgSrc: "content/gfx/but-quit.png" - onClicked: {Qt.quit(); } - anchors { left: parent.left; verticalCenter: parent.verticalCenter; leftMargin: 11 } - } - Button { - id: menuButton - height: Settings.toolButtonHeight - imgSrc: "content/gfx/but-menu.png" - visible: (root.state == "in-game"); - onClicked: {root.state = ""; Logic.cleanUp(); gameCanvas.mode = ""} - anchors { left: quitButton.right; verticalCenter: parent.verticalCenter; leftMargin: 0 } - } - Button { - id: againButton - height: Settings.toolButtonHeight - imgSrc: "content/gfx/but-game-new.png" - visible: (root.state == "in-game"); - opacity: gameCanvas.gameOver && (gameCanvas.mode == "arcade" || gameCanvas.mode == "multiplayer") - Behavior on opacity{ NumberAnimation {} } - onClicked: {if (gameCanvas.gameOver) { Logic.startNewGame(gameCanvas, gameCanvas.mode);}} - anchors { right: parent.right; verticalCenter: parent.verticalCenter; rightMargin: 11 } - } - Button { - id: nextButton - height: Settings.toolButtonHeight - imgSrc: "content/gfx/but-puzzle-next.png" - visible: (root.state == "in-game") && gameCanvas.mode == "puzzle" && gameCanvas.puzzleWon - opacity: gameCanvas.puzzleWon ? 1 : 0 - Behavior on opacity{ NumberAnimation {} } - onClicked: {if (gameCanvas.puzzleWon) nextPuzzle();} - anchors { right: parent.right; verticalCenter: parent.verticalCenter; rightMargin: 11 } - } - } - - Connections { - target: root - onStateChanged: stateChangeAnim.running = true - } - SequentialAnimation { - id: stateChangeAnim - ParallelAnimation { - NumberAnimation { target: bottomBar; property: "y"; to: root.height; duration: Settings.menuDelay/2; easing.type: Easing.OutQuad } - NumberAnimation { target: scoreBar; property: "y"; to: -Settings.headerHeight; duration: Settings.menuDelay/2; easing.type: Easing.OutQuad } - } - ParallelAnimation { - NumberAnimation { target: bottomBar; property: "y"; to: root.height - Settings.footerHeight; duration: Settings.menuDelay/2; easing.type: Easing.OutBounce} - NumberAnimation { target: scoreBar; property: "y"; to: root.state == "" ? -Settings.headerHeight : 0; duration: Settings.menuDelay/2; easing.type: Easing.OutBounce} - } - } - - states: [ - State { - name: "in-game" - PropertyChanges { - target: menu - opacity: 0 - visible: false - } - } - ] - - transitions: [ - Transition { - NumberAnimation {properties: "x,y,opacity"} - } - ] - - //"Debug mode" - focus: true - Keys.onAsteriskPressed: Logic.nuke(); - Keys.onSpacePressed: gameCanvas.puzzleWon = true; -} diff --git a/basicsuite/qt5-launchpresentation/samegame/content/Block.qml b/basicsuite/qt5-launchpresentation/samegame/content/Block.qml deleted file mode 100644 index 85f2e27..0000000 --- a/basicsuite/qt5-launchpresentation/samegame/content/Block.qml +++ /dev/null @@ -1,114 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Particles 2.0 - -Item { - id: block - property bool dying: false - property bool spawned: false - property int type: 0 - property ParticleSystem particleSystem - - Behavior on x { - enabled: spawned; - SpringAnimation{ spring: 2; damping: 0.2 } - } - Behavior on y { - SpringAnimation{ spring: 2; damping: 0.2 } - } - - Image { - id: img - source: { - if (type == 0){ - "gfx/red.png"; - } else if (type == 1) { - "gfx/blue.png"; - } else if (type == 2) { - "gfx/green.png"; - } else { - "gfx/yellow.png"; - } - } - opacity: 0 - Behavior on opacity { NumberAnimation { duration: 200 } } - anchors.fill: parent - } - - //Foreground particles - BlockEmitter { - id: particles - system: particleSystem - group: { - if (type == 0){ - "red"; - } else if (type == 1) { - "blue"; - } else if (type == 2) { - "green"; - } else { - "yellow"; - } - } - anchors.fill: parent - } - - //Paint particles on the background - PaintEmitter { - id: particles2 - system: particleSystem - } - - states: [ - State { - name: "AliveState"; when: spawned == true && dying == false - PropertyChanges { target: img; opacity: 1 } - }, - - State { - name: "DeathState"; when: dying == true - StateChangeScript { script: {particleSystem.paused = false; particles.pulse(100); particles2.pulse(100);} } - PropertyChanges { target: img; opacity: 0 } - StateChangeScript { script: block.destroy(1000); } - } - ] -} diff --git a/basicsuite/qt5-launchpresentation/samegame/content/BlockEmitter.qml b/basicsuite/qt5-launchpresentation/samegame/content/BlockEmitter.qml deleted file mode 100644 index 7dad509..0000000 --- a/basicsuite/qt5-launchpresentation/samegame/content/BlockEmitter.qml +++ /dev/null @@ -1,57 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Particles 2.0 - -import "../settings.js" as Settings - -Emitter { - property Item block: parent - velocity: TargetDirection{targetX: block.width/2; targetY: block.height/2; magnitude: -40; magnitudeVariation: 40} - acceleration: TargetDirection{targetX: block.width/2; targetY: block.height/2; magnitude: -100;} - shape: EllipseShape{fill:true} - enabled: false; - lifeSpan: 700; lifeSpanVariation: 100 - emitRate: 1000 - maximumEmitted: 100 //only fires 0.1s bursts (still 2x old number) - size: Settings.blockSize * 0.85 - endSize: Settings.blockSize * 0.85 /2 -} diff --git a/basicsuite/qt5-launchpresentation/samegame/content/Button.qml b/basicsuite/qt5-launchpresentation/samegame/content/Button.qml deleted file mode 100644 index aab21ec..0000000 --- a/basicsuite/qt5-launchpresentation/samegame/content/Button.qml +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Particles 2.0 - -Item { - property alias imgSrc: image.source - property alias system: emitter.system - property alias group: emitter.group - signal clicked - property bool rotatedButton: false - - width: image.width - height: image.sourceSize.height - Image { - id: image - height: parent.height - width: height/sourceSize.height * sourceSize.width - - anchors.horizontalCenter: parent.horizontalCenter - rotation: rotatedButton ? ((Math.random() * 3 + 2) * (Math.random() <= 0.5 ? -1 : 1)) : 0 - MenuEmitter { - id: emitter - anchors.fill: parent - //shape: MaskShape {source: image.source} - } - } - MouseArea { - anchors.fill: parent - onClicked: {parent.clicked(); emitter.burst(400);} - } -} diff --git a/basicsuite/qt5-launchpresentation/samegame/content/GameArea.qml b/basicsuite/qt5-launchpresentation/samegame/content/GameArea.qml deleted file mode 100644 index f3ca98d..0000000 --- a/basicsuite/qt5-launchpresentation/samegame/content/GameArea.qml +++ /dev/null @@ -1,226 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Particles 2.0 -import "samegame.js" as Logic - -Item { - id: gameCanvas - property bool gameOver: true - property int score: 0 - property int highScore: 0 - property int moves: 0 - property string mode: "" - property ParticleSystem ps: particleSystem - //For easy theming - property alias backgroundVisible: bg.visible - property string background: "gfx/background.png" - property string blockFile: "Block.qml" - onBlockFileChanged: Logic.changeBlock(blockFile); - property alias particlePack: auxLoader.source - //For multiplayer - property int score2: 0 - property int curTurn: 1 - property bool autoTurnChange: false - signal swapPlayers - property bool swapping: false - //onSwapPlayers: if (autoTurnChange) Logic.turnChange();//Now implemented below - //For puzzle - property url level - property bool puzzleWon: false - signal puzzleLost //Since root is tracking the puzzle progress - function showPuzzleEnd (won) { - if (won) { - smokeParticle.color = Qt.rgba(0,1,0,0); - puzzleWin.play(); - } else { - smokeParticle.color = Qt.rgba(1,0,0,0); - puzzleFail.play(); - puzzleLost(); - } - } - function showPuzzleGoal (str) { - puzzleTextBubble.opacity = 1; - puzzleTextLabel.text = str; - } - Image { - id: bg - z: -1 - anchors.fill: parent - source: background; - fillMode: Image.PreserveAspectCrop - } - - MouseArea { - anchors.fill: parent; onClicked: { - if (puzzleTextBubble.opacity == 1) { - puzzleTextBubble.opacity = 0; - Logic.finishLoadingMap(); - } else if (!swapping) { - Logic.handleClick(mouse.x,mouse.y); - } - } - } - - Image { - id: highScoreTextBubble - opacity: mode == "arcade" && gameOver && gameCanvas.score == gameCanvas.highScore ? 1 : 0 - Behavior on opacity { NumberAnimation {} } - anchors.centerIn: parent - z: 10 - source: "gfx/bubble-highscore.png" - Image { - anchors.centerIn: parent - source: "gfx/text-highscore-new.png" - rotation: -10 - } - } - - Image { - id: puzzleTextBubble - anchors.centerIn: parent - opacity: 0 - Behavior on opacity { NumberAnimation {} } - z: 10 - source: "gfx/bubble-puzzle.png" - Connections { - target: gameCanvas - onModeChanged: if (mode != "puzzle" && puzzleTextBubble.opacity > 0) puzzleTextBubble.opacity = 0; - } - Text { - id: puzzleTextLabel - width: parent.width - 24 - anchors.centerIn: parent - horizontalAlignment: Text.AlignHCenter - color: "white" - font.pixelSize: 24 - font.bold: true - wrapMode: Text.WordWrap - } - } - onModeChanged: { - p1WonImg.opacity = 0; - p2WonImg.opacity = 0; - } - SmokeText { id: puzzleWin; source: "gfx/icon-ok.png"; system: particleSystem } - SmokeText { id: puzzleFail; source: "gfx/icon-fail.png"; system: particleSystem } - - onSwapPlayers: { - smokeParticle.color = "yellow" - Logic.turnChange(); - if (curTurn == 1) { - p1Text.play(); - } else { - p2Text.play(); - } - clickDelay.running = true; - } - SequentialAnimation { - id: clickDelay - ScriptAction { script: gameCanvas.swapping = true; } - PauseAnimation { duration: 750 } - ScriptAction { script: gameCanvas.swapping = false; } - } - - SmokeText { - id: p1Text; source: "gfx/text-p1-go.png"; - system: particleSystem; playerNum: 1 - opacity: p1WonImg.opacity + p2WonImg.opacity > 0 ? 0 : 1 - } - - SmokeText { - id: p2Text; source: "gfx/text-p2-go.png"; - system: particleSystem; playerNum: 2 - opacity: p1WonImg.opacity + p2WonImg.opacity > 0 ? 0 : 1 - } - - onGameOverChanged: { - if (gameCanvas.mode == "multiplayer") { - if (gameCanvas.score >= gameCanvas.score2) { - p1WonImg.opacity = 1; - } else { - p2WonImg.opacity = 1; - } - } - } - Image { - id: p1WonImg - source: "gfx/text-p1-won.png" - anchors.centerIn: parent - opacity: 0 - Behavior on opacity { NumberAnimation {} } - z: 10 - } - Image { - id: p2WonImg - source: "gfx/text-p2-won.png" - anchors.centerIn: parent - opacity: 0 - Behavior on opacity { NumberAnimation {} } - z: 10 - } - - ParticleSystem{ - id: particleSystem; - anchors.fill: parent - z: 5 - ImageParticle { - id: smokeParticle - groups: ["smoke"] - source: "gfx/particle-smoke.png" - alpha: 0.1 - alphaVariation: 0.1 - color: "yellow" - } - Loader { - id: auxLoader - anchors.fill: parent - source: "PrimaryPack.qml" - onItemChanged: { - if (item && "particleSystem" in item) - item.particleSystem = particleSystem - if (item && "gameArea" in item) - item.gameArea = gameCanvas - } - } - } -} - diff --git a/basicsuite/qt5-launchpresentation/samegame/content/LogoAnimation.qml b/basicsuite/qt5-launchpresentation/samegame/content/LogoAnimation.qml deleted file mode 100644 index c879893..0000000 --- a/basicsuite/qt5-launchpresentation/samegame/content/LogoAnimation.qml +++ /dev/null @@ -1,102 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Particles 2.0 - -Item { - id: container //Positioned where the 48x48 S/G should be - property alias running: mainAnim.running - property ParticleSystem particleSystem - property int dur: 500 - signal boomTime - Image { - id: s1 - source: "gfx/logo-s.png" - y: 0 - } - Image { - id: g1 - source: "gfx/logo-g.png" - y: -128 - } - Column { - Repeater { - model: 2 - Item { - width: 48 - height: 48 - BlockEmitter { - id: emitter - anchors.fill: parent - group: "red" - system: particleSystem - Connections { - target: container - onBoomTime: emitter.pulse(100); - } - } - } - } - } - SequentialAnimation { - id: mainAnim - running: true - loops: -1 - PropertyAction { target: g1; property: "y"; value: -128} - PropertyAction { target: g1; property: "opacity"; value: 1} - PropertyAction { target: s1; property: "y"; value: 0} - PropertyAction { target: s1; property: "opacity"; value: 1} - NumberAnimation { target: g1; property: "y"; from: -96; to: -48; duration: dur} - ParallelAnimation { - NumberAnimation { target: g1; property: "y"; from: -48; to: 0; duration: dur} - NumberAnimation { target: s1; property: "y"; from: 0; to: 48; duration: dur } - } - PauseAnimation { duration: dur } - ScriptAction { script: container.boomTime(); } - ParallelAnimation { - NumberAnimation { target: g1; property: "opacity"; to: 0; duration: dur } - NumberAnimation { target: s1; property: "opacity"; to: 0; duration: dur } - } - PropertyAction { target: s1; property: "y"; value: -128} - PropertyAction { target: s1; property: "opacity"; value: 1} - NumberAnimation { target: s1; property: "y"; from: -96; to: 0; duration: dur * 2} - } -} diff --git a/basicsuite/qt5-launchpresentation/samegame/content/MenuEmitter.qml b/basicsuite/qt5-launchpresentation/samegame/content/MenuEmitter.qml deleted file mode 100644 index 16c7660..0000000 --- a/basicsuite/qt5-launchpresentation/samegame/content/MenuEmitter.qml +++ /dev/null @@ -1,53 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Particles 2.0 - -Emitter { - anchors.fill: parent - velocity: AngleDirection{angleVariation: 360; magnitude: 140; magnitudeVariation: 40} - enabled: false; - lifeSpan: 500; - emitRate: 1 - size: 28 - endSize: 14 - group: "yellow" -} diff --git a/basicsuite/qt5-launchpresentation/samegame/content/PaintEmitter.qml b/basicsuite/qt5-launchpresentation/samegame/content/PaintEmitter.qml deleted file mode 100644 index 4a67c4a..0000000 --- a/basicsuite/qt5-launchpresentation/samegame/content/PaintEmitter.qml +++ /dev/null @@ -1,98 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Particles 2.0 -import "../settings.js" as Settings - -Emitter { - property Item block: parent - anchors.fill: parent - shape: EllipseShape { fill: true } - group: { - if (block.type == 0){ - "redspots"; - } else if (block.type == 1) { - "bluespots"; - } else if (block.type == 2) { - "greenspots"; - } else { - "yellowspots"; - } - } - size: Settings.blockSize * 2 - endSize: Settings.blockSize/2 - lifeSpan: 30000 - enabled: false - emitRate: 60 - maximumEmitted: 60 - velocity: PointDirection{ y: 4; yVariation: 4 } - /* Possibly better, but dependent on gerrit change,28212 - property real mainIntensity: 0.8 - property real subIntensity: 0.1 - property real colorVariation: 0.005 - onEmitParticles: {//One group, many colors, for better stacking - for (var i=0; i
Clear in three moves..." - startingGrid: [ 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , - 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , - 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , - 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , - 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , - 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , - 0 , 0 , 0 , 0 , 0 , 0 , 0 , 1 , 1 , 1 , - 0 , 0 , 0 , 0 , 0 , 1 , 1 , 2 , 1 , 1 , - 0 , 0 , 0 , 1 , 1 , 3 , 3 , 3 , 3 , 3 , - 0 , 1 , 1 , 3 , 3 , 3 , 1 , 3 , 1 , 1 , - 1 , 2 , 3 , 3 , 1 , 1 , 3 , 3 , 3 , 3 , - 1 , 3 , 3 , 2 , 3 , 3 , 3 , 3 , 1 , 1 , - 1 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 ] -} diff --git a/basicsuite/qt5-launchpresentation/samegame/content/levels/level1.qml b/basicsuite/qt5-launchpresentation/samegame/content/levels/level1.qml deleted file mode 100644 index 4bb15cb..0000000 --- a/basicsuite/qt5-launchpresentation/samegame/content/levels/level1.qml +++ /dev/null @@ -1,59 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 - -TemplateBase{ - timeTarget: 10 - goalText: "2 of 10

Clear in 10 seconds..." - startingGrid: [ 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , - 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , - 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , - 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , - 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , - 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , - 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , - 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , - 1 , 3 , 3 , 3 , 1 , 1 , 1 , 1 , 2 , 2 , - 1 , 2 , 3 , 3 , 3 , 1 , 1 , 1 , 1 , 2 , - 2 , 2 , 1 , 3 , 3 , 3 , 1 , 1 , 1 , 2 , - 2 , 1 , 1 , 1 , 3 , 3 , 3 , 1 , 2 , 2 , - 1 , 1 , 1 , 1 , 1 , 3 , 3 , 3 , 2 , 1 ] -} diff --git a/basicsuite/qt5-launchpresentation/samegame/content/levels/level2.qml b/basicsuite/qt5-launchpresentation/samegame/content/levels/level2.qml deleted file mode 100644 index a319479..0000000 --- a/basicsuite/qt5-launchpresentation/samegame/content/levels/level2.qml +++ /dev/null @@ -1,61 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 - -TemplateBase{ - scoreTarget: 1200 - timeTarget: 60 - goalText: "3 of 10

Score over 1200 points in one minute..." - mustClear: false - startingGrid: [ 3 , 1 , 2 , 1 , 1 , 2 , 1 , 1 , 3 , 3 , - 1 , 3 , 3 , 2 , 3 , 3 , 1 , 1 , 3 , 1 , - 3 , 1 , 3 , 3 , 2 , 3 , 3 , 3 , 1 , 2 , - 3 , 2 , 2 , 1 , 3 , 3 , 2 , 1 , 1 , 2 , - 3 , 1 , 2 , 2 , 2 , 2 , 2 , 1 , 3 , 1 , - 2 , 3 , 1 , 2 , 2 , 3 , 3 , 1 , 3 , 2 , - 3 , 2 , 1 , 1 , 3 , 3 , 3 , 2 , 2 , 1 , - 1 , 2 , 2 , 3 , 2 , 3 , 3 , 3 , 1 , 1 , - 1 , 3 , 3 , 3 , 1 , 2 , 2 , 3 , 3 , 1 , - 3 , 3 , 2 , 1 , 2 , 2 , 1 , 1 , 1 , 3 , - 2 , 1 , 3 , 2 , 3 , 2 , 3 , 2 , 2 , 1 , - 1 , 3 , 1 , 2 , 1 , 2 , 3 , 1 , 2 , 2 , - 1 , 2 , 2 , 2 , 1 , 1 , 2 , 3 , 1 , 2 ] -} diff --git a/basicsuite/qt5-launchpresentation/samegame/content/levels/level3.qml b/basicsuite/qt5-launchpresentation/samegame/content/levels/level3.qml deleted file mode 100644 index 43e82d7..0000000 --- a/basicsuite/qt5-launchpresentation/samegame/content/levels/level3.qml +++ /dev/null @@ -1,60 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 - -TemplateBase{ - scoreTarget: 3000 - timeTarget: 60 - goalText: "4 of 10
Clear the board with over 3000 points in under a minute..." - startingGrid: [ 3 , 3 , 1 , 1 , 1 , 2 , 2 , 4 , 3 , 3 , - 4 , 3 , 1 , 4 , 2 , 2 , 2 , 4 , 3 , 4 , - 4 , 3 , 3 , 4 , 1 , 1 , 3 , 3 , 4 , 4 , - 3 , 3 , 3 , 3 , 3 , 1 , 3 , 2 , 2 , 4 , - 4 , 4 , 3 , 4 , 3 , 1 , 4 , 4 , 4 , 4 , - 4 , 4 , 3 , 4 , 1 , 1 , 4 , 4 , 3 , 3 , - 4 , 2 , 2 , 2 , 2 , 2 , 4 , 4 , 4 , 1 , - 4 , 4 , 2 , 4 , 2 , 2 , 1 , 1 , 1 , 1 , - 4 , 4 , 2 , 4 , 2 , 2 , 1 , 4 , 4 , 1 , - 4 , 1 , 1 , 4 , 3 , 3 , 4 , 2 , 4 , 1 , - 4 , 1 , 1 , 2 , 3 , 3 , 4 , 2 , 2 , 1 , - 1 , 1 , 2 , 2 , 2 , 3 , 3 , 3 , 2 , 1 , - 4 , 1 , 1 , 2 , 2 , 3 , 4 , 3 , 4 , 4 ] -} diff --git a/basicsuite/qt5-launchpresentation/samegame/content/levels/level4.qml b/basicsuite/qt5-launchpresentation/samegame/content/levels/level4.qml deleted file mode 100644 index 46ad42f..0000000 --- a/basicsuite/qt5-launchpresentation/samegame/content/levels/level4.qml +++ /dev/null @@ -1,58 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 - -TemplateBase{ - goalText: "5 of 10

Clear the level..." - startingGrid: [ 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , - 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , - 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , - 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , - 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , - 1 , 3 , 2 , 1 , 1 , 1 , 1 , 3 , 2 , 3 , - 1 , 2 , 3 , 1 , 3 , 2 , 2 , 1 , 1 , 2 , - 3 , 2 , 2 , 2 , 1 , 1 , 1 , 1 , 3 , 3 , - 2 , 1 , 1 , 3 , 2 , 1 , 1 , 2 , 1 , 3 , - 1 , 3 , 3 , 1 , 2 , 1 , 2 , 1 , 3 , 3 , - 1 , 3 , 2 , 2 , 2 , 1 , 1 , 3 , 2 , 3 , - 1 , 1 , 3 , 2 , 3 , 3 , 2 , 1 , 1 , 1 , - 1 , 2 , 2 , 3 , 2 , 2 , 1 , 3 , 1 , 3 ] -} diff --git a/basicsuite/qt5-launchpresentation/samegame/content/levels/level5.qml b/basicsuite/qt5-launchpresentation/samegame/content/levels/level5.qml deleted file mode 100644 index 3716264..0000000 --- a/basicsuite/qt5-launchpresentation/samegame/content/levels/level5.qml +++ /dev/null @@ -1,59 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 - -TemplateBase{ - moveTarget: 4 - goalText: "6 of 10

Clear in four or less moves..." - startingGrid: [ 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , - 4 , 2 , 2 , 2 , 4 , 3 , 3 , 3 , 4 , 4 , - 4 , 2 , 4 , 4 , 4 , 3 , 2 , 3 , 4 , 4 , - 4 , 2 , 2 , 2 , 4 , 3 , 3 , 3 , 4 , 4 , - 4 , 4 , 4 , 2 , 4 , 3 , 4 , 3 , 4 , 4 , - 4 , 2 , 2 , 2 , 4 , 3 , 4 , 3 , 4 , 4 , - 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , - 4 , 3 , 4 , 3 , 4 , 2 , 2 , 2 , 4 , 3 , - 4 , 3 , 3 , 3 , 4 , 2 , 4 , 4 , 4 , 3 , - 4 , 3 , 3 , 3 , 4 , 2 , 2 , 2 , 4 , 3 , - 4 , 3 , 4 , 3 , 4 , 2 , 4 , 4 , 4 , 4 , - 4 , 3 , 4 , 3 , 4 , 2 , 2 , 2 , 4 , 3 , - 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 ] -} diff --git a/basicsuite/qt5-launchpresentation/samegame/content/levels/level6.qml b/basicsuite/qt5-launchpresentation/samegame/content/levels/level6.qml deleted file mode 100644 index 4547b75..0000000 --- a/basicsuite/qt5-launchpresentation/samegame/content/levels/level6.qml +++ /dev/null @@ -1,60 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 - -TemplateBase{ - moveTarget: 20 - timeTarget: 40 - goalText: "7 of 10

Clear with 20 moves in 40 seconds (or better)." - startingGrid: [ 1 , 3 , 1 , 1 , 1 , 1 , 2 , 1 , 2 , 2 , - 2 , 1 , 2 , 3 , 3 , 1 , 3 , 1 , 1 , 3 , - 3 , 1 , 1 , 1 , 2 , 2 , 3 , 2 , 3 , 1 , - 1 , 3 , 1 , 1 , 3 , 1 , 1 , 1 , 2 , 3 , - 2 , 1 , 1 , 1 , 3 , 2 , 3 , 3 , 2 , 3 , - 3 , 3 , 3 , 3 , 2 , 2 , 3 , 1 , 3 , 2 , - 2 , 2 , 3 , 2 , 2 , 3 , 2 , 2 , 2 , 2 , - 1 , 2 , 1 , 2 , 1 , 3 , 2 , 3 , 2 , 3 , - 1 , 1 , 2 , 3 , 3 , 3 , 3 , 1 , 1 , 2 , - 3 , 3 , 2 , 2 , 2 , 2 , 3 , 1 , 3 , 1 , - 1 , 2 , 3 , 3 , 3 , 1 , 3 , 2 , 1 , 2 , - 1 , 2 , 1 , 1 , 2 , 3 , 1 , 2 , 1 , 3 , - 3 , 1 , 2 , 2 , 1 , 3 , 3 , 1 , 3 , 2 ] -} diff --git a/basicsuite/qt5-launchpresentation/samegame/content/levels/level7.qml b/basicsuite/qt5-launchpresentation/samegame/content/levels/level7.qml deleted file mode 100644 index 5d71d7c..0000000 --- a/basicsuite/qt5-launchpresentation/samegame/content/levels/level7.qml +++ /dev/null @@ -1,58 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 - -TemplateBase{ - goalText: "8 of 10

Clear the grid." - startingGrid: [ 2 , 4 , 3 , 2 , 3 , 2 , 3 , 3 , 4 , 3 , - 2 , 2 , 3 , 3 , 1 , 4 , 3 , 3 , 3 , 2 , - 1 , 4 , 2 , 3 , 4 , 3 , 3 , 1 , 1 , 1 , - 2 , 1 , 2 , 4 , 4 , 2 , 2 , 3 , 2 , 1 , - 3 , 4 , 4 , 1 , 3 , 2 , 4 , 2 , 1 , 1 , - 2 , 2 , 3 , 1 , 2 , 4 , 1 , 2 , 1 , 2 , - 1 , 2 , 3 , 2 , 4 , 4 , 3 , 1 , 1 , 2 , - 4 , 4 , 2 , 1 , 2 , 4 , 2 , 2 , 4 , 3 , - 4 , 2 , 4 , 1 , 3 , 4 , 1 , 4 , 2 , 4 , - 4 , 3 , 4 , 1 , 4 , 3 , 1 , 3 , 1 , 1 , - 3 , 3 , 2 , 3 , 2 , 4 , 1 , 2 , 4 , 4 , - 3 , 4 , 2 , 2 , 4 , 3 , 4 , 1 , 3 , 2 , - 4 , 3 , 3 , 4 , 2 , 4 , 1 , 2 , 3 , 2 ] -} diff --git a/basicsuite/qt5-launchpresentation/samegame/content/levels/level8.qml b/basicsuite/qt5-launchpresentation/samegame/content/levels/level8.qml deleted file mode 100644 index 9dbb8c2..0000000 --- a/basicsuite/qt5-launchpresentation/samegame/content/levels/level8.qml +++ /dev/null @@ -1,59 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 - -TemplateBase{ - scoreTarget: 1000 - goalText: "9 of 10

Score over 1000 points" - startingGrid: [ 1 , 4 , 4 , 3 , 2 , 1 , 4 , 2 , 4 , 2 , - 2 , 3 , 4 , 4 , 1 , 1 , 1 , 4 , 4 , 4 , - 1 , 3 , 1 , 2 , 2 , 1 , 2 , 1 , 4 , 2 , - 4 , 3 , 4 , 2 , 1 , 4 , 1 , 2 , 2 , 3 , - 3 , 4 , 2 , 4 , 4 , 3 , 2 , 2 , 2 , 1 , - 4 , 4 , 3 , 2 , 4 , 4 , 2 , 1 , 1 , 1 , - 1 , 2 , 1 , 3 , 4 , 1 , 1 , 3 , 2 , 3 , - 3 , 4 , 2 , 2 , 1 , 3 , 2 , 2 , 4 , 2 , - 2 , 4 , 1 , 2 , 2 , 4 , 3 , 3 , 3 , 1 , - 1 , 2 , 2 , 4 , 1 , 2 , 2 , 3 , 3 , 3 , - 4 , 4 , 1 , 4 , 3 , 1 , 3 , 3 , 3 , 4 , - 1 , 2 , 4 , 1 , 2 , 1 , 1 , 4 , 2 , 1 , - 1 , 2 , 3 , 4 , 2 , 4 , 4 , 2 , 1 , 3 ] -} diff --git a/basicsuite/qt5-launchpresentation/samegame/content/levels/level9.qml b/basicsuite/qt5-launchpresentation/samegame/content/levels/level9.qml deleted file mode 100644 index 4e8bf19..0000000 --- a/basicsuite/qt5-launchpresentation/samegame/content/levels/level9.qml +++ /dev/null @@ -1,62 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 - -TemplateBase{ - scoreTarget: 2000 - timeTarget: 60 - moveTarget: 20 - mustClear: false - goalText: "10 of 10

Score 2000 in one minute with less than 20 moves!" - startingGrid: [ 3 , 2 , 3 , 1 , 3 , 3 , 4 , 1 , 3 , 3 , - 2 , 3 , 2 , 1 , 1 , 2 , 2 , 2 , 4 , 1 , - 2 , 4 , 4 , 4 , 3 , 1 , 4 , 4 , 4 , 1 , - 3 , 1 , 3 , 4 , 4 , 2 , 2 , 2 , 2 , 3 , - 2 , 1 , 4 , 4 , 3 , 3 , 1 , 1 , 3 , 2 , - 3 , 2 , 1 , 4 , 3 , 4 , 1 , 3 , 4 , 2 , - 3 , 3 , 1 , 4 , 4 , 4 , 2 , 1 , 2 , 3 , - 2 , 3 , 4 , 3 , 4 , 1 , 1 , 3 , 2 , 4 , - 4 , 4 , 1 , 2 , 4 , 3 , 2 , 2 , 2 , 4 , - 1 , 4 , 2 , 2 , 1 , 1 , 2 , 1 , 1 , 4 , - 1 , 4 , 3 , 3 , 3 , 1 , 3 , 4 , 4 , 2 , - 3 , 4 , 1 , 1 , 2 , 2 , 2 , 3 , 2 , 1 , - 3 , 3 , 4 , 3 , 1 , 1 , 1 , 4 , 4 , 3 ] -} diff --git a/basicsuite/qt5-launchpresentation/samegame/content/samegame.js b/basicsuite/qt5-launchpresentation/samegame/content/samegame.js deleted file mode 100755 index 7b226cb..0000000 --- a/basicsuite/qt5-launchpresentation/samegame/content/samegame.js +++ /dev/null @@ -1,581 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/* This script file handles the game logic */ -.pragma library -.import QtQuick.LocalStorage 2.0 as Sql -.import "../settings.js" as Settings - -var maxColumn = 10; -var maxRow = 13; -var types = 3; -var maxIndex = maxColumn*maxRow; -var board = new Array(maxIndex); -var blockSrc = "Block.qml"; -var gameDuration; -var component = Qt.createComponent(blockSrc); -var gameCanvas; -var betweenTurns = false; - -var puzzleLevel = null; -var puzzlePath = ""; - -var gameMode = "arcade"; //Set in new game, then tweaks behaviour of other functions -var gameOver = false; - -function changeBlock(src) -{ - blockSrc = src; - component = Qt.createComponent(blockSrc); -} - -// Index function used instead of a 2D array -function index(column, row) -{ - return column + row * maxColumn; -} - -function timeStr(msecs) -{ - var secs = Math.floor(msecs/1000); - var m = Math.floor(secs/60); - var ret = "" + m + "m " + (secs%60) + "s"; - return ret; -} - -function cleanUp() -{ - if (gameCanvas == undefined) - return; - // Delete blocks from previous game - for (var i = 0; i < maxIndex; i++) { - if (board[i] != null) - board[i].destroy(); - board[i] = null; - } - if (puzzleLevel != null){ - puzzleLevel.destroy(); - puzzleLevel = null; - } - gameCanvas.mode = "" -} - -function startNewGame(gc, mode, map) -{ - gameCanvas = gc; - if (mode == undefined) - gameMode = "arcade"; - else - gameMode = mode; - gameOver = false; - - cleanUp(); - - gc.gameOver = false; - gc.mode = gameMode; - // Calculate board size - maxColumn = Math.floor(gameCanvas.width/Settings.blockSize); - maxRow = Math.floor(gameCanvas.height/Settings.blockSize); - maxIndex = maxRow * maxColumn; - if (gameMode == "arcade") //Needs to be after board sizing - getHighScore(); - - - // Initialize Board - board = new Array(maxIndex); - gameCanvas.score = 0; - gameCanvas.score2 = 0; - gameCanvas.moves = 0; - gameCanvas.curTurn = 1; - if (gameMode == "puzzle") - loadMap(map); - else//Note that we load them in reverse order for correct visual stacking - for (var column = maxColumn - 1; column >= 0; column--) - for (var row = maxRow - 1; row >= 0; row--) - createBlock(column, row); - if (gameMode == "puzzle") - getLevelHistory();//Needs to be after map load - gameDuration = new Date(); -} - -var fillFound; // Set after a floodFill call to the number of blocks found -var floodBoard; // Set to 1 if the floodFill reaches off that node - -// NOTE: Be careful with vars named x,y, as the calling object's x,y are still in scope -function handleClick(x,y) -{ - if (betweenTurns || gameOver || gameCanvas == undefined) - return; - var column = Math.floor(x/Settings.blockSize); - var row = Math.floor(y/Settings.blockSize); - if (column >= maxColumn || column < 0 || row >= maxRow || row < 0) - return; - if (board[index(column, row)] == null) - return; - // If it's a valid block, remove it and all connected (does nothing if it's not connected) - floodFill(column,row, -1); - if (fillFound <= 0) - return; - if (gameMode == "multiplayer" && gameCanvas.curTurn == 2) - gameCanvas.score2 += (fillFound - 1) * (fillFound - 1); - else - gameCanvas.score += (fillFound - 1) * (fillFound - 1); - if (gameMode == "multiplayer" && gameCanvas.curTurn == 2) - shuffleUp(); - else - shuffleDown(); - gameCanvas.moves += 1; - if (gameMode == "endless") - refill(); - else if (gameMode != "multiplayer") - victoryCheck(); - if (gameMode == "multiplayer" && !gc.gameOver){ - betweenTurns = true; - gameCanvas.swapPlayers();//signal, animate and call turnChange() when ready - } -} - -function floodFill(column,row,type) -{ - if (board[index(column, row)] == null) - return; - var first = false; - if (type == -1) { - first = true; - type = board[index(column,row)].type; - - // Flood fill initialization - fillFound = 0; - floodBoard = new Array(maxIndex); - } - if (column >= maxColumn || column < 0 || row >= maxRow || row < 0) - return; - if (floodBoard[index(column, row)] == 1 || (!first && type != board[index(column, row)].type)) - return; - floodBoard[index(column, row)] = 1; - floodFill(column + 1, row, type); - floodFill(column - 1, row, type); - floodFill(column, row + 1, type); - floodFill(column, row - 1, type); - if (first == true && fillFound == 0) - return; // Can't remove single blocks - board[index(column, row)].dying = true; - board[index(column, row)] = null; - fillFound += 1; -} - -function shuffleDown() -{ - // Fall down - for (var column = 0; column < maxColumn; column++) { - var fallDist = 0; - for (var row = maxRow - 1; row >= 0; row--) { - if (board[index(column,row)] == null) { - fallDist += 1; - } else { - if (fallDist > 0) { - var obj = board[index(column, row)]; - obj.y = (row + fallDist) * Settings.blockSize; - board[index(column, row + fallDist)] = obj; - board[index(column, row)] = null; - } - } - } - } - // Fall to the left - fallDist = 0; - for (column = 0; column < maxColumn; column++) { - if (board[index(column, maxRow - 1)] == null) { - fallDist += 1; - } else { - if (fallDist > 0) { - for (row = 0; row < maxRow; row++) { - obj = board[index(column, row)]; - if (obj == null) - continue; - obj.x = (column - fallDist) * Settings.blockSize; - board[index(column - fallDist,row)] = obj; - board[index(column, row)] = null; - } - } - } - } -} - - -function shuffleUp() -{ - // Fall up - for (var column = 0; column < maxColumn; column++) { - var fallDist = 0; - for (var row = 0; row < maxRow; row++) { - if (board[index(column,row)] == null) { - fallDist += 1; - } else { - if (fallDist > 0) { - var obj = board[index(column, row)]; - obj.y = (row - fallDist) * Settings.blockSize; - board[index(column, row - fallDist)] = obj; - board[index(column, row)] = null; - } - } - } - } - // Fall to the left (or should it be right, so as to be left for P2?) - fallDist = 0; - for (column = 0; column < maxColumn; column++) { - if (board[index(column, 0)] == null) { - fallDist += 1; - } else { - if (fallDist > 0) { - for (row = 0; row < maxRow; row++) { - obj = board[index(column, row)]; - if (obj == null) - continue; - obj.x = (column - fallDist) * Settings.blockSize; - board[index(column - fallDist,row)] = obj; - board[index(column, row)] = null; - } - } - } - } -} - -function turnChange()//called by ui outside -{ - betweenTurns = false; - if (gameCanvas.curTurn == 1){ - shuffleUp(); - gameCanvas.curTurn = 2; - victoryCheck(); - }else{ - shuffleDown(); - gameCanvas.curTurn = 1; - victoryCheck(); - } -} - -function refill() -{ - for (var column = 0; column < maxColumn; column++) { - for (var row = 0; row < maxRow; row++) { - if (board[index(column, row)] == null) - createBlock(column, row); - } - } -} - -function victoryCheck() -{ - // Awards bonuses for no blocks left - var deservesBonus = true; - if (board[index(0,maxRow - 1)] != null || board[index(0,0)] != null) - deservesBonus = false; - // Checks for game over - if (deservesBonus){ - if (gameCanvas.curTurn = 1) - gameCanvas.score += 1000; - else - gameCanvas.score2 += 1000; - } - gameOver = deservesBonus; - if (gameCanvas.curTurn == 1){ - if (!(floodMoveCheck(0, maxRow - 1, -1))) - gameOver = true; - }else{ - if (!(floodMoveCheck(0, 0, -1, true))) - gameOver = true; - } - if (gameMode == "puzzle"){ - puzzleVictoryCheck(deservesBonus);//Takes it from here - return; - } - if (gameOver) { - var winnerScore = Math.max(gameCanvas.score, gameCanvas.score2); - if (gameMode == "multiplayer"){ - gameCanvas.score = winnerScore; - saveHighScore(gameCanvas.score2); - } - saveHighScore(gameCanvas.score); - gameDuration = new Date() - gameDuration; - gameCanvas.gameOver = true; - } -} - -// Only floods up and right, to see if it can find adjacent same-typed blocks -function floodMoveCheck(column, row, type, goDownInstead) -{ - if (column >= maxColumn || column < 0 || row >= maxRow || row < 0) - return false; - if (board[index(column, row)] == null) - return false; - var myType = board[index(column, row)].type; - if (type == myType) - return true; - if (goDownInstead) - return floodMoveCheck(column + 1, row, myType, goDownInstead) || - floodMoveCheck(column, row + 1, myType, goDownInstead); - else - return floodMoveCheck(column + 1, row, myType) || - floodMoveCheck(column, row - 1, myType); -} - -function createBlock(column,row,type) -{ - // Note that we don't wait for the component to become ready. This will - // only work if the block QML is a local file. Otherwise the component will - // not be ready immediately. There is a statusChanged signal on the - // component you could use if you want to wait to load remote files. - if (component.status == 1){ - if (type == undefined) - type = Math.floor(Math.random() * types); - if (type < 0 || type > 4) { - console.log("Invalid type requested");//TODO: Is this triggered by custom levels much? - return; - } - var dynamicObject = component.createObject(gameCanvas, - {"type": type, - "x": column*Settings.blockSize, - "y": -1*Settings.blockSize, - "width": Settings.blockSize, - "height": Settings.blockSize, - "particleSystem": gameCanvas.ps}); - if (dynamicObject == null){ - console.log("error creating block"); - console.log(component.errorString()); - return false; - } - dynamicObject.y = row*Settings.blockSize; - dynamicObject.spawned = true; - - board[index(column,row)] = dynamicObject; - }else{ - console.log("error loading block component"); - console.log(component.errorString()); - return false; - } - return true; -} - -function showPuzzleError(str) -{ - //TODO: Nice user visible UI? - console.log(str); -} - -function loadMap(map) -{ - puzzlePath = map; - var levelComp = Qt.createComponent(puzzlePath); - if (levelComp.status != 1){ - console.log("Error loading level"); - showPuzzleError(levelComp.errorString()); - return; - } - puzzleLevel = levelComp.createObject(); - if (puzzleLevel == null || !puzzleLevel.startingGrid instanceof Array) { - showPuzzleError("Bugger!"); - return; - } - gameCanvas.showPuzzleGoal(puzzleLevel.goalText); - //showPuzzleGoal should call finishLoadingMap as the next thing it does, before handling more events -} - -function finishLoadingMap() -{ - for (var i in puzzleLevel.startingGrid) - if (! (puzzleLevel.startingGrid[i] >= 0 && puzzleLevel.startingGrid[i] <= 9) ) - puzzleLevel.startingGrid[i] = 0; - //TODO: Don't allow loading larger levels, leads to cheating - while (puzzleLevel.startingGrid.length > maxIndex) puzzleLevel.startingGrid.shift(); - while (puzzleLevel.startingGrid.length < maxIndex) puzzleLevel.startingGrid.unshift(0); - for (var i in puzzleLevel.startingGrid) - if (puzzleLevel.startingGrid[i] > 0) - createBlock(i % maxColumn, Math.floor(i / maxColumn), puzzleLevel.startingGrid[i] - 1); - - //### Experimental feature - allow levels to contain arbitrary QML scenes as well! - //while (puzzleLevel.children.length) - // puzzleLevel.children[0].parent = gameCanvas; - gameDuration = new Date(); //Don't start until we finish loading -} - -function puzzleVictoryCheck(clearedAll)//gameOver has also been set if no more moves -{ - var won = true; - var soFar = new Date() - gameDuration; - if (puzzleLevel.scoreTarget != -1 && gameCanvas.score < puzzleLevel.scoreTarget){ - won = false; - } if (puzzleLevel.scoreTarget != -1 && gameCanvas.score >= puzzleLevel.scoreTarget && !puzzleLevel.mustClear){ - gameOver = true; - } if (puzzleLevel.timeTarget != -1 && soFar/1000.0 > puzzleLevel.timeTarget){ - gameOver = true; - } if (puzzleLevel.moveTarget != -1 && gameCanvas.moves >= puzzleLevel.moveTarget){ - gameOver = true; - } if (puzzleLevel.mustClear && gameOver && !clearedAll) { - won = false; - } - - if (gameOver) { - gameCanvas.gameOver = true; - gameCanvas.showPuzzleEnd(won); - - if (won) { - // Store progress - saveLevelHistory(); - } - } -} - -function getHighScore() -{ - var db = Sql.LocalStorage.openDatabaseSync( - "SameGame", - "2.0", - "SameGame Local Data", - 100 - ); - db.transaction( - function(tx) { - tx.executeSql('CREATE TABLE IF NOT EXISTS Scores(game TEXT, score NUMBER, gridSize TEXT, time NUMBER)'); - // Only show results for the current grid size - var rs = tx.executeSql('SELECT * FROM Scores WHERE gridSize = "' - + maxColumn + "x" + maxRow + '" AND game = "' + gameMode + '" ORDER BY score desc'); - if (rs.rows.length > 0) - gameCanvas.highScore = rs.rows.item(0).score; - else - gameCanvas.highScore = 0; - } - ); -} - -function saveHighScore(score) -{ - // Offline storage - var db = Sql.LocalStorage.openDatabaseSync( - "SameGame", - "2.0", - "SameGame Local Data", - 100 - ); - var dataStr = "INSERT INTO Scores VALUES(?, ?, ?, ?)"; - var data = [ - gameMode, - score, - maxColumn + "x" + maxRow, - Math.floor(gameDuration / 1000) - ]; - if (score >= gameCanvas.highScore)//Update UI field - gameCanvas.highScore = score; - - db.transaction( - function(tx) { - tx.executeSql('CREATE TABLE IF NOT EXISTS Scores(game TEXT, score NUMBER, gridSize TEXT, time NUMBER)'); - tx.executeSql(dataStr, data); - } - ); -} - -function getLevelHistory() -{ - var db = Sql.LocalStorage.openDatabaseSync( - "SameGame", - "2.0", - "SameGame Local Data", - 100 - ); - db.transaction( - function(tx) { - tx.executeSql('CREATE TABLE IF NOT EXISTS Puzzle(level TEXT, score NUMBER, moves NUMBER, time NUMBER)'); - var rs = tx.executeSql('SELECT * FROM Puzzle WHERE level = "' + puzzlePath + '" ORDER BY score desc'); - if (rs.rows.length > 0) { - gameCanvas.puzzleWon = true; - gameCanvas.highScore = rs.rows.item(0).score; - } else { - gameCanvas.puzzleWon = false; - gameCanvas.highScore = 0; - } - } - ); -} - -function saveLevelHistory() -{ - var db = Sql.LocalStorage.openDatabaseSync( - "SameGame", - "2.0", - "SameGame Local Data", - 100 - ); - var dataStr = "INSERT INTO Puzzle VALUES(?, ?, ?, ?)"; - var data = [ - puzzlePath, - gameCanvas.score, - gameCanvas.moves, - Math.floor(gameDuration / 1000) - ]; - gameCanvas.puzzleWon = true; - - db.transaction( - function(tx) { - tx.executeSql('CREATE TABLE IF NOT EXISTS Puzzle(level TEXT, score NUMBER, moves NUMBER, time NUMBER)'); - tx.executeSql(dataStr, data); - } - ); -} - -function nuke() //For "Debug mode" -{ - for (var row = 1; row <= 5; row++) { - for (var col = 0; col < 5; col++) { - if (board[index(col, maxRow - row)] != null) { - board[index(col, maxRow - row)].dying = true; - board[index(col, maxRow - row)] = null; - } - } - } - if (gameMode == "multiplayer" && gameCanvas.curTurn == 2) - shuffleUp(); - else - shuffleDown(); - if (gameMode == "endless") - refill(); - else - victoryCheck(); -} diff --git a/basicsuite/qt5-launchpresentation/samegame/settings.js b/basicsuite/qt5-launchpresentation/samegame/settings.js deleted file mode 100644 index e09dee9..0000000 --- a/basicsuite/qt5-launchpresentation/samegame/settings.js +++ /dev/null @@ -1,56 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Research In Motion -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -.pragma library - -//This should be switched over once a proper QML settings API exists - -var menuDelay = 500 - -var headerHeight = 20 // 70 on BB10 -var footerHeight = 44 // 100 on BB10 - -var fontPixelSize = 14 // 55 on BB10 - -var blockSize = 32 // 64 on BB10 - -var toolButtonHeight = 32 // 64 on BB10 - -var menuButtonSpacing = 0 // 15 on BB10 diff --git a/basicsuite/qt5-launchpresentation/title.txt b/basicsuite/qt5-launchpresentation/title.txt deleted file mode 100644 index 19f15b6..0000000 --- a/basicsuite/qt5-launchpresentation/title.txt +++ /dev/null @@ -1 +0,0 @@ -040. Qt5 Launch Presentation -- cgit v1.2.3 From bc13e03aa85951136d66048a033972b9b8b47ae6 Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Tue, 24 Jun 2014 13:12:46 +0200 Subject: webengine: enable the browser example on android-nexus7v2 Change-Id: Ib43f9f2fa0ac3cd9f5d535c2548bf510d5b86772 Reviewed-by: Eirik Aavitsland --- basicsuite/webengine/exclude.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/basicsuite/webengine/exclude.txt b/basicsuite/webengine/exclude.txt index 4ae58fb..4efe135 100644 --- a/basicsuite/webengine/exclude.txt +++ b/basicsuite/webengine/exclude.txt @@ -3,4 +3,3 @@ linux-emulator linux-raspberrypi linux-beaglebone android-beaglebone -android-nexus7v2 -- cgit v1.2.3 From e029852de438d1509ea067f05e9a026b41375f89 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 24 Jun 2014 13:59:28 +0300 Subject: disable camera and sensor demo from Toradex Apalis iMX6 Change-Id: I12d72339a1071500a92b87e7c62fe3d7de6b9b25 Reviewed-by: Eirik Aavitsland --- basicsuite/camera/exclude.txt | 1 + basicsuite/sensors/exclude.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/basicsuite/camera/exclude.txt b/basicsuite/camera/exclude.txt index 0d5537c..bd99fda 100644 --- a/basicsuite/camera/exclude.txt +++ b/basicsuite/camera/exclude.txt @@ -8,3 +8,4 @@ linux-iMX6 linux-raspberrypi linux-emulator linux-imx6qsabresd +linux-apalis-imx6 diff --git a/basicsuite/sensors/exclude.txt b/basicsuite/sensors/exclude.txt index 7ced997..4d1d7ec 100644 --- a/basicsuite/sensors/exclude.txt +++ b/basicsuite/sensors/exclude.txt @@ -5,3 +5,4 @@ linux-raspberrypi linux-beagleboard linux-beaglebone linux-imx6qsabresd +linux-apalis-imx6 -- cgit v1.2.3 From 9f3510eed3b040a39a79a6c21d5c00d4306e1693 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pasi=20Pet=C3=A4j=C3=A4j=C3=A4rvi?= Date: Mon, 23 Jun 2014 13:54:29 +0300 Subject: Add Meet Qt Enterprise Embedded video to mediaplayer demo * Add Qt Enterprise Embedded video to /data/videos folder * Set Qt Enterprise Embedded video as default one and start it when mediaplayer is started. Task-number: QTEE-663 Change-Id: I97dbf8741f5a63ea7e0017c7736298881b0a56bc Reviewed-by: Kalle Viironen --- basicsuite/mediaplayer/main.qml | 1 + videos/Qt_EnterpriseEmbedded_1080p.mp4 | Bin 0 -> 20613355 bytes 2 files changed, 1 insertion(+) create mode 100644 videos/Qt_EnterpriseEmbedded_1080p.mp4 diff --git a/basicsuite/mediaplayer/main.qml b/basicsuite/mediaplayer/main.qml index d8075c8..dfda2db 100755 --- a/basicsuite/mediaplayer/main.qml +++ b/basicsuite/mediaplayer/main.qml @@ -257,6 +257,7 @@ FocusScope { function init() { content.init() + content.openVideo("file://data/videos/Qt_EnterpriseEmbedded_1080p.mp4"); } function openVideo() { diff --git a/videos/Qt_EnterpriseEmbedded_1080p.mp4 b/videos/Qt_EnterpriseEmbedded_1080p.mp4 new file mode 100644 index 0000000..d3d7e62 Binary files /dev/null and b/videos/Qt_EnterpriseEmbedded_1080p.mp4 differ -- cgit v1.2.3 From 46bc25ee43316930eb595504c0d2f817862b2516 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 24 Jun 2014 16:02:06 +0300 Subject: Remove incorrect assingment of QUrl to bool MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This time in RSS reader. Change-Id: I2b9e74e1605f76d8c954f2f988506d0704d9e81d Reviewed-by: Pasi Petäjäjärvi --- basicsuite/qt5-everywhere/demos/gridrssnews/RssDelegate.qml | 2 -- 1 file changed, 2 deletions(-) diff --git a/basicsuite/qt5-everywhere/demos/gridrssnews/RssDelegate.qml b/basicsuite/qt5-everywhere/demos/gridrssnews/RssDelegate.qml index 87b25c2..e5d042f 100644 --- a/basicsuite/qt5-everywhere/demos/gridrssnews/RssDelegate.qml +++ b/basicsuite/qt5-everywhere/demos/gridrssnews/RssDelegate.qml @@ -86,8 +86,6 @@ Rectangle { anchors.bottom: parent.bottom color: "Black" opacity: 0.5 - visible: iconImage.source - } Text { -- cgit v1.2.3 From 6b788710cb2f1f46a3a23ea790a63919c02b1ef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pasi=20Pet=C3=A4j=C3=A4j=C3=A4rvi?= Date: Thu, 19 Jun 2014 17:40:56 +0300 Subject: Update Enterprise gallery demo description Task-number: QTEE-661 Change-Id: Iaea48d6db731452c7df824c59a6f16e13e8517b3 Reviewed-by: Kalle Viironen --- basicsuite/enterprise-gallery/description.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basicsuite/enterprise-gallery/description.txt b/basicsuite/enterprise-gallery/description.txt index ba0806c..93b45f6 100644 --- a/basicsuite/enterprise-gallery/description.txt +++ b/basicsuite/enterprise-gallery/description.txt @@ -1,3 +1,3 @@ -The Gallery example showcases Qt Quick Enterprise Controls. If you have any suggestions for improvements to existing controls or ideas for new controls please email them to Qt.Enterprise-Controls@digia.com. +The Gallery example showcases Qt Quick Enterprise Controls. These controls are developed based on the input and feedback coming directly from Qt Enterprise Embedded customers. Each control can be customized and styled through the API. We have included a small subset of these customization options in the gallery example, which you can explore and interact with under the "cog" or "gear" icon on the lower right corner of each control's page. -- cgit v1.2.3 From c0d19af8bec6a4ece318a1721dd7c2cc6988c759 Mon Sep 17 00:00:00 2001 From: Kalle Viironen Date: Mon, 23 Jun 2014 15:32:52 +0300 Subject: About Boot to Qt-demo update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Content update for About Boot to Qt-demo Change-Id: I8217a6c6ee0ca7f642dbe4d250a329f9f27c0713 Reviewed-by: Topi Reiniö Reviewed-by: Gatis Paeglis Reviewed-by: Eirik Aavitsland --- basicsuite/about-b2qt/AboutBoot2Qt.qml | 266 ++++++++++++++++++++++++++------ basicsuite/about-b2qt/Box.qml | 3 +- basicsuite/about-b2qt/ColouredTitle.qml | 54 +++++++ basicsuite/about-b2qt/HighlightText.qml | 53 +++++++ basicsuite/about-b2qt/description.txt | 4 +- basicsuite/about-b2qt/main.qml | 9 -- basicsuite/about-b2qt/preview_l.jpg | Bin 28727 -> 34971 bytes 7 files changed, 326 insertions(+), 63 deletions(-) create mode 100644 basicsuite/about-b2qt/ColouredTitle.qml create mode 100644 basicsuite/about-b2qt/HighlightText.qml diff --git a/basicsuite/about-b2qt/AboutBoot2Qt.qml b/basicsuite/about-b2qt/AboutBoot2Qt.qml index d050a71..abb6dc8 100644 --- a/basicsuite/about-b2qt/AboutBoot2Qt.qml +++ b/basicsuite/about-b2qt/AboutBoot2Qt.qml @@ -46,11 +46,18 @@ Column { width: parent.width - spacing: engine.smallFontSize() + spacing: engine.smallFontSize() * 2 - Title { - id: title - text: "Qt Enterprise Embedded" + property color qtlightgreen: '#80c342' + property color qtmediumgreen: '#328930' + property color qtdarkgreen: '#006325' + property color qtdarkblue: '#14148c' + property color qtlightblue: '#14aaff' + property color qtpurple: '#ae32a0' + property color qtred: '#b40000' + + ColouredTitle { + text: "MEET Qt ENTERPRISE EMBEDDED" } ContentText { @@ -59,62 +66,221 @@ Column { text: '

Qt Enterprise Embedded provides a fully-integrated solution to get you started immediately with software development on your embedded device with a tailored user experience for embedded Linux and embedded Android. It - supports your key requirements for high performance, minimal footprint together + supports your key requirements for high performance and minimal footprint together with Qt’s flexible full-framework modular architecture to deliver unparalleled - scalability.' + scalability. The development cycle is as rapid as it gets with fully integrated + embedded tooling, pre-configured software stack and a collection of value-add components.

' } + // Large overview picture Column { - id: diagram - spacing: 1 - width: parent.width * 0.5 + width: parent.width anchors.horizontalCenter: parent.horizontalCenter - Box { text: "Application"; accentColor: "coral" } - Box { text: "Qt Framework"; accentColor: Qt.rgba(0.64, 0.82, 0.15) } - Box { text: "Android/Linux Baselayer"; accentColor: "steelblue" } - Box { text: "Embedded Hardware"; accentColor: "steelblue"} + spacing: 10 + + Box{ text: "Cross-Platform Qt Libraries"; width: parent.width; accentColor: qtlightgreen } + Box{ text: "Value-Add Components"; width: parent.width; accentColor: qtlightgreen } + + Row { + id: row1 + spacing: 10 + width: parent.width + + Box{ text: "Complete Development Environment\nwith Qt Creator IDE"; + width: (row1.width - row1.spacing) / 2; height: column1.height; accentColor: qtmediumgreen } + + Column { + id: column1 + width: (row1.width - row1.spacing ) / 2 + spacing: row1.spacing + + + Box{ text: "Boot to Qt\nSoftware Stack\nfor HW"; accentColor: qtdarkblue; height: b2.height * 3 } + Box{ id: b2; text: "Build-Your-Own-Stack Tooling"; accentColor: qtdarkblue; } + } + } + } // end overview picture + + ColouredTitle { + text: "POWER OF CROSS-PLATFORM Qt" + } + + ContentText { + width: parent.width + text: '

Leverage the cross-platform C++ native APIs for maximum performance on both beautiful + user interfaces as well as non-GUI operations. With C++, you have full control + over your application code and direct device access. You can also configure Qt Enterprise Embedded + directly from the source codes into a large variety of supported hardware and + operating systems. As with any Qt project, the same application can be deployed + natively to desktop and mobile OS targets as well.

' + } + + HighlightText { + text: "Velvet-Like Native UIs, HTML5 or Both!" + } + + ContentText { + width: parent.width + text: '

With Qt Quick you can create beautiful and modern touch-based UIs + with maximum performance. Just like everything you find from this demo launcher!

+

Should you want dynamic web content and HTML5, the Qt WebEngine gives you full + Chromium-based browser engine with comprehensive HTML5 feature support. Mix and match with Qt Quick to get the best + of both worlds!

' + } + + ColouredTitle { + text: "SHORTER TIME-TO-MARKET" + } + + HighlightText { + text: "Full Embedded Development Environment" + } + + ContentText { + width: parent.width + text: '

A full-blown, productivity enhancing development environment, + installed on a Linux development desktop. This self-contained environment + is installed and updated through one online installer and features the Qt + Creator Enterprise IDE, with features that facilitate the whole product + creation lifecycle: UI designer, code editor, direct device deployment + via USB or IP, emulator, on-device debugging and profiling.

' + } + + + HighlightText { + text: "Boot to Qt Software Stack -\nEmbedded Prototyping Couldn't Get Any Simpler!" + } + + Row { + width: parent.width + spacing: 30 + + ContentText { + width: (parent.width - parent.spacing ) / 2 + + text: '

The Boot to Qt software stack gets you + immediately started with software development on your embedded device + with a tailored user experience for embedded Linux and embedded Android. It + supports your key requirements for high performance, minimal footprint together + with Qt’s flexible full-framework modular architecture to deliver unparalleled + scalability.

The Boot to Qt stack can be made to run on a variety + of hardware with the provided Build-Your-Own-Stack tooling. It comes + pre-built for several reference devices with the installation of Qt Enterprise Embedded.

' + } + + Column { + spacing: 5 + width: ( parent.width - parent.spacing ) / 2 + Box { text: "Application"; accentColor: qtpurple } + Box { text: "Qt Framework"; accentColor: qtlightgreen } + Box { text: "Android/Linux Baselayer"; accentColor: qtdarkblue } + Box { text: "Embedded Hardware"; accentColor: qtdarkblue } + } + + } + HighlightText { + text: "Value-Add Components - No Need to Re-Invent the Wheel!" + } ContentText { - id: description + width: parent.width + text: '

The Qt libraries come with a lot of high-level functionality for + various parts of your application. On top of that, we\'ve extended Qt Enterprise Embedded + to contain all the important things you need to create your embedded device, such as:

' + } + + + // The "grid" layout for key add-ons + Row { + width: parent.width * 0.9 + spacing: 30 + anchors.horizontalCenter: parent.horizontalCenter + + Column { + spacing: 10 + width: parent.width * 0.4 + + HighlightText { + color: qtlightgreen + horizontalAlignment: Text.AlignHCenter + font.pixelSize: engine.smallFontSize() + text: "Virtual Keyboard" + } + HighlightText { + color: qtlightgreen + horizontalAlignment: Text.AlignHCenter + font.pixelSize: engine.smallFontSize() + text: "Dynamic and Static Charting" + } + HighlightText { + color: qtlightgreen + horizontalAlignment: Text.AlignHCenter + font.pixelSize: engine.smallFontSize() + + text: "Pre-Built UI Controls" + } + } + Column { + spacing: 10 + width: parent.width * 0.4 + HighlightText { + color: qtlightgreen + horizontalAlignment: Text.AlignHCenter + font.pixelSize: engine.smallFontSize() + text: "3D Data Visualization" + } + HighlightText { + color: qtlightgreen + horizontalAlignment: Text.AlignHCenter + font.pixelSize: engine.smallFontSize() + text: "Qt Quick Compiler" + } + HighlightText { + color: qtlightgreen + horizontalAlignment: Text.AlignHCenter + font.pixelSize: engine.smallFontSize() + text: "Additional Tooling" + } + } + } // end of "grid" layout + + ColouredTitle { + text: "TRUSTED TECHNOLOGY PARTNER" + } + ContentText { width: parent.width + text: '

Qt is powering millions of everyday embedded devices user by over 70 industries. The Qt developer + community consists of hundreds of thousands of enthusiastic developers.

' + } + ContentText { + width: parent.width + text: '

With Qt Enterprise Embedded you are never alone with your device creation. You get + full support and portfolio of Digia Qt Professional Services + to help you pass all obstacles and reach your markets faster with outstanding quality.

' + } - text: '

Qt Enterprise Embedded gives you shorter time-to-market - providing you with the productivity-enhancing tools and value-adding components. - You are up-to-speed with development and prototyping since day one. You can just - focus on writing your application with Qt.
-

Qt Enterprise Embedded provides you with the following: -

    -
  • A full-blown, productivity enhancing development environment, - installed on a Linux development desktop. This self-contained environment - is installed and updated through one online installer and features the Qt - Creator Enterprise IDE, with features that facilitate the whole product - creation lifecycle: UI designer, code editor, direct device deployment - via USB or IP, emulator, on-device debugging and profiling.

    • -
  • Shorter time-to-market with the Boot to Qt Software Stack. A - light-weight, Qt-optimized, full software stack that is installed into - the actual target device. The stack comes in two flavors, Embedded Android - and Embedded Linux. The pre-built stack gets you up-to-speed with prototyping - in no time and with our professional tooling you can customize the stack into - your exact production needs.

    • -
  • Full power and scalability of Qt on Embedded. Leverage the - cross-platform C++ native APIs for maximum performance on both beautiful - user interfaces as well as non-GUI operations. With C++, you have full control - over your application code. You can also configure Qt Enterprise Embedded - directly from the source codes into a large variety of supported hardware and - operating systems. As with any Qt project, the same application can be deployed - natively to desktop and mobile OS targets as well.

    • -
  • Value-Adding Components. No need to re-implement the wheel! Full Qt - Enterprise libraries give you a shortcut on development time providing ready-made - solutions, such as a comprehensive virtual keyboard, charts and industrial UI - controls. -
- -

Qt Enterprise Embedded includes Boot to Qt, a light-weight, - Qt-optimized, full software stack for embedded systems that is installed into the actual - target device. The Boot to Qt stack can be made to run on a variety of hardware - Qt - Enterprise Embedded comes with pre-built images for several reference devices. - ' + ColouredTitle { + text: "GETTING STARTED WITH DEVELOPMENT" } + ContentText { + width: parent.width + text: '

Play around with the demos in this launcher to see the power of Qt and get your + free evaluation version of Qt Enterprise Embedded with the Boot to Qt images + for common developer boards from

' + } + HighlightText { + text: "http://qt.digia.com/QtEnterpriseEmbedded" + color: qtpurple + font.bold: true + horizontalAlignment: Text.AlignHCenter + } + ContentText { + width: parent.width + text: '

With an online installer, you\'ll get the out-of-the-box + pre-configured development environment, Qt Creator IDE, and you can start your + embedded development immediately!

' + } + } diff --git a/basicsuite/about-b2qt/Box.qml b/basicsuite/about-b2qt/Box.qml index ab6e971..72ede4b 100644 --- a/basicsuite/about-b2qt/Box.qml +++ b/basicsuite/about-b2qt/Box.qml @@ -56,7 +56,7 @@ Rectangle { gradient: Gradient { GradientStop { position: 0; color: root.accentColor; } - GradientStop { position: 1; color: "black"; } + GradientStop { position: 1; color: Qt.darker(Qt.darker(root.accentColor)); } } Text { @@ -65,6 +65,7 @@ Rectangle { font.bold: true; color: "white" anchors.centerIn: parent + horizontalAlignment: Text.AlignHCenter } } diff --git a/basicsuite/about-b2qt/ColouredTitle.qml b/basicsuite/about-b2qt/ColouredTitle.qml new file mode 100644 index 0000000..c73192c --- /dev/null +++ b/basicsuite/about-b2qt/ColouredTitle.qml @@ -0,0 +1,54 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: For any questions to Digia, please use the contact form at +** http://qt.digia.com/ +** +** This file is part of the examples of the Qt Enterprise Embedded. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +import QtQuick 2.0 + +Text { + + property color qtlightgreen: '#80c342' + + width: parent.width + horizontalAlignment: Text.AlignHCenter + wrapMode: Text.WordWrap + + font.pixelSize: engine.titleFontSize() + font.bold: true + color: qtlightgreen +} diff --git a/basicsuite/about-b2qt/HighlightText.qml b/basicsuite/about-b2qt/HighlightText.qml new file mode 100644 index 0000000..e1fc68e --- /dev/null +++ b/basicsuite/about-b2qt/HighlightText.qml @@ -0,0 +1,53 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: For any questions to Digia, please use the contact form at +** http://qt.digia.com/ +** +** This file is part of the examples of the Qt Enterprise Embedded. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +import QtQuick 2.0 + +Text { + + property color qtlightblue: '#14aaff' + + width: parent.width + horizontalAlignment: Text.AlignLeft + wrapMode: Text.WordWrap + font.pixelSize: engine.fontSize() + font.bold: true + color: qtlightblue +} diff --git a/basicsuite/about-b2qt/description.txt b/basicsuite/about-b2qt/description.txt index 676a166..df6f286 100644 --- a/basicsuite/about-b2qt/description.txt +++ b/basicsuite/about-b2qt/description.txt @@ -1,3 +1 @@ -The "About Boot to Qt" provides an introduction to what Boot to Qt is all about. - -It talks briefly about how the software stack is built up, rough hardware requirements and how Boot to Qt differs from the more traditional Qt editions. +The "About Qt Enterprise Embedded" provides an introduction to what Qt Enterprise Embedded is all about. diff --git a/basicsuite/about-b2qt/main.qml b/basicsuite/about-b2qt/main.qml index 694ba50..2b21a6b 100644 --- a/basicsuite/about-b2qt/main.qml +++ b/basicsuite/about-b2qt/main.qml @@ -48,11 +48,6 @@ Item { width : Screen.height > Screen.width ? Screen.height : Screen.width height : Screen.height > Screen.width ? Screen.width : Screen.height -// Rectangle { -// anchors.fill: parent -// color: "black" -// } - Flickable { id: flick property real inertia: 0.4 @@ -70,8 +65,6 @@ Item { property real topOvershoot: Math.max(0, contentItem.y); property real bottomOvershoot: Math.max(0, root.height - (contentItem.height + contentItem.y)); -// onTopOvershootChanged: print("Top Overshoot:", topOvershoot); -// onBottomOvershootChanged: print("Bottom Overshoot:", bottomOvershoot); Item { id: shiftTrickery @@ -107,8 +100,6 @@ Item { Item { width: 1; height: engine.smallFontSize() } AboutBoot2Qt { } - QtForAndroid { } - QtFramework { } Image { id: codeLessImage source: "codeless.png" diff --git a/basicsuite/about-b2qt/preview_l.jpg b/basicsuite/about-b2qt/preview_l.jpg index f2eb2e0..5ea4310 100644 Binary files a/basicsuite/about-b2qt/preview_l.jpg and b/basicsuite/about-b2qt/preview_l.jpg differ -- cgit v1.2.3 From 9e13cff1bba56c844589a8471bffe59564629898 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Wed, 25 Jun 2014 17:47:05 +0200 Subject: Fix a typo in the new About presentation Change-Id: I7af338332b09f01fd9af9c82a5271a7faa5629d3 Reviewed-by: Gatis Paeglis --- basicsuite/about-b2qt/AboutBoot2Qt.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basicsuite/about-b2qt/AboutBoot2Qt.qml b/basicsuite/about-b2qt/AboutBoot2Qt.qml index abb6dc8..1c60bc3 100644 --- a/basicsuite/about-b2qt/AboutBoot2Qt.qml +++ b/basicsuite/about-b2qt/AboutBoot2Qt.qml @@ -251,7 +251,7 @@ Column { } ContentText { width: parent.width - text: '

Qt is powering millions of everyday embedded devices user by over 70 industries. The Qt developer + text: '

Qt is powering millions of everyday embedded devices used by over 70 industries. The Qt developer community consists of hundreds of thousands of enthusiastic developers.

' } ContentText { -- cgit v1.2.3 From 2feac635797f95006ce9487a8de9c77a880c9983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pasi=20Pet=C3=A4j=C3=A4j=C3=A4rvi?= Date: Thu, 26 Jun 2014 16:40:52 +0300 Subject: Fix Meet Qt Enterprise Embedded video url on startup Change-Id: I666b943a8228b7078d42032e2bc148a42e33b28d Reviewed-by: Samuli Piippo --- basicsuite/mediaplayer/main.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basicsuite/mediaplayer/main.qml b/basicsuite/mediaplayer/main.qml index dfda2db..4aa038c 100755 --- a/basicsuite/mediaplayer/main.qml +++ b/basicsuite/mediaplayer/main.qml @@ -257,7 +257,7 @@ FocusScope { function init() { content.init() - content.openVideo("file://data/videos/Qt_EnterpriseEmbedded_1080p.mp4"); + content.openVideo("file:///data/videos/Qt_EnterpriseEmbedded_1080p.mp4"); } function openVideo() { -- cgit v1.2.3 From 61cbe63fba9e03ee9b65a1ada0792579e0562815 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 26 Jun 2014 14:07:59 +0300 Subject: about: fit text properly to the box Did not look good in smaller resolution Change-Id: Id7e33d9e1b06a13282d0ca82c017ff860f0cf312 Reviewed-by: Kalle Viironen --- basicsuite/about-b2qt/AboutBoot2Qt.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basicsuite/about-b2qt/AboutBoot2Qt.qml b/basicsuite/about-b2qt/AboutBoot2Qt.qml index 1c60bc3..4f3b40f 100644 --- a/basicsuite/about-b2qt/AboutBoot2Qt.qml +++ b/basicsuite/about-b2qt/AboutBoot2Qt.qml @@ -86,7 +86,7 @@ Column { spacing: 10 width: parent.width - Box{ text: "Complete Development Environment\nwith Qt Creator IDE"; + Box{ text: "Complete\nDevelopment Environment\nwith Qt Creator IDE"; width: (row1.width - row1.spacing) / 2; height: column1.height; accentColor: qtmediumgreen } Column { -- cgit v1.2.3 From dd698678584affa0bc00a6c526d04b32f43d1be2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pasi=20Pet=C3=A4j=C3=A4j=C3=A4rvi?= Date: Wed, 25 Jun 2014 12:19:29 +0300 Subject: Disable GraphicalEffects demo on beagleboneblack The performance is not satisfactory on this device Task-number: QTEE-672 Change-Id: I4055f1614f96c37bd38b06987e018ba7b562c6a5 Reviewed-by: Kalle Viironen --- basicsuite/graphicaleffects/exclude.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 basicsuite/graphicaleffects/exclude.txt diff --git a/basicsuite/graphicaleffects/exclude.txt b/basicsuite/graphicaleffects/exclude.txt new file mode 100644 index 0000000..715f5c2 --- /dev/null +++ b/basicsuite/graphicaleffects/exclude.txt @@ -0,0 +1,2 @@ +linux-beaglebone +android-beaglebone -- cgit v1.2.3 From 0f9d49c641268f141ca7c3d3cba9f750e400a6ab Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Fri, 27 Jun 2014 13:19:00 +0200 Subject: Doc: Content/language improvement for About QtEE demo. Rephrase a couple of sentences. Task-number: QTEE-691 Change-Id: I92d55e8215f5ce6bf4aab2019854149f37c78ad2 Reviewed-by: Mitch Curtis Reviewed-by: Kalle Viironen --- basicsuite/about-b2qt/AboutBoot2Qt.qml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/basicsuite/about-b2qt/AboutBoot2Qt.qml b/basicsuite/about-b2qt/AboutBoot2Qt.qml index 4f3b40f..ada3eb1 100644 --- a/basicsuite/about-b2qt/AboutBoot2Qt.qml +++ b/basicsuite/about-b2qt/AboutBoot2Qt.qml @@ -66,8 +66,8 @@ Column { text: '

Qt Enterprise Embedded provides a fully-integrated solution to get you started immediately with software development on your embedded device with a tailored user experience for embedded Linux and embedded Android. It - supports your key requirements for high performance and minimal footprint together - with Qt’s flexible full-framework modular architecture to deliver unparalleled + supports your key requirements for high performance and minimal footprint, and together + with Qt - a full framework with modular architecture - delivers unparalleled scalability. The development cycle is as rapid as it gets with fully integrated embedded tooling, pre-configured software stack and a collection of value-add components.

' } @@ -109,9 +109,9 @@ Column { width: parent.width text: '

Leverage the cross-platform C++ native APIs for maximum performance on both beautiful user interfaces as well as non-GUI operations. With C++, you have full control - over your application code and direct device access. You can also configure Qt Enterprise Embedded - directly from the source codes into a large variety of supported hardware and - operating systems. As with any Qt project, the same application can be deployed + over your application code and direct device access. You can also create custom configurations + of Qt Enterprise Embedded, targeting a large variety of supported hardware and + operating systems with ease. As with any Qt project, the same application can be deployed natively to desktop and mobile OS targets as well.

' } @@ -123,7 +123,7 @@ Column { width: parent.width text: '

With Qt Quick you can create beautiful and modern touch-based UIs with maximum performance. Just like everything you find from this demo launcher!

-

Should you want dynamic web content and HTML5, the Qt WebEngine gives you full +

Should you want dynamic web content and HTML5, the Qt WebEngine gives you a Chromium-based browser engine with comprehensive HTML5 feature support. Mix and match with Qt Quick to get the best of both worlds!

' } -- cgit v1.2.3 From 3f64212f863b2776a125f925fb0051eba79d904b Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Fri, 27 Jun 2014 14:43:40 +0200 Subject: Doc: Bump version to 3.1.0 Change-Id: I65ec140af6a42fc8df0eeeeefe09ad36253b4c4d Reviewed-by: Kalle Viironen Reviewed-by: Samuli Piippo --- doc/b2qt-demos.qdocconf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/b2qt-demos.qdocconf b/doc/b2qt-demos.qdocconf index 24a23db..2af1183 100644 --- a/doc/b2qt-demos.qdocconf +++ b/doc/b2qt-demos.qdocconf @@ -6,7 +6,7 @@ sourceencoding = UTF-8 project = QtEnterpriseEmbeddedDemos description = Qt Enterprise Embedded Examples and Demos -version = 3.0.0 +version = 3.1.0 sourcedirs = . imagedirs += images @@ -21,7 +21,7 @@ exampledirs = ../basicsuite qhp.projects = QtEnterpriseEmbeddedDemos qhp.QtEnterpriseEmbeddedDemos.file = b2qt-demos.qhp -qhp.QtEnterpriseEmbeddedDemos.namespace = com.digia.b2qt-demos.300 +qhp.QtEnterpriseEmbeddedDemos.namespace = com.digia.b2qt-demos.310 qhp.QtEnterpriseEmbeddedDemos.virtualFolder = b2qt-demos qhp.QtEnterpriseEmbeddedDemos.indexTitle = Qt Enterprise Embedded Examples and Demos qhp.QtEnterpriseEmbeddedDemos.indexRoot = -- cgit v1.2.3 From 76217b65aa7e2af9ecb21acb509f345313a262cc Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 30 Jun 2014 09:08:02 +0300 Subject: Update all VirtualKeyboard import to version 1.1 Change-Id: Idd65fcdc0afee0f54c8532bb2c26121a0b2da2b6 Reviewed-by: Eirik Aavitsland --- basicsuite/shared/SharedMain.qml | 2 +- basicsuite/textinput/TextArea.qml | 2 +- basicsuite/textinput/TextBase.qml | 2 +- basicsuite/textinput/TextField.qml | 2 +- basicsuite/textinput/main.qml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/basicsuite/shared/SharedMain.qml b/basicsuite/shared/SharedMain.qml index 60a141b..98ca779 100644 --- a/basicsuite/shared/SharedMain.qml +++ b/basicsuite/shared/SharedMain.qml @@ -16,7 +16,7 @@ ** ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.0 +import QtQuick.Enterprise.VirtualKeyboard 1.1 Item { id: root diff --git a/basicsuite/textinput/TextArea.qml b/basicsuite/textinput/TextArea.qml index 89cdc9f..cf84689 100644 --- a/basicsuite/textinput/TextArea.qml +++ b/basicsuite/textinput/TextArea.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.0 +import QtQuick.Enterprise.VirtualKeyboard 1.1 TextBase { id: textArea diff --git a/basicsuite/textinput/TextBase.qml b/basicsuite/textinput/TextBase.qml index fc399a8..0fcf294 100644 --- a/basicsuite/textinput/TextBase.qml +++ b/basicsuite/textinput/TextBase.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.0 +import QtQuick.Enterprise.VirtualKeyboard 1.1 FocusScope { id: textBase diff --git a/basicsuite/textinput/TextField.qml b/basicsuite/textinput/TextField.qml index b3671d7..f25dc49 100644 --- a/basicsuite/textinput/TextField.qml +++ b/basicsuite/textinput/TextField.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.0 +import QtQuick.Enterprise.VirtualKeyboard 1.1 TextBase { id: textField diff --git a/basicsuite/textinput/main.qml b/basicsuite/textinput/main.qml index bcb48d9..db407c2 100644 --- a/basicsuite/textinput/main.qml +++ b/basicsuite/textinput/main.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 1.0 +import QtQuick.Enterprise.VirtualKeyboard 1.1 Flickable { id: flickable -- cgit v1.2.3 From 7236ab7b3015f3310860b96cf1da17d0aa2a7d6a Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 30 Jun 2014 09:58:40 +0300 Subject: Remove deleted demos also from doc Photogallery and Qt5 presentation demos were removed, so remove them also from the documentation. Change-Id: Idb88eb7cabc1f4666c6f7e89274d327eadd65f22 Reviewed-by: Laszlo Agocs --- doc/b2qt-demos.qdoc | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/doc/b2qt-demos.qdoc b/doc/b2qt-demos.qdoc index 3bfb6d6..0a61968 100644 --- a/doc/b2qt-demos.qdoc +++ b/doc/b2qt-demos.qdoc @@ -105,17 +105,6 @@ It can play from a file or from a network source, both videos and music. */ -/*! - \example photogallery - \title Photo Gallery - \ingroup b2qt-demos - \brief A photo gallery implemented in QML. - - \image b2qt-demo-photogallery.jpg - - This is a simple photo gallery, showing images found in \c {/data/images} directory. -*/ - /*! \example qt5-cinematicdemo \title Qt 5 Cinematic Demo @@ -135,21 +124,6 @@ More awesome looking Qt Quick examples are available from \l {http://quitcoding.com}. */ -/*! - \example qt5-launchpresentation - \title Qt 5 Launch Presentation - \ingroup b2qt-demos - \brief A quick tour of what is new in Qt 5. - - \image b2qt-demo-qt5-launchpresentation.jpg - - This is an application written with Qt Quick, based on Qt 5. - - The source code is also available here: \l {https://qt.gitorious.org/qt-labs/qt5-launch-demo}. - The demo makes use of the QML Presentation System, available from - \c {ssh://codereview.qt-project.org/qt-labs/qml-presentation-system.git} repository. -*/ - /*! \example qt5-everywhere \title Qt 5 Everywhere -- cgit v1.2.3 From 73b88511a7762fc21765556ed649e056e5d28100 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 30 Jun 2014 13:25:25 +0300 Subject: launchersettings: make ip field span two columns This makes the hostname button fit better in smaller resolution. Task-number: QTEE-689 Change-Id: I8bead95d7b0d614ee1fa882699b990ef33848f99 Reviewed-by: Eirik Aavitsland --- basicsuite/launchersettings/main.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/basicsuite/launchersettings/main.qml b/basicsuite/launchersettings/main.qml index 7c4daaf..c42d8dc 100644 --- a/basicsuite/launchersettings/main.qml +++ b/basicsuite/launchersettings/main.qml @@ -243,6 +243,7 @@ Rectangle { text: if (networkControllerLoader.item != undefined) { networkControllerLoader.item.getIPAddress(); } font.pixelSize: 18 color: "white" + Layout.columnSpan: 2 } Button { -- cgit v1.2.3 From c420c17185d569a734c1cde4e269ae3f157794c1 Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Mon, 30 Jun 2014 15:28:50 +0200 Subject: Fix demo descriptions. - Camera example refers to the "Photo Gallery" demo, which does not exists anymore. - Shorten the description of the "Qt5 Cinematic Experience" demo, this fixes the overlapping issue. Task-number: QTEE-700 Change-Id: I4552089e2f12d37e9a61c08bb5a2a999dc5cce3a Reviewed-by: Eirik Aavitsland --- basicsuite/camera/description.txt | 4 +--- basicsuite/qt5-cinematicdemo/description.txt | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/basicsuite/camera/description.txt b/basicsuite/camera/description.txt index 71c3c44..adfdafa 100644 --- a/basicsuite/camera/description.txt +++ b/basicsuite/camera/description.txt @@ -1,5 +1,3 @@ This example demonstrates the use of the camera features of Qt Multimedia with Qt Quick. -Demo can be used to take pictures. Files are saved inside the /data/images/ folder and can be viewed with the "Photo Gallery" application. - -Camera parameters such as flash mode, scene mode or white balance can be changed. The availability of parameters depends on what the camera driver provides. +Demo can be used to take photos which are saved in the /data/images/ directory. Camera parameters such as flash mode, scene mode or white balance can be changed. The availability of parameters depends on what the camera driver provides. diff --git a/basicsuite/qt5-cinematicdemo/description.txt b/basicsuite/qt5-cinematicdemo/description.txt index 253d246..c78f386 100644 --- a/basicsuite/qt5-cinematicdemo/description.txt +++ b/basicsuite/qt5-cinematicdemo/description.txt @@ -1,5 +1,3 @@ -The Qt5 Cinematic Experience is a demo by "QUIt Coding", a small group of talented individuals enjoying software development with cutting edge technologies. They are official members of the Qt Ambassador Program. +The Qt5 Cinematic Experience is a demo by "QUIt Coding". -The demo shows off a number features of Qt Quick 2.0. A nicely styled list control of movie covers with lighting effects, particles and transitions. The information roll-down curvy curtain is implemented using inline GLSL in the QML file. - -The source code for this demo and more awesome looking Qt Quick examples are available from quitcoding.com. +The demo shows off a number features of Qt Quick 2.0. A nicely styled list control of movie covers with lighting effects, particles and transitions. The information roll-down curvy curtain is implemented using inline GLSL in the QML file. The source code for this demo and more awesome looking Qt Quick examples are available from quitcoding.com. -- cgit v1.2.3 From a9785f3036ca5cab93bc07a42ad3417392941e81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Str=C3=B8mme?= Date: Mon, 30 Jun 2014 17:28:41 +0200 Subject: Changed the audio track on the Qt_EnterpriseEmbedded_1080p.mp4 video. The audio track was not supported properly on Android. Change-Id: I0a2bac0de5e4ecfb235723135e62313bc847d166 Reviewed-by: Eirik Aavitsland --- videos/Qt_EnterpriseEmbedded_1080p.mp4 | Bin 20613355 -> 23057072 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/videos/Qt_EnterpriseEmbedded_1080p.mp4 b/videos/Qt_EnterpriseEmbedded_1080p.mp4 index d3d7e62..993eb5c 100644 Binary files a/videos/Qt_EnterpriseEmbedded_1080p.mp4 and b/videos/Qt_EnterpriseEmbedded_1080p.mp4 differ -- cgit v1.2.3 From 3473ec2b9a38a703310b773e51ce059a8423e379 Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Tue, 1 Jul 2014 15:33:52 +0200 Subject: [Doc] Use symbolic links for demo preview images Task-number: QTEE-703 Change-Id: Ic9373dd54726c892f5318a86ab535d04d85c607b Reviewed-by: Samuli Piippo --- doc/images/b2qt-demo-about-b2qt.jpg | Bin 28727 -> 41 bytes doc/images/b2qt-demo-camera.jpg | Bin 33458 -> 37 bytes doc/images/b2qt-demo-controls-touch.jpg | Bin 11179 -> 45 bytes doc/images/b2qt-demo-enterprise-charts.jpg | Bin 11070 -> 48 bytes doc/images/b2qt-demo-enterprise-dashboard.jpg | Bin 11239 -> 51 bytes doc/images/b2qt-demo-enterprise-gallery.jpg | Bin 9016 -> 49 bytes doc/images/b2qt-demo-enterprise-qtdatavis3d.jpg | Bin 30360 -> 53 bytes doc/images/b2qt-demo-graphicaleffects.jpg | Bin 33841 -> 47 bytes doc/images/b2qt-demo-launchersettings.jpg | 1 + doc/images/b2qt-demo-mediaplayer.jpg | Bin 29015 -> 42 bytes doc/images/b2qt-demo-photogallery.jpg | Bin 55274 -> 0 bytes doc/images/b2qt-demo-qt5-cinematicdemo.jpg | Bin 36830 -> 48 bytes doc/images/b2qt-demo-qt5-everywhere.jpg | Bin 34331 -> 45 bytes doc/images/b2qt-demo-qt5-launchpresentation.jpg | Bin 16252 -> 0 bytes doc/images/b2qt-demo-qt5-particlesdemo.jpg | Bin 8889 -> 48 bytes doc/images/b2qt-demo-sensorexplorer.jpg | Bin 21553 -> 45 bytes doc/images/b2qt-demo-sensors.jpg | Bin 19464 -> 38 bytes doc/images/b2qt-demo-textinput.jpg | Bin 10684 -> 40 bytes doc/images/b2qt-demo-webengine.jpg | Bin 18081 -> 40 bytes doc/images/update-doc-images.sh | 2 ++ 20 files changed, 3 insertions(+) mode change 100644 => 120000 doc/images/b2qt-demo-about-b2qt.jpg mode change 100644 => 120000 doc/images/b2qt-demo-camera.jpg mode change 100644 => 120000 doc/images/b2qt-demo-controls-touch.jpg mode change 100644 => 120000 doc/images/b2qt-demo-enterprise-charts.jpg mode change 100644 => 120000 doc/images/b2qt-demo-enterprise-dashboard.jpg mode change 100644 => 120000 doc/images/b2qt-demo-enterprise-gallery.jpg mode change 100644 => 120000 doc/images/b2qt-demo-enterprise-qtdatavis3d.jpg mode change 100644 => 120000 doc/images/b2qt-demo-graphicaleffects.jpg create mode 120000 doc/images/b2qt-demo-launchersettings.jpg mode change 100644 => 120000 doc/images/b2qt-demo-mediaplayer.jpg delete mode 100644 doc/images/b2qt-demo-photogallery.jpg mode change 100644 => 120000 doc/images/b2qt-demo-qt5-cinematicdemo.jpg mode change 100644 => 120000 doc/images/b2qt-demo-qt5-everywhere.jpg delete mode 100644 doc/images/b2qt-demo-qt5-launchpresentation.jpg mode change 100644 => 120000 doc/images/b2qt-demo-qt5-particlesdemo.jpg mode change 100644 => 120000 doc/images/b2qt-demo-sensorexplorer.jpg mode change 100644 => 120000 doc/images/b2qt-demo-sensors.jpg mode change 100644 => 120000 doc/images/b2qt-demo-textinput.jpg mode change 100644 => 120000 doc/images/b2qt-demo-webengine.jpg create mode 100755 doc/images/update-doc-images.sh diff --git a/doc/images/b2qt-demo-about-b2qt.jpg b/doc/images/b2qt-demo-about-b2qt.jpg deleted file mode 100644 index f2eb2e0..0000000 Binary files a/doc/images/b2qt-demo-about-b2qt.jpg and /dev/null differ diff --git a/doc/images/b2qt-demo-about-b2qt.jpg b/doc/images/b2qt-demo-about-b2qt.jpg new file mode 120000 index 0000000..b7c27dd --- /dev/null +++ b/doc/images/b2qt-demo-about-b2qt.jpg @@ -0,0 +1 @@ +../../basicsuite/about-b2qt/preview_l.jpg \ No newline at end of file diff --git a/doc/images/b2qt-demo-camera.jpg b/doc/images/b2qt-demo-camera.jpg deleted file mode 100644 index 3f15310..0000000 Binary files a/doc/images/b2qt-demo-camera.jpg and /dev/null differ diff --git a/doc/images/b2qt-demo-camera.jpg b/doc/images/b2qt-demo-camera.jpg new file mode 120000 index 0000000..6989f2b --- /dev/null +++ b/doc/images/b2qt-demo-camera.jpg @@ -0,0 +1 @@ +../../basicsuite/camera/preview_l.jpg \ No newline at end of file diff --git a/doc/images/b2qt-demo-controls-touch.jpg b/doc/images/b2qt-demo-controls-touch.jpg deleted file mode 100644 index c57eac3..0000000 Binary files a/doc/images/b2qt-demo-controls-touch.jpg and /dev/null differ diff --git a/doc/images/b2qt-demo-controls-touch.jpg b/doc/images/b2qt-demo-controls-touch.jpg new file mode 120000 index 0000000..bd78fcf --- /dev/null +++ b/doc/images/b2qt-demo-controls-touch.jpg @@ -0,0 +1 @@ +../../basicsuite/controls-touch/preview_l.jpg \ No newline at end of file diff --git a/doc/images/b2qt-demo-enterprise-charts.jpg b/doc/images/b2qt-demo-enterprise-charts.jpg deleted file mode 100644 index 2776b0b..0000000 Binary files a/doc/images/b2qt-demo-enterprise-charts.jpg and /dev/null differ diff --git a/doc/images/b2qt-demo-enterprise-charts.jpg b/doc/images/b2qt-demo-enterprise-charts.jpg new file mode 120000 index 0000000..e2f9e6c --- /dev/null +++ b/doc/images/b2qt-demo-enterprise-charts.jpg @@ -0,0 +1 @@ +../../basicsuite/enterprise-charts/preview_l.jpg \ No newline at end of file diff --git a/doc/images/b2qt-demo-enterprise-dashboard.jpg b/doc/images/b2qt-demo-enterprise-dashboard.jpg deleted file mode 100644 index eb2e3b5..0000000 Binary files a/doc/images/b2qt-demo-enterprise-dashboard.jpg and /dev/null differ diff --git a/doc/images/b2qt-demo-enterprise-dashboard.jpg b/doc/images/b2qt-demo-enterprise-dashboard.jpg new file mode 120000 index 0000000..5a9e599 --- /dev/null +++ b/doc/images/b2qt-demo-enterprise-dashboard.jpg @@ -0,0 +1 @@ +../../basicsuite/enterprise-dashboard/preview_l.jpg \ No newline at end of file diff --git a/doc/images/b2qt-demo-enterprise-gallery.jpg b/doc/images/b2qt-demo-enterprise-gallery.jpg deleted file mode 100644 index 8ddcad8..0000000 Binary files a/doc/images/b2qt-demo-enterprise-gallery.jpg and /dev/null differ diff --git a/doc/images/b2qt-demo-enterprise-gallery.jpg b/doc/images/b2qt-demo-enterprise-gallery.jpg new file mode 120000 index 0000000..75dfea4 --- /dev/null +++ b/doc/images/b2qt-demo-enterprise-gallery.jpg @@ -0,0 +1 @@ +../../basicsuite/enterprise-gallery/preview_l.jpg \ No newline at end of file diff --git a/doc/images/b2qt-demo-enterprise-qtdatavis3d.jpg b/doc/images/b2qt-demo-enterprise-qtdatavis3d.jpg deleted file mode 100644 index ee3d50d..0000000 Binary files a/doc/images/b2qt-demo-enterprise-qtdatavis3d.jpg and /dev/null differ diff --git a/doc/images/b2qt-demo-enterprise-qtdatavis3d.jpg b/doc/images/b2qt-demo-enterprise-qtdatavis3d.jpg new file mode 120000 index 0000000..0ac4dd3 --- /dev/null +++ b/doc/images/b2qt-demo-enterprise-qtdatavis3d.jpg @@ -0,0 +1 @@ +../../basicsuite/enterprise-qtdatavis3d/preview_l.jpg \ No newline at end of file diff --git a/doc/images/b2qt-demo-graphicaleffects.jpg b/doc/images/b2qt-demo-graphicaleffects.jpg deleted file mode 100644 index 80fbbd5..0000000 Binary files a/doc/images/b2qt-demo-graphicaleffects.jpg and /dev/null differ diff --git a/doc/images/b2qt-demo-graphicaleffects.jpg b/doc/images/b2qt-demo-graphicaleffects.jpg new file mode 120000 index 0000000..5a092e2 --- /dev/null +++ b/doc/images/b2qt-demo-graphicaleffects.jpg @@ -0,0 +1 @@ +../../basicsuite/graphicaleffects/preview_l.jpg \ No newline at end of file diff --git a/doc/images/b2qt-demo-launchersettings.jpg b/doc/images/b2qt-demo-launchersettings.jpg new file mode 120000 index 0000000..0139c4c --- /dev/null +++ b/doc/images/b2qt-demo-launchersettings.jpg @@ -0,0 +1 @@ +../../basicsuite/launchersettings/preview_l.jpg \ No newline at end of file diff --git a/doc/images/b2qt-demo-mediaplayer.jpg b/doc/images/b2qt-demo-mediaplayer.jpg deleted file mode 100644 index 0fff215..0000000 Binary files a/doc/images/b2qt-demo-mediaplayer.jpg and /dev/null differ diff --git a/doc/images/b2qt-demo-mediaplayer.jpg b/doc/images/b2qt-demo-mediaplayer.jpg new file mode 120000 index 0000000..cce5a00 --- /dev/null +++ b/doc/images/b2qt-demo-mediaplayer.jpg @@ -0,0 +1 @@ +../../basicsuite/mediaplayer/preview_l.jpg \ No newline at end of file diff --git a/doc/images/b2qt-demo-photogallery.jpg b/doc/images/b2qt-demo-photogallery.jpg deleted file mode 100644 index 0b67f1d..0000000 Binary files a/doc/images/b2qt-demo-photogallery.jpg and /dev/null differ diff --git a/doc/images/b2qt-demo-qt5-cinematicdemo.jpg b/doc/images/b2qt-demo-qt5-cinematicdemo.jpg deleted file mode 100644 index 21bb2f9..0000000 Binary files a/doc/images/b2qt-demo-qt5-cinematicdemo.jpg and /dev/null differ diff --git a/doc/images/b2qt-demo-qt5-cinematicdemo.jpg b/doc/images/b2qt-demo-qt5-cinematicdemo.jpg new file mode 120000 index 0000000..1cc8325 --- /dev/null +++ b/doc/images/b2qt-demo-qt5-cinematicdemo.jpg @@ -0,0 +1 @@ +../../basicsuite/qt5-cinematicdemo/preview_l.jpg \ No newline at end of file diff --git a/doc/images/b2qt-demo-qt5-everywhere.jpg b/doc/images/b2qt-demo-qt5-everywhere.jpg deleted file mode 100644 index 1bb40bf..0000000 Binary files a/doc/images/b2qt-demo-qt5-everywhere.jpg and /dev/null differ diff --git a/doc/images/b2qt-demo-qt5-everywhere.jpg b/doc/images/b2qt-demo-qt5-everywhere.jpg new file mode 120000 index 0000000..0c61cdb --- /dev/null +++ b/doc/images/b2qt-demo-qt5-everywhere.jpg @@ -0,0 +1 @@ +../../basicsuite/qt5-everywhere/preview_l.jpg \ No newline at end of file diff --git a/doc/images/b2qt-demo-qt5-launchpresentation.jpg b/doc/images/b2qt-demo-qt5-launchpresentation.jpg deleted file mode 100644 index 8decd76..0000000 Binary files a/doc/images/b2qt-demo-qt5-launchpresentation.jpg and /dev/null differ diff --git a/doc/images/b2qt-demo-qt5-particlesdemo.jpg b/doc/images/b2qt-demo-qt5-particlesdemo.jpg deleted file mode 100644 index fa0db59..0000000 Binary files a/doc/images/b2qt-demo-qt5-particlesdemo.jpg and /dev/null differ diff --git a/doc/images/b2qt-demo-qt5-particlesdemo.jpg b/doc/images/b2qt-demo-qt5-particlesdemo.jpg new file mode 120000 index 0000000..42553b8 --- /dev/null +++ b/doc/images/b2qt-demo-qt5-particlesdemo.jpg @@ -0,0 +1 @@ +../../basicsuite/qt5-particlesdemo/preview_l.jpg \ No newline at end of file diff --git a/doc/images/b2qt-demo-sensorexplorer.jpg b/doc/images/b2qt-demo-sensorexplorer.jpg deleted file mode 100644 index b0469e5..0000000 Binary files a/doc/images/b2qt-demo-sensorexplorer.jpg and /dev/null differ diff --git a/doc/images/b2qt-demo-sensorexplorer.jpg b/doc/images/b2qt-demo-sensorexplorer.jpg new file mode 120000 index 0000000..4c2797f --- /dev/null +++ b/doc/images/b2qt-demo-sensorexplorer.jpg @@ -0,0 +1 @@ +../../basicsuite/sensorexplorer/preview_l.jpg \ No newline at end of file diff --git a/doc/images/b2qt-demo-sensors.jpg b/doc/images/b2qt-demo-sensors.jpg deleted file mode 100644 index 7ce979d..0000000 Binary files a/doc/images/b2qt-demo-sensors.jpg and /dev/null differ diff --git a/doc/images/b2qt-demo-sensors.jpg b/doc/images/b2qt-demo-sensors.jpg new file mode 120000 index 0000000..4144c1c --- /dev/null +++ b/doc/images/b2qt-demo-sensors.jpg @@ -0,0 +1 @@ +../../basicsuite/sensors/preview_l.jpg \ No newline at end of file diff --git a/doc/images/b2qt-demo-textinput.jpg b/doc/images/b2qt-demo-textinput.jpg deleted file mode 100644 index 67a2917..0000000 Binary files a/doc/images/b2qt-demo-textinput.jpg and /dev/null differ diff --git a/doc/images/b2qt-demo-textinput.jpg b/doc/images/b2qt-demo-textinput.jpg new file mode 120000 index 0000000..ea9dcbe --- /dev/null +++ b/doc/images/b2qt-demo-textinput.jpg @@ -0,0 +1 @@ +../../basicsuite/textinput/preview_l.jpg \ No newline at end of file diff --git a/doc/images/b2qt-demo-webengine.jpg b/doc/images/b2qt-demo-webengine.jpg deleted file mode 100644 index 963258a..0000000 Binary files a/doc/images/b2qt-demo-webengine.jpg and /dev/null differ diff --git a/doc/images/b2qt-demo-webengine.jpg b/doc/images/b2qt-demo-webengine.jpg new file mode 120000 index 0000000..5d319d8 --- /dev/null +++ b/doc/images/b2qt-demo-webengine.jpg @@ -0,0 +1 @@ +../../basicsuite/webengine/preview_l.jpg \ No newline at end of file diff --git a/doc/images/update-doc-images.sh b/doc/images/update-doc-images.sh new file mode 100755 index 0000000..1463ac2 --- /dev/null +++ b/doc/images/update-doc-images.sh @@ -0,0 +1,2 @@ +rm b2qt-demo-* +find ../../basicsuite/ -name "preview_l.jpg" -execdir sh -c 'ln -s ../../basicsuite/${PWD##*/}/preview_l.jpg ../../doc/images/b2qt-demo-${PWD##*/}.jpg' \; -- cgit v1.2.3