Merge pull request #515

01e735c move OK button to the right in confirm exit dialog (Jaquee)
bce496b confirm daemon running on exit (Jaquee)

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