From 21b44bcf66ceedcfa1d37cbacd4e5134ec19d203 Mon Sep 17 00:00:00 2001 From: miruka Date: Wed, 28 Aug 2019 13:50:29 -0400 Subject: [PATCH] Add animated icon to ImportingKeys box --- TODO.md | 4 +--- src/qml/Pages/EditAccount/ImportingKeys.qml | 24 +++++++++++++++++++-- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/TODO.md b/TODO.md index db519683..d41786c9 100644 --- a/TODO.md +++ b/TODO.md @@ -1,5 +1,3 @@ -rename hinterfacebox -translated arg for avatar upload and login - Refactoring - Banners @@ -33,7 +31,6 @@ translated arg for avatar upload and login - Terrible performance using `QT_QPA_PLATFORM=wayland-egl`, must use `xcb` - UI - - HProgressBar - Choose a better default easing type for animations - Make invite icon blink if there's no one but ourself in the room, but never do it again once the user hovered it long enough to show tooltip @@ -122,6 +119,7 @@ translated arg for avatar upload and login - Links preview - Client improvements + - `translated` arg for avatar upload and login errors - Check if username exists on login screen - `pyotherside.atexit()` - Logout previous session if adding an account that's already connected diff --git a/src/qml/Pages/EditAccount/ImportingKeys.qml b/src/qml/Pages/EditAccount/ImportingKeys.qml index 4eac8caf..b933395f 100644 --- a/src/qml/Pages/EditAccount/ImportingKeys.qml +++ b/src/qml/Pages/EditAccount/ImportingKeys.qml @@ -5,13 +5,34 @@ import "../../Base" import "../../utils.js" as Utils HColumnLayout { + readonly property int progress: accountInfo.importing_key + + onProgressChanged: iconAnimation.restart() + + HRowLayout { + HIcon { + id: icon + svgName: "import-keys" + + Layout.margins: currentSpacing + + SequentialAnimation { + id: iconAnimation + + HNumberAnimation { target: icon; property: "opacity"; to: 0.6 } + HNumberAnimation { target: icon; property: "opacity"; to: 1 } + } + } + HLabel { text: qsTr("Importing decryption keys...") elide: Text.ElideRight Layout.fillWidth: true Layout.margins: currentSpacing + Layout.leftMargin: 0 + Layout.rightMargin: 0 } HLabel { @@ -19,14 +40,13 @@ HColumnLayout { .arg(Math.ceil(progressBar.value)).arg(progressBar.to) Layout.margins: currentSpacing - Layout.leftMargin: 0 } } ProgressBar { id: progressBar from: 0 - value: accountInfo.importing_key + value: progress to: accountInfo.total_keys_to_import Behavior on value { HNumberAnimation { factor: 5 } }