From 4b96d975a6e3a83675d525b1b74ebbd46af6a998 Mon Sep 17 00:00:00 2001 From: Alan Alpert <416365416c@gmail.com> Date: Wed, 23 Apr 2014 21:04:52 -0700 Subject: Add [ChangeLog] tags to qtdeclarative changelog. Change-Id: Ia235b6b2397cfaeb20f0c7ea0d6196c603b2aaaa Reviewed-by: Thiago Macieira --- dist/changes-5.3.0 | 88 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 54 insertions(+), 34 deletions(-) diff --git a/dist/changes-5.3.0 b/dist/changes-5.3.0 index 05550765d4..56c4b5e20c 100644 --- a/dist/changes-5.3.0 +++ b/dist/changes-5.3.0 @@ -2,7 +2,7 @@ Qt 5.3 introduces many new features and improvements as well as bugfixes over the 5.2.x series. For more details, refer to the online documentation included in this distribution. The documentation is also available online: - http://qt-project.org/doc/qt-5.2 + http://qt-project.org/doc/qt-5 The Qt version 5.3 series is binary compatible with the 5.2.x series. Applications compiled for 5.2 will continue to run with 5.3. @@ -29,46 +29,66 @@ Third party components * Important Behavior Changes * **************************************************************************** -- Signals declared in QML that take "var" parameters, are now using QJSValue - as C++ type for these parameters, instead of QVariant. + - Signals declared in QML that take "var" parameters, are now using QJSValue + as C++ type for these parameters, instead of QVariant. -**************************************************************************** -* Library * -**************************************************************************** - -QtQml ------- - -QtQuick ------- - -- Introduced QQuickWidget. This is the equivalent of QQuickView in the - QWidget world. It allows easy and flexible embedding of QtQuick - scenes into widget-based application windows without the - restrictions imposed by QWidget::createWindowContainer(). - - -**************************************************************************** -* Database Drivers * -**************************************************************************** + - [QTBUG-35913] A QQuick Item is now strongly referenced by its visual + parent item, so it doesn't require a QObject parent to stay alive. + - [QTBUG-37924] Keys.forwardTo no longer propagates key events to the + target item's parents. This makes Keys.forwardTo act more as expected, + like an event filter. This way Keys.forwardTo becomes usable for + composite types that want to enable the Keys attached property + handling by forwarding key events from an internal editor. **************************************************************************** -* Platform Specific Changes * +* Library * **************************************************************************** +QtQml +----- -**************************************************************************** -* Compiler Specific Changes * -**************************************************************************** + - [QTBUG-36491] Fixed JavaScript Array.push() not working on QStringList + properties. + - [QTBUG-38430] Fixed a bug that caused a crash when the item is deleted but + is not removed from the QQmlDelegateModel's cache. +QtQuickWidgets +------- + - Introduced QQuickWidget. This is the equivalent of QQuickView in the + QWidget world. It allows easy and flexible embedding of QtQuick + scenes into widget-based application windows without the + restrictions imposed by QWidget::createWindowContainer(). -**************************************************************************** -* Tools * -**************************************************************************** - - -**************************************************************************** -* Plugins * -**************************************************************************** +QtQuick +------- + + - Added displayMarginBeginning/End to ListView and GridView. + - Added a new sceneGraphError() signal to QQuickWindow which applications + can use to detect errors like OpenGL context creation failures and react + in their own custom ways. + - Moved dialog implementations from qtdeclarative repository to + qtquickcontrols repository due to dependencies. QML import remains unchanged. + + + - [QTBUG-18946] Added Text::linkAt(x,y) method. + - [QTBUG-18946] Added TextEdit::linkAt(x,y) method. + - [QTBUG-19961] Added Image.mipmap property to enable mipmap filtering when + scaled or transformed. + - [QTBUG-38004] Mac: any editable text input will get tab focus when "Text + boxes and lists only" option was selected. + - [QTBUG-21549] Fixed a bug where Behavior would trigger when the tracked + value has not changed. + - [QTBUG-35073] QQuickWindow will now emit the afterAnimating() signal + from the gui thread before each scenegraph sync request. + - [QTBUG-36749] Fixed wrong baseline alignment for TextInput + - [QTBUG-31047] handles mouse as a touchpoint; added mouseEnabled + property to permit transparent pass-through to mouse-sensitive items + - [QTBUG-31830] "updatePolish" is not called for invisible items any more. + - [QTBUG-35772] Changed QSGGeometry::lineWidth to also affect point size + (glPointSize) when drawing GL_POINTS, in addition to the existing + behavior of affecting line width when drawing GL_LINES, GL_LINE_STRIP, + and GL_LINE_LOOP. + - [QTBUG-36069] Fixed TextEdit not vertically aligning its text after + having its height changed. -- cgit v1.2.3 From 7996ac4c0a679ca5e476c2d3e3e0b84582e40c22 Mon Sep 17 00:00:00 2001 From: Bernd Weimer Date: Mon, 14 Apr 2014 09:50:41 +0200 Subject: Always implement text input "canPaste" property This is needed for TextField control for instance. If QT_NO_CLIPBOARD is defined, canPaste will always return false. Fixes dialogs auto test when QT_NO_CLIPBOARD is defined. [ChangeLog][QtQuick][Platform Specific Changes] Added canPaste property to TextInput element also on platforms that don't support a clipboard (QT_NO_CLIPBOARD is defined). Change-Id: Ia85205672ba59c1fce70852458c514b03d332de6 (cherry picked from commit c2d802049e48d1d6f0bce6eb0972fb26dc4d6ce3) Reviewed-by: Fabian Bumberger Reviewed-by: Bernd Weimer --- src/quick/items/qquicktextinput.cpp | 6 ++++-- src/quick/items/qquicktextinput_p.h | 4 ---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index 5195911c5f..597025b796 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -2337,7 +2337,6 @@ void QQuickTextInput::setPersistentSelection(bool on) emit persistentSelectionChanged(); } -#ifndef QT_NO_CLIPBOARD /*! \qmlproperty bool QtQuick::TextInput::canPaste @@ -2346,6 +2345,7 @@ void QQuickTextInput::setPersistentSelection(bool on) */ bool QQuickTextInput::canPaste() const { +#if !defined(QT_NO_CLIPBOARD) Q_D(const QQuickTextInput); if (!d->canPasteValid) { if (const QMimeData *mimeData = QGuiApplication::clipboard()->mimeData()) @@ -2353,8 +2353,10 @@ bool QQuickTextInput::canPaste() const const_cast(d)->canPasteValid = true; } return d->canPaste; -} +#else + return false; #endif +} /*! \qmlproperty bool QtQuick::TextInput::canUndo diff --git a/src/quick/items/qquicktextinput_p.h b/src/quick/items/qquicktextinput_p.h index 5f0250aaf1..042859df17 100644 --- a/src/quick/items/qquicktextinput_p.h +++ b/src/quick/items/qquicktextinput_p.h @@ -99,9 +99,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickTextInput : public QQuickImplicitSizeItem Q_PROPERTY(bool selectByMouse READ selectByMouse WRITE setSelectByMouse NOTIFY selectByMouseChanged) Q_PROPERTY(SelectionMode mouseSelectionMode READ mouseSelectionMode WRITE setMouseSelectionMode NOTIFY mouseSelectionModeChanged) Q_PROPERTY(bool persistentSelection READ persistentSelection WRITE setPersistentSelection NOTIFY persistentSelectionChanged) -#ifndef QT_NO_CLIPBOARD Q_PROPERTY(bool canPaste READ canPaste NOTIFY canPasteChanged) -#endif Q_PROPERTY(bool canUndo READ canUndo NOTIFY canUndoChanged) Q_PROPERTY(bool canRedo READ canRedo NOTIFY canRedoChanged) #ifndef QT_NO_IM @@ -256,9 +254,7 @@ public: QRectF boundingRect() const; QRectF clipRect() const; -#ifndef QT_NO_CLIPBOARD bool canPaste() const; -#endif bool canUndo() const; bool canRedo() const; -- cgit v1.2.3 From d98362f5e9cc5c07cff5f32672aa448b0a0c31c4 Mon Sep 17 00:00:00 2001 From: Mika Salmela Date: Fri, 2 May 2014 14:14:55 +0300 Subject: StocQt demo improvement MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Along with general demo improvements, this task implements the new layout to the StocQt demo. Also few bugs on the functionality are corrected, like drawing the stock graph on right way and initial values reset on stock model when changing active stock. Task-number: QTBUG-38254 Change-Id: I9d3387ed0e3f23512b8e60c70246589c10237818 Reviewed-by: Topi Reiniö --- examples/quick/demos/stocqt/content/Button.qml | 10 +- examples/quick/demos/stocqt/content/CheckBox.qml | 24 +-- examples/quick/demos/stocqt/content/DatePicker.qml | 131 ------------ examples/quick/demos/stocqt/content/StockChart.qml | 226 ++++++++++++--------- examples/quick/demos/stocqt/content/StockInfo.qml | 119 +++++++++++ .../quick/demos/stocqt/content/StockListModel.qml | 200 +++++++++--------- .../quick/demos/stocqt/content/StockListView.qml | 181 ++++++++++++++++- examples/quick/demos/stocqt/content/StockModel.qml | 45 ++-- .../quick/demos/stocqt/content/StockSettings.qml | 216 -------------------- .../demos/stocqt/content/StockSettingsPanel.qml | 174 ++++++++++++++++ examples/quick/demos/stocqt/content/StockView.qml | 92 +++------ .../stocqt/content/images/icon-calendar-anim.png | Bin 1088 -> 0 bytes .../demos/stocqt/content/images/icon-calendar.png | Bin 884 -> 0 bytes .../demos/stocqt/content/images/icon-items.png | Bin 887 -> 0 bytes .../stocqt/content/images/icon-left-arrow.png | Bin 0 -> 1368 bytes .../demos/stocqt/content/images/icon-settings.png | Bin 1066 -> 0 bytes .../quick/demos/stocqt/content/images/logo.png | Bin 4266 -> 0 bytes .../stocqt/doc/images/qtquick-demo-stocqt.png | Bin 24592 -> 48979 bytes examples/quick/demos/stocqt/stocqt.pro | 1 + examples/quick/demos/stocqt/stocqt.qml | 140 ++++++++----- examples/quick/demos/stocqt/stocqt.qrc | 10 +- 21 files changed, 850 insertions(+), 719 deletions(-) delete mode 100644 examples/quick/demos/stocqt/content/DatePicker.qml create mode 100644 examples/quick/demos/stocqt/content/StockInfo.qml delete mode 100644 examples/quick/demos/stocqt/content/StockSettings.qml create mode 100644 examples/quick/demos/stocqt/content/StockSettingsPanel.qml delete mode 100644 examples/quick/demos/stocqt/content/images/icon-calendar-anim.png delete mode 100644 examples/quick/demos/stocqt/content/images/icon-calendar.png delete mode 100644 examples/quick/demos/stocqt/content/images/icon-items.png create mode 100644 examples/quick/demos/stocqt/content/images/icon-left-arrow.png delete mode 100644 examples/quick/demos/stocqt/content/images/icon-settings.png delete mode 100644 examples/quick/demos/stocqt/content/images/logo.png diff --git a/examples/quick/demos/stocqt/content/Button.qml b/examples/quick/demos/stocqt/content/Button.qml index 6cad4e135e..38b553fb31 100644 --- a/examples/quick/demos/stocqt/content/Button.qml +++ b/examples/quick/demos/stocqt/content/Button.qml @@ -47,17 +47,17 @@ Rectangle { property bool buttonEnabled: false width: Math.max(64, txt.width + 16) height: 32 - color: buttonEnabled ? "#76644A" : "transparent" - border.color: "#76644A" - border.width: 1 + color: "transparent" MouseArea { anchors.fill: parent onClicked: button.clicked() } Text { anchors.centerIn: parent - font.pixelSize: 18 - color: "#ecc089" + font.family: "Open Sans" + font.pointSize: 19 + font.weight: Font.DemiBold + color: button.buttonEnabled ? "#000000" : "#14aaff" id: txt } } diff --git a/examples/quick/demos/stocqt/content/CheckBox.qml b/examples/quick/demos/stocqt/content/CheckBox.qml index 1e7dcf7c74..5d9accaf7f 100644 --- a/examples/quick/demos/stocqt/content/CheckBox.qml +++ b/examples/quick/demos/stocqt/content/CheckBox.qml @@ -42,10 +42,9 @@ import QtQuick 2.0 Item { id: button - property alias text: txt.text property bool buttonEnabled: true - width: 140 - height: 25 + width: 30 + height: 30 x: 5 MouseArea { id: mouse @@ -59,29 +58,20 @@ Item { } Rectangle { id: checkbox - width: 23 - height: 23 + width: 30 + height: 30 anchors.left: parent.left - border.color: "#76644A" + border.color: "#999999" border.width: 1 antialiasing: true radius: 2 color: "transparent" Rectangle { anchors.fill: parent - anchors.margins: 4 + anchors.margins: 5 antialiasing: true radius: 1 - color: mouse.pressed || buttonEnabled ? "#76644A" : "transparent" + color: mouse.pressed || buttonEnabled ? "#999999" : "transparent" } } - Text { - id: txt - anchors.left: checkbox.right - anchors.leftMargin: 4 - anchors.verticalCenter: parent.verticalCenter - text: "Close " - color: "#ecc089" - font.pixelSize: 18 - } } diff --git a/examples/quick/demos/stocqt/content/DatePicker.qml b/examples/quick/demos/stocqt/content/DatePicker.qml deleted file mode 100644 index 6c0df2a41a..0000000000 --- a/examples/quick/demos/stocqt/content/DatePicker.qml +++ /dev/null @@ -1,131 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 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 - -Rectangle { - id: root - color: "transparent" - width: 300 - height: 40 - property var _monthNames: [ "JAN", "FEB", "MAR", "APR", "MAY", "JUN","JUL", "AUG", "SEP", "OCT", "NOV", "DEC" ]; - property var date: new Date() - - onDateChanged: { - month.text = root._monthNames[root.date.getMonth()]; - day.text = date.getDate(); - year.text = date.getFullYear(); - } - Row { - spacing: 4 - anchors.fill: parent - - Rectangle { - height: root.height - width: root.width/3 - 20 - color: "#272822" - border.color: "#76644A" - border.width: 1 - radius: 2 - antialiasing: true - - TextInput { - id: month - anchors.centerIn: parent - color: "#ecc089" - font.pointSize: 25 - font.bold: true - text: root._monthNames[root.date.getMonth()] - onAccepted: { - for (var i = 0; i < 12; i++) { - if (text === root._monthNames[i]) { - root.date.setMonth(i); - root.date = root.date; - return; - } - } - root.date = root.date; - } - } - } - - Rectangle { - height: root.height - width: root.width/3 - 20 - color: "#272822" - border.color: "#76644A" - border.width: 1 - radius: 2 - antialiasing: true - - TextInput { - id: day - anchors.centerIn: parent - color: "#ecc089" - font.pointSize: 25 - font.bold: true - text: root.date.getDate() - validator:IntValidator {bottom: 1; top: 31} - onAccepted: { root.date.setDate(text); root.date = root.date;} - } - } - - Rectangle { - height: root.height - width: root.width/3 - 20 - color: "#272822" - border.color: "#76644A" - border.width: 1 - radius: 2 - antialiasing: true - - TextInput { - id: year - anchors.centerIn: parent - color: "#ecc089" - font.pointSize: 25 - font.bold: true - text: root.date.getFullYear() - validator: IntValidator {bottom: 1995; top: (new Date()).getFullYear()} - onAccepted:{ root.date.setFullYear(text); root.date = root.date;} - } - } - } -} diff --git a/examples/quick/demos/stocqt/content/StockChart.qml b/examples/quick/demos/stocqt/content/StockChart.qml index f7e0d0206b..e6bc02306e 100644 --- a/examples/quick/demos/stocqt/content/StockChart.qml +++ b/examples/quick/demos/stocqt/content/StockChart.qml @@ -43,93 +43,155 @@ import QtQuick 2.0 Rectangle { id: chart width: 320 - height: 320 + height: 200 color: "transparent" property var _months: [ "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" ] property var stockModel: null property var startDate: new Date() property var endDate: new Date() + property string activeChart: "year" property var settings function update() { - if (settings.chartType === "year") + endDate = new Date(); + if (chart.activeChart === "year") chart.startDate = new Date(chart.endDate.getFullYear() - 1, chart.endDate.getMonth(), chart.endDate.getDate()); - else if (settings.chartType === "month") + else if (chart.activeChart === "month") chart.startDate = new Date(chart.endDate.getFullYear() , chart.endDate.getMonth() -1, chart.endDate.getDate()); - else if (settings.chartType === "week") + else if (chart.activeChart === "week") chart.startDate = new Date(chart.endDate.getFullYear() , chart.endDate.getMonth(), chart.endDate.getDate() - 7); else - chart.startDate = new Date(1995, 3, 25); + chart.startDate = new Date(2005, 3, 25); canvas.requestPaint(); } + Row { + id: activeChartRow + anchors.left: chart.left + anchors.right: chart.right + anchors.top: chart.top + anchors.topMargin: 4 + spacing: 52 + onWidthChanged: { + var buttonsLen = maxButton.width + yearButton.width + monthButton.width + weekButton.width; + var space = (width - buttonsLen) / 3; + spacing = Math.max(space, 10); + } + + Button { + id: maxButton + text: "Max" + buttonEnabled: chart.activeChart === "max" + onClicked: { + chart.activeChart = "max"; + chart.update(); + } + } + Button { + id: yearButton + text: "Year" + buttonEnabled: chart.activeChart === "year" + onClicked: { + chart.activeChart = "year"; + chart.update(); + } + } + Button { + id: monthButton + text: "Month" + buttonEnabled: chart.activeChart === "month" + onClicked: { + chart.activeChart = "month"; + chart.update(); + } + } + Button { + id: weekButton + text: "Week" + buttonEnabled: chart.activeChart === "week" + onClicked: { + chart.activeChart = "week"; + chart.update(); + } + } + } + Text { id: fromDate - color: "#6a5b44" + color: "#000000" width: 50 + font.family: "Open Sans" font.pointSize: 10 wrapMode: Text.WordWrap anchors.left: parent.left anchors.leftMargin: 20 - anchors.top: parent.top + anchors.bottom: parent.bottom text: _months[startDate.getMonth()] + "\n" + startDate.getFullYear() } Text { id: toDate - color: "#6a5b44" + color: "#000000" font.pointSize: 10 width: 50 wrapMode: Text.WordWrap anchors.right: parent.right anchors.leftMargin: 20 - anchors.top: parent.top + anchors.bottom: parent.bottom text: _months[endDate.getMonth()] + "\n" + endDate.getFullYear() } Canvas { id: canvas - width: parent.width - anchors.top: toDate.bottom - anchors.bottom: parent.bottom - renderTarget: Canvas.FramebufferObject + anchors.top: activeChartRow.bottom + anchors.left: chart.left + anchors.right: chart.right + anchors.bottom: fromDate.top antialiasing: true - property int frames: first - property int mouseX: 0 - property int mouseY: 0 - property int mousePressedX: 0 - property int mousePressedY: 0 - property int movedY: 0 - property real scaleX: 1.0 - property real scaleY: 1.0 - property int first: 0 - property int last: 0 property int pixelSkip: 1 + property real xGridOffset: width / 13 + property real xGridStep: width / 4 + property real yGridOffset: height / 26 + property real yGridStep: height / 12 + function drawBackground(ctx) { ctx.save(); - ctx.fillStyle = "#272822"; + ctx.fillStyle = "#ffffff"; ctx.fillRect(0, 0, canvas.width, canvas.height); - ctx.strokeStyle = "#423a2f"; + ctx.strokeStyle = "#d7d7d7"; ctx.beginPath(); - for (var i = 0; i < 10; i++) { - ctx.moveTo(0, i * (canvas.height/10.0)); - ctx.lineTo(canvas.width, i * (canvas.height/10.0)); + // Horizontal grid lines + for (var i = 0; i < 12; i++) { + ctx.moveTo(0, canvas.yGridOffset + i * canvas.yGridStep); + ctx.lineTo(canvas.width, canvas.yGridOffset + i * canvas.yGridStep); } - for (i = 0; i < 12; i++) { - ctx.moveTo(i * (canvas.width/12.0), 0); - ctx.lineTo(i * (canvas.width/12.0), canvas.height); + // Vertical grid lines + var height = 35 * canvas.height / 36; + var yOffset = canvas.height - height; + for (i = 0; i < 4; i++) { + ctx.moveTo(canvas.xGridOffset + i * canvas.xGridStep, yOffset); + ctx.lineTo(canvas.xGridOffset + i * canvas.xGridStep, height); } ctx.stroke(); - ctx.strokeStyle = "#5c7a37"; + // Right ticks + ctx.strokeStyle = "#666666"; ctx.beginPath(); - ctx.moveTo(8 * (canvas.width/12.0), 0); - ctx.lineTo(8 * (canvas.width/12.0), canvas.height); + var xStart = 35 * canvas.width / 36; + ctx.moveTo(xStart, 0); + ctx.lineTo(xStart, canvas.height); + for (i = 0; i < 12; i++) { + ctx.moveTo(xStart, canvas.yGridOffset + i * canvas.yGridStep); + ctx.lineTo(canvas.width, canvas.yGridOffset + i * canvas.yGridStep); + } + ctx.moveTo(0, canvas.yGridOffset + 9 * canvas.yGridStep); + ctx.lineTo(canvas.width, canvas.yGridOffset + 9 * canvas.yGridStep); + ctx.closePath(); ctx.stroke(); ctx.restore(); @@ -140,64 +202,29 @@ Rectangle { ctx.save(); ctx.globalAlpha = 0.7; ctx.strokeStyle = color; - ctx.lineWidth = 1; + ctx.lineWidth = 3; ctx.beginPath(); - var w = canvas.width/points.length; var end = points.length; - for (var i = 0; i < end; i+=pixelSkip) { - var x = points[i].x; + var xOffset = canvas.width / 36 + + for (var i = 0; i < end; i += pixelSkip) { + var x = 34 * points[i].x / 36 + xOffset; var y = points[i][price]; + y = canvas.height * y/highest; + y = canvas.height - y; + y = 9 * y / 12 + yGridOffset; // Scaling to graph area if (i == 0) { - ctx.moveTo(x+w/2, y); + ctx.moveTo(x, y); } else { - ctx.lineTo(x+w/2, y); + ctx.lineTo(x, y); } } ctx.stroke(); ctx.restore(); } - function drawKLine(ctx, from, to, points, highest) - { - ctx.save(); - ctx.globalAlpha = 0.4; - ctx.lineWidth = 2; - var end = points.length; - for (var i = 0; i < end; i+=pixelSkip) { - var x = points[i].x; - var open = canvas.height * points[i].open/highest - canvas.movedY; - var close = canvas.height * points[i].close/highest - canvas.movedY; - var high = canvas.height * points[i].high/highest - canvas.movedY; - var low = canvas.height * points[i].low/highest - canvas.movedY; - - var top, bottom; - if (close <= open) { - ctx.fillStyle = Qt.rgba(1, 0, 0, 1); - ctx.strokeStyle = Qt.rgba(1, 0, 0, 1); - top = close; - bottom = open; - } else { - ctx.fillStyle = Qt.rgba(0, 1, 0, 1); - ctx.strokeStyle = Qt.rgba(0, 1, 0, 1); - top = open; - bottom = close; - } - - var w1, w2; - w1 = canvas.width/points.length; - w2 = w1 > 10 ? w1/2 : w1; - - ctx.fillRect(x + (w1 - w2)/2, top, w2, bottom - top); - ctx.beginPath(); - ctx.moveTo(x+w1/2, high); - ctx.lineTo(x+w1/2, low); - ctx.stroke(); - } - ctx.restore(); - } - function drawVolume(ctx, from, to, color, price, points, highest) { ctx.save(); @@ -211,7 +238,8 @@ Rectangle { var x = points[i].x; var y = points[i][price]; y = canvas.height * (1 - y/highest); - ctx.fillRect(x, y, canvas.width/points.length, canvas.height - y); + y = 3 * y / 13; + ctx.fillRect(x, canvas.height - y, canvas.width/points.length, y); } ctx.restore(); } @@ -223,41 +251,39 @@ Rectangle { ctx.lineWidth = 1; drawBackground(ctx); - if (!stockModel.ready) + + if (!stockModel.ready) { return; + } - last = stockModel.indexOf(chart.endDate) - first = last - (chart.endDate.getTime() - chart.startDate.getTime())/86400000; - first = Math.max(first, 0); - console.log("painting... first:" + first + ", last:" + last); + var last = stockModel.indexOf(chart.startDate); + var first = 0; var highestPrice = stockModel.highestPrice; var highestVolume = stockModel.highestVolume; - console.log("highest price:" + highestPrice + ", highest volume:" + highestVolume) var points = []; - for (var i = 0; i <= last - first; i+=pixelSkip) { - var price = stockModel.get(i + first); + var step = canvas.width / (last + 0); + for (var i = last, j = 0; i >= 0 ; i -= pixelSkip, j += pixelSkip) { + var price = stockModel.get(i); points.push({ - x: i*canvas.width/(last-first+1), + x: j * step, open: price.open, close: price.close, - high:price.high, - low:price.low, - volume:price.volume + high: price.high, + low: price.low, + volume: price.volume }); } + if (settings.drawHighPrice) - drawPrice(ctx, first, last, settings.highColor,"high", points, highestPrice); + drawPrice(ctx, first, last, settings.highColor, "high", points, highestPrice); if (settings.drawLowPrice) - drawPrice(ctx, first, last, settings.lowColor,"low", points, highestPrice); + drawPrice(ctx, first, last, settings.lowColor, "low", points, highestPrice); if (settings.drawOpenPrice) - drawPrice(ctx, first, last,settings.openColor,"open", points, highestPrice); + drawPrice(ctx, first, last,settings.openColor, "open", points, highestPrice); if (settings.drawClosePrice) - drawPrice(ctx, first, last, settings.closeColor,"close", points, highestPrice); - if (settings.drawVolume) - drawVolume(ctx, first, last, settings.volumeColor,"volume", points, highestVolume); - if (settings.drawKLine) - drawKLine(ctx, first, last, points, highestPrice); + drawPrice(ctx, first, last, settings.closeColor, "close", points, highestPrice); + drawVolume(ctx, first, last, settings.volumeColor, "volume", points, highestVolume); } } } diff --git a/examples/quick/demos/stocqt/content/StockInfo.qml b/examples/quick/demos/stocqt/content/StockInfo.qml new file mode 100644 index 0000000000..3178f03098 --- /dev/null +++ b/examples/quick/demos/stocqt/content/StockInfo.qml @@ -0,0 +1,119 @@ +/**************************************************************************** +** +** Copyright (C) 2014 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 + +Rectangle { + id: root + width: 440 + height: 160 + color: "transparent" + + property var stock: null + + Text { + id: stockIdText + anchors.left: parent.left + anchors.leftMargin: 5 + anchors.top: parent.top + anchors.topMargin: 15 + color: "#000000" + font.family: "Open Sans" + font.pointSize: 38 + font.weight: Font.DemiBold + text: root.stock.stockId + } + + Text { + id: stockNameText + anchors.left: parent.left + anchors.leftMargin: 5 + anchors.bottom: priceChangePercentage.bottom + anchors.right: priceChangePercentage.left + anchors.rightMargin: 15 + color: "#000000" + font.family: "Open Sans" + font.pointSize: 16 + elide: Text.ElideRight + text: root.stock.stockName + } + + Text { + id: price + anchors.right: parent.right + anchors.rightMargin: 5 + anchors.top: parent.top + anchors.topMargin: 15 + horizontalAlignment: Text.AlignRight + color: "#000000" + font.family: "Open Sans" + font.pointSize: 30 + font.weight: Font.DemiBold + text: root.stock.stockPrice + } + + Text { + id: priceChange + anchors.right: parent.right + anchors.rightMargin: 20 + anchors.top: price.bottom + anchors.topMargin: 5 + horizontalAlignment: Text.AlignRight + color: root.stock.stockPriceChanged < 0 ? "#d40000" : "#328930" + font.family: "Open Sans" + font.pointSize: 20 + font.weight: Font.Bold + text: root.stock.stockPriceChanged + } + + Text { + id: priceChangePercentage + anchors.right: parent.right + anchors.rightMargin: 20 + anchors.top: priceChange.bottom + anchors.topMargin: 5 + horizontalAlignment: Text.AlignRight + color: root.stock.stockPriceChanged < 0 ? "#d40000" : "#328930" + font.family: "Open Sans" + font.pointSize: 18 + font.weight: Font.Bold + text: Math.abs(Math.round(root.stock.stockPriceChanged/(root.stock.stockPrice - root.stock.stockPriceChanged) * 100))/100 +"%" + } +} diff --git a/examples/quick/demos/stocqt/content/StockListModel.qml b/examples/quick/demos/stocqt/content/StockListModel.qml index 635e3afb4a..a0e5590763 100644 --- a/examples/quick/demos/stocqt/content/StockListModel.qml +++ b/examples/quick/demos/stocqt/content/StockListModel.qml @@ -43,104 +43,104 @@ import QtQuick 2.0 ListModel { id: stocks // Data from : http://en.wikipedia.org/wiki/NASDAQ-100 - ListElement {name: "Activision Blizzard"; stockId: "ATVI"} - ListElement {name: "Adobe Systems Incorporated"; stockId: "ADBE"} - ListElement {name: "Akamai Technologies, Inc"; stockId: "AKAM"} - ListElement {name: "Alexion Pharmaceuticals"; stockId: "ALXN"} - ListElement {name: "Altera Corporation"; stockId: "ALTR"} - ListElement {name: "Amazon.com, Inc."; stockId: "AMZN"} - ListElement {name: "Amgen Inc."; stockId: "AMGN"} - ListElement {name: "Apollo Group, Inc."; stockId: "APOL"} - ListElement {name: "Apple Inc."; stockId: "AAPL"} - ListElement {name: "Applied Materials, Inc."; stockId: "AMAT"} - ListElement {name: "Autodesk, Inc."; stockId: "ADSK"} - ListElement {name: "Automatic Data Processing, Inc."; stockId: "ADP"} - ListElement {name: "Baidu.com, Inc."; stockId: "BIDU"} - ListElement {name: "Bed Bath & Beyond Inc."; stockId: "BBBY"} - ListElement {name: "Biogen Idec, Inc"; stockId: "BIIB"} - ListElement {name: "BMC Software, Inc."; stockId: "BMC"} - ListElement {name: "Broadcom Corporation"; stockId: "BRCM"} - ListElement {name: "C. H. Robinson Worldwide, Inc."; stockId: "CHRW"} - ListElement {name: "CA, Inc."; stockId: "CA"} - ListElement {name: "Celgene Corporation"; stockId: "CELG"} - ListElement {name: "Cephalon, Inc."; stockId: "CEPH"} - ListElement {name: "Cerner Corporation"; stockId: "CERN"} - ListElement {name: "Check Point Software Technologies Ltd."; stockId: "CHKP"} - ListElement {name: "Cisco Systems, Inc."; stockId: "CSCO"} - ListElement {name: "Citrix Systems, Inc."; stockId: "CTXS"} - ListElement {name: "Cognizant Technology Solutions Corporation"; stockId: "CTSH"} - ListElement {name: "Comcast Corporation"; stockId: "CMCSA"} - ListElement {name: "Costco Wholesale Corporation"; stockId: "COST"} - ListElement {name: "Ctrip.com International, Ltd."; stockId: "CTRP"} - ListElement {name: "Dell Inc."; stockId: "DELL"} - ListElement {name: "DENTSPLY International Inc."; stockId: "XRAY"} - ListElement {name: "DirecTV"; stockId: "DTV"} - ListElement {name: "Dollar Tree, Inc."; stockId: "DLTR"} - ListElement {name: "eBay Inc."; stockId: "EBAY"} - ListElement {name: "Electronic Arts Inc."; stockId: "ERTS"} - ListElement {name: "Expedia, Inc."; stockId: "EXPE"} - ListElement {name: "Expeditors International of Washington, Inc."; stockId: "EXPD"} - ListElement {name: "Express Scripts, Inc."; stockId: "ESRX"} - ListElement {name: "F5 Networks, Inc."; stockId: "FFIV"} - ListElement {name: "Fastenal Company"; stockId: "FAST"} - ListElement {name: "First Solar, Inc."; stockId: "FSLR"} - ListElement {name: "Fiserv, Inc."; stockId: "FISV"} - ListElement {name: "Flextronics International Ltd."; stockId: "FLEX"} - ListElement {name: "FLIR Systems, Inc."; stockId: "FLIR"} - ListElement {name: "Garmin Ltd."; stockId: "GRMN"} - ListElement {name: "Gilead Sciences, Inc."; stockId: "GILD"} - ListElement {name: "Google Inc."; stockId: "GOOG"} - ListElement {name: "Green Mountain Coffee Roasters, Inc."; stockId: "GMCR"} - ListElement {name: "Henry Schein, Inc."; stockId: "HSIC"} - ListElement {name: "Illumina, Inc."; stockId: "ILMN"} - ListElement {name: "Infosys Technologies"; stockId: "INFY"} - ListElement {name: "Intel Corporation"; stockId: "INTC"} - ListElement {name: "Intuit, Inc."; stockId: "INTU"} - ListElement {name: "Intuitive Surgical Inc."; stockId: "ISRG"} - ListElement {name: "Joy Global Inc."; stockId: "JOYG"} - ListElement {name: "KLA Tencor Corporation"; stockId: "KLAC"} - ListElement {name: "Lam Research Corporation"; stockId: "LRCX"} - ListElement {name: "Liberty Media Corporation, Interactive Series A"; stockId: "LINTA"} - ListElement {name: "Life Technologies Corporation"; stockId: "LIFE"} - ListElement {name: "Linear Technology Corporation"; stockId: "LLTC"} - ListElement {name: "Marvell Technology Group, Ltd."; stockId: "MRVL"} - ListElement {name: "Mattel, Inc."; stockId: "MAT"} - ListElement {name: "Maxim Integrated Products"; stockId: "MXIM"} - ListElement {name: "Microchip Technology Incorporated"; stockId: "MCHP"} - ListElement {name: "Micron Technology, Inc."; stockId: "MU"} - ListElement {name: "Microsoft Corporation"; stockId: "MSFT"} - ListElement {name: "Mylan, Inc."; stockId: "MYL"} - ListElement {name: "NetApp, Inc."; stockId: "NTAP"} - ListElement {name: "Netflix, Inc."; stockId: "NFLX"} - ListElement {name: "News Corporation, Ltd."; stockId: "NWSA"} - ListElement {name: "NII Holdings, Inc."; stockId: "NIHD"} - ListElement {name: "NVIDIA Corporation"; stockId: "NVDA"} - ListElement {name: "O'Reilly Automotive, Inc."; stockId: "ORLY"} - ListElement {name: "Oracle Corporation"; stockId: "ORCL"} - ListElement {name: "PACCAR Inc."; stockId: "PCAR"} - ListElement {name: "Paychex, Inc."; stockId: "PAYX"} - ListElement {name: "Priceline.com, Incorporated"; stockId: "PCLN"} - ListElement {name: "Qiagen N.V."; stockId: "QGEN"} - ListElement {name: "QUALCOMM Incorporated"; stockId: "QCOM"} - ListElement {name: "Research in Motion Limited"; stockId: "RIMM"} - ListElement {name: "Ross Stores Inc."; stockId: "ROST"} - ListElement {name: "SanDisk Corporation"; stockId: "SNDK"} - ListElement {name: "Seagate Technology Holdings"; stockId: "STX"} - ListElement {name: "Sears Holdings Corporation"; stockId: "SHLD"} - ListElement {name: "Sigma-Aldrich Corporation"; stockId: "SIAL"} - ListElement {name: "Staples Inc."; stockId: "SPLS"} - ListElement {name: "Starbucks Corporation"; stockId: "SBUX"} - ListElement {name: "Stericycle, Inc"; stockId: "SRCL"} - ListElement {name: "Symantec Corporation"; stockId: "SYMC"} - ListElement {name: "Teva Pharmaceutical Industries Ltd."; stockId: "TEVA"} - ListElement {name: "Urban Outfitters, Inc."; stockId: "URBN"} - ListElement {name: "VeriSign, Inc."; stockId: "VRSN"} - ListElement {name: "Vertex Pharmaceuticals"; stockId: "VRTX"} - ListElement {name: "Virgin Media, Inc."; stockId: "VMED"} - ListElement {name: "Vodafone Group, plc."; stockId: "VOD"} - ListElement {name: "Warner Chilcott, Ltd."; stockId: "WCRX"} - ListElement {name: "Whole Foods Market, Inc."; stockId: "WFM"} - ListElement {name: "Wynn Resorts Ltd."; stockId: "WYNN"} - ListElement {name: "Xilinx, Inc."; stockId: "XLNX"} - ListElement {name: "Yahoo! Inc."; stockId: "YHOO"} + ListElement {name: "Apple Inc."; stockId: "AAPL"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Adobe Systems Inc."; stockId: "ADBE"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Analog Devices, Inc."; stockId: "ADI"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Automatic Data Processing, Inc."; stockId: "ADP"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Autodesk, Inc."; stockId: "ADSK"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Akamai Technologies, Inc."; stockId: "AKAM"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Altera Corp."; stockId: "ALTR"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Alexion Pharmaceuticals, Inc."; stockId: "ALXN"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Applied Materials, Inc."; stockId: "AMAT"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Amgen Inc."; stockId: "AMGN"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Amazon.com Inc."; stockId: "AMZN"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Activision Blizzard, Inc."; stockId: "ATVI"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Avago Technologies Limited"; stockId: "AVGO"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Bed Bath & Beyond Inc."; stockId: "BBBY"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Baidu, Inc."; stockId: "BIDU"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Biogen Idec Inc."; stockId: "BIIB"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Broadcom Corp."; stockId: "BRCM"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "CA Technologies"; stockId: "CA"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Celgene Corporation"; stockId: "CELG"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Cerner Corporation"; stockId: "CERN"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Check Point Software Technologies Ltd."; stockId: "CHKP"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "CH Robinson Worldwide Inc."; stockId: "CHRW"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Charter Communications, Inc."; stockId: "CHTR"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Comcast Corporation"; stockId: "CMCSA"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Costco Wholesale Corporation"; stockId: "COST"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Cisco Systems, Inc."; stockId: "CSCO"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Catamaran Corporation"; stockId: "CTRX"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Cognizant Technology Solutions Corporation"; stockId: "CTSH"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Citrix Systems, Inc."; stockId: "CTXS"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Discovery Communications, Inc."; stockId: "DISCA"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Dish Network Corp."; stockId: "DISH"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Dollar Tree, Inc."; stockId: "DLTR"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "DIRECTV"; stockId: "DTV"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "eBay Inc."; stockId: "EBAY"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Equinix, Inc."; stockId: "EQIX"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Express Scripts Holding Company"; stockId: "ESRX"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Expeditors International of Washington Inc."; stockId: "EXPD"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Expedia Inc."; stockId: "EXPE"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Fastenal Company"; stockId: "FAST"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Facebook, Inc."; stockId: "FB"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "F5 Networks, Inc."; stockId: "FFIV"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Fiserv, Inc."; stockId: "FISV"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Twenty-First Century Fox, Inc."; stockId: "FOXA"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Gilead Sciences Inc."; stockId: "GILD"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Keurig Green Mountain, Inc."; stockId: "GMCR"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Google Inc."; stockId: "GOOG"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Google Inc."; stockId: "GOOGL"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Garmin Ltd."; stockId: "GRMN"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Henry Schein, Inc."; stockId: "HSIC"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Illumina Inc."; stockId: "ILMN"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Intel Corporation"; stockId: "INTC"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Intuit Inc."; stockId: "INTU"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Intuitive Surgical, Inc."; stockId: "ISRG"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "KLA-Tencor Corporation"; stockId: "KLAC"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Kraft Foods Group, Inc."; stockId: "KRFT"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Liberty Global plc"; stockId: "LBTYA"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Liberty Interactive Corporation"; stockId: "LINTA"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Linear Technology Corporation"; stockId: "LLTC"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Liberty Media Corporation"; stockId: "LMCA"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Marriott International, Inc."; stockId: "MAR"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Mattel, Inc"; stockId: "MAT"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Mondelez International, Inc."; stockId: "MDLZ"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Monster Beverage Corporation"; stockId: "MNST"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Microsoft Corporation"; stockId: "MSFT"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Micron Technology Inc."; stockId: "MU"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Maxim Integrated Products, Inc."; stockId: "MXIM"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Mylan, Inc."; stockId: "MYL"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Netflix, Inc."; stockId: "NFLX"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "NetApp, Inc."; stockId: "NTAP"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "NVIDIA Corporation"; stockId: "NVDA"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "NXP Semiconductors NV"; stockId: "NXPI"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "O'Reilly Automotive Inc."; stockId: "ORLY"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Paychex, Inc."; stockId: "PAYX"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "PACCAR Inc."; stockId: "PCAR"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "The Priceline Group Inc."; stockId: "PCLN"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "QUALCOMM Incorporated"; stockId: "QCOM"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Regeneron Pharmaceuticals, Inc."; stockId: "REGN"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Ross Stores Inc."; stockId: "ROST"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "SBA Communications Corp."; stockId: "SBAC"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Starbucks Corporation"; stockId: "SBUX"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Sigma-Aldrich Corporation"; stockId: "SIAL"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Sirius XM Holdings Inc."; stockId: "SIRI"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "SanDisk Corp."; stockId: "SNDK"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Staples, Inc."; stockId: "SPLS"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Stericycle, Inc."; stockId: "SRCL"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Seagate Technology Public Limited Company"; stockId: "STX"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Symantec Corporation"; stockId: "SYMC"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "TripAdvisor Inc."; stockId: "TRIP"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Tractor Supply Company"; stockId: "TSCO"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Tesla Motors, Inc."; stockId: "TSLA"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Texas Instruments Inc."; stockId: "TXN"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Viacom, Inc."; stockId: "VIAB"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "VimpelCom Ltd."; stockId: "VIP"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Vodafone Group Public Limited Company"; stockId: "VOD"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Verisk Analytics, Inc."; stockId: "VRSK"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Vertex Pharmaceuticals Incorporated"; stockId: "VRTX"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Western Digital Corporation"; stockId: "WDC"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Whole Foods Market, Inc."; stockId: "WFM"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Wynn Resorts Ltd."; stockId: "WYNN"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} + ListElement {name: "Xilinx Inc."; stockId: "XLNX"; value: "0.0"; change: "0.0"; changePercentage: "0.0"} } diff --git a/examples/quick/demos/stocqt/content/StockListView.qml b/examples/quick/demos/stocqt/content/StockListView.qml index 3345e5d804..72d8df2440 100644 --- a/examples/quick/demos/stocqt/content/StockListView.qml +++ b/examples/quick/demos/stocqt/content/StockListView.qml @@ -43,8 +43,10 @@ import QtQuick 2.0 Rectangle { id: root width: 320 - height: 480 - color: "#423A2F" + height: 410 + anchors.top: parent.top + anchors.bottom: parent.bottom + color: "white" property string currentStockId: "" property string currentStockName: "" @@ -52,39 +54,196 @@ Rectangle { ListView { id: view anchors.fill: parent + width: parent.width + clip: true keyNavigationWraps: true + highlightMoveDuration: 0 focus: true snapMode: ListView.SnapToItem model: StockListModel{} + function requestUrl(stockId) { + var endDate = new Date(""); //today + var startDate = new Date() + startDate.setDate(startDate.getDate() - 5); + + var request = "http://ichart.finance.yahoo.com/table.csv?"; + request += "s=" + stockId; + request += "&g=d"; + request += "&a=" + startDate.getMonth(); + request += "&b=" + startDate.getDate(); + request += "&c=" + startDate.getFullYear(); + request += "&d=" + endDate.getMonth(); + request += "&e=" + endDate.getDate(); + request += "&f=" + endDate.getFullYear(); + request += "&g=d"; + request += "&ignore=.csv"; + return request; + } + + function getCloseValue(index) { + var req = requestUrl(model.get(index).stockId); + + if (!req) + return; + + var xhr = new XMLHttpRequest; + + xhr.open("GET", req, true); + + xhr.onreadystatechange = function() { + if (xhr.readyState === XMLHttpRequest.LOADING || xhr.readyState === XMLHttpRequest.DONE) { + var records = xhr.responseText.split('\n'); + if (records.length > 0) { + var r = records[1].split(','); + model.setProperty(index, "value", r[4]); + + var today = parseFloat(r[4]); + r = records[2].split(','); + var yesterday = parseFloat(r[4]); + var change = today - yesterday; + if (change >= 0.0) + model.setProperty(index, "change", "+" + change.toFixed(2)); + else + model.setProperty(index, "change", change.toFixed(2)); + + var changePercentage = (change / yesterday) * 100.0; + if (changePercentage >= 0.0) + model.setProperty(index, "changePercentage", "+" + changePercentage.toFixed(2) + "%"); + else + model.setProperty(index, "changePercentage", changePercentage.toFixed(2) + "%"); + } + } + } + xhr.send() + } + onCurrentIndexChanged: { + mainRect.listViewActive = 0; root.currentStockId = model.get(currentIndex).stockId; root.currentStockName = model.get(currentIndex).name; - console.log("current stock:" + root.currentStockId + " - " + root.currentStockName); } delegate: Rectangle { - height: 30 + height: 102 width: parent.width color: "transparent" MouseArea { anchors.fill: parent; - onClicked:view.currentIndex = index; + onClicked: { + view.currentIndex = index; + } } Text { - anchors.verticalCenter: parent.top - anchors.verticalCenterOffset : 15 - color: index == view.currentIndex ? "#ECC089" : "#A58963" - font.pointSize: 12 + id: stockIdText + anchors.top: parent.top + anchors.topMargin: 15 + anchors.left: parent.left + anchors.leftMargin: 15 + width: 125 + height: 40 + color: "#000000" + font.family: "Open Sans" + font.pointSize: 20 + font.weight: Font.Bold + verticalAlignment: Text.AlignVCenter + text: stockId + } + + Text { + id: stockValueText + anchors.top: parent.top + anchors.topMargin: 15 + anchors.right: parent.right + anchors.rightMargin: 0.31 * parent.width + width: 190 + height: 40 + color: "#000000" + font.family: "Open Sans" + font.pointSize: 20 font.bold: true - text:" " + stockId + " - " + name + horizontalAlignment: Text.AlignRight + verticalAlignment: Text.AlignVCenter + text: value + Component.onCompleted: view.getCloseValue(index); + } + + Text { + id: stockValueChangeText + anchors.top: parent.top + anchors.topMargin: 15 + anchors.right: parent.right + anchors.rightMargin: 20 + width: 135 + height: 40 + color: "#328930" + font.family: "Open Sans" + font.pointSize: 20 + font.bold: true + horizontalAlignment: Text.AlignRight + verticalAlignment: Text.AlignVCenter + text: change + onTextChanged: { + if (parseFloat(text) >= 0.0) + color = "#328930"; + else + color = "#d40000"; + } + } + + Text { + id: stockNameText + anchors.top: stockIdText.bottom + anchors.left: parent.left + anchors.leftMargin: 15 + width: 330 + height: 30 + color: "#000000" + font.family: "Open Sans" + font.pointSize: 16 + font.bold: false + elide: Text.ElideRight + maximumLineCount: 1 + verticalAlignment: Text.AlignVCenter + text: name + } + + Text { + id: stockValueChangePercentageText + anchors.top: stockIdText.bottom + anchors.right: parent.right + anchors.rightMargin: 20 + width: 120 + height: 30 + color: "#328930" + font.family: "Open Sans" + font.pointSize: 18 + font.bold: false + horizontalAlignment: Text.AlignRight + verticalAlignment: Text.AlignVCenter + text: changePercentage + onTextChanged: { + if (parseFloat(text) >= 0.0) + color = "#328930"; + else + color = "#d40000"; + } + } + + Rectangle { + id: endingLine + anchors.bottom: parent.bottom + anchors.left: parent.left + height: 1 + width: parent.width + color: "#d7d7d7" } } highlight: Rectangle { width: parent.width - color: "#662" + color: "#eeeeee" } } } diff --git a/examples/quick/demos/stocqt/content/StockModel.qml b/examples/quick/demos/stocqt/content/StockModel.qml index f9ed9c87d4..682c96bb53 100644 --- a/examples/quick/demos/stocqt/content/StockModel.qml +++ b/examples/quick/demos/stocqt/content/StockModel.qml @@ -44,8 +44,6 @@ ListModel { id: model property string stockId: "" property string stockName: "" - property var startDate - property var endDate property string stockDataCycle: "d" property bool ready: false property real stockPrice: 0.0 @@ -56,19 +54,28 @@ ListModel { signal dataReady function indexOf(date) { - var end = new Date(model.get(0).date); - var start = new Date(model.get(model.count - 1).date); - if (end <= date) - return model.count -1; + var newest = new Date(model.get(0).date); + var oldest = new Date(model.get(model.count - 1).date); + if (newest <= date) + return -1; - if (start >= date) - return 0; + if (oldest >= date) + return model.count - 1; + var currDiff = 0; + var bestDiff = Math.abs(date.getTime() - newest.getTime()); + var retval = 0; for (var i = 0; i < model.count; i++) { var d = new Date(model.get(i).date); - if ( d === date) - return i; + currDiff = Math.abs(d.getTime() - date.getTime()); + if (currDiff < bestDiff) { + bestDiff = currDiff; + retval = i; + } + if (currDiff > bestDiff) + return retval; } + return -1; } @@ -76,11 +83,9 @@ ListModel { if (stockId === "") return; - if (startDate === undefined) - startDate = new Date(1995, 3, 25); //default: 25 April 1995 + var startDate = new Date(2011, 4, 25); - if (endDate === undefined) - endDate = new Date(); //today + var endDate = new Date(); //today if (stockDataCycle !== "d" && stockDataCycle !== "w" && stockDataCycle !== "m") stockDataCycle = "d"; @@ -94,11 +99,11 @@ ListModel { */ var request = "http://ichart.finance.yahoo.com/table.csv?"; request += "s=" + stockId; - request += "&a=" + startDate.getDate(); - request += "&b=" + startDate.getMonth(); + request += "&a=" + startDate.getMonth(); + request += "&b=" + startDate.getDate(); request += "&c=" + startDate.getFullYear(); - request += "&d=" + endDate.getDate(); - request += "&e=" + endDate.getMonth(); + request += "&d=" + endDate.getMonth(); + request += "&e=" + endDate.getDate(); request += "&f=" + endDate.getFullYear(); request += "&g=" + stockDataCycle; request += "&ignore=.csv"; @@ -133,6 +138,10 @@ ListModel { model.ready = false; model.clear(); + + highestPrice = 0; + highestVolume = 0; + var i = 1; //skip the first line xhr.onreadystatechange = function() { if (xhr.readyState === XMLHttpRequest.LOADING || xhr.readyState === XMLHttpRequest.DONE) { diff --git a/examples/quick/demos/stocqt/content/StockSettings.qml b/examples/quick/demos/stocqt/content/StockSettings.qml deleted file mode 100644 index 07152410fa..0000000000 --- a/examples/quick/demos/stocqt/content/StockSettings.qml +++ /dev/null @@ -1,216 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 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 - -Rectangle { - id: root - width: 320 - height: 480 - color: "#423A2F" - property var startDate : startDatePicker.date - property var endDate : endDatePicker.date - - property bool drawHighPrice: highButton.buttonEnabled - property bool drawLowPrice: lowButton.buttonEnabled - property bool drawOpenPrice: openButton.buttonEnabled - property bool drawClosePrice: closeButton.buttonEnabled - property bool drawVolume: volumeButton.buttonEnabled - property bool drawKLine: klineButton.buttonEnabled - - property color highColor: Qt.rgba(1, 0, 0, 1) - property color lowColor: Qt.rgba(0, 1, 0, 1) - property color openColor: Qt.rgba(0, 0, 1, 1) - property color volumeColor: Qt.rgba(0.3, 0.5, 0.7, 1) - property color closeColor: "#ecc088" - - property string chartType: "year" - - Image { - id: logo - source: "images/logo.png" - anchors.horizontalCenter : parent.horizontalCenter - anchors.top: parent.top - anchors.topMargin: 15 - } - - Text { - id: startDateText - text: "START DATE:" - color: "#76644A" - font.pointSize: 15 - anchors.left: parent.left - anchors.leftMargin: 20 - anchors.top: logo.bottom - anchors.topMargin: 20 - } - - DatePicker { - id: startDatePicker - anchors.left: parent.left - anchors.leftMargin: 30 - anchors.top: startDateText.bottom - anchors.topMargin: 8 - } - - Text { - id: endDateText - text: "END DATE:" - color: "#76644A" - font.pointSize: 15 - anchors.left: parent.left - anchors.leftMargin: 20 - anchors.top: startDatePicker.bottom - anchors.topMargin: 20 - } - - DatePicker { - id: endDatePicker - anchors.left: parent.left - anchors.leftMargin: 30 - anchors.top: endDateText.bottom - anchors.topMargin: 8 - } - - Text { - id: drawOptionsText - text: "DRAW OPTIONS:" - color: "#76644A" - font.pointSize: 15 - anchors.left: parent.left - anchors.leftMargin: 20 - anchors.top: endDatePicker.bottom - anchors.topMargin: 20 - } - Column { - id: drawOptions - anchors.top: drawOptionsText.bottom - anchors.topMargin: 8 - anchors.left: parent.left - anchors.leftMargin: 30 - spacing: 2 - - Row { - spacing: 10 - - CheckBox { - id: highButton - text: "High" - buttonEnabled: false - } - CheckBox { - id: lowButton - text: "Low" - buttonEnabled: false - } - } - Row { - spacing: 10 - CheckBox { - id: openButton - text: "Open" - buttonEnabled: false - } - CheckBox { - text: "Close" - id: closeButton - buttonEnabled: true - } - - } - Row { - spacing: 10 - CheckBox { - id: volumeButton - text: "Volume" - buttonEnabled: true - } - CheckBox { - id: klineButton - text: "K Line" - buttonEnabled: false - } - } - } - - Text { - id: chartTypeText - text: "SHOW PREVIOUS:" - color: "#76644A" - font.pointSize: 15 - anchors.left: parent.left - anchors.leftMargin: 20 - anchors.top: drawOptions.bottom - anchors.topMargin: 20 - } - Row { - anchors.left: parent.left - anchors.leftMargin: 20 - anchors.top: chartTypeText.bottom - anchors.topMargin: 8 - spacing: -1 - Button { - id: yearView - text: "YEAR" - buttonEnabled: root.chartType == "year" - onClicked: root.chartType = "year" - } - Button { - id: monthView - text: "MONTH" - buttonEnabled: root.chartType == "month" - onClicked: root.chartType = "month" - } - Button { - id: weekView - text: "WEEK" - buttonEnabled: root.chartType == "week" - onClicked: root.chartType = "week" - } - Button { - id: allView - text: "ALL" - buttonEnabled: root.chartType == "all" - onClicked: root.chartType = "all" - } - } - - Component.onCompleted: startDatePicker.date = new Date(1995, 3, 25) -} diff --git a/examples/quick/demos/stocqt/content/StockSettingsPanel.qml b/examples/quick/demos/stocqt/content/StockSettingsPanel.qml new file mode 100644 index 0000000000..055d15e1b1 --- /dev/null +++ b/examples/quick/demos/stocqt/content/StockSettingsPanel.qml @@ -0,0 +1,174 @@ +/**************************************************************************** +** +** Copyright (C) 2014 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 + +Rectangle { + id: root + width: 440 + height: 160 + color: "transparent" + + property bool drawOpenPrice: openButton.buttonEnabled + property bool drawClosePrice: closeButton.buttonEnabled + property bool drawHighPrice: highButton.buttonEnabled + property bool drawLowPrice: lowButton.buttonEnabled + + property string openColor: "#face20" + property string closeColor: "#14aaff" + property string highColor: "#80c342" + property string lowColor: "#f30000" + property string volumeColor: "#14aaff" + + Text { + id: openText + anchors.left: root.left + anchors.top: root.top + color: "#000000" + font.family: "Open Sans" + font.pointSize: 19 + text: "Open" + } + + Text { + id: closeText + anchors.left: root.left + anchors.top: openText.bottom + anchors.topMargin: 10 + color: "#000000" + font.family: "Open Sans" + font.pointSize: 19 + text: "Close" + } + + Text { + id: highText + anchors.left: root.left + anchors.top: closeText.bottom + anchors.topMargin: 10 + color: "#000000" + font.family: "Open Sans" + font.pointSize: 19 + text: "High" + } + + Text { + id: lowText + anchors.left: root.left + anchors.top: highText.bottom + anchors.topMargin: 10 + color: "#000000" + font.family: "Open Sans" + font.pointSize: 19 + text: "Low" + } + + Rectangle { + height: 4 + anchors.left: root.left + anchors.leftMargin: 114 + anchors.right: openButton.left + anchors.rightMargin: 65 + anchors.verticalCenter: openText.verticalCenter + color: openColor + } + + Rectangle { + height: 4 + anchors.left: root.left + anchors.leftMargin: 114 + anchors.right: closeButton.left + anchors.rightMargin: 65 + anchors.verticalCenter: closeText.verticalCenter + color: closeColor + } + + Rectangle { + height: 4 + anchors.left: root.left + anchors.leftMargin: 114 + anchors.right: highButton.left + anchors.rightMargin: 65 + anchors.verticalCenter: highText.verticalCenter + color: highColor + } + + Rectangle { + height: 4 + anchors.left: root.left + anchors.leftMargin: 114 + anchors.right: lowButton.left + anchors.rightMargin: 65 + anchors.verticalCenter: lowText.verticalCenter + color: lowColor + } + + CheckBox { + id: openButton + buttonEnabled: false + anchors.verticalCenter: openText.verticalCenter + anchors.right: root.right + anchors.rightMargin: 40 + } + + CheckBox { + id: closeButton + buttonEnabled: false + anchors.verticalCenter: closeText.verticalCenter + anchors.right: root.right + anchors.rightMargin: 40 + } + + CheckBox { + id: highButton + buttonEnabled: true + anchors.verticalCenter: highText.verticalCenter + anchors.right: root.right + anchors.rightMargin: 40 + } + + CheckBox { + id: lowButton + buttonEnabled: true + anchors.verticalCenter: lowText.verticalCenter + anchors.right: root.right + anchors.rightMargin: 40 + } +} diff --git a/examples/quick/demos/stocqt/content/StockView.qml b/examples/quick/demos/stocqt/content/StockView.qml index ce55fdf3d3..e503cbea04 100644 --- a/examples/quick/demos/stocqt/content/StockView.qml +++ b/examples/quick/demos/stocqt/content/StockView.qml @@ -39,95 +39,63 @@ ****************************************************************************/ import QtQuick 2.0 +import QtQuick.Window 2.1 Rectangle { id: root width: 320 height: 480 - color: "#423A2F" + color: "transparent" property var stock: null property var stocklist: null - property var settings: null - signal listViewClicked signal settingsClicked function update() { - if (!settings) - return; - chart.endDate = settings.endDate chart.update() } Rectangle { - color: "#272822" + id: mainRect + color: "transparent" anchors.fill: parent - radius: 20 - Image { - source: "images/icon-items.png" + StockInfo { + id: stockInfo anchors.left: parent.left anchors.leftMargin: 10 anchors.top: parent.top - anchors.topMargin: 10 - MouseArea { - anchors.fill: parent - onClicked: listViewClicked() - } - } - Image { - source: "images/icon-settings.png" - anchors.right: parent.right - anchors.rightMargin: 10 - anchors.top: parent.top - anchors.topMargin: 10 - MouseArea { - anchors.fill: parent - onClicked: settingsClicked() - } - } - - Text { - id: desc - anchors.left: parent.left - anchors.leftMargin: 20 - anchors.top: parent.top - anchors.topMargin: 40 - color: "#564c3A" - font.pointSize: 15 - text: root.stock.stockId + " - " + root.stock.stockName + anchors.topMargin: 15 + height: 160 + anchors.right: Screen.primaryOrientation === Qt.PortraitOrientation ? parent.right : chart.left + anchors.rightMargin: 20 + stock: root.stock } - Text { - id: price - anchors.left: parent.left - anchors.leftMargin: 20 - anchors.top: desc.bottom - anchors.topMargin: 5 - color: "#ECC089" - font.pointSize: 30 - text: root.stock.stockPrice + StockChart { + id: chart + anchors.bottom: Screen.primaryOrientation === Qt.PortraitOrientation ? settingsPanel.top : parent.bottom + anchors.bottomMargin: 20 + anchors.top : Screen.primaryOrientation === Qt.PortraitOrientation ? stockInfo.bottom : parent.top + anchors.topMargin: 20 + anchors.right: parent.right + anchors.rightMargin: 20 + width: Screen.primaryOrientation === Qt.PortraitOrientation ? parent.width - 40 : 0.6 * parent.width + stockModel: root.stock + settings: settingsPanel } - Text { - id: priceChange + StockSettingsPanel { + id: settingsPanel anchors.left: parent.left anchors.leftMargin: 20 - anchors.top: price.bottom - anchors.topMargin: 5 - color: root.stock.stockPriceChanged < 0 ? "#A43D3D" : "#679B3A" - font.pointSize: 25 - text: root.stock.stockPriceChanged + " (" + Math.abs(Math.round(root.stock.stockPriceChanged/(root.stock.stockPrice - root.stock.stockPriceChanged) * 100))/100 +"%)" - } - - StockChart { - id: chart + anchors.right: Screen.primaryOrientation === Qt.PortraitOrientation ? parent.right : chart.left + anchors.rightMargin: 20 anchors.bottom: parent.bottom - anchors.top : priceChange.bottom - anchors.topMargin: 30 - width: parent.width - stockModel: root.stock - settings: root.settings + onDrawOpenPriceChanged: root.update() + onDrawClosePriceChanged: root.update(); + onDrawHighPriceChanged: root.update(); + onDrawLowPriceChanged: root.update(); } } } diff --git a/examples/quick/demos/stocqt/content/images/icon-calendar-anim.png b/examples/quick/demos/stocqt/content/images/icon-calendar-anim.png deleted file mode 100644 index c5164d5183..0000000000 Binary files a/examples/quick/demos/stocqt/content/images/icon-calendar-anim.png and /dev/null differ diff --git a/examples/quick/demos/stocqt/content/images/icon-calendar.png b/examples/quick/demos/stocqt/content/images/icon-calendar.png deleted file mode 100644 index bd2857470b..0000000000 Binary files a/examples/quick/demos/stocqt/content/images/icon-calendar.png and /dev/null differ diff --git a/examples/quick/demos/stocqt/content/images/icon-items.png b/examples/quick/demos/stocqt/content/images/icon-items.png deleted file mode 100644 index f951aa5009..0000000000 Binary files a/examples/quick/demos/stocqt/content/images/icon-items.png and /dev/null differ diff --git a/examples/quick/demos/stocqt/content/images/icon-left-arrow.png b/examples/quick/demos/stocqt/content/images/icon-left-arrow.png new file mode 100644 index 0000000000..7868e8ab31 Binary files /dev/null and b/examples/quick/demos/stocqt/content/images/icon-left-arrow.png differ diff --git a/examples/quick/demos/stocqt/content/images/icon-settings.png b/examples/quick/demos/stocqt/content/images/icon-settings.png deleted file mode 100644 index 222d998289..0000000000 Binary files a/examples/quick/demos/stocqt/content/images/icon-settings.png and /dev/null differ diff --git a/examples/quick/demos/stocqt/content/images/logo.png b/examples/quick/demos/stocqt/content/images/logo.png deleted file mode 100644 index 90c7c3ba3d..0000000000 Binary files a/examples/quick/demos/stocqt/content/images/logo.png and /dev/null differ diff --git a/examples/quick/demos/stocqt/doc/images/qtquick-demo-stocqt.png b/examples/quick/demos/stocqt/doc/images/qtquick-demo-stocqt.png index 1783881e1f..550c2a8a22 100644 Binary files a/examples/quick/demos/stocqt/doc/images/qtquick-demo-stocqt.png and b/examples/quick/demos/stocqt/doc/images/qtquick-demo-stocqt.png differ diff --git a/examples/quick/demos/stocqt/stocqt.pro b/examples/quick/demos/stocqt/stocqt.pro index efe37cb722..0e89a30050 100644 --- a/examples/quick/demos/stocqt/stocqt.pro +++ b/examples/quick/demos/stocqt/stocqt.pro @@ -3,6 +3,7 @@ TEMPLATE = app QT += qml quick SOURCES += main.cpp RESOURCES += stocqt.qrc +OTHER_FILES += *.qml content/*.qml content/images/*.png target.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/stocqt INSTALLS += target diff --git a/examples/quick/demos/stocqt/stocqt.qml b/examples/quick/demos/stocqt/stocqt.qml index 3e231ab8bf..d4a188d0d2 100644 --- a/examples/quick/demos/stocqt/stocqt.qml +++ b/examples/quick/demos/stocqt/stocqt.qml @@ -42,67 +42,103 @@ import QtQuick 2.0 import QtQml.Models 2.1 import "./content" -ListView { - id: root - width: 320 - height: 480 - snapMode: ListView.SnapOneItem - focus: false - orientation: ListView.Horizontal - boundsBehavior: Flickable.StopAtBounds - currentIndex: 1 +Rectangle { + id: mainRect + width: 1000 + height: 700 - Timer { - id: updateTimer - interval: 500 - onTriggered: stock.updateStock() - } + property int listViewActive: 0 + + Rectangle { + id: banner + height: 80 + anchors.top: parent.top + width: parent.width + color: "#000000" - StockModel { - id: stock - stockId: listView.currentStockId - stockName: listView.currentStockName - startDate: settings.startDate - endDate: settings.endDate - onStockIdChanged: updateTimer.restart() - onStartDateChanged: updateTimer.restart() - onEndDateChanged: updateTimer.restart() - onDataReady: { - root.positionViewAtIndex(1, ListView.SnapPosition) - stockView.update() + Image { + id: arrow + source: "./content/images/icon-left-arrow.png" + anchors.left: banner.left + anchors.leftMargin: 20 + anchors.verticalCenter: banner.verticalCenter + visible: root.currentIndex == 1 ? true : false + + MouseArea { + anchors.fill: parent + onClicked: listViewActive = 1; + } } - } - model: ObjectModel { - StockListView { - id: listView - width: root.width - height: root.height + Item { + id: textItem + width: stocText.width + qtText.width + height: stocText.height + qtText.height + anchors.horizontalCenter: banner.horizontalCenter + anchors.verticalCenter: banner.verticalCenter + + Text { + id: stocText + anchors.verticalCenter: textItem.verticalCenter + color: "#ffffff" + font.family: "Abel" + font.pointSize: 40 + text: "Stoc" + } + Text { + id: qtText + anchors.verticalCenter: textItem.verticalCenter + anchors.left: stocText.right + color: "#5caa15" + font.family: "Abel" + font.pointSize: 40 + text: "Qt" + } } + } - StockView { - id: stockView - width: root.width - height: root.height - stocklist: listView - settings: settings - stock: stock + ListView { + id: root + width: parent.width + anchors.top: banner.bottom + anchors.bottom: parent.bottom + snapMode: ListView.SnapOneItem + highlightRangeMode: ListView.StrictlyEnforceRange + highlightMoveDuration: 250 + focus: false + orientation: ListView.Horizontal + boundsBehavior: Flickable.StopAtBounds + currentIndex: listViewActive == 0 ? 1 : 0 + onCurrentIndexChanged: { + if (currentIndex == 1) + listViewActive = 0; + } - onListViewClicked: root.currentIndex = 0 - onSettingsClicked: root.currentIndex = 2 + StockModel { + id: stock + stockId: listView.currentStockId + stockName: listView.currentStockName + onStockIdChanged: stock.updateStock(); + onDataReady: { + root.positionViewAtIndex(1, ListView.SnapPosition) + stockView.update() + } } - StockSettings { - id: settings - width: root.width - height: root.height - onDrawHighPriceChanged: stockView.update() - onDrawLowPriceChanged: stockView.update() - onDrawOpenPriceChanged: stockView.update() - onDrawClosePriceChanged: stockView.update() - onDrawVolumeChanged: stockView.update() - onDrawKLineChanged: stockView.update() - onChartTypeChanged: stockView.update() + model: ObjectModel { + StockListView { + id: listView + width: root.width + height: root.height + } + + StockView { + id: stockView + width: root.width + height: root.height + stocklist: listView + stock: stock + } } } } diff --git a/examples/quick/demos/stocqt/stocqt.qrc b/examples/quick/demos/stocqt/stocqt.qrc index 8885aaa807..ee5dd0c24f 100644 --- a/examples/quick/demos/stocqt/stocqt.qrc +++ b/examples/quick/demos/stocqt/stocqt.qrc @@ -3,19 +3,15 @@ stocqt.qml content/Button.qml content/CheckBox.qml - content/DatePicker.qml content/StockChart.qml content/StockListModel.qml content/StockListView.qml content/StockModel.qml - content/StockSettings.qml content/StockView.qml - content/images/icon-calendar-anim.png - content/images/icon-calendar.png - content/images/icon-items.png - content/images/icon-settings.png - content/images/logo.png content/images/wheel-touch.png content/images/wheel.png + content/images/icon-left-arrow.png + content/StockSettingsPanel.qml + content/StockInfo.qml -- cgit v1.2.3 From bef0fd5fe9bdcdfa6eb9f0e14fa096038f391139 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Mon, 5 May 2014 15:01:10 +0200 Subject: Android: Fix crash in String.replace() in release builds When enabling optimizations in the compiler, it produces bogus code for the regExp->value deref in the line nMatchOffsets += regExp->value->captureCount() * 2 This is a random refactoring to work around the compiler bug. The only line that actually needs to be touched is the one mentioned above, but I replaced all uses of regExp->value so that it wouldn't look too weird. Task-number: QTBUG-38692 Change-Id: Ib33a523a86ce51ebc6c7095a803fedaebcaa8e63 Reviewed-by: Lars Knoll Reviewed-by: Simon Hausmann --- src/qml/jsruntime/qv4stringobject.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/qml/jsruntime/qv4stringobject.cpp b/src/qml/jsruntime/qv4stringobject.cpp index 7c38ae4f01..f1e51703a8 100644 --- a/src/qml/jsruntime/qv4stringobject.cpp +++ b/src/qml/jsruntime/qv4stringobject.cpp @@ -508,21 +508,24 @@ ReturnedValue StringPrototype::method_replace(CallContext *ctx) Scoped regExp(scope, searchValue); if (regExp) { uint offset = 0; + + // We extract the pointer here to work around a compiler bug on Android. + Scoped re(scope, regExp->value); while (true) { int oldSize = nMatchOffsets; - if (allocatedMatchOffsets < nMatchOffsets + regExp->value->captureCount() * 2) { - allocatedMatchOffsets = qMax(allocatedMatchOffsets * 2, nMatchOffsets + regExp->value->captureCount() * 2); + if (allocatedMatchOffsets < nMatchOffsets + re->captureCount() * 2) { + allocatedMatchOffsets = qMax(allocatedMatchOffsets * 2, nMatchOffsets + re->captureCount() * 2); uint *newOffsets = (uint *)malloc(allocatedMatchOffsets*sizeof(uint)); memcpy(newOffsets, matchOffsets, nMatchOffsets*sizeof(uint)); if (matchOffsets != _matchOffsets) free(matchOffsets); matchOffsets = newOffsets; } - if (regExp->value->match(string, offset, matchOffsets + oldSize) == JSC::Yarr::offsetNoMatch) { + if (re->match(string, offset, matchOffsets + oldSize) == JSC::Yarr::offsetNoMatch) { nMatchOffsets = oldSize; break; } - nMatchOffsets += regExp->value->captureCount() * 2; + nMatchOffsets += re->captureCount() * 2; if (!regExp->global) break; offset = qMax(offset + 1, matchOffsets[oldSize + 1]); -- cgit v1.2.3 From 18a96e8f4913dd96bcead3ddde99a015737e3a3b Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Thu, 1 May 2014 14:08:42 -0700 Subject: Update qmltypes files Additionally, fixes some revisioning errors which a manual inspection of the qmltypes files diffs revealed. -mipmapChanged signal is new -windowTitleChanged signal is new -Matrix4x4 made 5.3, but was revisioned for 5.4 Task-number: QTBUG-29806 Change-Id: I4cb8bca6ac6fe8040871734c88aabcd392c1d696 Reviewed-by: Frederik Gladhorn --- src/imports/qtquick2/plugins.qmltypes | 277 ++++++++++++++++++++++-- src/imports/window/plugins.qmltypes | 36 +++ src/quick/items/qquickimage_p.h | 2 +- src/quick/items/qquickitemsmodule.cpp | 2 +- src/quick/items/qquickwindowmodule.cpp | 1 + tests/auto/quick/qquickitem2/tst_qquickitem.cpp | 2 +- 6 files changed, 296 insertions(+), 24 deletions(-) diff --git a/src/imports/qtquick2/plugins.qmltypes b/src/imports/qtquick2/plugins.qmltypes index cadef10370..dd41871e45 100644 --- a/src/imports/qtquick2/plugins.qmltypes +++ b/src/imports/qtquick2/plugins.qmltypes @@ -176,6 +176,7 @@ Module { name: "QInputMethod" prototype: "QObject" exports: ["QtQuick/InputMethod 2.0"] + isCreatable: false exportMetaObjectRevisions: [0] Enum { name: "Action" @@ -225,6 +226,7 @@ Module { Component { name: "QKeySequence" exports: ["QtQuick/StandardKey 2.2"] + isCreatable: false exportMetaObjectRevisions: [2] Enum { name: "StandardKey" @@ -514,6 +516,7 @@ Module { name: "QQmlEasingValueType" prototype: "QQmlValueType" exports: ["QtQuick/Easing 2.0"] + isCreatable: false exportMetaObjectRevisions: [0] Enum { name: "Type" @@ -677,6 +680,7 @@ Module { Component { name: "QQmlLocale" exports: ["QtQml/Locale 2.2", "QtQuick/Locale 2.0"] + isCreatable: false exportMetaObjectRevisions: [0, 0] Enum { name: "MeasurementSystem" @@ -750,6 +754,7 @@ Module { name: "QQuickAbstractAnimation" prototype: "QObject" exports: ["QtQuick/Animation 2.0"] + isCreatable: false exportMetaObjectRevisions: [0] Enum { name: "Loops" @@ -790,10 +795,81 @@ Module { name: "QQuickAccessibleAttached" prototype: "QObject" exports: ["QtQuick/Accessible 2.0"] + isCreatable: false exportMetaObjectRevisions: [0] Property { name: "role"; type: "QAccessible::Role" } Property { name: "name"; type: "string" } Property { name: "description"; type: "string" } + Property { name: "checkable"; type: "bool" } + Property { name: "checked"; type: "bool" } + Property { name: "editable"; type: "bool" } + Property { name: "focusable"; type: "bool" } + Property { name: "focused"; type: "bool" } + Property { name: "multiLine"; type: "bool" } + Property { name: "readOnly"; type: "bool" } + Property { name: "selected"; type: "bool" } + Property { name: "selectable"; type: "bool" } + Property { name: "pressed"; type: "bool" } + Property { name: "checkStateMixed"; type: "bool" } + Property { name: "defaultButton"; type: "bool" } + Property { name: "passwordEdit"; type: "bool" } + Property { name: "selectableText"; type: "bool" } + Signal { + name: "checkableChanged" + Parameter { name: "arg"; type: "bool" } + } + Signal { + name: "checkedChanged" + Parameter { name: "arg"; type: "bool" } + } + Signal { + name: "editableChanged" + Parameter { name: "arg"; type: "bool" } + } + Signal { + name: "focusableChanged" + Parameter { name: "arg"; type: "bool" } + } + Signal { + name: "focusedChanged" + Parameter { name: "arg"; type: "bool" } + } + Signal { + name: "multiLineChanged" + Parameter { name: "arg"; type: "bool" } + } + Signal { + name: "readOnlyChanged" + Parameter { name: "arg"; type: "bool" } + } + Signal { + name: "selectedChanged" + Parameter { name: "arg"; type: "bool" } + } + Signal { + name: "selectableChanged" + Parameter { name: "arg"; type: "bool" } + } + Signal { + name: "pressedChanged" + Parameter { name: "arg"; type: "bool" } + } + Signal { + name: "checkStateMixedChanged" + Parameter { name: "arg"; type: "bool" } + } + Signal { + name: "defaultButtonChanged" + Parameter { name: "arg"; type: "bool" } + } + Signal { + name: "passwordEditChanged" + Parameter { name: "arg"; type: "bool" } + } + Signal { + name: "selectableTextChanged" + Parameter { name: "arg"; type: "bool" } + } Method { name: "valueChanged" } Method { name: "cursorPositionChanged" } } @@ -1051,6 +1127,7 @@ Module { name: "QQuickAnimator" prototype: "QQuickAbstractAnimation" exports: ["QtQuick/Animator 2.2"] + isCreatable: false exportMetaObjectRevisions: [0] Property { name: "target"; type: "QQuickItem"; isPointer: true } Property { name: "easing"; type: "QEasingCurve" } @@ -1082,6 +1159,7 @@ Module { name: "QQuickApplication" prototype: "QQmlApplication" exports: ["QtQuick/Application 2.0"] + isCreatable: false exportMetaObjectRevisions: [0] Property { name: "active"; type: "bool"; isReadonly: true } Property { name: "layoutDirection"; type: "Qt::LayoutDirection"; isReadonly: true } @@ -1097,6 +1175,7 @@ Module { defaultProperty: "data" prototype: "QQuickImplicitSizeItem" exports: ["QtQuick/Positioner 2.0"] + isCreatable: false exportMetaObjectRevisions: [0] attachedType: "QQuickPositionerAttached" Property { name: "spacing"; type: "double" } @@ -1220,6 +1299,11 @@ Module { } Method { name: "toDataURL"; type: "string" } } + Component { + name: "QQuickCloseEvent" + prototype: "QObject" + Property { name: "accepted"; type: "bool" } + } Component { name: "QQuickColorAnimation" prototype: "QQuickPropertyAnimation" @@ -1255,6 +1339,7 @@ Module { name: "QQuickDrag" prototype: "QObject" exports: ["QtQuick/Drag 2.0"] + isCreatable: false exportMetaObjectRevisions: [0] attachedType: "QQuickDragAttached" Enum { @@ -1344,6 +1429,39 @@ Module { Property { name: "source"; type: "QObject"; isReadonly: true; isPointer: true } Signal { name: "positionChanged" } } + Component { + name: "QQuickDropEvent" + prototype: "QObject" + Property { name: "x"; type: "double"; isReadonly: true } + Property { name: "y"; type: "double"; isReadonly: true } + Property { name: "source"; type: "QObject"; isReadonly: true; isPointer: true } + Property { name: "keys"; type: "QStringList"; isReadonly: true } + Property { name: "supportedActions"; type: "Qt::DropActions"; isReadonly: true } + Property { name: "proposedAction"; type: "Qt::DropActions"; isReadonly: true } + Property { name: "action"; type: "Qt::DropAction" } + Property { name: "accepted"; type: "bool" } + Property { name: "hasColor"; type: "bool"; isReadonly: true } + Property { name: "hasHtml"; type: "bool"; isReadonly: true } + Property { name: "hasText"; type: "bool"; isReadonly: true } + Property { name: "hasUrls"; type: "bool"; isReadonly: true } + Property { name: "colorData"; type: "QVariant"; isReadonly: true } + Property { name: "html"; type: "string"; isReadonly: true } + Property { name: "text"; type: "string"; isReadonly: true } + Property { name: "urls"; type: "QList"; isReadonly: true } + Property { name: "formats"; type: "QStringList"; isReadonly: true } + Method { + name: "getDataAsString" + Parameter { type: "QQmlV4Function"; isPointer: true } + } + Method { + name: "acceptProposedAction" + Parameter { type: "QQmlV4Function"; isPointer: true } + } + Method { + name: "accept" + Parameter { type: "QQmlV4Function"; isPointer: true } + } + } Component { name: "QQuickFlickable" defaultProperty: "flickableData" @@ -1517,6 +1635,7 @@ Module { name: "QQuickFontValueType" prototype: "QQmlValueType" exports: ["QtQuick/Font 2.0"] + isCreatable: false exportMetaObjectRevisions: [0] Enum { name: "FontWeight" @@ -1551,6 +1670,13 @@ Module { Property { name: "letterSpacing"; type: "double" } Property { name: "wordSpacing"; type: "double" } } + Component { + name: "QQuickGrabGestureEvent" + prototype: "QObject" + Property { name: "touchPoints"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "dragThreshold"; type: "double"; isReadonly: true } + Method { name: "grab" } + } Component { name: "QQuickGradient" defaultProperty: "stops" @@ -1667,17 +1793,13 @@ Module { Method { name: "moveCurrentIndexLeft" } Method { name: "moveCurrentIndexRight" } } - Component { - name: "QQuickGridViewAttached" - prototype: "QQuickItemViewAttached" - Property { name: "view"; type: "QQuickGridView"; isReadonly: true; isPointer: true } - } + Component { name: "QQuickGridViewAttached"; prototype: "QQuickItemViewAttached" } Component { name: "QQuickImage" defaultProperty: "data" prototype: "QQuickImageBase" - exports: ["QtQuick/Image 2.0"] - exportMetaObjectRevisions: [0] + exports: ["QtQuick/Image 2.0", "QtQuick/Image 2.3"] + exportMetaObjectRevisions: [0, 1] Enum { name: "HAlignment" values: { @@ -1711,6 +1833,7 @@ Module { Property { name: "paintedHeight"; type: "double"; isReadonly: true } Property { name: "horizontalAlignment"; type: "HAlignment" } Property { name: "verticalAlignment"; type: "VAlignment" } + Property { name: "mipmap"; revision: 1; type: "bool" } Signal { name: "paintedGeometryChanged" } Signal { name: "horizontalAlignmentChanged" @@ -1720,6 +1843,11 @@ Module { name: "verticalAlignmentChanged" Parameter { name: "alignment"; type: "VAlignment" } } + Signal { + name: "mipmapChanged" + revision: 1 + Parameter { type: "bool" } + } } Component { name: "QQuickImageBase" @@ -1967,8 +2095,9 @@ Module { name: "QQuickItemView" defaultProperty: "flickableData" prototype: "QQuickFlickable" - exports: ["QtQuick/ItemView 2.1"] - exportMetaObjectRevisions: [1] + exports: ["QtQuick/ItemView 2.1", "QtQuick/ItemView 2.3"] + isCreatable: false + exportMetaObjectRevisions: [1, 2] Enum { name: "LayoutDirection" values: { @@ -2011,6 +2140,8 @@ Module { Property { name: "currentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } Property { name: "keyNavigationWraps"; type: "bool" } Property { name: "cacheBuffer"; type: "int" } + Property { name: "displayMarginBeginning"; revision: 2; type: "int" } + Property { name: "displayMarginEnd"; revision: 2; type: "int" } Property { name: "layoutDirection"; type: "Qt::LayoutDirection" } Property { name: "effectiveLayoutDirection"; type: "Qt::LayoutDirection"; isReadonly: true } Property { name: "verticalLayoutDirection"; type: "VerticalLayoutDirection" } @@ -2065,6 +2196,7 @@ Module { Component { name: "QQuickItemViewAttached" prototype: "QObject" + Property { name: "view"; type: "QQuickItemView"; isReadonly: true; isPointer: true } Property { name: "isCurrentItem"; type: "bool"; isReadonly: true } Property { name: "delayRemove"; type: "bool" } Property { name: "section"; type: "string"; isReadonly: true } @@ -2075,10 +2207,28 @@ Module { Signal { name: "remove" } Signal { name: "prevSectionChanged" } } + Component { + name: "QQuickKeyEvent" + prototype: "QObject" + Property { name: "key"; type: "int"; isReadonly: true } + Property { name: "text"; type: "string"; isReadonly: true } + Property { name: "modifiers"; type: "int"; isReadonly: true } + Property { name: "isAutoRepeat"; type: "bool"; isReadonly: true } + Property { name: "count"; type: "int"; isReadonly: true } + Property { name: "nativeScanCode"; type: "uint"; isReadonly: true } + Property { name: "accepted"; type: "bool" } + Method { + name: "matches" + revision: 2 + type: "bool" + Parameter { name: "key"; type: "QKeySequence::StandardKey" } + } + } Component { name: "QQuickKeyNavigationAttached" prototype: "QObject" exports: ["QtQuick/KeyNavigation 2.0"] + isCreatable: false exportMetaObjectRevisions: [0] Enum { name: "Priority" @@ -2099,6 +2249,7 @@ Module { name: "QQuickKeysAttached" prototype: "QObject" exports: ["QtQuick/Keys 2.0"] + isCreatable: false exportMetaObjectRevisions: [0] Enum { name: "Priority" @@ -2275,6 +2426,7 @@ Module { name: "QQuickLayoutMirroringAttached" prototype: "QObject" exports: ["QtQuick/LayoutMirroring 2.0"] + isCreatable: false exportMetaObjectRevisions: [0] Property { name: "enabled"; type: "bool" } Property { name: "childrenInherit"; type: "bool" } @@ -2312,11 +2464,7 @@ Module { Method { name: "incrementCurrentIndex" } Method { name: "decrementCurrentIndex" } } - Component { - name: "QQuickListViewAttached" - prototype: "QQuickItemViewAttached" - Property { name: "view"; type: "QQuickListView"; isReadonly: true; isPointer: true } - } + Component { name: "QQuickListViewAttached"; prototype: "QQuickItemViewAttached" } Component { name: "QQuickLoader" defaultProperty: "data" @@ -2345,6 +2493,13 @@ Module { Parameter { type: "QQmlV4Function"; isPointer: true } } } + Component { + name: "QQuickMatrix4x4" + prototype: "QQuickTransform" + exports: ["QtQuick/Matrix4x4 2.3"] + exportMetaObjectRevisions: [0] + Property { name: "matrix"; type: "QMatrix4x4" } + } Component { name: "QQuickMouseArea" defaultProperty: "data" @@ -2425,6 +2580,7 @@ Module { Property { name: "touchPoints"; type: "QQuickTouchPoint"; isList: true; isReadonly: true } Property { name: "minimumTouchPoints"; type: "int" } Property { name: "maximumTouchPoints"; type: "int" } + Property { name: "mouseEnabled"; type: "bool" } Signal { name: "pressed" Parameter { name: "touchPoints"; type: "QList" } @@ -2483,6 +2639,7 @@ Module { defaultProperty: "data" prototype: "QQuickItem" exports: ["QtQuick/PaintedItem 2.0"] + isCreatable: false exportMetaObjectRevisions: [0] Enum { name: "RenderTarget" @@ -2843,6 +3000,24 @@ Module { Parameter { name: "pinch"; type: "QQuickPinchEvent"; isPointer: true } } } + Component { + name: "QQuickPinchEvent" + prototype: "QObject" + Property { name: "center"; type: "QPointF"; isReadonly: true } + Property { name: "startCenter"; type: "QPointF"; isReadonly: true } + Property { name: "previousCenter"; type: "QPointF"; isReadonly: true } + Property { name: "scale"; type: "double"; isReadonly: true } + Property { name: "previousScale"; type: "double"; isReadonly: true } + Property { name: "angle"; type: "double"; isReadonly: true } + Property { name: "previousAngle"; type: "double"; isReadonly: true } + Property { name: "rotation"; type: "double"; isReadonly: true } + Property { name: "point1"; type: "QPointF"; isReadonly: true } + Property { name: "startPoint1"; type: "QPointF"; isReadonly: true } + Property { name: "point2"; type: "QPointF"; isReadonly: true } + Property { name: "startPoint2"; type: "QPointF"; isReadonly: true } + Property { name: "pointCount"; type: "int"; isReadonly: true } + Property { name: "accepted"; type: "bool" } + } Component { name: "QQuickPositionerAttached" prototype: "QObject" @@ -3081,6 +3256,7 @@ Module { name: "QQuickShaderEffectMesh" prototype: "QObject" exports: ["QtQuick/ShaderEffectMesh 2.0"] + isCreatable: false exportMetaObjectRevisions: [0] Signal { name: "geometryChanged" } } @@ -3430,8 +3606,8 @@ Module { name: "QQuickText" defaultProperty: "data" prototype: "QQuickImplicitSizeItem" - exports: ["QtQuick/Text 2.0", "QtQuick/Text 2.2"] - exportMetaObjectRevisions: [0, 2] + exports: ["QtQuick/Text 2.0", "QtQuick/Text 2.2", "QtQuick/Text 2.3"] + exportMetaObjectRevisions: [0, 2, 3] Enum { name: "HAlignment" values: { @@ -3587,6 +3763,13 @@ Module { Parameter { name: "line"; type: "QQuickTextLine"; isPointer: true } } Method { name: "doLayout" } + Method { + name: "linkAt" + revision: 3 + type: "string" + Parameter { name: "x"; type: "double" } + Parameter { name: "y"; type: "double" } + } } Component { name: "QQuickTextDocument"; prototype: "QObject" } Component { @@ -3596,9 +3779,10 @@ Module { exports: [ "QtQuick/TextEdit 2.0", "QtQuick/TextEdit 2.1", - "QtQuick/TextEdit 2.2" + "QtQuick/TextEdit 2.2", + "QtQuick/TextEdit 2.3" ] - exportMetaObjectRevisions: [0, 1, 2] + exportMetaObjectRevisions: [0, 1, 2, 3] Enum { name: "HAlignment" values: { @@ -3830,13 +4014,20 @@ Module { Parameter { name: "start"; type: "int" } Parameter { name: "end"; type: "int" } } + Method { + name: "linkAt" + revision: 3 + type: "string" + Parameter { name: "x"; type: "double" } + Parameter { name: "y"; type: "double" } + } } Component { name: "QQuickTextInput" defaultProperty: "data" prototype: "QQuickImplicitSizeItem" - exports: ["QtQuick/TextInput 2.0"] - exportMetaObjectRevisions: [0] + exports: ["QtQuick/TextInput 2.0", "QtQuick/TextInput 2.2"] + exportMetaObjectRevisions: [0, 2] Enum { name: "EchoMode" values: { @@ -3932,6 +4123,7 @@ Module { Property { name: "contentHeight"; type: "double"; isReadonly: true } Property { name: "renderType"; type: "RenderType" } Signal { name: "accepted" } + Signal { name: "editingFinished"; revision: 2 } Signal { name: "fontChanged" Parameter { name: "font"; type: "QFont" } @@ -4035,6 +4227,15 @@ Module { Parameter { name: "end"; type: "int" } } } + Component { + name: "QQuickTextLine" + prototype: "QObject" + Property { name: "number"; type: "int"; isReadonly: true } + Property { name: "width"; type: "double" } + Property { name: "height"; type: "double" } + Property { name: "x"; type: "double" } + Property { name: "y"; type: "double" } + } Component { name: "QQuickTouchPoint" prototype: "QObject" @@ -4125,6 +4326,7 @@ Module { name: "QQuickViewTransitionAttached" prototype: "QObject" exports: ["QtQuick/ViewTransition 2.0"] + isCreatable: false exportMetaObjectRevisions: [0] Property { name: "index"; type: "int"; isReadonly: true } Property { name: "item"; type: "QQuickItem"; isReadonly: true; isPointer: true } @@ -4132,6 +4334,17 @@ Module { Property { name: "targetIndexes"; type: "QList"; isReadonly: true } Property { name: "targetItems"; type: "QObject"; isList: true; isReadonly: true } } + Component { + name: "QQuickWheelEvent" + prototype: "QObject" + Property { name: "x"; type: "double"; isReadonly: true } + Property { name: "y"; type: "double"; isReadonly: true } + Property { name: "angleDelta"; type: "QPoint"; isReadonly: true } + Property { name: "pixelDelta"; type: "QPoint"; isReadonly: true } + Property { name: "buttons"; type: "int"; isReadonly: true } + Property { name: "modifiers"; type: "int"; isReadonly: true } + Property { name: "accepted"; type: "bool" } + } Component { name: "QQuickWorkerScript" prototype: "QObject" @@ -4585,7 +4798,10 @@ Module { "AA_SynthesizeTouchForUnhandledMouseEvents": 11, "AA_SynthesizeMouseForUnhandledTouchEvents": 12, "AA_UseHighDpiPixmaps": 13, - "AA_AttributeCount": 14 + "AA_ForceRasterWidgets": 14, + "AA_UseDesktopOpenGL": 15, + "AA_UseOpenGLES": 16, + "AA_AttributeCount": 17 } } Enum { @@ -5027,6 +5243,9 @@ Module { "Key_Blue": 16777495, "Key_ChannelUp": 16777496, "Key_ChannelDown": 16777497, + "Key_Guide": 16777498, + "Key_Info": 16777499, + "Key_Settings": 16777500, "Key_MediaLast": 16842751, "Key_Select": 16842752, "Key_Yes": 16842753, @@ -5037,6 +5256,7 @@ Module { "Key_Sleep": 16908292, "Key_Play": 16908293, "Key_Zoom": 16908294, + "Key_Exit": 16908298, "Key_Context1": 17825792, "Key_Context2": 17825793, "Key_Context3": 17825794, @@ -5287,6 +5507,15 @@ Module { "BottomEdge": 8 } } + Enum { + name: "Edges" + values: { + "TopEdge": 1, + "LeftEdge": 2, + "RightEdge": 4, + "BottomEdge": 8 + } + } Enum { name: "ConnectionType" values: { @@ -5376,6 +5605,9 @@ Module { "ImAnchorPosition": 128, "ImHints": 256, "ImPreferredLanguage": 512, + "ImAbsolutePosition": 1024, + "ImTextBeforeCursor": 2048, + "ImTextAfterCursor": 4096, "ImPlatformData": -2147483648, "ImQueryInput": 186, "ImQueryAll": -1 @@ -5395,6 +5627,9 @@ Module { "ImAnchorPosition": 128, "ImHints": 256, "ImPreferredLanguage": 512, + "ImAbsolutePosition": 1024, + "ImTextBeforeCursor": 2048, + "ImTextAfterCursor": 4096, "ImPlatformData": -2147483648, "ImQueryInput": 186, "ImQueryAll": -1 diff --git a/src/imports/window/plugins.qmltypes b/src/imports/window/plugins.qmltypes index 1e3577acda..f69359b125 100644 --- a/src/imports/window/plugins.qmltypes +++ b/src/imports/window/plugins.qmltypes @@ -24,6 +24,7 @@ Module { name: "QQuickScreen" prototype: "QObject" exports: ["QtQuick.Window/Screen 2.0"] + isCreatable: false exportMetaObjectRevisions: [0] attachedType: "QQuickScreenAttached" } @@ -56,6 +57,12 @@ Module { prototype: "QWindow" exports: ["QtQuick.Window/Window 2.0"] exportMetaObjectRevisions: [0] + Enum { + name: "SceneGraphError" + values: { + "ContextNotAvailable": 1 + } + } Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } Property { name: "color"; type: "QColor" } Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } @@ -67,11 +74,19 @@ Module { isPointer: true } Signal { name: "frameSwapped" } + Signal { + name: "openglContextCreated" + revision: 2 + Parameter { name: "context"; type: "QOpenGLContext"; isPointer: true } + } Signal { name: "sceneGraphInitialized" } Signal { name: "sceneGraphInvalidated" } Signal { name: "beforeSynchronizing" } + Signal { name: "afterSynchronizing"; revision: 2 } Signal { name: "beforeRendering" } Signal { name: "afterRendering" } + Signal { name: "afterAnimating"; revision: 2 } + Signal { name: "sceneGraphAboutToStop"; revision: 2 } Signal { name: "closing" revision: 1 @@ -82,6 +97,12 @@ Module { Parameter { type: "QColor" } } Signal { name: "activeFocusItemChanged"; revision: 1 } + Signal { + name: "sceneGraphError" + revision: 2 + Parameter { name: "error"; type: "QQuickWindow::SceneGraphError" } + Parameter { name: "message"; type: "string" } + } Method { name: "update" } Method { name: "releaseResources" } } @@ -91,6 +112,16 @@ Module { prototype: "QQuickWindow" exports: ["QtQuick.Window/Window 2.1"] exportMetaObjectRevisions: [0] + Property { name: "visible"; type: "bool" } + Property { name: "visibility"; type: "Visibility" } + Signal { + name: "visibleChanged" + Parameter { name: "arg"; type: "bool" } + } + Signal { + name: "visibilityChanged" + Parameter { name: "visibility"; type: "QWindow::Visibility" } + } } Component { name: "QWindow" @@ -134,6 +165,11 @@ Module { name: "windowStateChanged" Parameter { name: "windowState"; type: "Qt::WindowState" } } + Signal { + name: "windowTitleChanged" + revision: 2 + Parameter { name: "title"; type: "string" } + } Signal { name: "xChanged" Parameter { name: "arg"; type: "int" } diff --git a/src/quick/items/qquickimage_p.h b/src/quick/items/qquickimage_p.h index 902e613b04..56b064f525 100644 --- a/src/quick/items/qquickimage_p.h +++ b/src/quick/items/qquickimage_p.h @@ -100,7 +100,7 @@ Q_SIGNALS: void paintedGeometryChanged(); void horizontalAlignmentChanged(HAlignment alignment); void verticalAlignmentChanged(VAlignment alignment); - void mipmapChanged(bool); + Q_REVISION(1) void mipmapChanged(bool); protected: QQuickImage(QQuickImagePrivate &dd, QQuickItem *parent); diff --git a/src/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp index 4c2028b53d..10c1780799 100644 --- a/src/quick/items/qquickitemsmodule.cpp +++ b/src/quick/items/qquickitemsmodule.cpp @@ -177,7 +177,7 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor) qmlRegisterType(uri,major,minor,"Translate"); qmlRegisterType(uri,major,minor,"Rotation"); qmlRegisterType(uri,major,minor,"Scale"); - qmlRegisterType(uri,2,4,"Matrix4x4"); + qmlRegisterType(uri,2,3,"Matrix4x4"); qmlRegisterType(uri,major,minor,"Text"); qmlRegisterType(uri,major,minor,"TextEdit"); qmlRegisterType(uri,2,1,"TextEdit"); diff --git a/src/quick/items/qquickwindowmodule.cpp b/src/quick/items/qquickwindowmodule.cpp index d06fff8c3e..91388ea30f 100644 --- a/src/quick/items/qquickwindowmodule.cpp +++ b/src/quick/items/qquickwindowmodule.cpp @@ -175,6 +175,7 @@ void QQuickWindowModule::defineModule() qmlRegisterType(uri, 2, 0, "Window"); qmlRegisterRevision(uri, 2, 1); + qmlRegisterRevision(uri, 2, 2); qmlRegisterRevision(uri, 2, 1);//Type moved to a subclass, but also has new members qmlRegisterRevision(uri, 2, 2); qmlRegisterType(uri, 2, 1, "Window"); diff --git a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp index 6778d6a8b6..bcfafac93b 100644 --- a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp +++ b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp @@ -2196,7 +2196,7 @@ void tst_QQuickItem::transforms() QFETCH(QByteArray, qml); QFETCH(QTransform, transform); QQmlComponent component(&engine); - component.setData("import QtQuick 2.4\nItem { transform: "+qml+"}", QUrl::fromLocalFile("")); + component.setData("import QtQuick 2.3\nItem { transform: "+qml+"}", QUrl::fromLocalFile("")); QQuickItem *item = qobject_cast(component.create()); QVERIFY(item); QCOMPARE(item->itemTransform(0,0), transform); -- cgit v1.2.3 From 0640dce6cd3200979a9b98d5bbae4526fc6dcec8 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 7 May 2014 13:51:26 +0200 Subject: Fix crash on host/target word size mismatches When compiling on a 64-bit host and using the QV4::CompileData on a 32-bit target, the size of QArrayData is different. Therefore we cannot use it in the QV4::CompiledData and have to resort to storing only the characters in there. We can at least still use fromRawData when extracting strings, but the QStringData will have to be allocated now. Change-Id: Ia9dab1722ed72186451b65ba74457051c6ce3155 Reviewed-by: Lars Knoll --- src/qml/compiler/qv4compileddata_p.h | 11 +++++------ src/qml/compiler/qv4compiler.cpp | 6 +----- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/qml/compiler/qv4compileddata_p.h b/src/qml/compiler/qv4compileddata_p.h index 1fba6c0d3c..6ee23690a6 100644 --- a/src/qml/compiler/qv4compileddata_p.h +++ b/src/qml/compiler/qv4compileddata_p.h @@ -151,7 +151,7 @@ struct JSClass struct String { quint32 flags; // isArrayIndex - QArrayData str; + qint32 size; // uint16 strdata[] static int calculateSize(const QString &str) { @@ -195,13 +195,12 @@ struct Unit const uint *offsetTable = reinterpret_cast((reinterpret_cast(this)) + offsetToStringTable); const uint offset = offsetTable[idx]; const String *str = reinterpret_cast(reinterpret_cast(this) + offset); - if (str->str.size == 0) + if (str->size == 0) return QString(); - QStringDataPtr holder = { const_cast(static_cast(&str->str)) }; - QString qstr(holder); + const QChar *characters = reinterpret_cast(str + 1); if (flags & StaticData) - return qstr; - return QString(qstr.constData(), qstr.length()); + return QString::fromRawData(characters, str->size); + return QString(characters, str->size); } const uint *functionOffsetTable() const { return reinterpret_cast((reinterpret_cast(this)) + offsetToFunctionTable); } diff --git a/src/qml/compiler/qv4compiler.cpp b/src/qml/compiler/qv4compiler.cpp index 65ef5c4b5e..144ef8a79e 100644 --- a/src/qml/compiler/qv4compiler.cpp +++ b/src/qml/compiler/qv4compiler.cpp @@ -82,11 +82,7 @@ void QV4::Compiler::StringTableGenerator::serialize(uint *stringTable, char *dat QV4::CompiledData::String *s = (QV4::CompiledData::String*)(stringData); s->flags = 0; // ### - s->str.ref.atomic.store(-1); - s->str.size = qstr.length(); - s->str.alloc = 0; - s->str.capacityReserved = false; - s->str.offset = sizeof(QArrayData); + s->size = qstr.length(); memcpy(s + 1, qstr.constData(), (qstr.length() + 1)*sizeof(ushort)); stringData += QV4::CompiledData::String::calculateSize(qstr); -- cgit v1.2.3 From 073cde9d21f95a896ffff3abfcc9a9da89175e28 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 5 May 2014 15:45:54 +0200 Subject: Fix QJSEngine::evaluate using the wrong execution context In contrary to what the documentation says, QJSEngine in Qt 5.x executes in the context of the global object (QScriptIsolate always called enter on the QV8Engine's "root" context, thus making it current). The v4 implementation unfortunately did what the documentation said and used the current context, which is wrong in many ways. For example it completely breaks the optimization of stack allocated contexts, because when a C++ callback is called from within a JS function with a stack allocated context and that C++ code calls QJSEngine::evaluate and creates new closures, the stack context would become an outter context and cause crashes during GC. This patch restores the behavior of Qt 5.0/5.1 and fixes the documentation. Task-number: QTBUG-38530 Change-Id: Ie6481f02e676954cc94b188a1c87c88e7c56dafa Reviewed-by: Lars Knoll --- src/qml/jsapi/qjsengine.cpp | 13 +++++++--- tests/auto/qml/qjsengine/tst_qjsengine.cpp | 39 ++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp index d05ada481a..9cb727dd63 100644 --- a/src/qml/jsapi/qjsengine.cpp +++ b/src/qml/jsapi/qjsengine.cpp @@ -235,7 +235,7 @@ void QJSEngine::collectGarbage() Evaluates \a program, using \a lineNumber as the base line number, and returns the result of the evaluation. - The script code will be evaluated in the current context. + The script code will be evaluated in the context of the global object. The evaluation of \a program can cause an exception in the engine; in this case the return value will be the exception @@ -261,8 +261,11 @@ void QJSEngine::collectGarbage() */ QJSValue QJSEngine::evaluate(const QString& program, const QString& fileName, int lineNumber) { - QV4::Scope scope(d->m_v4Engine); - QV4::ExecutionContext *ctx = d->m_v4Engine->currentContext(); + QV4::ExecutionEngine *v4 = d->m_v4Engine; + QV4::Scope scope(v4); + QV4::ExecutionContext *ctx = v4->currentContext(); + if (ctx != v4->rootContext) + ctx = v4->pushGlobalContext(); QV4::ScopedValue result(scope); QV4::Script script(ctx, program, fileName, lineNumber); @@ -273,7 +276,9 @@ QJSValue QJSEngine::evaluate(const QString& program, const QString& fileName, in result = script.run(); if (scope.engine->hasException) result = ctx->catchException(); - return new QJSValuePrivate(d->m_v4Engine, result); + if (ctx != v4->rootContext) + v4->popContext(); + return new QJSValuePrivate(v4, result); } /*! diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp index b2723b02fd..17acb4fd32 100644 --- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp +++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp @@ -157,6 +157,8 @@ private slots: void dynamicProperties(); + void scopeOfEvaluate(); + signals: void testSignal(); }; @@ -3011,6 +3013,43 @@ void tst_QJSEngine::dynamicProperties() } } +class EvaluateWrapper : public QObject +{ + Q_OBJECT +public: + EvaluateWrapper(QJSEngine *engine) + : engine(engine) + {} + +public slots: + QJSValue cppEvaluate(const QString &program) + { + return engine->evaluate(program); + } + +private: + QJSEngine *engine; +}; + +void tst_QJSEngine::scopeOfEvaluate() +{ + QJSEngine engine; + QJSValue wrapper = engine.newQObject(new EvaluateWrapper(&engine)); + + engine.evaluate("testVariable = 42"); + + QJSValue function = engine.evaluate("(function(evalWrapper){\n" + "var testVariable = 100; \n" + "try { \n" + " return evalWrapper.cppEvaluate(\"(function() { return testVariable; })\")\n" + " ()\n" + "} catch (e) {}\n" + "})"); + QVERIFY(function.isCallable()); + QJSValue result = function.call(QJSValueList() << wrapper); + QCOMPARE(result.toInt(), 42); +} + QTEST_MAIN(tst_QJSEngine) #include "tst_qjsengine.moc" -- cgit v1.2.3