X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=launcher%2Fsrc%2Fmain.cpp;h=77dee2736f7c715add27d708c45c18abe5573a31;hb=fd578508fe8f59a0bf11916ea99561125dcfc4ba;hp=5a44cc76ff5fd5d9f6e706d17bfcca637224c193;hpb=aa8e593bf3d5138d007619048eeac0e4b9863b7a;p=apps%2Flauncher.git

diff --git a/launcher/src/main.cpp b/launcher/src/main.cpp
index 5a44cc7..77dee27 100644
--- a/launcher/src/main.cpp
+++ b/launcher/src/main.cpp
@@ -25,92 +25,30 @@
 #include <QQuickWindow>
 #include <QThread>
 
-#include <qlibwindowmanager.h>
 #include "applicationmodel.h"
 #include "appinfo.h"
 #include "homescreenhandler.h"
-#include "hmi-debug.h"
 
 int main(int argc, char *argv[])
 {
     QString myname = QString("launcher");
     QGuiApplication a(argc, argv);
 
-    QCoreApplication::setOrganizationDomain("LinuxFoundation");
-    QCoreApplication::setOrganizationName("AutomotiveGradeLinux");
-    QCoreApplication::setApplicationName(myname);
-    QCoreApplication::setApplicationVersion("0.1.0");
-
-    QCommandLineParser parser;
-    parser.addPositionalArgument("port", a.translate("main", "port for binding"));
-    parser.addPositionalArgument("secret", a.translate("main", "secret for binding"));
-    parser.addHelpOption();
-    parser.addVersionOption();
-    parser.process(a);
-    QStringList positionalArguments = parser.positionalArguments();
-
-    int port = 1700;
-    QString token = "wm";
-
-    if (positionalArguments.length() == 2) {
-        port = positionalArguments.takeFirst().toInt();
-        token = positionalArguments.takeFirst();
-    }
-
-    HMI_DEBUG("launcher","port = %d, token = %s", port, token.toStdString().c_str());
+    // necessary to identify correctly by app_id
+    a.setDesktopFileName(myname);
 
     // import C++ class to QML
     qmlRegisterType<ApplicationModel>("AppModel", 1, 0, "ApplicationModel");
 
-    QLibWindowmanager* layoutHandler = new QLibWindowmanager();
-    if(layoutHandler->init(port,token) != 0){
-        exit(EXIT_FAILURE);
-    }
-
-    AGLScreenInfo screenInfo(layoutHandler->get_scale_factor());
-
-    if (layoutHandler->requestSurface(myname) != 0) {
-        exit(EXIT_FAILURE);
-    }
-
-    layoutHandler->set_event_handler(QLibWindowmanager::Event_SyncDraw, [layoutHandler, myname](json_object *object) {
-        layoutHandler->endDraw(myname);
-    });
-
     HomescreenHandler* homescreenHandler = new HomescreenHandler();
-    homescreenHandler->init(port, token.toStdString().c_str(), layoutHandler, myname);
-
-    QUrl bindingAddress;
-    bindingAddress.setScheme(QStringLiteral("ws"));
-    bindingAddress.setHost(QStringLiteral("localhost"));
-    bindingAddress.setPort(port);
-    bindingAddress.setPath(QStringLiteral("/api"));
-
-    QUrlQuery query;
-    query.addQueryItem(QStringLiteral("token"), token);
-    bindingAddress.setQuery(query);
-
-    const QByteArray hack_delay = qgetenv("HMI_LAUNCHER_STARTUP_DELAY");
-    int delay_time = 1;
-
-    if (!hack_delay.isEmpty()) {
-       delay_time = (QString::fromLocal8Bit(hack_delay)).toInt();
-    }
-
-    QThread::sleep(delay_time);
-    qDebug("Sleep %d sec to resolve race condtion between HomeScreen and Launcher", delay_time);
 
     // mail.qml loading
     QQmlApplicationEngine engine;
-    engine.rootContext()->setContextProperty(QStringLiteral("layoutHandler"), layoutHandler);
+    int apps = homescreenHandler->getRunnablesCount();
     engine.rootContext()->setContextProperty(QStringLiteral("homescreenHandler"), homescreenHandler);
-    engine.rootContext()->setContextProperty(QStringLiteral("screenInfo"), &screenInfo);
+    engine.rootContext()->setContextProperty(QStringLiteral("apps_len"), apps);
     engine.load(QUrl(QStringLiteral("qrc:/Launcher.qml")));
     homescreenHandler->getRunnables();
 
-    QObject *root = engine.rootObjects().first();
-    QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
-    QObject::connect(window, SIGNAL(frameSwapped()), layoutHandler, SLOT(slotActivateSurface()));
-
     return a.exec();
 }