Merge pull request #163

efb3c75 splash: add option to close popup (Jacob Brydolf)
faeb9bb progress splash: ensure correct message is shown (Jacob Brydolf)
This commit is contained in:
Riccardo Spagni 2016-11-17 16:59:17 +02:00
commit 5d03bb92dc
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 2 additions and 2 deletions

View file

@ -34,7 +34,7 @@ import QtQuick.Layouts 1.1
Window {
id: root
modality: Qt.ApplicationModal
flags: Qt.Window | Qt.FramelessWindowHint
flags: Qt.Window
property alias messageText: messageTitle.text
property alias heightProgressText : heightProgress.text

View file

@ -199,7 +199,7 @@ ApplicationWindow {
function connectWallet(wallet) {
showProcessingSplash()
showProcessingSplash("Please wait...")
currentWallet = wallet
// Disconnect before connecting