summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Dzyubenko <denis.dzyubenko@nokia.com>2010-09-09 15:59:58 +0200
committerDenis Dzyubenko <denis.dzyubenko@nokia.com>2010-09-22 17:00:15 +0200
commit73a5cbfbee575978da6162411af2c55dd705abe5 (patch)
tree34b0ecb6672257547acfee609c30c24f71dafe62
parente35061e19c3b280b2daecea48ebf5408ceeba3f6 (diff)
Renamed multilayer-dashboard project to dashboard
Reviewed-by: trustme
-rw-r--r--dashboard/Button.qml (renamed from multilayer-dashboard/Button.qml)0
-rw-r--r--dashboard/ColumnFour.qml (renamed from multilayer-dashboard/ColumnFour.qml)0
-rw-r--r--dashboard/ColumnOne.qml (renamed from multilayer-dashboard/ColumnOne.qml)0
-rw-r--r--dashboard/ColumnThree.qml (renamed from multilayer-dashboard/ColumnThree.qml)0
-rw-r--r--dashboard/ColumnTwo.qml (renamed from multilayer-dashboard/ColumnTwo.qml)0
-rw-r--r--dashboard/ExpandableWidget.qml (renamed from multilayer-dashboard/ExpandableWidget.qml)0
-rwxr-xr-xdashboard/MainWidget.qml (renamed from multilayer-dashboard/MainWidget.qml)0
-rw-r--r--dashboard/RotatableImage.qml (renamed from multilayer-dashboard/RotatableImage.qml)0
-rw-r--r--dashboard/StrokeList.qml (renamed from multilayer-dashboard/StrokeList.qml)0
-rw-r--r--dashboard/TapAndHoldWidget.qml (renamed from multilayer-dashboard/TapAndHoldWidget.qml)0
-rw-r--r--dashboard/TapWidget.qml (renamed from multilayer-dashboard/TapWidget.qml)0
-rw-r--r--dashboard/VolumeChannel.qml (renamed from multilayer-dashboard/VolumeChannel.qml)0
-rw-r--r--dashboard/VolumeControl.qml (renamed from multilayer-dashboard/VolumeControl.qml)0
-rw-r--r--dashboard/dashboard.qml73
-rw-r--r--dashboard/dashboard.qmlproject2
-rw-r--r--dashboard/images/1.png (renamed from multilayer-dashboard/images/1.png)bin475381 -> 475381 bytes
-rw-r--r--dashboard/images/2.png (renamed from multilayer-dashboard/images/2.png)bin310017 -> 310017 bytes
-rw-r--r--dashboard/images/3.png (renamed from multilayer-dashboard/images/3.png)bin459841 -> 459841 bytes
-rw-r--r--dashboard/images/4.png (renamed from multilayer-dashboard/images/4.png)bin374758 -> 374758 bytes
-rw-r--r--dashboard/images/5.png (renamed from multilayer-dashboard/images/5.png)bin372444 -> 372444 bytes
-rw-r--r--dashboard/images/6.png (renamed from multilayer-dashboard/images/6.png)bin233423 -> 233423 bytes
-rw-r--r--dashboard/images/bg.png (renamed from multilayer-dashboard/images/bg.png)bin984326 -> 984326 bytes
-rw-r--r--dashboard/images/button.png (renamed from multilayer-dashboard/images/button.png)bin1021 -> 1021 bytes
-rw-r--r--dashboard/images/columnbg.png (renamed from multilayer-dashboard/images/columnbg.png)bin1038 -> 1038 bytes
-rw-r--r--dashboard/images/qt-logo.png (renamed from multilayer-dashboard/images/qt-logo.png)bin28187 -> 28187 bytes
-rw-r--r--dashboard/nested.qml112
-rw-r--r--multilayer-dashboard/multilayer-dashboard.qmlproject18
27 files changed, 2 insertions, 203 deletions
diff --git a/multilayer-dashboard/Button.qml b/dashboard/Button.qml
index fd27972..fd27972 100644
--- a/multilayer-dashboard/Button.qml
+++ b/dashboard/Button.qml
diff --git a/multilayer-dashboard/ColumnFour.qml b/dashboard/ColumnFour.qml
index 2161495..2161495 100644
--- a/multilayer-dashboard/ColumnFour.qml
+++ b/dashboard/ColumnFour.qml
diff --git a/multilayer-dashboard/ColumnOne.qml b/dashboard/ColumnOne.qml
index cbc6329..cbc6329 100644
--- a/multilayer-dashboard/ColumnOne.qml
+++ b/dashboard/ColumnOne.qml
diff --git a/multilayer-dashboard/ColumnThree.qml b/dashboard/ColumnThree.qml
index 2c3b0b4..2c3b0b4 100644
--- a/multilayer-dashboard/ColumnThree.qml
+++ b/dashboard/ColumnThree.qml
diff --git a/multilayer-dashboard/ColumnTwo.qml b/dashboard/ColumnTwo.qml
index 17618e0..17618e0 100644
--- a/multilayer-dashboard/ColumnTwo.qml
+++ b/dashboard/ColumnTwo.qml
diff --git a/multilayer-dashboard/ExpandableWidget.qml b/dashboard/ExpandableWidget.qml
index 0a1c3e5..0a1c3e5 100644
--- a/multilayer-dashboard/ExpandableWidget.qml
+++ b/dashboard/ExpandableWidget.qml
diff --git a/multilayer-dashboard/MainWidget.qml b/dashboard/MainWidget.qml
index 6207583..6207583 100755
--- a/multilayer-dashboard/MainWidget.qml
+++ b/dashboard/MainWidget.qml
diff --git a/multilayer-dashboard/RotatableImage.qml b/dashboard/RotatableImage.qml
index 2e422bf..2e422bf 100644
--- a/multilayer-dashboard/RotatableImage.qml
+++ b/dashboard/RotatableImage.qml
diff --git a/multilayer-dashboard/StrokeList.qml b/dashboard/StrokeList.qml
index 9b0daa4..9b0daa4 100644
--- a/multilayer-dashboard/StrokeList.qml
+++ b/dashboard/StrokeList.qml
diff --git a/multilayer-dashboard/TapAndHoldWidget.qml b/dashboard/TapAndHoldWidget.qml
index d009d1a..d009d1a 100644
--- a/multilayer-dashboard/TapAndHoldWidget.qml
+++ b/dashboard/TapAndHoldWidget.qml
diff --git a/multilayer-dashboard/TapWidget.qml b/dashboard/TapWidget.qml
index db524e9..db524e9 100644
--- a/multilayer-dashboard/TapWidget.qml
+++ b/dashboard/TapWidget.qml
diff --git a/multilayer-dashboard/VolumeChannel.qml b/dashboard/VolumeChannel.qml
index 559485b..559485b 100644
--- a/multilayer-dashboard/VolumeChannel.qml
+++ b/dashboard/VolumeChannel.qml
diff --git a/multilayer-dashboard/VolumeControl.qml b/dashboard/VolumeControl.qml
index 38b0ad7..38b0ad7 100644
--- a/multilayer-dashboard/VolumeControl.qml
+++ b/dashboard/VolumeControl.qml
diff --git a/dashboard/dashboard.qml b/dashboard/dashboard.qml
deleted file mode 100644
index 5c1e8df..0000000
--- a/dashboard/dashboard.qml
+++ /dev/null
@@ -1,73 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 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: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 Qt 4.7
-import Qt.labs.gestures 1.0
-
-// Only works on platforms with Touch support.
-
-Rectangle {
- id: rect
- width: 320
- height: 180
-
- Text {
- anchors.centerIn: parent
- text: "Tap / TapAndHold / Pan / Pinch / Swipe\nOnly works on platforms with Touch support."
- horizontalAlignment: Text.Center
- }
-
- GestureArea {
- id: me
- anchors.fill: parent
- focus: true
-
- // Only some of the many gesture properties are shown. See Gesture documentation.
-
- Pan {
- onUpdated: {
- if (gesture.offset.x >= 10 && gesture.offset.y < 10)
- console.log("pan: horizontally", gesture.offset.x)
- else if (gesture.offset.y >= 10 && gesture.offset.x < 10)
- console.log("pan: vertically", gesture.offset.y)
- }
- }
- }
-}
diff --git a/dashboard/dashboard.qmlproject b/dashboard/dashboard.qmlproject
index d4909f8..e526217 100644
--- a/dashboard/dashboard.qmlproject
+++ b/dashboard/dashboard.qmlproject
@@ -1,3 +1,5 @@
+/* File generated by QtCreator */
+
import QmlProject 1.0
Project {
diff --git a/multilayer-dashboard/images/1.png b/dashboard/images/1.png
index 03a0a94..03a0a94 100644
--- a/multilayer-dashboard/images/1.png
+++ b/dashboard/images/1.png
Binary files differ
diff --git a/multilayer-dashboard/images/2.png b/dashboard/images/2.png
index c85b283..c85b283 100644
--- a/multilayer-dashboard/images/2.png
+++ b/dashboard/images/2.png
Binary files differ
diff --git a/multilayer-dashboard/images/3.png b/dashboard/images/3.png
index 17733ba..17733ba 100644
--- a/multilayer-dashboard/images/3.png
+++ b/dashboard/images/3.png
Binary files differ
diff --git a/multilayer-dashboard/images/4.png b/dashboard/images/4.png
index 5631513..5631513 100644
--- a/multilayer-dashboard/images/4.png
+++ b/dashboard/images/4.png
Binary files differ
diff --git a/multilayer-dashboard/images/5.png b/dashboard/images/5.png
index e181e49..e181e49 100644
--- a/multilayer-dashboard/images/5.png
+++ b/dashboard/images/5.png
Binary files differ
diff --git a/multilayer-dashboard/images/6.png b/dashboard/images/6.png
index d493886..d493886 100644
--- a/multilayer-dashboard/images/6.png
+++ b/dashboard/images/6.png
Binary files differ
diff --git a/multilayer-dashboard/images/bg.png b/dashboard/images/bg.png
index 0c21d75..0c21d75 100644
--- a/multilayer-dashboard/images/bg.png
+++ b/dashboard/images/bg.png
Binary files differ
diff --git a/multilayer-dashboard/images/button.png b/dashboard/images/button.png
index a32d4eb..a32d4eb 100644
--- a/multilayer-dashboard/images/button.png
+++ b/dashboard/images/button.png
Binary files differ
diff --git a/multilayer-dashboard/images/columnbg.png b/dashboard/images/columnbg.png
index 09d7f08..09d7f08 100644
--- a/multilayer-dashboard/images/columnbg.png
+++ b/dashboard/images/columnbg.png
Binary files differ
diff --git a/multilayer-dashboard/images/qt-logo.png b/dashboard/images/qt-logo.png
index b9eed00..b9eed00 100644
--- a/multilayer-dashboard/images/qt-logo.png
+++ b/dashboard/images/qt-logo.png
Binary files differ
diff --git a/dashboard/nested.qml b/dashboard/nested.qml
deleted file mode 100644
index e2d516a..0000000
--- a/dashboard/nested.qml
+++ /dev/null
@@ -1,112 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 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: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 Qt 4.7
-import Qt.labs.gestures 1.0
-
-Rectangle {
- id: rect
- width: 450
- height: 450
-
- Rectangle {
- id: horiz
- x: 10
- y: 10
- width: 200
- height: 200
- color: "lightblue"
-
- Text {
- id: horizText
- anchors.centerIn: parent
- text: "Horizontal"
- horizontalAlignment: Text.Center
- }
- GestureArea {
- id: horizArea
- anchors.fill: parent
- focus: true
-
- Pan {
- when: Math.abs(gesture.offset.x) >= 10 && Math.abs(gesture.offset.y) < 10
- script: console.log("pan horizontally", gesture.offset.x)
- }
- }
- }
- Rectangle {
- id: vert
- x: 120
- y: 120
- width: 200
- height: 200
-
- color: "lightgreen"
- opacity: 0.9
-
- Text {
- id: vertText;
- anchors.centerIn: parent
- text: "Vertical"
- horizontalAlignment: Text.Center
- }
-
- GestureArea {
- id: vertArea
- anchors.fill: parent
- focus: true
-
-// Tap {
-// // states: [ "finished" ] // default is gesture-specific
-// script: console.log("tap") // executed on finished
-// }
-
- Pan {
- // executed on updated
- when: Math.abs(gesture.offset.y) >= 10 && Math.abs(gesture.offset.x < 10)
- script: { console.log("pan: vertically", gesture.offset.y) }
- }
-
-// CustomGestureFoo {
-// script: console.log("foo")
-// }
- }
- }
-}
diff --git a/multilayer-dashboard/multilayer-dashboard.qmlproject b/multilayer-dashboard/multilayer-dashboard.qmlproject
deleted file mode 100644
index e526217..0000000
--- a/multilayer-dashboard/multilayer-dashboard.qmlproject
+++ /dev/null
@@ -1,18 +0,0 @@
-/* File generated by QtCreator */
-
-import QmlProject 1.0
-
-Project {
- /* Include .qml, .js, and image files from current directory and subdirectories */
- QmlFiles {
- directory: "."
- }
- JavaScriptFiles {
- directory: "."
- }
- ImageFiles {
- directory: "."
- }
- /* List of plugin directories passed to QML runtime */
- // importPaths: [ " ../exampleplugin " ]
-}