diff options
| author | Samuli Piippo <samuli.piippo@digia.com> | 2014-10-02 10:42:00 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@digia.com> | 2014-10-07 08:43:19 +0300 |
| commit | a8cb750ef7c4975dcff4d911b6e0a8ff9d975d91 (patch) | |
| tree | 5961b061992421591b3fb969e3d0982735309835 | |
| parent | a1a303d5a741bf5a99cdb9cbc4d33ba526f8fbe6 (diff) | |
Update Qt logos
New Qt logos, no update available for the "Code less" image.
Adjusted some of the scaling etc. values to look good with
different size images.
Task-number: QTEE-777
Change-Id: I0f8a6f2ec1d840c4346b5a49062a304194fa0809
Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
| -rw-r--r-- | qml/BootScreen.qml | 5 | ||||
| -rw-r--r-- | qml/GlimmeringQtLogo.qml | 2 | ||||
| -rw-r--r-- | qml/LaunchScreen.qml | 2 | ||||
| -rw-r--r-- | qml/images/qt-logo-green-mask.png | bin | 5982 -> 18794 bytes | |||
| -rw-r--r-- | qml/images/qt-logo-small.png | bin | 3862 -> 0 bytes | |||
| -rw-r--r-- | qml/images/qt-logo-white-mask.png | bin | 14353 -> 6775 bytes | |||
| -rw-r--r-- | qml/images/qt-logo.png | bin | 21659 -> 5883 bytes | |||
| -rw-r--r-- | resources.qrc | 1 |
8 files changed, 6 insertions, 4 deletions
diff --git a/qml/BootScreen.qml b/qml/BootScreen.qml index 37e5690..49b76bd 100644 --- a/qml/BootScreen.qml +++ b/qml/BootScreen.qml @@ -56,6 +56,9 @@ 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; @@ -70,7 +73,7 @@ Item { id: label anchors.centerIn: parent - anchors.verticalCenterOffset: -root.size * 0.1 + logo.height / 2 + 20 + anchors.verticalCenterOffset: -root.size * 0.1 + logo.width; font.pixelSize: size * 0.04 color: "white" diff --git a/qml/GlimmeringQtLogo.qml b/qml/GlimmeringQtLogo.qml index 2e82be6..567a445 100644 --- a/qml/GlimmeringQtLogo.qml +++ b/qml/GlimmeringQtLogo.qml @@ -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/LaunchScreen.qml b/qml/LaunchScreen.qml index 6d4fea7..104ed68 100644 --- a/qml/LaunchScreen.qml +++ b/qml/LaunchScreen.qml @@ -132,7 +132,7 @@ Item { id: logo anchors.bottom: parent.bottom anchors.right: parent.right - anchors.margins: width / 4; + anchors.margins: width / 3; } } 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/resources.qrc b/resources.qrc index 56201c4..32918a0 100644 --- a/resources.qrc +++ b/resources.qrc @@ -9,7 +9,6 @@ <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> |
