aboutsummaryrefslogtreecommitdiff
path: root/main.cpp
diff options
context:
space:
mode:
authorJaquee <jaquee.monero@gmail.com>2017-03-01 22:03:50 +0100
committerJaquee <jaquee.monero@gmail.com>2017-03-03 15:40:42 +0100
commitbce496b8d13c6a303d8e20ffbf2497cf9e532430 (patch)
tree6fbcfddd78d4ac3f7abed58042dedadcf33351e5 /main.cpp
parent988e2992907459bdba5d421a88e28760eb205557 (diff)
downloadmonzero-gui-bce496b8d13c6a303d8e20ffbf2497cf9e532430.tar.gz
monzero-gui-bce496b8d13c6a303d8e20ffbf2497cf9e532430.tar.xz
monzero-gui-bce496b8d13c6a303d8e20ffbf2497cf9e532430.zip
confirm daemon running on exit
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/main.cpp b/main.cpp
index 53ab4752..ed0da185 100644
--- a/main.cpp
+++ b/main.cpp
@@ -50,6 +50,7 @@
#include "AddressBook.h"
#include "model/AddressBookModel.h"
#include "wallet/wallet2_api.h"
+#include "MainApp.h"
// IOS exclusions
#ifndef Q_OS_IOS
@@ -74,7 +75,7 @@ int main(int argc, char *argv[])
Monero::Wallet::init(argv[0], "monero-wallet-gui");
qInstallMessageHandler(messageHandler);
- QApplication app(argc, argv);
+ MainApp app(argc, argv);
qDebug() << "app startd";
@@ -146,6 +147,8 @@ int main(int argc, char *argv[])
engine.addImageProvider(QLatin1String("qrcode"), new QRCodeImageProvider());
const QStringList arguments = QCoreApplication::arguments();
+ engine.rootContext()->setContextProperty("mainApp", &app);
+
// Exclude daemon manager from IOS
#ifndef Q_OS_IOS
DaemonManager * daemonManager = DaemonManager::instance(&arguments);
@@ -210,4 +213,3 @@ int main(int argc, char *argv[])
return app.exec();
}
-