diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-11-17 16:59:17 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-11-17 16:59:17 +0200 |
| commit | 5d03bb92dc1eb84dffbb61d229dd76cc8946a7b9 (patch) | |
| tree | 426d605a368fa392c9457d7e90ea25be778da076 | |
| parent | 14c89776f3bffc62e36f1823a6f2c896dfd7cb88 (diff) | |
| parent | efb3c75cd3ff6487b612043e5d0b2e00b694db91 (diff) | |
| download | monzero-gui-5d03bb92dc1eb84dffbb61d229dd76cc8946a7b9.tar.gz monzero-gui-5d03bb92dc1eb84dffbb61d229dd76cc8946a7b9.tar.xz monzero-gui-5d03bb92dc1eb84dffbb61d229dd76cc8946a7b9.zip | |
Merge pull request #163
efb3c75 splash: add option to close popup (Jacob Brydolf)
faeb9bb progress splash: ensure correct message is shown (Jacob Brydolf)
| -rw-r--r-- | components/ProcessingSplash.qml | 2 | ||||
| -rw-r--r-- | main.qml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/components/ProcessingSplash.qml b/components/ProcessingSplash.qml index 42312f42..d8dc0e84 100644 --- a/components/ProcessingSplash.qml +++ b/components/ProcessingSplash.qml @@ -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 @@ -199,7 +199,7 @@ ApplicationWindow { function connectWallet(wallet) { - showProcessingSplash() + showProcessingSplash("Please wait...") currentWallet = wallet // Disconnect before connecting |