diff options
author | wang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com> | 2019-05-28 14:02:08 +0800 |
---|---|---|
committer | wang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com> | 2019-05-28 14:02:08 +0800 |
commit | 3508d025b0046fffb337ffceb912947ef1dcf47d (patch) | |
tree | c2665aa357bda0132a6134621c9cacd0b2795200 /launcher/src/main.cpp | |
parent | 353da85004c72efb2bd6f117a15713b58e0df866 (diff) |
registerShortcut
Change-Id: Ia05d26a3e14f6b35e53f70c116e5b422518883a4
Diffstat (limited to 'launcher/src/main.cpp')
-rw-r--r-- | launcher/src/main.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/launcher/src/main.cpp b/launcher/src/main.cpp index 15ce0f6..7181a78 100644 --- a/launcher/src/main.cpp +++ b/launcher/src/main.cpp @@ -30,6 +30,7 @@ #include "appinfo.h" #include "afm_user_daemon_proxy.h" #include "homescreenhandler.h" +#include "shortcutappmodel.h" #include "hmi-debug.h" // XXX: We want this DBus connection to be shared across the different @@ -88,6 +89,7 @@ int main(int argc, char *argv[]) // import C++ class to QML qmlRegisterType<ApplicationModel>("AppModel", 1, 0, "ApplicationModel"); + qmlRegisterType<ShortcutAppModel>("ShortcutAppModel", 1, 0, "ShortcutAppModel"); // DBus qDBusRegisterMetaType<AppInfo>(); @@ -95,11 +97,12 @@ int main(int argc, char *argv[]) ApplicationLauncher *launcher = new ApplicationLauncher(); QLibWindowmanager* layoutHandler = new QLibWindowmanager(); + ShortcutAppModel* shortcutAppModel = new ShortcutAppModel(); if(layoutHandler->init(port,token) != 0){ exit(EXIT_FAILURE); } - AGLScreenInfo screenInfo(layoutHandler->get_scale_factor()); +// AGLScreenInfo screenInfo(layoutHandler->get_scale_factor()); if (layoutHandler->requestSurface(myname) != 0) { exit(EXIT_FAILURE); @@ -121,6 +124,7 @@ int main(int argc, char *argv[]) }); HomescreenHandler* homescreenHandler = new HomescreenHandler(); + QObject::connect(homescreenHandler, SIGNAL(updateShortcutList(QStringList)), shortcutAppModel, SLOT(shortcutUpdate(QStringList))); homescreenHandler->init(port, token.toStdString().c_str(), layoutHandler, myname); QUrl bindingAddress; @@ -148,7 +152,8 @@ int main(int argc, char *argv[]) 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.rootContext()->setContextProperty(QStringLiteral("screenInfo"), &screenInfo); + engine.rootContext()->setContextProperty(QStringLiteral("shortcutAppModel"), shortcutAppModel); engine.load(QUrl(QStringLiteral("qrc:/Launcher.qml"))); homescreenHandler->getRunnables(); |