#include <QtQml/QQmlContext>
#include <QtQml/qqml.h>
#include <QQuickWindow>
+#include <QThread>
#include <qlibwindowmanager.h>
#include "applicationlauncher.h"
#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
qDBusRegisterMetaType<AppInfo>();
qDBusRegisterMetaType<QList<AppInfo> >();
- QLibHomeScreen* homescreenHandler = new QLibHomeScreen();
+// QLibHomeScreen* homescreenHandler = new QLibHomeScreen();
ApplicationLauncher *launcher = new ApplicationLauncher();
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);
}
HMI_DEBUG("launch", "surface %s Event_Invisible", label);
});
- homescreenHandler->init(port, token.toStdString().c_str());
-
- homescreenHandler->set_event_handler(QLibHomeScreen::Event_TapShortcut, [layoutHandler, myname](json_object *object){
- json_object *appnameJ = nullptr;
- if(json_object_object_get_ex(object, "application_name", &appnameJ))
- {
- const char *appname = json_object_get_string(appnameJ);
- if(myname == appname)
- {
- qDebug("Surface %s got tapShortcut\n", appname);
- layoutHandler->activateSurface(myname);
- }
- }
- });
+ HomescreenHandler* homescreenHandler = new HomescreenHandler();
+ homescreenHandler->init(port, token.toStdString().c_str(), layoutHandler, myname);
QUrl bindingAddress;
bindingAddress.setScheme(QStringLiteral("ws"));
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("layoutHandler", layoutHandler);
- engine.rootContext()->setContextProperty("homescreenHandler", homescreenHandler);
- engine.rootContext()->setContextProperty("launcher", launcher);
+ engine.rootContext()->setContextProperty(QStringLiteral("layoutHandler"), layoutHandler);
+ engine.rootContext()->setContextProperty(QStringLiteral("homescreenHandler"), homescreenHandler);
+ 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);