diff options
author | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2019-03-25 11:21:01 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@automotivelinux.org> | 2019-03-25 11:21:01 +0000 |
commit | 4b45ee3167d9218772d76555a65c5f2c673c72a8 (patch) | |
tree | 7c99afe6c2eac787c47b6981753d695584262419 /launcher/src/main.cpp | |
parent | f2d3da19a294487fa41a81674ab2ef10fde04dd8 (diff) | |
parent | 607fdc0374e76a272455cc010f35693ba8b6894b (diff) |
Merge "Start app and get runnables list by homescreen"
Diffstat (limited to 'launcher/src/main.cpp')
-rw-r--r-- | launcher/src/main.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
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); |