diff options
| author | aavit <eirik.aavitsland@digia.com> | 2014-10-28 12:59:23 +0100 |
|---|---|---|
| committer | aavit <eirik.aavitsland@digia.com> | 2014-10-28 13:02:01 +0100 |
| commit | fbca4e2effee224e522d2a6be97f5e05cf60ec93 (patch) | |
| tree | f0dccb81dcffde63e874d4a1418c1637dc24925b | |
| parent | 7f4ac3989bef110c39ecbd86d9ae5bdeb998b9f0 (diff) | |
| parent | 3b3221c5cf4be69a83b4fb404668fac7afd10787 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
* origin/stable:
Update "Code less" logo
Make boot logo and text proportions consistent
Clean up b2qt launcher
Update Qt logos
Use more relevant URL
Change copyright notice
Add few helper functions to qml context
Enable cacheBuffer in demo ListView
Use all available screen space for flicking
Change-Id: I12c356444499cde13b10f474133548af3df41d69
58 files changed, 102 insertions, 164 deletions
diff --git a/open-sans/OpenSans-Bold.ttf b/open-sans/OpenSans-Bold.ttf Binary files differdeleted file mode 100755 index fd79d43..0000000 --- a/open-sans/OpenSans-Bold.ttf +++ /dev/null diff --git a/open-sans/OpenSans-BoldItalic.ttf b/open-sans/OpenSans-BoldItalic.ttf Binary files differdeleted file mode 100755 index 9bc8009..0000000 --- a/open-sans/OpenSans-BoldItalic.ttf +++ /dev/null diff --git a/open-sans/OpenSans-ExtraBold.ttf b/open-sans/OpenSans-ExtraBold.ttf Binary files differdeleted file mode 100755 index 21f6f84..0000000 --- a/open-sans/OpenSans-ExtraBold.ttf +++ /dev/null diff --git a/open-sans/OpenSans-ExtraBoldItalic.ttf b/open-sans/OpenSans-ExtraBoldItalic.ttf Binary files differdeleted file mode 100755 index 31cb688..0000000 --- a/open-sans/OpenSans-ExtraBoldItalic.ttf +++ /dev/null diff --git a/open-sans/OpenSans-Italic.ttf b/open-sans/OpenSans-Italic.ttf Binary files differdeleted file mode 100755 index c90da48..0000000 --- a/open-sans/OpenSans-Italic.ttf +++ /dev/null diff --git a/open-sans/OpenSans-Light.ttf b/open-sans/OpenSans-Light.ttf Binary files differdeleted file mode 100755 index 0d38189..0000000 --- a/open-sans/OpenSans-Light.ttf +++ /dev/null diff --git a/open-sans/OpenSans-LightItalic.ttf b/open-sans/OpenSans-LightItalic.ttf Binary files differdeleted file mode 100755 index 68299c4..0000000 --- a/open-sans/OpenSans-LightItalic.ttf +++ /dev/null diff --git a/open-sans/OpenSans-Regular.ttf b/open-sans/OpenSans-Regular.ttf Binary files differdeleted file mode 100755 index db43334..0000000 --- a/open-sans/OpenSans-Regular.ttf +++ /dev/null diff --git a/open-sans/OpenSans-Semibold.ttf b/open-sans/OpenSans-Semibold.ttf Binary files differdeleted file mode 100755 index 1a7679e..0000000 --- a/open-sans/OpenSans-Semibold.ttf +++ /dev/null diff --git a/open-sans/OpenSans-SemiboldItalic.ttf b/open-sans/OpenSans-SemiboldItalic.ttf Binary files differdeleted file mode 100755 index 59b6d16..0000000 --- a/open-sans/OpenSans-SemiboldItalic.ttf +++ /dev/null diff --git a/open-sans/fonts.pri b/open-sans/fonts.pri deleted file mode 100644 index 1d10517..0000000 --- a/open-sans/fonts.pri +++ /dev/null @@ -1,16 +0,0 @@ -FONTFILES += \ - $$PWD/OpenSans-BoldItalic.ttf \ - $$PWD/OpenSans-ExtraBold.ttf \ - $$PWD/OpenSans-ExtraBoldItalic.ttf \ - $$PWD/OpenSans-Italic.ttf \ - $$PWD/OpenSans-Light.ttf \ - $$PWD/OpenSans-LightItalic.ttf \ - $$PWD/OpenSans-Regular.ttf \ - $$PWD/OpenSans-Semibold.ttf \ - $$PWD/OpenSans-SemiboldItalic.ttf - -fontfiles.files = $$FONTFILES -fontfiles.path = $$[QT_INSTALL_LIBS]/fonts - -INSTALLS += fontfiles - diff --git a/qml/ApplicationIcon.qml b/qml/ApplicationIcon.qml index 8c4ae79..a72ead9 100644 --- a/qml/ApplicationIcon.qml +++ b/qml/ApplicationIcon.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -12,7 +12,7 @@ ** a written agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com +** contact form at http://www.qt.io ** ****************************************************************************/ import QtQuick 2.0 diff --git a/qml/BootScreen.qml b/qml/BootScreen.qml index ac4ec3a..3ae4ace 100644 --- a/qml/BootScreen.qml +++ b/qml/BootScreen.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -12,7 +12,7 @@ ** a written agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com +** contact form at http://www.qt.io ** ****************************************************************************/ import QtQuick 2.0 @@ -20,17 +20,12 @@ import QtQuick.Particles 2.0 Item { id: root - - property real size: Math.min(root.width, root.height); - property int particleLifeTime: 2000; SequentialAnimation { id: entryAnimation NumberAnimation { target: logo; property: "opacity"; to: 1; duration: 500 } -// NumberAnimation { target: logo; property: "t"; from: 0; to: 5; duration: 2000; easing.type: Easing.InCubic } - PauseAnimation { duration: 500 } ParallelAnimation { ScriptAction { script: { @@ -56,23 +51,22 @@ Item { Image { id: logo; + + width: engine.centimeter() * 3; + height: width * sourceSize.height / sourceSize.width; anchors.centerIn: parent - anchors.verticalCenterOffset: -root.size * 0.1 + Math.random() * t; - anchors.horizontalCenterOffset: Math.random() * t; + anchors.verticalCenterOffset: -Math.min(engine.screenWidth(), engine.screenHeight()) * 0.1 source: "images/qt-logo.png" opacity: 0 - - property real t; - } Text { id: label - anchors.centerIn: parent - anchors.verticalCenterOffset: -root.size * 0.1 + logo.height / 2 + 20 - - font.pixelSize: size * 0.04 + anchors.top: logo.bottom + anchors.topMargin: engine.mm(4) + anchors.horizontalCenter: logo.horizontalCenter + font.pixelSize: engine.fontSize() * 1.2 color: "white" text: "Boot to Qt" opacity: logo.opacity * 0.5 diff --git a/qml/GlimmeringQtLogo.qml b/qml/GlimmeringQtLogo.qml index d9c6a8e..567a445 100644 --- a/qml/GlimmeringQtLogo.qml +++ b/qml/GlimmeringQtLogo.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -12,7 +12,7 @@ ** a written agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com +** contact form at http://www.qt.io ** ****************************************************************************/ import QtQuick 2.0 @@ -27,7 +27,7 @@ Item { Image { id: image - width: engine.centimeter() * 1.5; + width: engine.centimeter() * 1.2; height: width * sourceSize.height / sourceSize.width; source: "images/qt-logo.png" diff --git a/qml/HighlightShader.qml b/qml/HighlightShader.qml index b6b0cf6..f211888 100644 --- a/qml/HighlightShader.qml +++ b/qml/HighlightShader.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -12,7 +12,7 @@ ** a written agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com +** contact form at http://www.qt.io ** ****************************************************************************/ import QtQuick 2.0 diff --git a/qml/LaunchScreen.qml b/qml/LaunchScreen.qml index 371c12e..104ed68 100644 --- a/qml/LaunchScreen.qml +++ b/qml/LaunchScreen.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -12,7 +12,7 @@ ** a written agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com +** contact form at http://www.qt.io ** ****************************************************************************/ import QtQuick 2.0 @@ -28,10 +28,12 @@ Item { id: list y: 10 width: parent.width - height: parent.height / root.itemsPerScreen + height: parent.height property real cellWidth: (list.width - (root.itemsPerScreen - 1) * list.spacing) / root.itemsPerScreen + property real cellHeight: (list.height / root.itemsPerScreen) + cacheBuffer: count * (cellWidth + spacing) orientation: ListView.Horizontal maximumFlickVelocity: 5000 @@ -51,7 +53,7 @@ Item { id: iconRoot; width: list.cellWidth - height: list.height + height: list.cellHeight offset: list.contentX; @@ -87,8 +89,10 @@ Item { } onMovementEnded: { - var center = mapToItem(contentItem, width / 2, height / 2) - itemAt(center.x, center.y).select() + var hCenter = mapToItem(contentItem, width / 2, engine.centimeter()) + var demo = itemAt(hCenter.x, hCenter.y) + if (demo) + demo.select() } onCountChanged: if (count > 0 && currentIndex < 0) currentIndex = 0 @@ -107,11 +111,8 @@ Item { font.pixelSize: engine.fontSize() color: "white" font.bold: true - anchors.horizontalCenter: parent.horizontalCenter; - anchors.top: list.bottom - anchors.topMargin: engine.centimeter() * 0.5 - + y: list.cellHeight + engine.centimeter() * 0.5 wrapMode: Text.WordWrap } @@ -119,22 +120,19 @@ Item { id: descriptionLabel font.pixelSize: engine.smallFontSize() color: "white" - anchors.left: parent.left anchors.right: logo.left anchors.top: nameLabel.bottom anchors.bottom: parent.bottom anchors.margins: engine.centimeter(); - wrapMode: Text.WordWrap } GlimmeringQtLogo { id: logo - anchors.bottom: parent.bottom anchors.right: parent.right - anchors.margins: width / 4; + anchors.margins: width / 3; } } diff --git a/qml/Main.qml b/qml/Main.qml index a56e851..027f67f 100644 --- a/qml/Main.qml +++ b/qml/Main.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -12,7 +12,7 @@ ** a written agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com +** contact form at http://www.qt.io ** ****************************************************************************/ import QtQuick 2.0 @@ -313,7 +313,7 @@ Item { Text { id: urlLabel; - text: "qt.digia.com/QtEnterpriseEmbedded" + text: "http://www.qt.io/qt-for-device-creation" color: qtpurple font.pixelSize: engine.sensibleButtonSize() * 0.2 font.bold: true diff --git a/qml/images/codeless.png b/qml/images/codeless.png Binary files differindex 53e4806..0aadc90 100644 --- a/qml/images/codeless.png +++ b/qml/images/codeless.png diff --git a/qml/images/preview_fallback_landscape.jpg b/qml/images/preview_fallback_landscape.jpg Binary files differdeleted file mode 100644 index 1c5d164..0000000 --- a/qml/images/preview_fallback_landscape.jpg +++ /dev/null diff --git a/qml/images/qt-logo-green-mask.png b/qml/images/qt-logo-green-mask.png Binary files differindex b13cb15..a682747 100644 --- a/qml/images/qt-logo-green-mask.png +++ b/qml/images/qt-logo-green-mask.png diff --git a/qml/images/qt-logo-small.png b/qml/images/qt-logo-small.png Binary files differdeleted file mode 100644 index 5abaa45..0000000 --- a/qml/images/qt-logo-small.png +++ /dev/null diff --git a/qml/images/qt-logo-white-mask.png b/qml/images/qt-logo-white-mask.png Binary files differindex ff2e4bf..cf80811 100644 --- a/qml/images/qt-logo-white-mask.png +++ b/qml/images/qt-logo-white-mask.png diff --git a/qml/images/qt-logo.png b/qml/images/qt-logo.png Binary files differindex 748392d..f3e8f29 100644 --- a/qml/images/qt-logo.png +++ b/qml/images/qt-logo.png diff --git a/qml/main_landscape.qml b/qml/main_landscape.qml index 599645c..33a9a43 100644 --- a/qml/main_landscape.qml +++ b/qml/main_landscape.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -12,15 +12,14 @@ ** a written agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com +** contact form at http://www.qt.io ** ****************************************************************************/ import QtQuick 2.0 Item { - width: 800 - height: 1280 - + width: engine.screenWidth() + height: engine.screenHeight() Main { anchors.centerIn: parent width: parent.height diff --git a/resources.qrc b/resources.qrc index 56201c4..034cc60 100644 --- a/resources.qrc +++ b/resources.qrc @@ -9,12 +9,10 @@ <file>qml/images/particle.png</file> <file>qml/images/particle_star.png</file> <file>qml/images/qt-logo-green-mask.png</file> - <file>qml/images/qt-logo-small.png</file> <file>qml/images/qt-logo-white-mask.png</file> <file>qml/images/qt-logo.png</file> <file>qml/GlimmeringQtLogo.qml</file> <file>qml/HighlightShader.qml</file> <file>qml/images/play.png</file> - <file>qml/images/preview_fallback_landscape.jpg</file> </qresource> </RCC> diff --git a/screenshot/Button.qml b/screenshot/Button.qml index 8094fd4..60b0c09 100644 --- a/screenshot/Button.qml +++ b/screenshot/Button.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -12,7 +12,7 @@ ** a written agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com +** contact form at http://www.qt.io ** ****************************************************************************/ import QtQuick 2.0 diff --git a/screenshot/Main.qml b/screenshot/Main.qml index ef0d5bf..b07f93a 100644 --- a/screenshot/Main.qml +++ b/screenshot/Main.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -12,7 +12,7 @@ ** a written agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com +** contact form at http://www.qt.io ** ****************************************************************************/ import QtQuick 2.0 diff --git a/screenshot/plugin/plugin.cpp b/screenshot/plugin/plugin.cpp index 5f37ab8..57f9b8b 100644 --- a/screenshot/plugin/plugin.cpp +++ b/screenshot/plugin/plugin.cpp @@ -2,7 +2,7 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -12,7 +12,7 @@ ** a written agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com +** contact form at http://www.qt.io ** ****************************************************************************/ #include <QtQml/QQmlExtensionPlugin> diff --git a/src/applicationsmodel.cpp b/src/applicationsmodel.cpp index 1a9cf10..b9c19e9 100644 --- a/src/applicationsmodel.cpp +++ b/src/applicationsmodel.cpp @@ -2,7 +2,7 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -12,7 +12,7 @@ ** a written agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com +** contact form at http://www.qt.io ** ****************************************************************************/ #include "applicationsmodel.h" @@ -96,7 +96,7 @@ public: QString imageName = path + "/preview_l.jpg"; data.icon = QFile::exists(imageName) ? QUrl::fromLocalFile(imageName) - : QUrl("qrc:///qml/images/preview_fallback_landscape.jpg"); + : QUrl("qrc:///qml/images/codeless.png"); results << data; } diff --git a/src/applicationsmodel.h b/src/applicationsmodel.h index 87586ee..659c6ef 100644 --- a/src/applicationsmodel.h +++ b/src/applicationsmodel.h @@ -2,7 +2,7 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -12,7 +12,7 @@ ** a written agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com +** contact form at http://www.qt.io ** ****************************************************************************/ #ifndef APPLICATIONSMODEL_H diff --git a/src/engine.cpp b/src/engine.cpp index 1ecd06a..b15885e 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -2,7 +2,7 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -12,7 +12,7 @@ ** a written agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com +** contact form at http://www.qt.io ** ****************************************************************************/ #include "engine.h" @@ -61,6 +61,8 @@ Engine::Engine(QObject *parent) float high = 20; float screenSizeCM = qMax<float>(qMin(m_screenSize.width(), m_screenSize.height()) / m_dpcm, low); m_dpcm *= (screenSizeCM - low) / (high - low) * 0.5 + 0.5; + m_screenWidth = m_screenSize.width(); + m_screenHeight = m_screenSize.height(); } diff --git a/src/engine.h b/src/engine.h index a837879..ae9f3fb 100644 --- a/src/engine.h +++ b/src/engine.h @@ -2,7 +2,7 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -12,7 +12,7 @@ ** a written agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com +** contact form at http://www.qt.io ** ****************************************************************************/ #ifndef ENGINE_H @@ -77,7 +77,10 @@ public: Q_INVOKABLE int smallFontSize() const { return qMax<int>(m_dpcm * 0.4, 10); } Q_INVOKABLE int fontSize() const { return qMax<int>(m_dpcm * 0.6, 14); } Q_INVOKABLE int titleFontSize() const { return qMax<int>(m_dpcm * 0.9, 20); } - Q_INVOKABLE int centimeter() const { return m_dpcm; } + Q_INVOKABLE int centimeter(int val = 1) const { return (m_dpcm * val); } + Q_INVOKABLE int mm(int val) const { return (int)(m_dpcm * val * 0.1); } + Q_INVOKABLE int screenWidth() const { return m_screenWidth; } + Q_INVOKABLE int screenHeight() const { return m_screenHeight; } protected: @@ -114,6 +117,7 @@ private: QSize m_screenSize; qreal m_dpcm; + int m_screenWidth, m_screenHeight; FpsCounter *m_fpsCounter; qreal m_fps; diff --git a/src/fpscounter.cpp b/src/fpscounter.cpp index 20f5efa..dce2378 100644 --- a/src/fpscounter.cpp +++ b/src/fpscounter.cpp @@ -2,7 +2,7 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -12,7 +12,7 @@ ** a written agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com +** contact form at http://www.qt.io ** ****************************************************************************/ #include "fpscounter.h" diff --git a/src/fpscounter.h b/src/fpscounter.h index 0c4557b..f0a50ba 100644 --- a/src/fpscounter.h +++ b/src/fpscounter.h @@ -2,7 +2,7 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -12,7 +12,7 @@ ** a written agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com +** contact form at http://www.qt.io ** ****************************************************************************/ #ifndef FPSCOUNTER_H diff --git a/src/logmanager.cpp b/src/logmanager.cpp index f4596fe..6ded4e1 100644 --- a/src/logmanager.cpp +++ b/src/logmanager.cpp @@ -2,7 +2,7 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -12,7 +12,7 @@ ** a written agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com +** contact form at http://www.qt.io ** ****************************************************************************/ #include "logmanager.h" diff --git a/src/logmanager.h b/src/logmanager.h index 1c0fb49..0bbb543 100644 --- a/src/logmanager.h +++ b/src/logmanager.h @@ -2,7 +2,7 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -12,7 +12,7 @@ ** a written agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com +** contact form at http://www.qt.io ** ****************************************************************************/ #ifndef LOGMANAGER_H diff --git a/src/main.cpp b/src/main.cpp index 0a6db11..5a2fd3b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2,7 +2,7 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** For any questions to Digia, please use contact form at http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -12,7 +12,7 @@ ** a written agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com +** contact form at http://www.qt.io ** ****************************************************************************/ #include <QtCore/QDebug> @@ -54,16 +54,6 @@ void displayHelp(const char *appName) ); } -/* - * TODO: - * - add fps counter - * - settings screen - * - Qt logo with glitter and particles - * - Brightness control (when applicable) - * - Toggle FPS measurement - * - power off - */ - int main(int argc, char **argv) { QApplication app(argc, argv); @@ -75,13 +65,6 @@ int main(int argc, char **argv) QtWebEngine::initialize(); #endif - QPalette pal; - pal.setColor(QPalette::Text, Qt::black); - pal.setColor(QPalette::WindowText, Qt::black); - pal.setColor(QPalette::ButtonText, Qt::black); - pal.setColor(QPalette::Base, Qt::white); - QGuiApplication::setPalette(pal); - QString fontName = QStringLiteral("/system/lib/fonts/DejaVuSans.ttf"); if (QFile::exists(fontName)) { QFontDatabase::addApplicationFont(fontName); @@ -101,9 +84,7 @@ int main(int argc, char **argv) : QStringLiteral("qrc:///qml/Main.qml"); QString appsRoot = QStringLiteral("/data/user/qt"); - QString bgImage = QStringLiteral(":/qml/images/bg_1280x800.jpg"); bool logcat = false; - QString bgColor; bool bootAnimation = true; bool showFps = false; diff --git a/startup.pro b/startup.pro index 0c9283a..98da2ae 100644 --- a/startup.pro +++ b/startup.pro @@ -1,14 +1,7 @@ -SOURCES += src/main.cpp \ - src/engine.cpp \ - src/applicationsmodel.cpp \ - src/logmanager.cpp \ - src/fpscounter.cpp - +# widgets dependency needed for QtChars demo QT += quick widgets TARGET = qtlauncher -QML_FILES += qml - qtHaveModule(webengine) { DEFINES += USE_QTWEBENGINE QT += webengine @@ -20,10 +13,20 @@ HEADERS += \ src/logmanager.h \ src/fpscounter.h -#script.files = qt_run.sh -#script.path = $$[INSTALL_ROOT]/system/bin +SOURCES += src/main.cpp \ + src/engine.cpp \ + src/applicationsmodel.cpp \ + src/logmanager.cpp \ + src/fpscounter.cpp -#include(open-sans/fonts.pri) +OTHER_FILES += \ + qml/LaunchScreen.qml \ + qml/main_landscape.qml \ + qml/HighlightShader.qml \ + qml/Main.qml \ + qml/ApplicationIcon.qml \ + qml/GlimmeringQtLogo.qml \ + qml/BootScreen.qml android { target.path = $$[INSTALL_ROOT]/system/bin @@ -35,28 +38,3 @@ INSTALLS += target RESOURCES += \ resources.qrc - -OTHER_FILES += \ - qml/GridViewWithInertia.qml \ - qml/NoisyGradient.qml \ - qml/Main.qml \ - qml/main_landscape.qml \ - qml/ApplicationIcon.qml \ - qml/LaunchScreen.qml \ - qml/TitleBar.qml \ - qml/BootScreen.qml \ - qml/Background.qml \ - qml/SettingsScreen.qml \ - qml/Section.qml \ - qml/ListViewWithInertia.qml \ - qml/SettingsRow.qml \ - qml/CheckBox.qml \ - qml/DeviceSettings.qml \ - qml/Button.qml \ - qml/Slider.qml \ - open-sans/fonts.pri \ - qml/GlimmeringQtLogo.qml \ - qml/HighlightShader.qml \ - screenshot/Main.qml \ - screenshot/Button.qml - diff --git a/test/dummyapps/About/AboutBoot2Qt.qml b/test/dummyapps/About/AboutBoot2Qt.qml index e723841..c0b66d2 100644 --- a/test/dummyapps/About/AboutBoot2Qt.qml +++ b/test/dummyapps/About/AboutBoot2Qt.qml @@ -2,7 +2,7 @@ ** ** 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/ +** http://www.qt.io/ ** ** This file is part of the examples of the Qt Enterprise Embedded. ** diff --git a/test/dummyapps/About/Box.qml b/test/dummyapps/About/Box.qml index 6dc040a..b468548 100644 --- a/test/dummyapps/About/Box.qml +++ b/test/dummyapps/About/Box.qml @@ -2,7 +2,7 @@ ** ** 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/ +** http://www.qt.io/ ** ** This file is part of the examples of the Qt Enterprise Embedded. ** diff --git a/test/dummyapps/About/ContentText.qml b/test/dummyapps/About/ContentText.qml index ec4b791..cf9be6f 100644 --- a/test/dummyapps/About/ContentText.qml +++ b/test/dummyapps/About/ContentText.qml @@ -2,7 +2,7 @@ ** ** 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/ +** http://www.qt.io/ ** ** This file is part of the examples of the Qt Enterprise Embedded. ** diff --git a/test/dummyapps/About/QtForAndroid.qml b/test/dummyapps/About/QtForAndroid.qml index c25084d..006ddd0 100644 --- a/test/dummyapps/About/QtForAndroid.qml +++ b/test/dummyapps/About/QtForAndroid.qml @@ -2,7 +2,7 @@ ** ** 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/ +** http://www.qt.io/ ** ** This file is part of the examples of the Qt Enterprise Embedded. ** diff --git a/test/dummyapps/About/QtFramework.qml b/test/dummyapps/About/QtFramework.qml index 1ec0316..59fd061 100644 --- a/test/dummyapps/About/QtFramework.qml +++ b/test/dummyapps/About/QtFramework.qml @@ -2,7 +2,7 @@ ** ** 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/ +** http://www.qt.io/ ** ** This file is part of the examples of the Qt Enterprise Embedded. ** diff --git a/test/dummyapps/About/Title.qml b/test/dummyapps/About/Title.qml index 146ce37..a8833c3 100644 --- a/test/dummyapps/About/Title.qml +++ b/test/dummyapps/About/Title.qml @@ -2,7 +2,7 @@ ** ** 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/ +** http://www.qt.io/ ** ** This file is part of the examples of the Qt Enterprise Embedded. ** diff --git a/test/dummyapps/About/main.qml b/test/dummyapps/About/main.qml index 865aca4..1ec8f19 100644 --- a/test/dummyapps/About/main.qml +++ b/test/dummyapps/About/main.qml @@ -2,7 +2,7 @@ ** ** 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/ +** http://www.qt.io/ ** ** This file is part of the examples of the Qt Enterprise Embedded. ** diff --git a/test/dummyapps/Address Book/main.qml b/test/dummyapps/Address Book/main.qml index 43ebb3d..67d138c 100644 --- a/test/dummyapps/Address Book/main.qml +++ b/test/dummyapps/Address Book/main.qml @@ -2,7 +2,7 @@ ** ** 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/ +** http://www.qt.io/ ** ** This file is part of the examples of the Qt Enterprise Embedded. ** diff --git a/test/dummyapps/Basic Application/main.qml b/test/dummyapps/Basic Application/main.qml index 8af3693..fe3c387 100644 --- a/test/dummyapps/Basic Application/main.qml +++ b/test/dummyapps/Basic Application/main.qml @@ -2,7 +2,7 @@ ** ** 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/ +** http://qt.io/ ** ** This file is part of the examples of the Qt Enterprise Embedded. ** diff --git a/test/dummyapps/Calculator/main.qml b/test/dummyapps/Calculator/main.qml index 43ebb3d..67d138c 100644 --- a/test/dummyapps/Calculator/main.qml +++ b/test/dummyapps/Calculator/main.qml @@ -2,7 +2,7 @@ ** ** 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/ +** http://www.qt.io/ ** ** This file is part of the examples of the Qt Enterprise Embedded. ** diff --git a/test/dummyapps/Calendar/main.qml b/test/dummyapps/Calendar/main.qml index 43ebb3d..67d138c 100644 --- a/test/dummyapps/Calendar/main.qml +++ b/test/dummyapps/Calendar/main.qml @@ -2,7 +2,7 @@ ** ** 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/ +** http://www.qt.io/ ** ** This file is part of the examples of the Qt Enterprise Embedded. ** diff --git a/test/dummyapps/Camera/main.qml b/test/dummyapps/Camera/main.qml index 43ebb3d..67d138c 100644 --- a/test/dummyapps/Camera/main.qml +++ b/test/dummyapps/Camera/main.qml @@ -2,7 +2,7 @@ ** ** 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/ +** http://www.qt.io/ ** ** This file is part of the examples of the Qt Enterprise Embedded. ** diff --git a/test/dummyapps/Clock/main.qml b/test/dummyapps/Clock/main.qml index 43ebb3d..67d138c 100644 --- a/test/dummyapps/Clock/main.qml +++ b/test/dummyapps/Clock/main.qml @@ -2,7 +2,7 @@ ** ** 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/ +** http://www.qt.io/ ** ** This file is part of the examples of the Qt Enterprise Embedded. ** diff --git a/test/dummyapps/Game/main.qml b/test/dummyapps/Game/main.qml index 43ebb3d..67d138c 100644 --- a/test/dummyapps/Game/main.qml +++ b/test/dummyapps/Game/main.qml @@ -2,7 +2,7 @@ ** ** 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/ +** http://www.qt.io/ ** ** This file is part of the examples of the Qt Enterprise Embedded. ** diff --git a/test/dummyapps/Music/main.qml b/test/dummyapps/Music/main.qml index 43ebb3d..67d138c 100644 --- a/test/dummyapps/Music/main.qml +++ b/test/dummyapps/Music/main.qml @@ -2,7 +2,7 @@ ** ** 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/ +** http://www.qt.io/ ** ** This file is part of the examples of the Qt Enterprise Embedded. ** diff --git a/test/dummyapps/Photo Gallery/main.qml b/test/dummyapps/Photo Gallery/main.qml index 5622eaf..7a52cb5 100644 --- a/test/dummyapps/Photo Gallery/main.qml +++ b/test/dummyapps/Photo Gallery/main.qml @@ -2,7 +2,7 @@ ** ** 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/ +** http://www.qt.io/ ** ** This file is part of the examples of the Qt Enterprise Embedded. ** diff --git a/test/dummyapps/Social/main.qml b/test/dummyapps/Social/main.qml index 43ebb3d..67d138c 100644 --- a/test/dummyapps/Social/main.qml +++ b/test/dummyapps/Social/main.qml @@ -2,7 +2,7 @@ ** ** 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/ +** http://www.qt.io/ ** ** This file is part of the examples of the Qt Enterprise Embedded. ** diff --git a/test/dummyapps/Todo List/main.qml b/test/dummyapps/Todo List/main.qml index 43ebb3d..67d138c 100644 --- a/test/dummyapps/Todo List/main.qml +++ b/test/dummyapps/Todo List/main.qml @@ -2,7 +2,7 @@ ** ** 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/ +** http://www.qt.io/ ** ** This file is part of the examples of the Qt Enterprise Embedded. ** diff --git a/test/dummyapps/Video Player/main.qml b/test/dummyapps/Video Player/main.qml index 43ebb3d..67d138c 100644 --- a/test/dummyapps/Video Player/main.qml +++ b/test/dummyapps/Video Player/main.qml @@ -2,7 +2,7 @@ ** ** 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/ +** http://www.qt.io/ ** ** This file is part of the examples of the Qt Enterprise Embedded. ** diff --git a/test/dummyapps/Web/main.qml b/test/dummyapps/Web/main.qml index 43ebb3d..67d138c 100644 --- a/test/dummyapps/Web/main.qml +++ b/test/dummyapps/Web/main.qml @@ -2,7 +2,7 @@ ** ** 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/ +** http://www.qt.io/ ** ** This file is part of the examples of the Qt Enterprise Embedded. ** |
