monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-23 12:09:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Processing splash bug fixed;

Browse source 
Receive page: wrong reference to the wallet fixed;
This commit is contained in:
Ilya Kitaev 2016-09-01 23:55:30 +03:00
parent db965e1265
commit 4706379079
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/ProcessingSplash.qml
View file

@ -34,7 +34,7 @@ import QtQuick.Layouts 1.1
Window { Window {
id: splash id: splash
modality: Qt.ApplicationModal modality: Qt.ApplicationModal
flags: Qt.SplashScreen flags: Qt.Window | Qt.FramelessWindowHint
property alias message: message.text property alias message: message.text
width: 200 width: 200
height: 100 height: 100

2
main.qml
View file

@ -324,7 +324,7 @@ ApplicationWindow {
function hideProcessingSplash() { function hideProcessingSplash() {
console.log("Hiding processing splash") console.log("Hiding processing splash")
splash.hide() splash.close()
} }

8
pages/Receive.qml
View file

@ -46,11 +46,11 @@ Rectangle {
if (payment_id.length === 0) { if (payment_id.length === 0) {
payment_id = appWindow.wallet.generatePaymentId() payment_id = appWindow.wallet.generatePaymentId()
appWindow.persistentSettings.payment_id = payment_id appWindow.persistentSettings.payment_id = payment_id
appWindow.wallet.payment_id = payment_id appWindow.currentWallet.payment_id = payment_id
} }
paymentIdLine.text = payment_id paymentIdLine.text = payment_id
addressLine.text = appWindow.wallet.address addressLine.text = appWindow.currentWallet.address
integratedAddressLine.text = appWindow.wallet.integratedAddress(payment_id) integratedAddressLine.text = appWindow.currentWallet.integratedAddress(payment_id)
} }
Clipboard { id: clipboard } Clipboard { id: clipboard }
@ -168,7 +168,7 @@ Rectangle {
text: qsTr("Generate") text: qsTr("Generate")
anchors.right: parent.right anchors.right: parent.right
onClicked: { onClicked: {
appWindow.persistentSettings.payment_id = appWindow.wallet.generatePaymentId(); appWindow.persistentSettings.payment_id = appWindow.currentWallet.generatePaymentId();
updatePaymentId() updatePaymentId()
} }
} }