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)

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

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)

main.qml

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

monero-core.pro

@@ -45,8 +45,7 @@ SOURCES = *.qml \
 }
 
 LIBS += -L$$WALLET_ROOT/lib \
-        -lwallet_merged \
-        -lwallet_merged2
+        -lwallet_merged 
 
 win32 {
     #QMAKE_LFLAGS += -static

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()
                 }
             }