aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--components/ProcessingSplash.qml67
-rw-r--r--images/busy-indicator.pngbin0 -> 2745 bytes
-rw-r--r--images/busy-indicator@2x.pngbin0 -> 7449 bytes
-rw-r--r--images/monero-vector.svg2
-rw-r--r--main.qml5
-rw-r--r--qml.qrc3
6 files changed, 47 insertions, 30 deletions
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
- MoneroComponents.TextPlain {
- id: messageTitle
- text: "Please wait..."
- font {
- pixelSize: 22
+ 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
+ }
+ }
+ }
}
- horizontalAlignment: Text.AlignHCenter
- Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
- Layout.fillWidth: true
- themeTransition: false
- color: "black"
}
MoneroComponents.TextPlain {
- id: heightProgress
- font {
- pixelSize: 18
- }
+ id: messageTitle
+ 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"
+ color: MoneroComponents.Style.defaultFontColor
}
}
}
diff --git a/images/busy-indicator.png b/images/busy-indicator.png
new file mode 100644
index 00000000..04e83208
--- /dev/null
+++ b/images/busy-indicator.png
Binary files differ
diff --git a/images/busy-indicator@2x.png b/images/busy-indicator@2x.png
new file mode 100644
index 00000000..525ae52f
--- /dev/null
+++ b/images/busy-indicator@2x.png
Binary files 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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 6000 6000" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"><metadata><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/></cc:Work></rdf:RDF></metadata><defs><clipPath id="a"><path d="m0 4500h4500v-4500h-4500z"/></clipPath></defs><g transform="matrix(1.3333 0 0 -1.3333 0 6e3)"><g clip-path="url(#a)"><g transform="translate(4128 2250.2)"><path d="m0 0c0-1037.2-840.79-1878.1-1878.1-1878.1-1037.2 0-1878 840.88-1878 1878.1 0 1037.3 840.8 1878.1 1878 1878.1 1037.3 0 1878.1-840.79 1878.1-1878.1" fill="#fff"/></g><g transform="translate(2250 4128.2)"><path d="m0 0c-1036.9 0-1879.1-842.06-1877.8-1878 0.262-207.26 33.308-406.63 95.342-593.12h561.88v1579.9l1220.6-1220.6 1220.6 1220.6v-1579.9h561.96c62.117 186.48 95.008 385.85 95.369 593.12 1.809 1037-840.89 1877.8-1877.9 1877.8z" fill="#f36e36"/></g><g transform="translate(1969.3 1735.8)"><path d="m0 0-532.67 532.7v-994.14h-407.26l-384.29-0.07c329.63-540.8 925.35-902.56 1604.9-902.56 679.54 0 1275.3 361.85 1605 902.65l-384.44-0.013h-407.27v994.14l-813.3-813.31-280.62 280.61z" fill="#575757"/></g></g></g></svg>
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 @@
<file>components/TipItem.qml</file>
<file>images/tip.png</file>
<file>components/MenuButtonDivider.qml</file>
+ <file>images/monero-vector.svg</file>
<file>components/StandardDropdown.qml</file>
<file>images/whiteDropIndicator.png</file>
<file>images/whiteDropIndicator@2x.png</file>
@@ -237,5 +238,7 @@
<file>images/arrow-right-in-circle-outline-medium-white.svg</file>
<file>images/tails-grey.png</file>
<file>components/AdvancedOptionsItem.qml</file>
+ <file>images/busy-indicator.png</file>
+ <file>images/busy-indicator@2x.png</file>
</qresource>
</RCC>
generated by cgit v1.2.3 (git 2.51.0) at 2026-08-16 00:36:48 +0000