From b992d6d3f111ea06e88d47369b814b0846aabc74 Mon Sep 17 00:00:00 2001 From: tiansen Date: Fri, 2 Nov 2018 19:33:30 +0800 Subject: [PATCH] delete tapshortcut check --- launcher/qml/images/images.qrc | 4 ++-- .../qml/images/{videoplayer_active.svg => video_active.svg} | 0 .../images/{videoplayer_inactive.svg => video_inactive.svg} | 0 launcher/src/main.cpp | 12 ++---------- 4 files changed, 4 insertions(+), 12 deletions(-) rename launcher/qml/images/{videoplayer_active.svg => video_active.svg} (100%) rename launcher/qml/images/{videoplayer_inactive.svg => video_inactive.svg} (100%) diff --git a/launcher/qml/images/images.qrc b/launcher/qml/images/images.qrc index 501e81d..b3a1cf6 100644 --- a/launcher/qml/images/images.qrc +++ b/launcher/qml/images/images.qrc @@ -23,8 +23,8 @@ radio_inactive.svg settings_active.svg settings_inactive.svg - videoplayer_active.svg - videoplayer_inactive.svg + video_active.svg + video_inactive.svg browser_active.svg browser_inactive.svg blank_active.svg diff --git a/launcher/qml/images/videoplayer_active.svg b/launcher/qml/images/video_active.svg similarity index 100% rename from launcher/qml/images/videoplayer_active.svg rename to launcher/qml/images/video_active.svg diff --git a/launcher/qml/images/videoplayer_inactive.svg b/launcher/qml/images/video_inactive.svg similarity index 100% rename from launcher/qml/images/videoplayer_inactive.svg rename to launcher/qml/images/video_inactive.svg diff --git a/launcher/src/main.cpp b/launcher/src/main.cpp index 91a1d80..d79e880 100644 --- a/launcher/src/main.cpp +++ b/launcher/src/main.cpp @@ -124,16 +124,8 @@ 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){ - 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); - } - } + qDebug("Surface launcher got tapShortcut. \n"); + layoutHandler->activateSurface(myname); }); QUrl bindingAddress; -- 2.16.6