diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2012-03-05 15:40:59 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-06 01:39:49 +0100 |
commit | 2738c57e51b4fcb70f25ea4ff46c966ce5287c27 (patch) | |
tree | 2f25e595603a8be269ef416cf280fe45e07a3380 /examples/qml/toys/clocks | |
parent | 3f62886ac84b31c5c8f90205583dc65e811ad20b (diff) |
Fix renaming merge with examples
Some examples were duplicated a few times. Removing the excess.
Change-Id: I6fa59f79de63ac952103421ba1c063f5912b702b
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'examples/qml/toys/clocks')
-rw-r--r-- | examples/qml/toys/clocks/clocks.qml | 88 | ||||
-rw-r--r-- | examples/qml/toys/clocks/content/Clock.qml | 143 | ||||
-rw-r--r-- | examples/qml/toys/clocks/content/QuitButton.qml | 52 | ||||
-rw-r--r-- | examples/qml/toys/clocks/content/arrow.png | bin | 692 -> 0 bytes | |||
-rw-r--r-- | examples/qml/toys/clocks/content/background.png | bin | 46895 -> 0 bytes | |||
-rw-r--r-- | examples/qml/toys/clocks/content/center.png | bin | 765 -> 0 bytes | |||
-rw-r--r-- | examples/qml/toys/clocks/content/clock-night.png | bin | 23359 -> 0 bytes | |||
-rw-r--r-- | examples/qml/toys/clocks/content/clock.png | bin | 20653 -> 0 bytes | |||
-rw-r--r-- | examples/qml/toys/clocks/content/hour.png | bin | 625 -> 0 bytes | |||
-rw-r--r-- | examples/qml/toys/clocks/content/minute.png | bin | 625 -> 0 bytes | |||
-rw-r--r-- | examples/qml/toys/clocks/content/quit.png | bin | 583 -> 0 bytes | |||
-rw-r--r-- | examples/qml/toys/clocks/content/second.png | bin | 303 -> 0 bytes |
12 files changed, 0 insertions, 283 deletions
diff --git a/examples/qml/toys/clocks/clocks.qml b/examples/qml/toys/clocks/clocks.qml deleted file mode 100644 index 288e50c9eb..0000000000 --- a/examples/qml/toys/clocks/clocks.qml +++ /dev/null @@ -1,88 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** 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 Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import "content" - -Rectangle { - id: root - width: 640; height: 320 - color: "#646464" - - ListView { - id: clockview - anchors.fill: parent - orientation: ListView.Horizontal - cacheBuffer: 2000 - snapMode: ListView.SnapOneItem - highlightRangeMode: ListView.ApplyRange - - delegate: Clock { city: cityName; shift: timeShift } - model: ListModel { - ListElement { cityName: "New York"; timeShift: -4 } - ListElement { cityName: "London"; timeShift: 0 } - ListElement { cityName: "Oslo"; timeShift: 1 } - ListElement { cityName: "Mumbai"; timeShift: 5.5 } - ListElement { cityName: "Tokyo"; timeShift: 9 } - ListElement { cityName: "Brisbane"; timeShift: 10 } - ListElement { cityName: "Los Angeles"; timeShift: -8 } - } - } - - Image { - anchors.left: parent.left - anchors.bottom: parent.bottom - anchors.margins: 10 - source: "content/arrow.png" - rotation: -90 - opacity: clockview.atXBeginning ? 0 : 0.5 - Behavior on opacity { NumberAnimation { duration: 500 } } - } - - Image { - anchors.right: parent.right - anchors.bottom: parent.bottom - anchors.margins: 10 - source: "content/arrow.png" - rotation: 90 - opacity: clockview.atXEnd ? 0 : 0.5 - Behavior on opacity { NumberAnimation { duration: 500 } } - } -} diff --git a/examples/qml/toys/clocks/content/Clock.qml b/examples/qml/toys/clocks/content/Clock.qml deleted file mode 100644 index 7f0e8cba83..0000000000 --- a/examples/qml/toys/clocks/content/Clock.qml +++ /dev/null @@ -1,143 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** 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 Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 - -Item { - id : clock - width: { - if (ListView.view && ListView.view.width >= 200) - return ListView.view.width / Math.floor(ListView.view.width / 200.0); - else - return 200; - } - - height: { - if (ListView.view && ListView.view.height >= 240) - return ListView.view.height; - else - return 240; - } - - property alias city: cityLabel.text - property int hours - property int minutes - property int seconds - property real shift - property bool night: false - property bool internationalTime: true //Unset for local time - - function timeChanged() { - var date = new Date; - hours = internationalTime ? date.getUTCHours() + Math.floor(clock.shift) : date.getHours() - night = ( hours < 7 || hours > 19 ) - minutes = internationalTime ? date.getUTCMinutes() + ((clock.shift % 1) * 60) : date.getMinutes() - seconds = date.getUTCSeconds(); - } - - Timer { - interval: 100; running: true; repeat: true; - onTriggered: clock.timeChanged() - } - - Item { - anchors.centerIn: parent - width: 200; height: 240 - - Image { id: background; source: "clock.png"; visible: clock.night == false } - Image { source: "clock-night.png"; visible: clock.night == true } - - - Image { - x: 92.5; y: 27 - source: "hour.png" - smooth: true - transform: Rotation { - id: hourRotation - origin.x: 7.5; origin.y: 73; - angle: (clock.hours * 30) + (clock.minutes * 0.5) - Behavior on angle { - SpringAnimation { spring: 2; damping: 0.2; modulus: 360 } - } - } - } - - Image { - x: 93.5; y: 17 - source: "minute.png" - smooth: true - transform: Rotation { - id: minuteRotation - origin.x: 6.5; origin.y: 83; - angle: clock.minutes * 6 - Behavior on angle { - SpringAnimation { spring: 2; damping: 0.2; modulus: 360 } - } - } - } - - Image { - x: 97.5; y: 20 - source: "second.png" - smooth: true - transform: Rotation { - id: secondRotation - origin.x: 2.5; origin.y: 80; - angle: clock.seconds * 6 - Behavior on angle { - SpringAnimation { spring: 2; damping: 0.2; modulus: 360 } - } - } - } - - Image { - anchors.centerIn: background; source: "center.png" - } - - Text { - id: cityLabel - y: 210; anchors.horizontalCenter: parent.horizontalCenter - color: "white" - font.family: "Helvetica" - font.bold: true; font.pixelSize: 16 - style: Text.Raised; styleColor: "black" - } - } -} diff --git a/examples/qml/toys/clocks/content/QuitButton.qml b/examples/qml/toys/clocks/content/QuitButton.qml deleted file mode 100644 index 702b892d23..0000000000 --- a/examples/qml/toys/clocks/content/QuitButton.qml +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** 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 Nokia Corporation 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 -Image { - source: "quit.png" - scale: quitMouse.pressed ? 0.8 : 1.0 - smooth: quitMouse.pressed - MouseArea { - id: quitMouse - anchors.fill: parent - anchors.margins: -10 - onClicked: Qt.quit() - } -} diff --git a/examples/qml/toys/clocks/content/arrow.png b/examples/qml/toys/clocks/content/arrow.png Binary files differdeleted file mode 100644 index e437312217..0000000000 --- a/examples/qml/toys/clocks/content/arrow.png +++ /dev/null diff --git a/examples/qml/toys/clocks/content/background.png b/examples/qml/toys/clocks/content/background.png Binary files differdeleted file mode 100644 index a885950862..0000000000 --- a/examples/qml/toys/clocks/content/background.png +++ /dev/null diff --git a/examples/qml/toys/clocks/content/center.png b/examples/qml/toys/clocks/content/center.png Binary files differdeleted file mode 100644 index 7fbd802a44..0000000000 --- a/examples/qml/toys/clocks/content/center.png +++ /dev/null diff --git a/examples/qml/toys/clocks/content/clock-night.png b/examples/qml/toys/clocks/content/clock-night.png Binary files differdeleted file mode 100644 index cc7151a397..0000000000 --- a/examples/qml/toys/clocks/content/clock-night.png +++ /dev/null diff --git a/examples/qml/toys/clocks/content/clock.png b/examples/qml/toys/clocks/content/clock.png Binary files differdeleted file mode 100644 index 462edacc0e..0000000000 --- a/examples/qml/toys/clocks/content/clock.png +++ /dev/null diff --git a/examples/qml/toys/clocks/content/hour.png b/examples/qml/toys/clocks/content/hour.png Binary files differdeleted file mode 100644 index f8061a1235..0000000000 --- a/examples/qml/toys/clocks/content/hour.png +++ /dev/null diff --git a/examples/qml/toys/clocks/content/minute.png b/examples/qml/toys/clocks/content/minute.png Binary files differdeleted file mode 100644 index 1297ec7c2b..0000000000 --- a/examples/qml/toys/clocks/content/minute.png +++ /dev/null diff --git a/examples/qml/toys/clocks/content/quit.png b/examples/qml/toys/clocks/content/quit.png Binary files differdeleted file mode 100644 index b822057d4e..0000000000 --- a/examples/qml/toys/clocks/content/quit.png +++ /dev/null diff --git a/examples/qml/toys/clocks/content/second.png b/examples/qml/toys/clocks/content/second.png Binary files differdeleted file mode 100644 index 4aa9fb5e8e..0000000000 --- a/examples/qml/toys/clocks/content/second.png +++ /dev/null |