diff options
author | Nedim Hadzic <nedim.hadzic@pelagicore.com> | 2016-03-16 16:07:38 +0100 |
---|---|---|
committer | Nedim Hadzic <nedim.hadzic@pelagicore.com> | 2016-03-17 14:46:16 +0000 |
commit | d67ccbd19ded3a67381ae5677dabbffebc34b912 (patch) | |
tree | 81102516faf42b9e9049d1b3113f6b79e4e5f7eb | |
parent | 35ea8a27c2d16fee64a5c7bd21be217e6650dd19 (diff) |
Updated QmlLive visuals
* New logo update
* Icon updates
Task-number: QTAUTO-75
Change-Id: Icc1f2cdb36c384b85d26a7c0c1182e66ab454050
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
-rw-r--r-- | icons/appicon.icns | bin | 84380 -> 56507 bytes | |||
-rw-r--r-- | icons/appicon.ico | bin | 1150 -> 1150 bytes | |||
-rw-r--r-- | src/images/favicon.png | bin | 439 -> 392 bytes | |||
-rw-r--r-- | src/livert/error_qt5.qml | 6 | ||||
-rw-r--r-- | src/livert/error_qt5_controls.qml | 6 | ||||
-rw-r--r-- | src/livert/logo.png | bin | 13470 -> 16591 bytes | |||
-rw-r--r-- | src/runtime/qml.qrc | 2 | ||||
-rw-r--r-- | src/runtime/qmlsplash/logo_white.png | bin | 0 -> 13884 bytes | |||
-rw-r--r-- | src/runtime/qmlsplash/pelagicore-symbol-white-rgb.png | bin | 18683 -> 0 bytes | |||
-rw-r--r-- | src/runtime/qmlsplash/splash-qt5.qml | 27 |
10 files changed, 22 insertions, 19 deletions
diff --git a/icons/appicon.icns b/icons/appicon.icns Binary files differindex 036ad2e..d911934 100644 --- a/icons/appicon.icns +++ b/icons/appicon.icns diff --git a/icons/appicon.ico b/icons/appicon.ico Binary files differindex 9c6a591..c910cef 100644 --- a/icons/appicon.ico +++ b/icons/appicon.ico diff --git a/src/images/favicon.png b/src/images/favicon.png Binary files differindex 4714c88..e05c302 100644 --- a/src/images/favicon.png +++ b/src/images/favicon.png diff --git a/src/livert/error_qt5.qml b/src/livert/error_qt5.qml index 8a48a8d..dbf74d9 100644 --- a/src/livert/error_qt5.qml +++ b/src/livert/error_qt5.qml @@ -33,18 +33,20 @@ Rectangle { width: 800 height: 480 + color: palette.base + SystemPalette { id: palette; colorGroup: SystemPalette.Active } - color: palette.base Image { anchors.fill: parent; source: "logo.png" - fillMode: Image.Tile + fillMode: Image.PreserveAspectFit opacity: 0.5 } + Text { anchors.centerIn: parent text: qsTr("An error occurred - please check the Log Output pane.") diff --git a/src/livert/error_qt5_controls.qml b/src/livert/error_qt5_controls.qml index fc89ad3..6b9a6c6 100644 --- a/src/livert/error_qt5_controls.qml +++ b/src/livert/error_qt5_controls.qml @@ -34,18 +34,20 @@ Rectangle { width: 800 height: 480 + color: palette.base + SystemPalette { id: palette; colorGroup: SystemPalette.Active } - color: palette.base Image { anchors.fill: parent; source: "logo.png" - fillMode: Image.Tile + fillMode: Image.PreserveAspectFit opacity: 0.5 } + Label { anchors.fill: parent verticalAlignment: Text.AlignVCenter diff --git a/src/livert/logo.png b/src/livert/logo.png Binary files differindex 347df0e..d286933 100644 --- a/src/livert/logo.png +++ b/src/livert/logo.png diff --git a/src/runtime/qml.qrc b/src/runtime/qml.qrc index f47865a..a64995d 100644 --- a/src/runtime/qml.qrc +++ b/src/runtime/qml.qrc @@ -1,6 +1,6 @@ <RCC> <qresource prefix="/qml"> - <file>qmlsplash/pelagicore-symbol-white-rgb.png</file> + <file>qmlsplash/logo_white.png</file> <file>qmlsplash/splash-qt5.qml</file> </qresource> </RCC> diff --git a/src/runtime/qmlsplash/logo_white.png b/src/runtime/qmlsplash/logo_white.png Binary files differnew file mode 100644 index 0000000..002498c --- /dev/null +++ b/src/runtime/qmlsplash/logo_white.png diff --git a/src/runtime/qmlsplash/pelagicore-symbol-white-rgb.png b/src/runtime/qmlsplash/pelagicore-symbol-white-rgb.png Binary files differdeleted file mode 100644 index 09e7dce..0000000 --- a/src/runtime/qmlsplash/pelagicore-symbol-white-rgb.png +++ /dev/null diff --git a/src/runtime/qmlsplash/splash-qt5.qml b/src/runtime/qmlsplash/splash-qt5.qml index 6743343..686e06a 100644 --- a/src/runtime/qmlsplash/splash-qt5.qml +++ b/src/runtime/qmlsplash/splash-qt5.qml @@ -32,16 +32,17 @@ import QtQuick 2.0 Rectangle { id: root - width: 1024 - height: 768 + width: parent.width ? parent.width : 1024 + height: parent.height ? parent.height : 768 color: "#FF6600" Image { id: logo - source: "pelagicore-symbol-white-rgb.png" - x: 50 + width: 300 + source: "logo_white.png" + anchors.horizontalCenter: parent.horizontalCenter anchors.top: parent.top - anchors.topMargin: 100 + anchors.topMargin: -100 anchors.bottom: parent.bottom anchors.bottomMargin: 250 @@ -51,28 +52,26 @@ Rectangle { Text { id: mantraText + anchors.horizontalCenter: parent.horizontalCenter + anchors.top: logo.bottom + anchors.topMargin: -150 + text: "Open Source Infotainment\n Enabling Great Design" font.pixelSize: 60 color: "white" lineHeight: 1.2 - - y: logo.y - anchors.left: logo.right - anchors.leftMargin: 25 - } Text { id: qmllivetext + anchors.top: mantraText.bottom + anchors.horizontalCenter: parent.horizontalCenter + text: "QmlLive" font.pixelSize: 70 color: "white" - - x: mantraText.x - anchors.top: mantraText.bottom - anchors.margins: 200 } Text { id: pleaseConnectText |