aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Kitaev <mbg033@gmail.com>2016-09-01 23:55:30 +0300
committerIlya Kitaev <mbg033@gmail.com>2016-09-01 23:55:30 +0300
commit47063790793874b63df51a7bcbc50bbb819fd80f (patch)
tree4d8ea5b3deb29e8ddba6eddeb66a468bb659c109
parentdb965e1265dbbcfd8b2874b0ac0e8efd346322a4 (diff)
downloadmonzero-gui-47063790793874b63df51a7bcbc50bbb819fd80f.tar.gz
monzero-gui-47063790793874b63df51a7bcbc50bbb819fd80f.tar.xz
monzero-gui-47063790793874b63df51a7bcbc50bbb819fd80f.zip
Processing splash bug fixed;
Receive page: wrong reference to the wallet fixed;
-rw-r--r--components/ProcessingSplash.qml2
-rw-r--r--main.qml2
-rw-r--r--pages/Receive.qml8
3 files changed, 6 insertions, 6 deletions
diff --git a/components/ProcessingSplash.qml b/components/ProcessingSplash.qml
index f98feb3b..70384f05 100644
--- a/components/ProcessingSplash.qml
+++ b/components/ProcessingSplash.qml
@@ -34,7 +34,7 @@ import QtQuick.Layouts 1.1
Window {
id: splash
modality: Qt.ApplicationModal
- flags: Qt.SplashScreen
+ flags: Qt.Window | Qt.FramelessWindowHint
property alias message: message.text
width: 200
height: 100
diff --git a/main.qml b/main.qml
index 6d57b634..e03aec5c 100644
--- a/main.qml
+++ b/main.qml
@@ -324,7 +324,7 @@ ApplicationWindow {
function hideProcessingSplash() {
console.log("Hiding processing splash")
- splash.hide()
+ splash.close()
}
diff --git a/pages/Receive.qml b/pages/Receive.qml
index 1218ed7c..e2c1cb7f 100644
--- a/pages/Receive.qml
+++ b/pages/Receive.qml
@@ -46,11 +46,11 @@ Rectangle {
if (payment_id.length === 0) {
payment_id = appWindow.wallet.generatePaymentId()
appWindow.persistentSettings.payment_id = payment_id
- appWindow.wallet.payment_id = payment_id
+ appWindow.currentWallet.payment_id = payment_id
}
paymentIdLine.text = payment_id
- addressLine.text = appWindow.wallet.address
- integratedAddressLine.text = appWindow.wallet.integratedAddress(payment_id)
+ addressLine.text = appWindow.currentWallet.address
+ integratedAddressLine.text = appWindow.currentWallet.integratedAddress(payment_id)
}
Clipboard { id: clipboard }
@@ -168,7 +168,7 @@ Rectangle {
text: qsTr("Generate")
anchors.right: parent.right
onClicked: {
- appWindow.persistentSettings.payment_id = appWindow.wallet.generatePaymentId();
+ appWindow.persistentSettings.payment_id = appWindow.currentWallet.generatePaymentId();
updatePaymentId()
}
}