X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=launcher%2Fsrc%2Fmain.cpp;fp=launcher%2Fsrc%2Fmain.cpp;h=e56ff5a32a7def40608f23ec4382dd88ae02f789;hb=607fdc0374e76a272455cc010f35693ba8b6894b;hp=291e9d520c289c12524fd5b9bcd90957d2e902a4;hpb=e8d1f16f785cc176a82a9b46e08e13eb89899437;p=apps%2Flauncher.git

diff --git a/launcher/src/main.cpp b/launcher/src/main.cpp
index 291e9d5..e56ff5a 100644
--- a/launcher/src/main.cpp
+++ b/launcher/src/main.cpp
@@ -29,7 +29,7 @@
 #include "applicationmodel.h"
 #include "appinfo.h"
 #include "afm_user_daemon_proxy.h"
-#include "qlibhomescreen.h"
+#include "homescreenhandler.h"
 #include "hmi-debug.h"
 
 // XXX: We want this DBus connection to be shared across the different
@@ -93,7 +93,6 @@ int main(int argc, char *argv[])
     qDBusRegisterMetaType<AppInfo>();
     qDBusRegisterMetaType<QList<AppInfo> >();
 
-    QLibHomeScreen* homescreenHandler = new QLibHomeScreen();
     ApplicationLauncher *launcher = new ApplicationLauncher();
     QLibWindowmanager* layoutHandler = new QLibWindowmanager();
     if(layoutHandler->init(port,token) != 0){
@@ -121,12 +120,8 @@ int main(int argc, char *argv[])
         HMI_DEBUG("launch", "surface %s Event_Invisible", label);
     });
 
-    homescreenHandler->init(port, token.toStdString().c_str());
-
-    homescreenHandler->set_event_handler(QLibHomeScreen::Event_ShowWindow, [layoutHandler, myname](json_object *object){
-        qDebug("Surface %s got Event_ShowWindow\n", myname);
-        layoutHandler->activateWindow(myname);
-    });
+    HomescreenHandler* homescreenHandler = new HomescreenHandler();
+    homescreenHandler->init(port, token.toStdString().c_str(), layoutHandler, myname);
 
     QUrl bindingAddress;
     bindingAddress.setScheme(QStringLiteral("ws"));
@@ -155,6 +150,7 @@ int main(int argc, char *argv[])
     engine.rootContext()->setContextProperty(QStringLiteral("launcher"), launcher);
     engine.rootContext()->setContextProperty(QStringLiteral("screenInfo"), &screenInfo);
     engine.load(QUrl(QStringLiteral("qrc:/Launcher.qml")));
+    homescreenHandler->getRunnables();
 
     QObject *root = engine.rootObjects().first();
     QQuickWindow *window = qobject_cast<QQuickWindow *>(root);