From db965e1265dbbcfd8b2874b0ac0e8efd346322a4 Mon Sep 17 00:00:00 2001 From: Ilya Kitaev Date: Thu, 1 Sep 2016 23:22:06 +0300 Subject: [PATCH 1/3] changes due updates in bitmonero --- get_libwallet_api.sh | 2 +- monero-core.pro | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/get_libwallet_api.sh b/get_libwallet_api.sh index bbfdb04c..414b1f90 100755 --- a/get_libwallet_api.sh +++ b/get_libwallet_api.sh @@ -2,7 +2,7 @@ BITMONERO_URL=https://github.com/mbg033/bitmonero.git -BITMONERO_BRANCH=develop +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) 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 From 47063790793874b63df51a7bcbc50bbb819fd80f Mon Sep 17 00:00:00 2001 From: Ilya Kitaev Date: Thu, 1 Sep 2016 23:55:30 +0300 Subject: [PATCH 2/3] Processing splash bug fixed; Receive page: wrong reference to the wallet fixed; --- components/ProcessingSplash.qml | 2 +- main.qml | 2 +- pages/Receive.qml | 8 ++++---- 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() } } From 0455502ffb203ca495da44e687e2fc260820d577 Mon Sep 17 00:00:00 2001 From: Ilya Kitaev Date: Fri, 2 Sep 2016 00:10:21 +0300 Subject: [PATCH 3/3] bitmonero comes from monero-project's repo --- get_libwallet_api.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/get_libwallet_api.sh b/get_libwallet_api.sh index 414b1f90..ffc75091 100755 --- a/get_libwallet_api.sh +++ b/get_libwallet_api.sh @@ -1,7 +1,7 @@ #!/bin/bash -BITMONERO_URL=https://github.com/mbg033/bitmonero.git +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)