From 25aebf4e1ccd64c70e56f9d82efdc814485a6f5a Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Wed, 3 Aug 2016 15:17:10 +0200 Subject: [PATCH] new ksplash design for 5.8 --- lookandfeel/contents/splash/Splash.qml | 95 +++++++----------- .../contents/splash/images/busywidget.svgz | Bin 0 -> 2139 bytes lookandfeel/contents/splash/images/kde.svgz | Bin 1884 -> 1886 bytes 3 files changed, 38 insertions(+), 57 deletions(-) create mode 100644 lookandfeel/contents/splash/images/busywidget.svgz 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 0000000000000000000000000000000000000000..b7c70377972b8857b54a98a41a65baff6d41e78e GIT binary patch literal 2139 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