diff options
Diffstat (limited to 'basicsuite/qt5-everywhere/demos')
67 files changed, 183 insertions, 80 deletions
diff --git a/basicsuite/qt5-everywhere/demos/canvasclock/canvasClock.qml b/basicsuite/qt5-everywhere/demos/canvasclock/canvasClock.qml index e2b3bb0..2a79735 100644 --- a/basicsuite/qt5-everywhere/demos/canvasclock/canvasClock.qml +++ b/basicsuite/qt5-everywhere/demos/canvasclock/canvasClock.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. @@ -249,7 +249,7 @@ function drawPointer(context, angle, len, thickness, color){ if (root.dialStyle === 1) x1-=clockContainer.width*0.01 - context.font = 'bold '+Math.floor(clockContainer.width*.1)+'px Arial' + context.font = 'bold '+Math.floor(clockContainer.width*.1)+'px sans-serif' if (i >= 10) diff --git a/basicsuite/qt5-everywhere/demos/gridrssnews/RssDelegate.qml b/basicsuite/qt5-everywhere/demos/gridrssnews/RssDelegate.qml index b0c2047..87b25c2 100644 --- a/basicsuite/qt5-everywhere/demos/gridrssnews/RssDelegate.qml +++ b/basicsuite/qt5-everywhere/demos/gridrssnews/RssDelegate.qml @@ -1,6 +1,6 @@ /****************************************************************************
**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** 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.
diff --git a/basicsuite/qt5-everywhere/demos/gridrssnews/ScrollBar.qml b/basicsuite/qt5-everywhere/demos/gridrssnews/ScrollBar.qml index dae206b..3a8fea9 100644 --- a/basicsuite/qt5-everywhere/demos/gridrssnews/ScrollBar.qml +++ b/basicsuite/qt5-everywhere/demos/gridrssnews/ScrollBar.qml @@ -1,6 +1,6 @@ /****************************************************************************
**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** 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.
diff --git a/basicsuite/qt5-everywhere/demos/gridrssnews/main.qml b/basicsuite/qt5-everywhere/demos/gridrssnews/main.qml index d85d292..2856cfb 100644 --- a/basicsuite/qt5-everywhere/demos/gridrssnews/main.qml +++ b/basicsuite/qt5-everywhere/demos/gridrssnews/main.qml @@ -1,6 +1,6 @@ /****************************************************************************
**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** 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.
@@ -74,6 +74,8 @@ Rectangle { onStatusChanged: {
if (status == XmlListModel.Ready) {
playbanner.start();
+ } else if (status == XmlListModel.Error) {
+ networkErrorMessage.start();
}
}
}
@@ -139,6 +141,21 @@ Rectangle { pageSize: grid.visibleArea.widthRatio
}
+ Item {
+ id: networkErrorBox
+ opacity: 0
+ anchors.fill: parent
+
+ Text {
+ anchors.centerIn: parent
+ text: qsTr("Sorry! No network connection")
+ font.family: uiFont;
+ font.pixelSize: appHeaderFontSize;
+ color: textColor
+ smooth: true
+ }
+ }
+
SequentialAnimation {
id: playbanner
running: false
@@ -146,5 +163,14 @@ Rectangle { NumberAnimation { target: grid; property: "opacity"; to: 1.0; duration: 300}
}
+ NumberAnimation {
+ id: networkErrorMessage
+ running: false
+ target: networkErrorBox
+ property: "opacity"
+ to: 1.0
+ duration: 300
+ }
+
}
diff --git a/basicsuite/qt5-everywhere/demos/heartmonitor/HeartData.js b/basicsuite/qt5-everywhere/demos/heartmonitor/HeartData.js index 467e431..d3ad154 100644 --- a/basicsuite/qt5-everywhere/demos/heartmonitor/HeartData.js +++ b/basicsuite/qt5-everywhere/demos/heartmonitor/HeartData.js @@ -1,6 +1,6 @@ /****************************************************************************
**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** 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.
diff --git a/basicsuite/qt5-everywhere/demos/heartmonitor/main.qml b/basicsuite/qt5-everywhere/demos/heartmonitor/main.qml index 08b8f28..7594bdd 100644 --- a/basicsuite/qt5-everywhere/demos/heartmonitor/main.qml +++ b/basicsuite/qt5-everywhere/demos/heartmonitor/main.qml @@ -1,6 +1,6 @@ /****************************************************************************
**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** 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.
diff --git a/basicsuite/qt5-everywhere/demos/particledemo/BootScreenDemo.qml b/basicsuite/qt5-everywhere/demos/particledemo/BootScreenDemo.qml index eb4e29e..ca1e55e 100644 --- a/basicsuite/qt5-everywhere/demos/particledemo/BootScreenDemo.qml +++ b/basicsuite/qt5-everywhere/demos/particledemo/BootScreenDemo.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/particledemo/ParticleSysComponent.qml b/basicsuite/qt5-everywhere/demos/particledemo/ParticleSysComponent.qml index fc74037..531b7c3 100644 --- a/basicsuite/qt5-everywhere/demos/particledemo/ParticleSysComponent.qml +++ b/basicsuite/qt5-everywhere/demos/particledemo/ParticleSysComponent.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/particledemo/particledemo.qml b/basicsuite/qt5-everywhere/demos/particledemo/particledemo.qml index c3f8253..235a2cd 100644 --- a/basicsuite/qt5-everywhere/demos/particledemo/particledemo.qml +++ b/basicsuite/qt5-everywhere/demos/particledemo/particledemo.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/photosurface/photosurface.qml b/basicsuite/qt5-everywhere/demos/photosurface/photosurface.qml index 6ca2626..d96a9bd 100644 --- a/basicsuite/qt5-everywhere/demos/photosurface/photosurface.qml +++ b/basicsuite/qt5-everywhere/demos/photosurface/photosurface.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/radio/VolumeButton.qml b/basicsuite/qt5-everywhere/demos/radio/VolumeButton.qml index 76635b6..11b687e 100644 --- a/basicsuite/qt5-everywhere/demos/radio/VolumeButton.qml +++ b/basicsuite/qt5-everywhere/demos/radio/VolumeButton.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/radio/VolumePoint.qml b/basicsuite/qt5-everywhere/demos/radio/VolumePoint.qml index c107823..a491860 100644 --- a/basicsuite/qt5-everywhere/demos/radio/VolumePoint.qml +++ b/basicsuite/qt5-everywhere/demos/radio/VolumePoint.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/radio/radio.qml b/basicsuite/qt5-everywhere/demos/radio/radio.qml index 8615f9b..e81c567 100644 --- a/basicsuite/qt5-everywhere/demos/radio/radio.qml +++ b/basicsuite/qt5-everywhere/demos/radio/radio.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. @@ -102,6 +102,22 @@ FocusScope { radius: height/2 + Item { + id: networkErrorBox + opacity: 0 + anchors.fill: parent + + Text { + anchors.verticalCenter: parent.verticalCenter + anchors.right: parent.right + anchors.rightMargin: parent.width * 0.1 + text: qsTr("Sorry! No network connection") + font.pixelSize: stationList.height*.1; + color: "white" + smooth: true + } + } + PathView { enabled: root.activeFocus id: stationList @@ -214,6 +230,14 @@ FocusScope { query: "/radio/channel" XmlRole {name: "title"; query: "title/string()"} XmlRole {name: "url"; query: "url/string()"} + + onStatusChanged: { + if (status == XmlListModel.Ready) { + networkErrorBox.opacity = 0; + } else if (status == XmlListModel.Error) { + networkErrorBox.opacity = 1; + } + } } VolumeButton { diff --git a/basicsuite/qt5-everywhere/demos/rssnews/content/BusyIndicator.qml b/basicsuite/qt5-everywhere/demos/rssnews/content/BusyIndicator.qml index c16f582..97065b2 100644 --- a/basicsuite/qt5-everywhere/demos/rssnews/content/BusyIndicator.qml +++ b/basicsuite/qt5-everywhere/demos/rssnews/content/BusyIndicator.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/rssnews/content/CategoryDelegate.qml b/basicsuite/qt5-everywhere/demos/rssnews/content/CategoryDelegate.qml index 2916d1b..ae70e44 100644 --- a/basicsuite/qt5-everywhere/demos/rssnews/content/CategoryDelegate.qml +++ b/basicsuite/qt5-everywhere/demos/rssnews/content/CategoryDelegate.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/rssnews/content/NewsDelegate.qml b/basicsuite/qt5-everywhere/demos/rssnews/content/NewsDelegate.qml index 4050af6..7080312 100644 --- a/basicsuite/qt5-everywhere/demos/rssnews/content/NewsDelegate.qml +++ b/basicsuite/qt5-everywhere/demos/rssnews/content/NewsDelegate.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/rssnews/content/RssFeeds.qml b/basicsuite/qt5-everywhere/demos/rssnews/content/RssFeeds.qml index da26d6a..2f0591b 100644 --- a/basicsuite/qt5-everywhere/demos/rssnews/content/RssFeeds.qml +++ b/basicsuite/qt5-everywhere/demos/rssnews/content/RssFeeds.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/rssnews/content/ScrollBar.qml b/basicsuite/qt5-everywhere/demos/rssnews/content/ScrollBar.qml index d3cf4a6..02ad7ea 100644 --- a/basicsuite/qt5-everywhere/demos/rssnews/content/ScrollBar.qml +++ b/basicsuite/qt5-everywhere/demos/rssnews/content/ScrollBar.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/rssnews/rssnews.qml b/basicsuite/qt5-everywhere/demos/rssnews/rssnews.qml index 5eae0a0..213d9e8 100644 --- a/basicsuite/qt5-everywhere/demos/rssnews/rssnews.qml +++ b/basicsuite/qt5-everywhere/demos/rssnews/rssnews.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -67,6 +67,14 @@ Rectangle { XmlRole { name: "title"; query: "title/string()" } XmlRole { name: "link"; query: "link/string()" } XmlRole { name: "description"; query: "description/string()" } + + onStatusChanged: { + if (status == XmlListModel.Error) { + networkErrorBox.opacity = 1.0 + } else if (status == XmlListModel.Ready) { + networkErrorBox.opacity = 0.0 + } + } } Row { @@ -93,9 +101,21 @@ Rectangle { width: window.width - window.listWidth; height: window.height model: feedModel delegate: NewsDelegate {} + + Item { + id: networkErrorBox + opacity: 0 + anchors.fill: parent + + Text { + anchors.centerIn: parent + text: qsTr("Sorry! No network connection") + } + } } } + ScrollBar { scrollArea: list; height: list.height; width: 8; anchors.right: window.right } Rectangle { x: window.listWidth; height: window.height; width: 1; color: "#cccccc" } } diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/Block.qml b/basicsuite/qt5-everywhere/demos/samegame/content/Block.qml index 0b10b7f..b643f4e 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/Block.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/Block.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/BlockEmitter.qml b/basicsuite/qt5-everywhere/demos/samegame/content/BlockEmitter.qml index ba6261c..f2c975f 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/BlockEmitter.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/BlockEmitter.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/Button.qml b/basicsuite/qt5-everywhere/demos/samegame/content/Button.qml index 4b825ba..5fcc578 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/Button.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/Button.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/GameArea.qml b/basicsuite/qt5-everywhere/demos/samegame/content/GameArea.qml index 6e72161..3a9e59b 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/GameArea.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/GameArea.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/LogoAnimation.qml b/basicsuite/qt5-everywhere/demos/samegame/content/LogoAnimation.qml index fb050e7..0322c67 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/LogoAnimation.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/LogoAnimation.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/MenuEmitter.qml b/basicsuite/qt5-everywhere/demos/samegame/content/MenuEmitter.qml index 93089fc..c74b7a3 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/MenuEmitter.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/MenuEmitter.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/PaintEmitter.qml b/basicsuite/qt5-everywhere/demos/samegame/content/PaintEmitter.qml index fe758af..c448cba 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/PaintEmitter.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/PaintEmitter.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/PrimaryPack.qml b/basicsuite/qt5-everywhere/demos/samegame/content/PrimaryPack.qml index 3fe7fb1..166fcb8 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/PrimaryPack.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/PrimaryPack.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/PuzzleBlock.qml b/basicsuite/qt5-everywhere/demos/samegame/content/PuzzleBlock.qml index 4f5b043..963565a 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/PuzzleBlock.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/PuzzleBlock.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/SimpleBlock.qml b/basicsuite/qt5-everywhere/demos/samegame/content/SimpleBlock.qml index 5ae4782..e389abd 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/SimpleBlock.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/SimpleBlock.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/SmokeText.qml b/basicsuite/qt5-everywhere/demos/samegame/content/SmokeText.qml index 46bc509..d4c4365 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/SmokeText.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/SmokeText.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/levels/TemplateBase.qml b/basicsuite/qt5-everywhere/demos/samegame/content/levels/TemplateBase.qml index 48ea399..d02f26d 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/levels/TemplateBase.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/levels/TemplateBase.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level0.qml b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level0.qml index 7ac7ed8..0e6e0a8 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level0.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level0.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level1.qml b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level1.qml index 0b7a889..0467c5b 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level1.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level1.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level2.qml b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level2.qml index 986f217..332af0f 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level2.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level2.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level3.qml b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level3.qml index eff5182..9504baf 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level3.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level3.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level4.qml b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level4.qml index 4438de1..d5d01f0 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level4.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level4.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level5.qml b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level5.qml index ee48217..d602567 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level5.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level5.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level6.qml b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level6.qml index 2b34baa..5dd42f8 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level6.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level6.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level7.qml b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level7.qml index 280bbb1..87633b4 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level7.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level7.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level8.qml b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level8.qml index 7661485..9d25e31 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level8.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level8.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level9.qml b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level9.qml index c75d8e5..755268d 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level9.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level9.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/samegame.js b/basicsuite/qt5-everywhere/demos/samegame/content/samegame.js index 96b8167..9035b12 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/samegame.js +++ b/basicsuite/qt5-everywhere/demos/samegame/content/samegame.js @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/samegame/samegame.qml b/basicsuite/qt5-everywhere/demos/samegame/samegame.qml index 49eab55..e81a8bf 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/samegame.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/samegame.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/shaders/Logo.qml b/basicsuite/qt5-everywhere/demos/shaders/Logo.qml index 2e2617a..04bcd36 100644 --- a/basicsuite/qt5-everywhere/demos/shaders/Logo.qml +++ b/basicsuite/qt5-everywhere/demos/shaders/Logo.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/shaders/LogoContainer.qml b/basicsuite/qt5-everywhere/demos/shaders/LogoContainer.qml index 1237305..57b3505 100644 --- a/basicsuite/qt5-everywhere/demos/shaders/LogoContainer.qml +++ b/basicsuite/qt5-everywhere/demos/shaders/LogoContainer.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/shaders/Slider.qml b/basicsuite/qt5-everywhere/demos/shaders/Slider.qml index 5ceefcc..2e21010 100644 --- a/basicsuite/qt5-everywhere/demos/shaders/Slider.qml +++ b/basicsuite/qt5-everywhere/demos/shaders/Slider.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/shaders/import/import.pro b/basicsuite/qt5-everywhere/demos/shaders/import/import.pro index d72fb60..af51461 100644 --- a/basicsuite/qt5-everywhere/demos/shaders/import/import.pro +++ b/basicsuite/qt5-everywhere/demos/shaders/import/import.pro @@ -1,13 +1,20 @@ -CXX_MODULE = qml +TEMPLATE = lib +CONFIG += plugin + TARGET = shaderreader -TARGETPATH = ShaderReader -IMPORT_VERSION = 1.0 -QT += quick +QT += qml quick SOURCES = main.cpp \ shaderfilereader.cpp \ HEADERS = shaderfilereader.h \ -load(qml_plugin) +pluginfiles.files += \ + qmldir \ + +B2QT_DEPLOYPATH = /data/user/qt/qmlplugins/ShaderReader +target.path += $$B2QT_DEPLOYPATH +pluginfiles.path += $$B2QT_DEPLOYPATH + +INSTALLS += target pluginfiles diff --git a/basicsuite/qt5-everywhere/demos/shaders/import/main.cpp b/basicsuite/qt5-everywhere/demos/shaders/import/main.cpp index 0475ea8..fe03f0e 100644 --- a/basicsuite/qt5-everywhere/demos/shaders/import/main.cpp +++ b/basicsuite/qt5-everywhere/demos/shaders/import/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/qt5-everywhere/demos/shaders/import/shaderfilereader.cpp b/basicsuite/qt5-everywhere/demos/shaders/import/shaderfilereader.cpp index 1623fb7..629f4b7 100644 --- a/basicsuite/qt5-everywhere/demos/shaders/import/shaderfilereader.cpp +++ b/basicsuite/qt5-everywhere/demos/shaders/import/shaderfilereader.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/qt5-everywhere/demos/shaders/import/shaderfilereader.h b/basicsuite/qt5-everywhere/demos/shaders/import/shaderfilereader.h index bfa82f7..30a68f3 100644 --- a/basicsuite/qt5-everywhere/demos/shaders/import/shaderfilereader.h +++ b/basicsuite/qt5-everywhere/demos/shaders/import/shaderfilereader.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/content/AndroidDelegate.qml b/basicsuite/qt5-everywhere/demos/touchgallery/content/AndroidDelegate.qml index 21160eb..e84d6b1 100644 --- a/basicsuite/qt5-everywhere/demos/touchgallery/content/AndroidDelegate.qml +++ b/basicsuite/qt5-everywhere/demos/touchgallery/content/AndroidDelegate.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Quick Controls module of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/content/ButtonPage.qml b/basicsuite/qt5-everywhere/demos/touchgallery/content/ButtonPage.qml index 63f9646..9133158 100644 --- a/basicsuite/qt5-everywhere/demos/touchgallery/content/ButtonPage.qml +++ b/basicsuite/qt5-everywhere/demos/touchgallery/content/ButtonPage.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Quick Controls module of the Qt Toolkit. @@ -97,7 +97,7 @@ Item { ButtonStyle { panel: Item { implicitHeight: 50 - implicitWidth: 320 + implicitWidth: 300 BorderImage { anchors.fill: parent antialiasing: true diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/content/CustomAppWindow.qml b/basicsuite/qt5-everywhere/demos/touchgallery/content/CustomAppWindow.qml index e0e7bcd..afaa951 100644 --- a/basicsuite/qt5-everywhere/demos/touchgallery/content/CustomAppWindow.qml +++ b/basicsuite/qt5-everywhere/demos/touchgallery/content/CustomAppWindow.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Quick Controls module of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/content/ProgressBarPage.qml b/basicsuite/qt5-everywhere/demos/touchgallery/content/ProgressBarPage.qml index dc0f552..93adc7a 100644 --- a/basicsuite/qt5-everywhere/demos/touchgallery/content/ProgressBarPage.qml +++ b/basicsuite/qt5-everywhere/demos/touchgallery/content/ProgressBarPage.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Quick Controls module of the Qt Toolkit. @@ -73,14 +73,14 @@ Item { ProgressBar { anchors.margins: 20 style: touchStyle - width: 400 + width: 300 value: progress } ProgressBar { anchors.margins: 20 style: touchStyle - width: 400 + width: 300 value: 1 - progress } @@ -88,7 +88,7 @@ Item { anchors.margins: 20 style: touchStyle value: 1 - width: 400 + width: 300 } } diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/content/SliderPage.qml b/basicsuite/qt5-everywhere/demos/touchgallery/content/SliderPage.qml index a1c0045..4a34037 100644 --- a/basicsuite/qt5-everywhere/demos/touchgallery/content/SliderPage.qml +++ b/basicsuite/qt5-everywhere/demos/touchgallery/content/SliderPage.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Quick Controls module of the Qt Toolkit. @@ -53,16 +53,19 @@ Item { Slider { anchors.margins: 20 + width: 280 style: touchStyle value: 0 } Slider { anchors.margins: 20 + width: 280 style: touchStyle value: 0.5 } Slider { anchors.margins: 20 + width: 280 style: touchStyle value: 1.0 } diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/content/TabBarPage.qml b/basicsuite/qt5-everywhere/demos/touchgallery/content/TabBarPage.qml index c96314b..7731c33 100644 --- a/basicsuite/qt5-everywhere/demos/touchgallery/content/TabBarPage.qml +++ b/basicsuite/qt5-everywhere/demos/touchgallery/content/TabBarPage.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Quick Controls module of the Qt Toolkit. @@ -84,7 +84,7 @@ Item { Text { anchors.centerIn: parent color: "white" - text: tab.title.toUpperCase() + text: styleData.title font.pixelSize: 16 } Rectangle { diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/content/TextInputPage.qml b/basicsuite/qt5-everywhere/demos/touchgallery/content/TextInputPage.qml index 605afef..0ed71f7 100644 --- a/basicsuite/qt5-everywhere/demos/touchgallery/content/TextInputPage.qml +++ b/basicsuite/qt5-everywhere/demos/touchgallery/content/TextInputPage.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Quick Controls module of the Qt Toolkit. @@ -91,7 +91,7 @@ Item { font.pixelSize: 28 background: Item { implicitHeight: 50 - implicitWidth: 320 + implicitWidth: 300 BorderImage { source: "../images/textinput.png" border.left: 8 diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/main.qml b/basicsuite/qt5-everywhere/demos/touchgallery/main.qml index 95d737b..94089cf 100644 --- a/basicsuite/qt5-everywhere/demos/touchgallery/main.qml +++ b/basicsuite/qt5-everywhere/demos/touchgallery/main.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Quick Controls module of the Qt Toolkit. @@ -81,9 +81,9 @@ CustomAppWindow { } Text { - font.pixelSize: app.height*.07 + font.pixelSize: app.height*.06 Behavior on x { NumberAnimation{ easing.type: Easing.OutCubic} } - x: backButton.x + backButton.width + 20 + x: backButton.x + backButton.width + 10 anchors.verticalCenter: parent.verticalCenter color: "white" text: "Widget Gallery" diff --git a/basicsuite/qt5-everywhere/demos/video/ControlBar.qml b/basicsuite/qt5-everywhere/demos/video/ControlBar.qml index c8e3b97..f013dcf 100644 --- a/basicsuite/qt5-everywhere/demos/video/ControlBar.qml +++ b/basicsuite/qt5-everywhere/demos/video/ControlBar.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/video/ImageButton.qml b/basicsuite/qt5-everywhere/demos/video/ImageButton.qml index 937a075..428f6de 100644 --- a/basicsuite/qt5-everywhere/demos/video/ImageButton.qml +++ b/basicsuite/qt5-everywhere/demos/video/ImageButton.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/video/PlaybackControl.qml b/basicsuite/qt5-everywhere/demos/video/PlaybackControl.qml index 9716825..2d7307e 100644 --- a/basicsuite/qt5-everywhere/demos/video/PlaybackControl.qml +++ b/basicsuite/qt5-everywhere/demos/video/PlaybackControl.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/video/ScrollBar.qml b/basicsuite/qt5-everywhere/demos/video/ScrollBar.qml index 37c2eab..8ac0d31 100644 --- a/basicsuite/qt5-everywhere/demos/video/ScrollBar.qml +++ b/basicsuite/qt5-everywhere/demos/video/ScrollBar.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/video/SeekControl.qml b/basicsuite/qt5-everywhere/demos/video/SeekControl.qml index 8003951..2e037e3 100644 --- a/basicsuite/qt5-everywhere/demos/video/SeekControl.qml +++ b/basicsuite/qt5-everywhere/demos/video/SeekControl.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/video/Slider.qml b/basicsuite/qt5-everywhere/demos/video/Slider.qml index 8a99cfe..cc45537 100644 --- a/basicsuite/qt5-everywhere/demos/video/Slider.qml +++ b/basicsuite/qt5-everywhere/demos/video/Slider.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/video/VideoDelegate.qml b/basicsuite/qt5-everywhere/demos/video/VideoDelegate.qml index 6109f81..fedc9f4 100644 --- a/basicsuite/qt5-everywhere/demos/video/VideoDelegate.qml +++ b/basicsuite/qt5-everywhere/demos/video/VideoDelegate.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. diff --git a/basicsuite/qt5-everywhere/demos/video/VideoSelector.qml b/basicsuite/qt5-everywhere/demos/video/VideoSelector.qml index aa54e33..8ce8d83 100644 --- a/basicsuite/qt5-everywhere/demos/video/VideoSelector.qml +++ b/basicsuite/qt5-everywhere/demos/video/VideoSelector.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. @@ -67,6 +67,29 @@ Item { XmlRole { name: "thumbnail"; query: "thumbnail/string()" } XmlRole { name: "title"; query: "title/string()" } XmlRole { name: "link"; query: "link/string()" } + + onStatusChanged: { + if (status == XmlListModel.Ready) { + networkErrorBox.opacity = 0.0 + } else if (status == XmlListModel.Error) { + networkErrorBox.opacity = 1.0 + } + } + } + + Item { + id: networkErrorBox + opacity: 0 + anchors.fill: parent + + Text { + anchors.centerIn: parent + text: qsTr("Sorry! No network connection") + font.family: uiFont; + font.pixelSize: tileFontSize * 2; + color: textColor + smooth: true + } } // Grid view diff --git a/basicsuite/qt5-everywhere/demos/video/VolumeControl.qml b/basicsuite/qt5-everywhere/demos/video/VolumeControl.qml index 6e75fd2..4754951 100644 --- a/basicsuite/qt5-everywhere/demos/video/VolumeControl.qml +++ b/basicsuite/qt5-everywhere/demos/video/VolumeControl.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** 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. |