diff --git a/components/ProcessingSplash.qml b/components/ProcessingSplash.qml
index 9211fa02..7cf7a567 100644
--- a/components/ProcessingSplash.qml
+++ b/components/ProcessingSplash.qml
@@ -29,21 +29,23 @@
import QtQuick 2.9
import QtQuick.Window 2.1
import QtQuick.Controls 1.4
+import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.1
import "../components" as MoneroComponents
Rectangle {
id: root
- color: MoneroComponents.Style.blackTheme ? "white" : "transparent"
+ color: MoneroComponents.Style.blackTheme ? "black" : "white"
visible: false
+ radius: 10
+ border.color: MoneroComponents.Style.blackTheme ? Qt.rgba(255, 255, 255, 0.25) : Qt.rgba(0, 0, 0, 0.25)
+ border.width: 1
z: 11
property alias messageText: messageTitle.text
- property alias heightProgressText : heightProgress.text
- width: 200
- height: 100
- opacity: 0.7
+ width: 100
+ height: 50
function show() {
root.visible = true;
@@ -56,44 +58,55 @@ Rectangle {
ColumnLayout {
id: rootLayout
- anchors.left: parent.left
- anchors.right: parent.right
- anchors.verticalCenter: parent.verticalCenter
+ anchors.centerIn: parent
anchors.leftMargin: 30
anchors.rightMargin: 30
- spacing: 12
+ spacing: 21
- BusyIndicator {
- running: parent.visible
+ Item {
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
+ Layout.preferredHeight: 80
+
+ Image {
+ id: imgLogo
+ width: 60
+ height: 60
+ anchors.centerIn: parent
+ source: "qrc:///images/monero-vector.svg"
+ mipmap: true
+ }
+
+ BusyIndicator {
+ running: parent.visible
+ anchors.centerIn: imgLogo
+ style: BusyIndicatorStyle {
+ indicator: Image {
+ visible: control.running
+ source: "qrc:///images/busy-indicator.png"
+ RotationAnimator on rotation {
+ running: control.running
+ loops: Animation.Infinite
+ duration: 1000
+ from: 0
+ to: 360
+ }
+ }
+ }
+ }
}
+
MoneroComponents.TextPlain {
id: messageTitle
- text: "Please wait..."
- font {
- pixelSize: 22
- }
+ text: qsTr("Please wait...") + translationManager.emptyString
+ font.pixelSize: 24
horizontalAlignment: Text.AlignHCenter
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
Layout.fillWidth: true
themeTransition: false
- color: "black"
- }
-
-
- MoneroComponents.TextPlain {
- id: heightProgress
- font {
- pixelSize: 18
- }
- horizontalAlignment: Text.AlignHCenter
- Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
- Layout.fillWidth: true
- themeTransition: false
- color: "black"
+ color: MoneroComponents.Style.defaultFontColor
}
}
}
diff --git a/images/busy-indicator.png b/images/busy-indicator.png
new file mode 100644
index 00000000..04e83208
Binary files /dev/null and b/images/busy-indicator.png differ
diff --git a/images/busy-indicator@2x.png b/images/busy-indicator@2x.png
new file mode 100644
index 00000000..525ae52f
Binary files /dev/null and b/images/busy-indicator@2x.png differ
diff --git a/images/monero-vector.svg b/images/monero-vector.svg
new file mode 100644
index 00000000..4ebe7da6
--- /dev/null
+++ b/images/monero-vector.svg
@@ -0,0 +1,2 @@
+
+
diff --git a/main.qml b/main.qml
index 31c531eb..5c7b62c9 100644
--- a/main.qml
+++ b/main.qml
@@ -1076,7 +1076,6 @@ ApplicationWindow {
console.log("Displaying processing splash")
if (typeof message != 'undefined') {
splash.messageText = message
- splash.heightProgressText = ""
}
leftPanel.enabled = false;
@@ -1566,8 +1565,8 @@ ApplicationWindow {
ProcessingSplash {
id: splash
- width: appWindow.width / 1.5
- height: appWindow.height / 2
+ width: appWindow.width / 2
+ height: appWindow.height / 2.66
x: (appWindow.width - width) / 2
y: (appWindow.height - height) / 2
messageText: qsTr("Please wait...") + translationManager.emptyString
diff --git a/qml.qrc b/qml.qrc
index d4feefde..28597b8d 100644
--- a/qml.qrc
+++ b/qml.qrc
@@ -26,6 +26,7 @@
components/TipItem.qml
images/tip.png
components/MenuButtonDivider.qml
+ images/monero-vector.svg
components/StandardDropdown.qml
images/whiteDropIndicator.png
images/whiteDropIndicator@2x.png
@@ -237,5 +238,7 @@
images/arrow-right-in-circle-outline-medium-white.svg
images/tails-grey.png
components/AdvancedOptionsItem.qml
+ images/busy-indicator.png
+ images/busy-indicator@2x.png