diff options
| -rw-r--r-- | app/Onscreen.qml | 6 | ||||
| -rw-r--r-- | app/eventhandler.cpp | 6 | ||||
| -rw-r--r-- | app/eventhandler.h | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/app/Onscreen.qml b/app/Onscreen.qml index cfad090..5e53f98 100644 --- a/app/Onscreen.qml +++ b/app/Onscreen.qml @@ -96,7 +96,7 @@ Rectangle { text: btn1Name onReleased: { btn1.highlighted = false - eventHandler.onScreenReply(btn1.text) + eventHandler.onScreenReply(title.text, btn1.text) } onPressed: { btn1.highlighted = true @@ -113,7 +113,7 @@ Rectangle { text: btn2Name onReleased: { btn2.highlighted = false - eventHandler.onScreenReply(btn2.text) + eventHandler.onScreenReply(title.text, btn2.text) } onPressed: { btn2.highlighted = true @@ -130,7 +130,7 @@ Rectangle { text: btn3Name onReleased: { btn3.highlighted = false - eventHandler.onScreenReply(btn3.text) + eventHandler.onScreenReply(title.text, btn3.text) } onPressed: { btn3.highlighted = true diff --git a/app/eventhandler.cpp b/app/eventhandler.cpp index c33022a..ff8617d 100644 --- a/app/eventhandler.cpp +++ b/app/eventhandler.cpp @@ -29,6 +29,7 @@ const char _myrole[] = "on_screen"; const char _parameter[] = "parameter"; const char _replyto[] = "replyto"; +const char _onscreen_title[] = "onscreenTitle"; const char _button_name[] = "buttonName"; const char _drawing_name[] = "drawing_name"; const char _application_id[] = "application_id"; @@ -180,12 +181,13 @@ void EventHandler::deactivateWindow() } } -void EventHandler::onScreenReply(const QString &btn_name) +void EventHandler::onScreenReply(const QString &ons_title, const QString &btn_name) { - HMI_DEBUG(APP_ID, "EventHandler::onScreenReply(),btn_name=%s", btn_name.toStdString().c_str()); + HMI_DEBUG(APP_ID, "ons_title=%s btn_name=%s", ons_title.toStdString().c_str(), btn_name.toStdString().c_str()); emit this->hideOnScreen(); struct json_object* j_param = json_object_new_object(); + json_object_object_add(j_param, _onscreen_title, json_object_new_string(ons_title.toStdString().c_str())); json_object_object_add(j_param, _button_name, json_object_new_string(btn_name.toStdString().c_str())); mp_hs->replyShowWindow(m_dsp.first.toStdString().c_str(), j_param); } diff --git a/app/eventhandler.h b/app/eventhandler.h index 567c8a9..bb75d9b 100644 --- a/app/eventhandler.h +++ b/app/eventhandler.h @@ -45,7 +45,7 @@ public: static void onRep_static(struct json_object* reply_contents); Q_INVOKABLE void deactivateWindow(); - Q_INVOKABLE void onScreenReply(const QString &btn_name); + Q_INVOKABLE void onScreenReply(const QString &ons_title, const QString &btn_name); signals: void updateModel(QVariant data); |