From d7e13c3ccce72d55f2ea25ee06e822cda5ff911e Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Wed, 29 Dec 2021 15:46:57 +0200 Subject: homescreenhandler: Start applications from homescreen panel We're missing application start-up from within homescreen. The top panel surface contains a list of applications which can be started directly (without the launcher). Bug-AGL: SPEC-4203 Signed-off-by: Marius Vlad Change-Id: Icd008c8bdbf3f107972b5b279f1439cab5aaebee --- homescreen/src/homescreenhandler.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/homescreen/src/homescreenhandler.cpp b/homescreen/src/homescreenhandler.cpp index d5e46fa..94e1c9b 100644 --- a/homescreen/src/homescreenhandler.cpp +++ b/homescreen/src/homescreenhandler.cpp @@ -133,10 +133,18 @@ void HomescreenHandler::tapShortcut(QString application_id) #endif - if (mp_launcher) { - mp_launcher->setCurrent(application_id); + QDBusPendingReply<> reply = applaunch_iface->start(application_id); + reply.waitForFinished(); + if (reply.isError()) { + HMI_ERROR("HomeScreen","Unable to start application '%s': %s", + application_id.toStdString().c_str(), + reply.error().message().toStdString().c_str()); + } else { + if (mp_launcher) { + mp_launcher->setCurrent(application_id); + } + appStarted(application_id); } - appStarted(application_id); } #if 0 -- cgit 1.2.3-korg From 1ffe62b257cbeffce9d812b4c63ee5359587943f Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Wed, 29 Dec 2021 16:05:32 +0200 Subject: package: Removal older artefacts from previous appfw Bug-AGL: SPEC-4204 Signed-off-by: Marius Vlad Change-Id: I74dfa2e24132b1928815963dfa6e1bcc4f706375 --- package/icon.svg | 279 ---------------------------------------------------- package/package.pro | 27 ----- 2 files changed, 306 deletions(-) delete mode 100644 package/icon.svg delete mode 100644 package/package.pro diff --git a/package/icon.svg b/package/icon.svg deleted file mode 100644 index 91661a7..0000000 --- a/package/icon.svg +++ /dev/null @@ -1,279 +0,0 @@ - - - -image/svg+xmlMULTIMEDIA - \ No newline at end of file diff --git a/package/package.pro b/package/package.pro deleted file mode 100644 index 1035088..0000000 --- a/package/package.pro +++ /dev/null @@ -1,27 +0,0 @@ -DISTFILES = icon.svg config.xml - -copy_icon.target = $$OUT_PWD/root/icon.svg -copy_icon.depends = $$_PRO_FILE_PWD_/icon.svg -copy_icon.commands = $(COPY_FILE) \"$$replace(copy_icon.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_icon.target, /, $$QMAKE_DIR_SEP)\" -QMAKE_EXTRA_TARGETS += copy_icon -PRE_TARGETDEPS += $$copy_icon.target - -copy_config.target = $$OUT_PWD/root/config.xml -copy_config.depends = $$_PRO_FILE_PWD_/config.xml -copy_config.commands = $(COPY_FILE) \"$$replace(copy_config.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_config.target, /, $$QMAKE_DIR_SEP)\" -QMAKE_EXTRA_TARGETS += copy_config -PRE_TARGETDEPS += $$copy_config.target - -WGT_TYPE = -CONFIG(debug, debug|release) { - WGT_TYPE = -debug -} - -wgt.target = package -wgt.commands = wgtpkg-pack -f -o homescreen$${WGT_TYPE}.wgt root - -QMAKE_EXTRA_TARGETS += wgt - -deploy.files = homescreen.wgt -deploy.path = /usr/AGL/apps/autoinstall -INSTALLS += deploy -- cgit 1.2.3-korg From a920d9537132f3778c137edee8d6741102919787 Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Wed, 29 Dec 2021 16:09:09 +0200 Subject: homescreenhandler: Remove old artifacts We're no longer using anything from the older appfw so remove dead code. Bug-AGL: SPEC-4204 Signed-off-by: Marius Vlad Change-Id: I8a9714701a9bbb0da6768cd4bcbca52cb23464cd --- homescreen/src/homescreenhandler.cpp | 102 +---------------------------------- 1 file changed, 1 insertion(+), 101 deletions(-) diff --git a/homescreen/src/homescreenhandler.cpp b/homescreen/src/homescreenhandler.cpp index 94e1c9b..9111ebb 100644 --- a/homescreen/src/homescreenhandler.cpp +++ b/homescreen/src/homescreenhandler.cpp @@ -38,19 +38,10 @@ HomescreenHandler::HomescreenHandler(Shell *_aglShell, ApplicationLauncher *laun HomescreenHandler::~HomescreenHandler() { -#if 0 - if (mp_hs != NULL) { - delete mp_hs; - } -#endif } void HomescreenHandler::init(void) { -#if 0 - mp_hs = new LibHomeScreen(); - mp_hs->init(port, token); -#endif myThis = this; /* @@ -61,45 +52,6 @@ void HomescreenHandler::init(void) connect(applaunch_iface, SIGNAL(started(QString)), this, SLOT(appStarted(QString))); connect(applaunch_iface, SIGNAL(terminated(QString)), this, SLOT(appTerminated(QString))); -#if 0 - mp_hs->registerCallback(nullptr, HomescreenHandler::onRep_static); - - mp_hs->set_event_handler(LibHomeScreen::Event_OnScreenMessage, [this](json_object *object){ - const char *display_message = json_object_get_string( - json_object_object_get(object, "display_message")); - HMI_DEBUG("HomeScreen","set_event_handler Event_OnScreenMessage display_message = %s", display_message); - }); - - // should be handled in the top panel - mp_hs->set_event_handler(LibHomeScreen::Event_ShowNotification,[this](json_object *object){ - json_object *p_obj = json_object_object_get(object, "parameter"); - const char *icon = json_object_get_string( - json_object_object_get(p_obj, "icon")); - const char *text = json_object_get_string( - json_object_object_get(p_obj, "text")); - const char *app_id = json_object_get_string( - json_object_object_get(p_obj, "caller")); - HMI_DEBUG("HomeScreen","Event_ShowNotification icon=%s, text=%s, caller=%s", icon, text, app_id); - QFileInfo icon_file(icon); - QString icon_path; - if (icon_file.isFile() && icon_file.exists()) { - icon_path = QString(QLatin1String(icon)); - } else { - icon_path = "./images/Utility_Logo_Grey-01.svg"; - } - - emit showNotification(QString(QLatin1String(app_id)), icon_path, QString(QLatin1String(text))); - }); - - // should be handled in the bottom panel - mp_hs->set_event_handler(LibHomeScreen::Event_ShowInformation,[this](json_object *object){ - json_object *p_obj = json_object_object_get(object, "parameter"); - const char *info = json_object_get_string( - json_object_object_get(p_obj, "info")); - - emit showInformation(QString(QLatin1String(info))); - }); -#endif } static struct wl_output * @@ -111,27 +63,7 @@ getWlOutput(QPlatformNativeInterface *native, QScreen *screen) void HomescreenHandler::tapShortcut(QString application_id) { - HMI_DEBUG("HomeScreen","tapShortcut %s", application_id.toStdString().c_str()); -#if 0 - struct json_object* j_json = json_object_new_object(); - struct json_object* value; - - struct agl_shell *agl_shell = aglShell->shell.get(); - QPlatformNativeInterface *native = qApp->platformNativeInterface(); - struct wl_output *output = getWlOutput(native, qApp->screens().first()); - - value = json_object_new_string("normal.full"); - json_object_object_add(j_json, "area", value); - - mp_hs->showWindow(application_id.toStdString().c_str(), j_json); - - // this works (and it is redundant the first time), due to the default - // policy engine installed which actives the application, when starting - // the first time. Later calls to HomescreenHandler::tapShortcut will - // require calling 'agl_shell_activate_app' - agl_shell_activate_app(agl_shell, application_id.toStdString().c_str(), output); - -#endif + HMI_DEBUG("HomeScreen","tapShortcut %s", application_id.toStdString().c_str()); QDBusPendingReply<> reply = applaunch_iface->start(application_id); reply.waitForFinished(); @@ -147,38 +79,6 @@ void HomescreenHandler::tapShortcut(QString application_id) } } -#if 0 -void HomescreenHandler::onRep_static(struct json_object* reply_contents) -{ - static_cast(HomescreenHandler::myThis)->onRep(reply_contents); -} - -void HomescreenHandler::onEv_static(const string& event, struct json_object* event_contents) -{ - static_cast(HomescreenHandler::myThis)->onEv(event, event_contents); -} - -void HomescreenHandler::onRep(struct json_object* reply_contents) -{ - const char* str = json_object_to_json_string(reply_contents); - HMI_DEBUG("HomeScreen","HomeScreen onReply %s", str); -} - -void HomescreenHandler::onEv(const string& event, struct json_object* event_contents) -{ - const char* str = json_object_to_json_string(event_contents); - HMI_DEBUG("HomeScreen","HomeScreen onEv %s, contents: %s", event.c_str(), str); - - if (event.compare("homescreen/on_screen_message") == 0) { - struct json_object *json_data = json_object_object_get(event_contents, "data"); - struct json_object *json_display_message = json_object_object_get(json_data, "display_message"); - const char* display_message = json_object_get_string(json_display_message); - - HMI_DEBUG("HomeScreen","display_message = %s", display_message); - } -} -#endif - void HomescreenHandler::appStarted(const QString& application_id) { struct agl_shell *agl_shell = aglShell->shell.get(); -- cgit 1.2.3-korg