diff --git a/lookandfeel/contents/splash/Splash.qml b/lookandfeel/contents/splash/Splash.qml index 02b2a0764..f0cb93c38 100644 --- a/lookandfeel/contents/splash/Splash.qml +++ b/lookandfeel/contents/splash/Splash.qml @@ -19,84 +19,65 @@ import QtQuick 2.5 -Image { +Rectangle { id: root - source: "../components/artwork/background.png" - fillMode: Image.PreserveAspectCrop + color: "black" property int stage onStageChanged: { - if (stage == 1) { - introAnimation.running = true + if (stage == 2) { + introAnimation.running = true; + } else if (stage == 5) { + introAnimation.target = busyIndicator; + introAnimation.from = 1; + introAnimation.to = 0; + introAnimation.running = true; } } + TextMetrics { id: units text: "M" property int gridUnit: boundingRect.height } - Rectangle { - id: topRect - width: parent.width - height: units.gridUnit * 14 + Column { + id: content + opacity: 0 anchors.centerIn: parent - color: "#4C000000" - Column { - id: content - y: units.gridUnit - x: parent.width - Image { - anchors.horizontalCenter: parent.horizontalCenter - source: "images/kde.svgz" - sourceSize.height: units.gridUnit * 8 - sourceSize.width: units.gridUnit * 8 - } - Item { - width: 1 - height: Math.round(units.gridUnit * 3 - progressBar.height/2) - } - Rectangle { - id: progressBar - radius: height - color: "#31363b" - height: Math.round(units.gridUnit/2) - width: height*32 - Rectangle { - radius: 3 - anchors { - left: parent.left - top: parent.top - bottom: parent.bottom - } - width: (parent.width / 6) * (stage - 1) - color: "#3daee9" - Behavior on width { - PropertyAnimation { - duration: 250 - easing.type: Easing.InOutQuad - } - } - } - } + Image { + anchors.horizontalCenter: parent.horizontalCenter + source: "images/kde.svgz" + sourceSize.height: units.gridUnit * 8 + sourceSize.width: units.gridUnit * 8 } - Rectangle { - id: separator - height: 1 - color: "#fdfdfd" - width: parent.width - opacity: 0.4 - y: parent.height - units.gridUnit * 4 + Item { + width: 1 + height: root.height / 3 + } + Image { + anchors.horizontalCenter: parent.horizontalCenter + source: "images/busywidget.svgz" + sourceSize.height: units.gridUnit * 3 + sourceSize.width: units.gridUnit * 3 + RotationAnimator on rotation { + id: rotationAnimator + from: 0 + to: 360 + duration: 1500 + loops: Animation.Infinite + } } } - XAnimator { + + OpacityAnimator { id: introAnimation running: false target: content - from: root.width - to: root.width / 2 - content.width/2 + from: 0 + to: 1 duration: 1000 easing.type: Easing.InOutQuad } diff --git a/lookandfeel/contents/splash/images/busywidget.svgz b/lookandfeel/contents/splash/images/busywidget.svgz new file mode 100644 index 000000000..b7c703779 Binary files /dev/null and b/lookandfeel/contents/splash/images/busywidget.svgz differ diff --git a/lookandfeel/contents/splash/images/kde.svgz b/lookandfeel/contents/splash/images/kde.svgz index d5da186b2..ec9d028bd 100644 Binary files a/lookandfeel/contents/splash/images/kde.svgz and b/lookandfeel/contents/splash/images/kde.svgz differ