monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-03-23 07:38:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #9

Browse source 
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)
This commit is contained in:
Riccardo Spagni 2016-09-01 23:32:09 +02:00
commit a3fa1913a6
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
5 changed files with 9 additions and 10 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

4
get_libwallet_api.sh
View file

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
BITMONERO_URL=https://github.com/mbg033/bitmonero.git BITMONERO_URL=https://github.com/monero-project/bitmonero.git
BITMONERO_BRANCH=develop BITMONERO_BRANCH=master
# thanks to SO: http://stackoverflow.com/a/20283965/4118915 # thanks to SO: http://stackoverflow.com/a/20283965/4118915
CPU_CORE_COUNT=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || sysctl -n hw.ncpu) CPU_CORE_COUNT=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || sysctl -n hw.ncpu)
pushd $(pwd) pushd $(pwd)

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

3
monero-core.pro
View file

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

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