diff options
author | tiansen <tian_sen@dl.cn.nexty-ele.com> | 2018-11-02 19:33:30 +0800 |
---|---|---|
committer | tiansen <tian_sen@dl.cn.nexty-ele.com> | 2018-11-02 19:33:30 +0800 |
commit | b992d6d3f111ea06e88d47369b814b0846aabc74 (patch) | |
tree | cad081b1326d9861218f9a4213baa4722143a22a | |
parent | b60fdd7fe43fb81e6be2674d442085d9d327af29 (diff) |
delete tapshortcut checksandbox/tiansen/vertical
-rw-r--r-- | launcher/qml/images/images.qrc | 4 | ||||
-rw-r--r-- | launcher/qml/images/video_active.svg (renamed from launcher/qml/images/videoplayer_active.svg) | 0 | ||||
-rw-r--r-- | launcher/qml/images/video_inactive.svg (renamed from launcher/qml/images/videoplayer_inactive.svg) | 0 | ||||
-rw-r--r-- | launcher/src/main.cpp | 12 |
4 files changed, 4 insertions, 12 deletions
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 @@ <file>radio_inactive.svg</file> <file>settings_active.svg</file> <file>settings_inactive.svg</file> - <file>videoplayer_active.svg</file> - <file>videoplayer_inactive.svg</file> + <file>video_active.svg</file> + <file>video_inactive.svg</file> <file>browser_active.svg</file> <file>browser_inactive.svg</file> <file>blank_active.svg</file> diff --git a/launcher/qml/images/videoplayer_active.svg b/launcher/qml/images/video_active.svg index 794a441..794a441 100644 --- a/launcher/qml/images/videoplayer_active.svg +++ b/launcher/qml/images/video_active.svg diff --git a/launcher/qml/images/videoplayer_inactive.svg b/launcher/qml/images/video_inactive.svg index 905d46f..905d46f 100644 --- a/launcher/qml/images/videoplayer_inactive.svg +++ b/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; |