summaryrefslogtreecommitdiffstats
path: root/homescreen/src/main.cpp
diff options
context:
space:
mode:
authorTasuku Suzuki <tasuku.suzuki@qt.io>2017-12-23 22:13:19 +0900
committerTadao Tanikawa <tanikawa.tadao@jp.panasonic.com>2017-12-25 07:27:32 +0000
commitec28d0bf46efbb13662a9b01de5d18f87fe34145 (patch)
treefff3beee142281c5c28661c255cfa91f2e53ef39 /homescreen/src/main.cpp
parent54f8d056bc2ee04f343352faa7e7e985e5cc4808 (diff)
Block launching app when an app is launchingeel_5.0.1eel_5.0.0eel/5.0.1eel/5.0.05.0.15.0.0
Bug-AGL: SPEC-1214 Change-Id: I747d20ca7a6219535668fc3951a4ff9f55bcaaaf Signed-off-by: Tasuku Suzuki <tasuku.suzuki@qt.io> Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> (cherry picked from commit db9f41d75fb4460f668117c69be05c4d4d4c7c7c)
Diffstat (limited to 'homescreen/src/main.cpp')
-rw-r--r--homescreen/src/main.cpp15
1 files changed, 14 insertions, 1 deletions
diff --git a/homescreen/src/main.cpp b/homescreen/src/main.cpp
index e0850d6..522f957 100644
--- a/homescreen/src/main.cpp
+++ b/homescreen/src/main.cpp
@@ -87,7 +87,7 @@ int main(int argc, char *argv[])
HMI_DEBUG("HomeScreen","port = %d, token = %s", port, token.toStdString().c_str());
// import C++ class to QML
- qmlRegisterType<ApplicationLauncher>("HomeScreen", 1, 0, "ApplicationLauncher");
+ // qmlRegisterType<ApplicationLauncher>("HomeScreen", 1, 0, "ApplicationLauncher");
qmlRegisterType<ApplicationModel>("Home", 1, 0, "ApplicationModel");
qmlRegisterType<StatusBarModel>("HomeScreen", 1, 0, "StatusBarModel");
qmlRegisterType<MasterVolume>("MasterVolume", 1, 0, "MasterVolume");
@@ -96,6 +96,7 @@ int main(int argc, char *argv[])
qDBusRegisterMetaType<AppInfo>();
qDBusRegisterMetaType<QList<AppInfo> >();
+ ApplicationLauncher *launcher = new ApplicationLauncher();
QLibWindowmanager* layoutHandler = new QLibWindowmanager();
if(layoutHandler->init(port,token) != 0){
exit(EXIT_FAILURE);
@@ -109,6 +110,17 @@ int main(int argc, char *argv[])
layoutHandler->endDraw(QString("HomeScreen"));
});
+ layoutHandler->set_event_handler(QLibWindowmanager::Event_Visible, [layoutHandler, launcher](json_object *object) {
+ QString label = QString(json_object_get_string( json_object_object_get(object, "drawing_name") ));
+ qDebug() << label;
+ QMetaObject::invokeMethod(launcher, "setCurrent", Qt::QueuedConnection, Q_ARG(QString, label == "HomeScreen" ? "Home" : label));
+ });
+
+ layoutHandler->set_event_handler(QLibWindowmanager::Event_Invisible, [layoutHandler, launcher](json_object *object) {
+ const char* label = json_object_get_string( json_object_object_get(object, "drawing_name") );
+ HMI_DEBUG("HomeScreen", "surface %s Event_Invisible", label);
+ });
+
HomescreenHandler* homescreenHandler = new HomescreenHandler();
homescreenHandler->init(port, token.toStdString().c_str());
@@ -116,6 +128,7 @@ int main(int argc, char *argv[])
QQmlApplicationEngine engine;
engine.rootContext()->setContextProperty("layoutHandler", layoutHandler);
engine.rootContext()->setContextProperty("homescreenHandler", homescreenHandler);
+ engine.rootContext()->setContextProperty("launcher", launcher);
engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
QObject *root = engine.rootObjects().first();