summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTadao Tanikawa <tanikawa.tadao@jp.panasonic.com>2018-08-24 04:44:12 +0000
committerTadao Tanikawa <tanikawa.tadao@jp.panasonic.com>2018-08-24 10:58:17 +0000
commit33d31b5bac3c8c9105d43d6566174f39ef7a4ea4 (patch)
tree48cc70cdfb290b632535dad7cae7c4433e710c12
parent856f9d9de4473a537ce4084271008fd40e230e8f (diff)
This reverts commit 389a02a99961f1bcc6d317ffc9223ea7f2d05023. Bug-AGL: SPEC-1685 Change-Id: I2f659dbb53b0b781ed588d19c2f3228e3abcbb4a Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
-rw-r--r--homescreen/qml/ShortcutArea.qml6
-rw-r--r--homescreen/src/homescreenhandler.cpp6
-rw-r--r--homescreen/src/homescreenhandler.h2
3 files changed, 5 insertions, 9 deletions
diff --git a/homescreen/qml/ShortcutArea.qml b/homescreen/qml/ShortcutArea.qml
index d7e97f0..e0c9182 100644
--- a/homescreen/qml/ShortcutArea.qml
+++ b/homescreen/qml/ShortcutArea.qml
@@ -28,22 +28,18 @@ Item {
ListModel {
id: applicationModel
ListElement {
- appid: 'launcher'
name: 'launcher'
application: 'launcher@0.1'
}
ListElement {
- appid: 'mediaplayer'
name: 'MediaPlayer'
application: 'mediaplayer@0.1'
}
ListElement {
- appid: 'hvac'
name: 'HVAC'
application: 'hvac@0.1'
}
ListElement {
- appid: 'navigation'
name: 'Navigation'
application: 'navigation@0.1'
}
@@ -70,7 +66,7 @@ Item {
console.warn(model.application)
console.warn("app cannot be launched!")
}
- homescreenHandler.tapShortcut(model.appid)
+ homescreenHandler.tapShortcut(model.name)
}
}
}
diff --git a/homescreen/src/homescreenhandler.cpp b/homescreen/src/homescreenhandler.cpp
index daf1b90..5da8b9e 100644
--- a/homescreen/src/homescreenhandler.cpp
+++ b/homescreen/src/homescreenhandler.cpp
@@ -51,10 +51,10 @@ void HomescreenHandler::init(int port, const char *token)
}
-void HomescreenHandler::tapShortcut(QString application_id)
+void HomescreenHandler::tapShortcut(QString application_name)
{
- HMI_DEBUG("HomeScreen","tapShortcut %s", application_id.toStdString().c_str());
- mp_hs->tapShortcut(application_id.toStdString().c_str());
+ HMI_DEBUG("HomeScreen","tapShortcut %s", application_name.toStdString().c_str());
+ mp_hs->tapShortcut(application_name.toStdString().c_str());
}
void HomescreenHandler::onRep_static(struct json_object* reply_contents)
diff --git a/homescreen/src/homescreenhandler.h b/homescreen/src/homescreenhandler.h
index 1a9a2b5..c18d7a0 100644
--- a/homescreen/src/homescreenhandler.h
+++ b/homescreen/src/homescreenhandler.h
@@ -32,7 +32,7 @@ public:
void init(int port, const char* token);
- Q_INVOKABLE void tapShortcut(QString application_id);
+ Q_INVOKABLE void tapShortcut(QString application_name);
void onRep(struct json_object* reply_contents);
void onEv(const string& event, struct json_object* event_contents);