From 9430d170c235ff75268db06d1ba32692dea0a65f Mon Sep 17 00:00:00 2001 From: Tadao Tanikawa Date: Fri, 24 Aug 2018 04:44:33 +0000 Subject: Revert "Use appid between homescreen-service and apps" This reverts commit 5fbb59e80e4f870a1badd694d2efcd8cd941cdfb. Bug-AGL: SPEC-1685 Change-Id: Idd71625415b79cff6ab76b6179236d946a5aab41 Signed-off-by: Tadao Tanikawa --- launcher/src/applicationmodel.cpp | 6 ------ launcher/src/applicationmodel.h | 1 - launcher/src/main.cpp | 12 ++++++++++-- 3 files changed, 10 insertions(+), 9 deletions(-) (limited to 'launcher/src') diff --git a/launcher/src/applicationmodel.cpp b/launcher/src/applicationmodel.cpp index 14e2ea1..17e38fb 100644 --- a/launcher/src/applicationmodel.cpp +++ b/launcher/src/applicationmodel.cpp @@ -127,12 +127,6 @@ QString ApplicationModel::id(int i) const return data(index(i), Qt::UserRole).toString(); } -QString ApplicationModel::appid(int i) const -{ - QString id = data(index(i), Qt::UserRole).toString(); - return id.split("@")[0]; -} - QString ApplicationModel::name(int i) const { return data(index(i), Qt::DisplayRole).toString(); diff --git a/launcher/src/applicationmodel.h b/launcher/src/applicationmodel.h index 71c79fc..8398b62 100644 --- a/launcher/src/applicationmodel.h +++ b/launcher/src/applicationmodel.h @@ -31,7 +31,6 @@ public: QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; QHash roleNames() const override; - Q_INVOKABLE QString appid(int index) const; Q_INVOKABLE QString id(int index) const; Q_INVOKABLE QString name(int index) const; Q_INVOKABLE void move(int from, int to); diff --git a/launcher/src/main.cpp b/launcher/src/main.cpp index 5720203..91a1d80 100644 --- a/launcher/src/main.cpp +++ b/launcher/src/main.cpp @@ -124,8 +124,16 @@ int main(int argc, char *argv[]) homescreenHandler->init(port, token.toStdString().c_str()); homescreenHandler->set_event_handler(QLibHomeScreen::Event_TapShortcut, [layoutHandler, myname](json_object *object){ - qDebug("Surface %s got tapShortcut\n", myname.toStdString().c_str()); - layoutHandler->activateSurface(myname); + 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); + } + } }); QUrl bindingAddress; -- cgit 1.2.3-korg