From 95a92ae3881ee99a851b69c96fc2c3c985a0a0ed Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Thu, 19 Jan 2012 15:14:06 +1000 Subject: Adhere to examples standards more consistently Example subfolders should be named 'content' Change-Id: I23f5b0ef44108f54f9b1703f04faf02cafc78efb Reviewed-by: Martin Jones --- examples/declarative/calculator/Core/Button.qml | 84 ------------------- examples/declarative/calculator/Core/Display.qml | 68 --------------- examples/declarative/calculator/Core/calculator.js | 91 --------------------- .../declarative/calculator/Core/images/button-.png | Bin 1288 -> 0 bytes .../calculator/Core/images/button-blue.png | Bin 1565 -> 0 bytes .../calculator/Core/images/button-green.png | Bin 1543 -> 0 bytes .../calculator/Core/images/button-purple.png | Bin 1566 -> 0 bytes .../calculator/Core/images/button-red.png | Bin 1586 -> 0 bytes .../declarative/calculator/Core/images/display.png | Bin 998 -> 0 bytes examples/declarative/calculator/Core/qmldir | 2 - examples/declarative/calculator/calculator.qml | 4 +- examples/declarative/calculator/content/Button.qml | 84 +++++++++++++++++++ .../declarative/calculator/content/Display.qml | 68 +++++++++++++++ .../declarative/calculator/content/calculator.js | 91 +++++++++++++++++++++ .../calculator/content/images/button-.png | Bin 0 -> 1288 bytes .../calculator/content/images/button-blue.png | Bin 0 -> 1565 bytes .../calculator/content/images/button-green.png | Bin 0 -> 1543 bytes .../calculator/content/images/button-purple.png | Bin 0 -> 1566 bytes .../calculator/content/images/button-red.png | Bin 0 -> 1586 bytes .../calculator/content/images/display.png | Bin 0 -> 998 bytes examples/declarative/calculator/content/qmldir | 2 + 21 files changed, 247 insertions(+), 247 deletions(-) delete mode 100644 examples/declarative/calculator/Core/Button.qml delete mode 100644 examples/declarative/calculator/Core/Display.qml delete mode 100644 examples/declarative/calculator/Core/calculator.js delete mode 100644 examples/declarative/calculator/Core/images/button-.png delete mode 100644 examples/declarative/calculator/Core/images/button-blue.png delete mode 100644 examples/declarative/calculator/Core/images/button-green.png delete mode 100644 examples/declarative/calculator/Core/images/button-purple.png delete mode 100644 examples/declarative/calculator/Core/images/button-red.png delete mode 100644 examples/declarative/calculator/Core/images/display.png delete mode 100644 examples/declarative/calculator/Core/qmldir create mode 100644 examples/declarative/calculator/content/Button.qml create mode 100644 examples/declarative/calculator/content/Display.qml create mode 100644 examples/declarative/calculator/content/calculator.js create mode 100644 examples/declarative/calculator/content/images/button-.png create mode 100644 examples/declarative/calculator/content/images/button-blue.png create mode 100644 examples/declarative/calculator/content/images/button-green.png create mode 100644 examples/declarative/calculator/content/images/button-purple.png create mode 100644 examples/declarative/calculator/content/images/button-red.png create mode 100644 examples/declarative/calculator/content/images/display.png create mode 100644 examples/declarative/calculator/content/qmldir (limited to 'examples/declarative/calculator') diff --git a/examples/declarative/calculator/Core/Button.qml b/examples/declarative/calculator/Core/Button.qml deleted file mode 100644 index 2b4e2f5b0f..0000000000 --- a/examples/declarative/calculator/Core/Button.qml +++ /dev/null @@ -1,84 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 - -BorderImage { - id: button - - property alias operation: buttonText.text - property string color: "" - - Accessible.name: operation - Accessible.description: "This button does " + operation - Accessible.role: Accessible.Button - - signal clicked - - source: "images/button-" + color + ".png"; clip: true - border { left: 10; top: 10; right: 10; bottom: 10 } - - Rectangle { - id: shade - anchors.fill: button; radius: 10; color: "black"; opacity: 0 - } - - Text { - id: buttonText - anchors.centerIn: parent; anchors.verticalCenterOffset: -1 - font.pixelSize: parent.width > parent.height ? parent.height * .5 : parent.width * .5 - style: Text.Sunken; color: "white"; styleColor: "black"; smooth: true - } - - MouseArea { - id: mouseArea - anchors.fill: parent - onClicked: { - doOp(operation) - button.clicked() - } - } - - states: State { - name: "pressed"; when: mouseArea.pressed == true - PropertyChanges { target: shade; opacity: .4 } - } -} diff --git a/examples/declarative/calculator/Core/Display.qml b/examples/declarative/calculator/Core/Display.qml deleted file mode 100644 index a3fa2e976a..0000000000 --- a/examples/declarative/calculator/Core/Display.qml +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 - -BorderImage { - id: image - - property alias text : displayText.text - property alias currentOperation : operationText - - source: "images/display.png" - border { left: 10; top: 10; right: 10; bottom: 10 } - - Text { - id: displayText - anchors { - right: parent.right; verticalCenter: parent.verticalCenter; verticalCenterOffset: -1 - rightMargin: 6; left: operationText.right - } - font.pixelSize: parent.height * .6; text: "0"; horizontalAlignment: Text.AlignRight; elide: Text.ElideRight - color: "#343434"; smooth: true; font.bold: true - } - Text { - id: operationText - font.bold: true; font.pixelSize: parent.height * .7 - color: "#343434"; smooth: true - anchors { left: parent.left; leftMargin: 6; verticalCenterOffset: -3; verticalCenter: parent.verticalCenter } - } -} diff --git a/examples/declarative/calculator/Core/calculator.js b/examples/declarative/calculator/Core/calculator.js deleted file mode 100644 index 7c363c7f30..0000000000 --- a/examples/declarative/calculator/Core/calculator.js +++ /dev/null @@ -1,91 +0,0 @@ - -var curVal = 0 -var memory = 0 -var lastOp = "" -var timer = 0 - -function disabled(op) { - if (op == "." && display.text.toString().search(/\./) != -1) { - return true - } else if (op == squareRoot && display.text.toString().search(/-/) != -1) { - return true - } else { - return false - } -} - -function doOperation(op) { - if (disabled(op)) { - return - } - - if (op.toString().length==1 && ((op >= "0" && op <= "9") || op==".") ) { - if (display.text.toString().length >= 14) - return; // No arbitrary length numbers - if (lastOp.toString().length == 1 && ((lastOp >= "0" && lastOp <= "9") || lastOp == ".") ) { - display.text = display.text + op.toString() - } else { - display.text = op - } - lastOp = op - return - } - lastOp = op - - if (display.currentOperation.text == "+") { - display.text = Number(display.text.valueOf()) + Number(curVal.valueOf()) - } else if (display.currentOperation.text == "-") { - display.text = Number(curVal) - Number(display.text.valueOf()) - } else if (display.currentOperation.text == multiplication) { - display.text = Number(curVal) * Number(display.text.valueOf()) - } else if (display.currentOperation.text == division) { - display.text = Number(Number(curVal) / Number(display.text.valueOf())).toString() - } else if (display.currentOperation.text == "=") { - } - - if (op == "+" || op == "-" || op == multiplication || op == division) { - display.currentOperation.text = op - curVal = display.text.valueOf() - return - } - - curVal = 0 - display.currentOperation.text = "" - - if (op == "1/x") { - display.text = (1 / display.text.valueOf()).toString() - } else if (op == "x^2") { - display.text = (display.text.valueOf() * display.text.valueOf()).toString() - } else if (op == "Abs") { - display.text = (Math.abs(display.text.valueOf())).toString() - } else if (op == "Int") { - display.text = (Math.floor(display.text.valueOf())).toString() - } else if (op == plusminus) { - display.text = (display.text.valueOf() * -1).toString() - } else if (op == squareRoot) { - display.text = (Math.sqrt(display.text.valueOf())).toString() - } else if (op == "mc") { - memory = 0; - } else if (op == "m+") { - memory += display.text.valueOf() - } else if (op == "mr") { - display.text = memory.toString() - } else if (op == "m-") { - memory = display.text.valueOf() - } else if (op == leftArrow) { - display.text = display.text.toString().slice(0, -1) - if (display.text.length == 0) { - display.text = "0" - } - } else if (op == "Off") { - Qt.quit(); - } else if (op == "C") { - display.text = "0" - } else if (op == "AC") { - curVal = 0 - memory = 0 - lastOp = "" - display.text ="0" - } -} - diff --git a/examples/declarative/calculator/Core/images/button-.png b/examples/declarative/calculator/Core/images/button-.png deleted file mode 100644 index 544e514536..0000000000 Binary files a/examples/declarative/calculator/Core/images/button-.png and /dev/null differ diff --git a/examples/declarative/calculator/Core/images/button-blue.png b/examples/declarative/calculator/Core/images/button-blue.png deleted file mode 100644 index 5f92de32d0..0000000000 Binary files a/examples/declarative/calculator/Core/images/button-blue.png and /dev/null differ diff --git a/examples/declarative/calculator/Core/images/button-green.png b/examples/declarative/calculator/Core/images/button-green.png deleted file mode 100644 index 36c93914c7..0000000000 Binary files a/examples/declarative/calculator/Core/images/button-green.png and /dev/null differ diff --git a/examples/declarative/calculator/Core/images/button-purple.png b/examples/declarative/calculator/Core/images/button-purple.png deleted file mode 100644 index 347cbbea9d..0000000000 Binary files a/examples/declarative/calculator/Core/images/button-purple.png and /dev/null differ diff --git a/examples/declarative/calculator/Core/images/button-red.png b/examples/declarative/calculator/Core/images/button-red.png deleted file mode 100644 index 3b335891ae..0000000000 Binary files a/examples/declarative/calculator/Core/images/button-red.png and /dev/null differ diff --git a/examples/declarative/calculator/Core/images/display.png b/examples/declarative/calculator/Core/images/display.png deleted file mode 100644 index 9507f4382e..0000000000 Binary files a/examples/declarative/calculator/Core/images/display.png and /dev/null differ diff --git a/examples/declarative/calculator/Core/qmldir b/examples/declarative/calculator/Core/qmldir deleted file mode 100644 index a926b93fac..0000000000 --- a/examples/declarative/calculator/Core/qmldir +++ /dev/null @@ -1,2 +0,0 @@ -Button Button.qml -Display Display.qml diff --git a/examples/declarative/calculator/calculator.qml b/examples/declarative/calculator/calculator.qml index d447822430..80f90f5fe9 100644 --- a/examples/declarative/calculator/calculator.qml +++ b/examples/declarative/calculator/calculator.qml @@ -41,8 +41,8 @@ import QtQuick 2.0 import QtQuick.Window 2.0 -import "Core" -import "Core/calculator.js" as CalcEngine +import "content" +import "content/calculator.js" as CalcEngine Rectangle { id: window diff --git a/examples/declarative/calculator/content/Button.qml b/examples/declarative/calculator/content/Button.qml new file mode 100644 index 0000000000..2b4e2f5b0f --- /dev/null +++ b/examples/declarative/calculator/content/Button.qml @@ -0,0 +1,84 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 + +BorderImage { + id: button + + property alias operation: buttonText.text + property string color: "" + + Accessible.name: operation + Accessible.description: "This button does " + operation + Accessible.role: Accessible.Button + + signal clicked + + source: "images/button-" + color + ".png"; clip: true + border { left: 10; top: 10; right: 10; bottom: 10 } + + Rectangle { + id: shade + anchors.fill: button; radius: 10; color: "black"; opacity: 0 + } + + Text { + id: buttonText + anchors.centerIn: parent; anchors.verticalCenterOffset: -1 + font.pixelSize: parent.width > parent.height ? parent.height * .5 : parent.width * .5 + style: Text.Sunken; color: "white"; styleColor: "black"; smooth: true + } + + MouseArea { + id: mouseArea + anchors.fill: parent + onClicked: { + doOp(operation) + button.clicked() + } + } + + states: State { + name: "pressed"; when: mouseArea.pressed == true + PropertyChanges { target: shade; opacity: .4 } + } +} diff --git a/examples/declarative/calculator/content/Display.qml b/examples/declarative/calculator/content/Display.qml new file mode 100644 index 0000000000..a3fa2e976a --- /dev/null +++ b/examples/declarative/calculator/content/Display.qml @@ -0,0 +1,68 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 + +BorderImage { + id: image + + property alias text : displayText.text + property alias currentOperation : operationText + + source: "images/display.png" + border { left: 10; top: 10; right: 10; bottom: 10 } + + Text { + id: displayText + anchors { + right: parent.right; verticalCenter: parent.verticalCenter; verticalCenterOffset: -1 + rightMargin: 6; left: operationText.right + } + font.pixelSize: parent.height * .6; text: "0"; horizontalAlignment: Text.AlignRight; elide: Text.ElideRight + color: "#343434"; smooth: true; font.bold: true + } + Text { + id: operationText + font.bold: true; font.pixelSize: parent.height * .7 + color: "#343434"; smooth: true + anchors { left: parent.left; leftMargin: 6; verticalCenterOffset: -3; verticalCenter: parent.verticalCenter } + } +} diff --git a/examples/declarative/calculator/content/calculator.js b/examples/declarative/calculator/content/calculator.js new file mode 100644 index 0000000000..7c363c7f30 --- /dev/null +++ b/examples/declarative/calculator/content/calculator.js @@ -0,0 +1,91 @@ + +var curVal = 0 +var memory = 0 +var lastOp = "" +var timer = 0 + +function disabled(op) { + if (op == "." && display.text.toString().search(/\./) != -1) { + return true + } else if (op == squareRoot && display.text.toString().search(/-/) != -1) { + return true + } else { + return false + } +} + +function doOperation(op) { + if (disabled(op)) { + return + } + + if (op.toString().length==1 && ((op >= "0" && op <= "9") || op==".") ) { + if (display.text.toString().length >= 14) + return; // No arbitrary length numbers + if (lastOp.toString().length == 1 && ((lastOp >= "0" && lastOp <= "9") || lastOp == ".") ) { + display.text = display.text + op.toString() + } else { + display.text = op + } + lastOp = op + return + } + lastOp = op + + if (display.currentOperation.text == "+") { + display.text = Number(display.text.valueOf()) + Number(curVal.valueOf()) + } else if (display.currentOperation.text == "-") { + display.text = Number(curVal) - Number(display.text.valueOf()) + } else if (display.currentOperation.text == multiplication) { + display.text = Number(curVal) * Number(display.text.valueOf()) + } else if (display.currentOperation.text == division) { + display.text = Number(Number(curVal) / Number(display.text.valueOf())).toString() + } else if (display.currentOperation.text == "=") { + } + + if (op == "+" || op == "-" || op == multiplication || op == division) { + display.currentOperation.text = op + curVal = display.text.valueOf() + return + } + + curVal = 0 + display.currentOperation.text = "" + + if (op == "1/x") { + display.text = (1 / display.text.valueOf()).toString() + } else if (op == "x^2") { + display.text = (display.text.valueOf() * display.text.valueOf()).toString() + } else if (op == "Abs") { + display.text = (Math.abs(display.text.valueOf())).toString() + } else if (op == "Int") { + display.text = (Math.floor(display.text.valueOf())).toString() + } else if (op == plusminus) { + display.text = (display.text.valueOf() * -1).toString() + } else if (op == squareRoot) { + display.text = (Math.sqrt(display.text.valueOf())).toString() + } else if (op == "mc") { + memory = 0; + } else if (op == "m+") { + memory += display.text.valueOf() + } else if (op == "mr") { + display.text = memory.toString() + } else if (op == "m-") { + memory = display.text.valueOf() + } else if (op == leftArrow) { + display.text = display.text.toString().slice(0, -1) + if (display.text.length == 0) { + display.text = "0" + } + } else if (op == "Off") { + Qt.quit(); + } else if (op == "C") { + display.text = "0" + } else if (op == "AC") { + curVal = 0 + memory = 0 + lastOp = "" + display.text ="0" + } +} + diff --git a/examples/declarative/calculator/content/images/button-.png b/examples/declarative/calculator/content/images/button-.png new file mode 100644 index 0000000000..544e514536 Binary files /dev/null and b/examples/declarative/calculator/content/images/button-.png differ diff --git a/examples/declarative/calculator/content/images/button-blue.png b/examples/declarative/calculator/content/images/button-blue.png new file mode 100644 index 0000000000..5f92de32d0 Binary files /dev/null and b/examples/declarative/calculator/content/images/button-blue.png differ diff --git a/examples/declarative/calculator/content/images/button-green.png b/examples/declarative/calculator/content/images/button-green.png new file mode 100644 index 0000000000..36c93914c7 Binary files /dev/null and b/examples/declarative/calculator/content/images/button-green.png differ diff --git a/examples/declarative/calculator/content/images/button-purple.png b/examples/declarative/calculator/content/images/button-purple.png new file mode 100644 index 0000000000..347cbbea9d Binary files /dev/null and b/examples/declarative/calculator/content/images/button-purple.png differ diff --git a/examples/declarative/calculator/content/images/button-red.png b/examples/declarative/calculator/content/images/button-red.png new file mode 100644 index 0000000000..3b335891ae Binary files /dev/null and b/examples/declarative/calculator/content/images/button-red.png differ diff --git a/examples/declarative/calculator/content/images/display.png b/examples/declarative/calculator/content/images/display.png new file mode 100644 index 0000000000..9507f4382e Binary files /dev/null and b/examples/declarative/calculator/content/images/display.png differ diff --git a/examples/declarative/calculator/content/qmldir b/examples/declarative/calculator/content/qmldir new file mode 100644 index 0000000000..a926b93fac --- /dev/null +++ b/examples/declarative/calculator/content/qmldir @@ -0,0 +1,2 @@ +Button Button.qml +Display Display.qml -- cgit v1.2.3 From e6b224aa2872d7d1030fa98bd30603e16f8f9604 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 20 Jan 2012 14:04:27 +1000 Subject: Update obsolete contact address. Replace Nokia contact email address with Qt Project website. Change-Id: I6a730abc0c396fb545a48b2d6938abedac2e3f1c Reviewed-by: Rohan McGovern Reviewed-by: Alan Alpert --- examples/declarative/calculator/calculator.qml | 2 +- examples/declarative/calculator/content/Button.qml | 2 +- examples/declarative/calculator/content/Display.qml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'examples/declarative/calculator') diff --git a/examples/declarative/calculator/calculator.qml b/examples/declarative/calculator/calculator.qml index 80f90f5fe9..cfec9c185f 100644 --- a/examples/declarative/calculator/calculator.qml +++ b/examples/declarative/calculator/calculator.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the QtDeclarative module of the Qt Toolkit. ** diff --git a/examples/declarative/calculator/content/Button.qml b/examples/declarative/calculator/content/Button.qml index 2b4e2f5b0f..98f57358e7 100644 --- a/examples/declarative/calculator/content/Button.qml +++ b/examples/declarative/calculator/content/Button.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the QtDeclarative module of the Qt Toolkit. ** diff --git a/examples/declarative/calculator/content/Display.qml b/examples/declarative/calculator/content/Display.qml index a3fa2e976a..23e0c5a9ec 100644 --- a/examples/declarative/calculator/content/Display.qml +++ b/examples/declarative/calculator/content/Display.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the QtDeclarative module of the Qt Toolkit. ** -- cgit v1.2.3 From d2d53dffbc3ba52333e559e2c0391bd73e5b840c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Tue, 24 Jan 2012 10:04:45 +0100 Subject: Adapted QQuickScreenAttached to orientation API changes in QScreen. Change-Id: Ic2cb008b989780e297f03ddd5bdef466bb230c74 Reviewed-by: Lars Knoll --- examples/declarative/calculator/calculator.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/declarative/calculator') diff --git a/examples/declarative/calculator/calculator.qml b/examples/declarative/calculator/calculator.qml index cfec9c185f..82fa1c1a3e 100644 --- a/examples/declarative/calculator/calculator.qml +++ b/examples/declarative/calculator/calculator.qml @@ -62,7 +62,7 @@ Rectangle { Item { id: main - state: "orientation " + Screen.currentOrientation + state: "orientation " + Screen.orientation property bool landscapeWindow: window.width > window.height property real baseWidth: landscapeWindow ? window.height : window.width -- cgit v1.2.3