Integrated file selection dialogue with the main code. Improved the

[openvpnui.git] / src / OpenVPNUI.cpp

diff --git a/src/OpenVPNUI.cpp b/src/OpenVPNUI.cpp
index 40e28ef..2df2800 100644 (file)
--- a/src/OpenVPNUI.cpp
+++ b/src/OpenVPNUI.cpp
@@ -38,9 +38,17 @@
 
 #include <sailfishapp.h>
 #include "vpncontrol.h"
+#include "filemodel.h"
+#include "fileinfo.h"
+#include "searchengine.h"
+#include "engine.h"
 
 int main(int argc, char *argv[])
 {
+    qmlRegisterType<FileModel>("harbour.file.browser.FileModel", 1, 0, "FileModel");
+    qmlRegisterType<FileInfo>("harbour.file.browser.FileInfo", 1, 0, "FileInfo");
+    qmlRegisterType<SearchEngine>("harbour.file.browser.SearchEngine", 1, 0, "SearchEngine");
+
     int result;
 
     setuid(0);
@@ -72,12 +80,16 @@ int main(int argc, char *argv[])
     view->rootContext()->setContextProperty("VpnControl", vpnControl);
 
     vpnControl->initialise();
-    //QObject * page = view->findChild(QString("page"),Qt::FindChildrenRecursively);
 
-    //QObject::connect(vpnControl, SIGNAL(statusChanged(int)), page, SLOT(updateStatus(int)));
+    // QML global engine object
+    QScopedPointer<Engine> engine(new Engine);
+    view->rootContext()->setContextProperty("engine", engine.data());
+    // Store pointer to engine to access it in any class
+    QVariant engineVariant = qVariantFromValue(engine.data());
+    qApp->setProperty("engine", engineVariant);
 
+    // Run the application loop
     view->show();
-
     result = app->exec();
 
     delete vpnControl;