X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=app%2Fmain.cpp;h=f44dd729024e390363d4388a0cf2ee4c26e22fac;hb=655ff6ee28103ec2373953dc60b75b2db0de0014;hp=7722a0a28b516656c09243b1906fe7ee2f9140bf;hpb=101b535c71b6055bb35884b606e4a978d2ce2599;p=apps%2Fhvac.git

diff --git a/app/main.cpp b/app/main.cpp
index 7722a0a..f44dd72 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -20,23 +20,26 @@
 #include <QtGui/QGuiApplication>
 #include <QtQml/QQmlApplicationEngine>
 #include <QtQml/QQmlContext>
-#include <QtQuickControls2/QQuickStyle>
-#include <QQuickWindow>
-#include <libhomescreen.hpp>
-#include "qlibwindowmanager.h"
+#include <QtQuick/QQuickWindow>
+
+#include "translator.h"
+
+#ifdef HAVE_QLIBHOMESCREEN
+#include <qlibhomescreen.h>
+#endif
+#ifdef HAVE_QLIBWINDOWMANAGER
+#include <qlibwindowmanager.h>
+#endif
 
 int main(int argc, char *argv[])
 {
-    std::string myname = std::string("HVAC");
+    QString myname = QString("HVAC");
 
     QGuiApplication app(argc, argv);
-    app.setApplicationName(myname.c_str());
     app.setApplicationVersion(QStringLiteral("0.1.0"));
     app.setOrganizationDomain(QStringLiteral("automotivelinux.org"));
     app.setOrganizationName(QStringLiteral("AutomotiveGradeLinux"));
 
-    QQuickStyle::setStyle("AGL");
-
     QCommandLineParser parser;
     parser.addPositionalArgument("port", app.translate("main", "port for binding"));
     parser.addPositionalArgument("secret", app.translate("main", "secret for binding"));
@@ -45,11 +48,17 @@ int main(int argc, char *argv[])
     parser.process(app);
     QStringList positionalArguments = parser.positionalArguments();
 
+    qmlRegisterType<Translator>("Translator", 1, 0, "Translator");
+
     QQmlApplicationEngine engine;
+    QQmlContext *context = engine.rootContext();
+    QUrl bindingAddress;
+
+    int port;
+    QString secret;
     if (positionalArguments.length() == 2) {
-        int port = positionalArguments.takeFirst().toInt();
-        QString secret = positionalArguments.takeFirst();
-        QUrl bindingAddress;
+        port = positionalArguments.takeFirst().toInt();
+        secret = positionalArguments.takeFirst();
         bindingAddress.setScheme(QStringLiteral("ws"));
         bindingAddress.setHost(QStringLiteral("localhost"));
         bindingAddress.setPort(port);
@@ -57,51 +66,51 @@ int main(int argc, char *argv[])
         QUrlQuery query;
         query.addQueryItem(QStringLiteral("token"), secret);
         bindingAddress.setQuery(query);
-        QQmlContext *context = engine.rootContext();
-        context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress);
+    }
+    context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress);
+#ifdef HAVE_QLIBWINDOWMANAGER
+    QLibWindowmanager* qwm = new QLibWindowmanager();
 
-        std::string token = secret.toStdString();
-        LibHomeScreen* hs = new LibHomeScreen();
-        QLibWindowmanager* qwm = new QLibWindowmanager();
+    // WindowManager
+    if(qwm->init(port,secret) != 0){
+        exit(EXIT_FAILURE);
+    }
+    AGLScreenInfo screenInfo(qwm->get_scale_factor());
+    engine.rootContext()->setContextProperty(QStringLiteral("screenInfo"), &screenInfo);
+    // Request a surface as described in layers.json windowmanager’s file
+    if (qwm->requestSurface(myname) != 0) {
+        exit(EXIT_FAILURE);
+    }
+    // Create an event callbnewack against an event type. Here a lambda is called when SyncDraw event occurs
+    qwm->set_event_handler(QLibWindowmanager::Event_SyncDraw, [qwm, myname](json_object *object) {
+        fprintf(stderr, "Surface got syncDraw!\n");
+        qwm->endDraw(myname);
+    });
+#endif
 
-        // WindowManager
-        if(qwm->init(port,secret) != 0){
-            exit(EXIT_FAILURE);
-        }
-        // Request a surface as described in layers.json windowmanager’s file
-        if (qwm->requestSurface(json_object_new_string(myname.c_str())) != 0) {
-            exit(EXIT_FAILURE);
-        }
-        // Create an event callback against an event type. Here a lambda is called when SyncDraw event occurs
-        qwm->set_event_handler(QLibWindowmanager::Event_SyncDraw, [qwm, myname](json_object *object) {
-            fprintf(stderr, "Surface got syncDraw!\n");
-            qwm->endDraw(json_object_new_string(myname.c_str()));
-        });
+#ifdef HAVE_QLIBHOMESCREEN
+    QLibHomeScreen* qhs = new QLibHomeScreen();
 
-        // HomeScreen
-        hs->init(port, token.c_str());
-        // Set the event handler for Event_TapShortcut which will activate the surface for windowmanager
-        hs->set_event_handler(LibHomeScreen::Event_TapShortcut, [qwm, myname](json_object *object){
-            qDebug("object %s", json_object_to_json_string(object));
-            json_object *appnameJ = nullptr;
-            if(json_object_object_get_ex(object, "application_name", &appnameJ))
-            {
-                const char *appname = json_object_get_string(appnameJ);
-                qDebug("appnameJ %s", json_object_to_json_string(appnameJ));
-                if(myname == appname)
-                {
-                    qDebug("Surface %s got tapShortcut\n", appname);
-                    qwm->activateSurface(json_object_new_string(myname.c_str()));
-                }
-            }
-        });
+    // HomeScreen
+    std::string token = secret.toStdString();
+    qhs->init(port, token.c_str());
+    // Set the event handler for Event_TapShortcut which will activate the surface for windowmanager
+    qhs->set_event_handler(QLibHomeScreen::Event_ShowWindow, [qwm, myname](json_object *object){
+        qwm->activateSurface(myname);
+    });
+#endif
+
+    engine.load(QUrl(QStringLiteral("qrc:/HVAC.qml")));
+    QObject *root = engine.rootObjects().first();
+    QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
+#ifdef HAVE_QLIBWINDOWMANAGER
+    // QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateSurface()));
+    qhs->setQuickWindow(window);
+#else
+    window->resize(1920, 720);
+    window->setVisible(true);
+#endif
 
-        engine.load(QUrl(QStringLiteral("qrc:/HVAC.qml")));
-        QObject *root = engine.rootObjects().first();
-        QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
-        QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateSurface()
-        ));
-    }
     return app.exec();
 }