diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-09-01 23:32:09 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-09-01 23:32:09 +0200 |
| commit | a3fa1913a61689d4ce5dc713ab0c49df2b0ebd4e (patch) | |
| tree | 72414add3bf4801d76303fc4ae4bc8ed7d839cc7 | |
| parent | 40e8077bb5032081e6be1a7386dc02eedc54f761 (diff) | |
| parent | c706040f64acda4a77ed64d4c6c1c5f221a2116e (diff) | |
| download | monzero-gui-a3fa1913a61689d4ce5dc713ab0c49df2b0ebd4e.tar.gz monzero-gui-a3fa1913a61689d4ce5dc713ab0c49df2b0ebd4e.tar.xz monzero-gui-a3fa1913a61689d4ce5dc713ab0c49df2b0ebd4e.zip | |
Merge pull request #9
0455502 bitmonero comes from monero-project's repo (Ilya Kitaev)
4706379 Processing splash bug fixed; Receive page: wrong reference to the wallet fixed; (Ilya Kitaev)
db965e1 changes due updates in bitmonero (Ilya Kitaev)
| -rw-r--r-- | components/ProcessingSplash.qml | 2 | ||||
| -rwxr-xr-x | get_libwallet_api.sh | 4 | ||||
| -rw-r--r-- | main.qml | 2 | ||||
| -rw-r--r-- | monero-core.pro | 3 | ||||
| -rw-r--r-- | pages/Receive.qml | 8 |
5 files changed, 9 insertions, 10 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/get_libwallet_api.sh b/get_libwallet_api.sh index bbfdb04c..ffc75091 100755 --- a/get_libwallet_api.sh +++ b/get_libwallet_api.sh @@ -1,8 +1,8 @@ #!/bin/bash -BITMONERO_URL=https://github.com/mbg033/bitmonero.git -BITMONERO_BRANCH=develop +BITMONERO_URL=https://github.com/monero-project/bitmonero.git +BITMONERO_BRANCH=master # thanks to SO: http://stackoverflow.com/a/20283965/4118915 CPU_CORE_COUNT=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || sysctl -n hw.ncpu) pushd $(pwd) @@ -324,7 +324,7 @@ ApplicationWindow { function hideProcessingSplash() { console.log("Hiding processing splash") - splash.hide() + splash.close() } diff --git a/monero-core.pro b/monero-core.pro index 2dde61fe..4b2bbf25 100644 --- a/monero-core.pro +++ b/monero-core.pro @@ -45,8 +45,7 @@ SOURCES = *.qml \ } LIBS += -L$$WALLET_ROOT/lib \ - -lwallet_merged \ - -lwallet_merged2 + -lwallet_merged win32 { #QMAKE_LFLAGS += -static 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() } } |