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-20 22:28:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #163

Browse source 
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
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: root id: root
modality: Qt.ApplicationModal modality: Qt.ApplicationModal
flags: Qt.Window | Qt.FramelessWindowHint flags: Qt.Window
property alias messageText: messageTitle.text property alias messageText: messageTitle.text
property alias heightProgressText : heightProgress.text property alias heightProgressText : heightProgress.text

2
main.qml
View file

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