diff options
author | Holger Behrens <holger.behrens@windriver.com> | 2015-02-16 14:51:56 +0100 |
---|---|---|
committer | Holger Behrens <holger.behrens@windriver.com> | 2015-02-16 16:21:59 +0100 |
commit | c53d1b89db42140296f89d07ea15dbdffa8cbb26 (patch) | |
tree | 432ee2240eb9a071d54af7c7b4b3d8d8bb3ff1f9 | |
parent | d3608e605f336a5c52da33937250ee0994e63cfb (diff) | |
download | genivi-demo-platform-hmi-c53d1b89db42140296f89d07ea15dbdffa8cbb26.tar.gz |
gdp-hmi-panel: cleanup image assets and signal handling
Signed-off-by: Holger Behrens <holger.behrens@windriver.com>
-rw-r--r-- | app/gdp-hmi-panel/assets/GDP_Hamburger.png | bin | 4283 -> 0 bytes | |||
-rw-r--r-- | app/gdp-hmi-panel/assets/GDP_Quadrat.png (renamed from app/gdp-hmi-panel/assets/GDP_Hamburger_white.png) | bin | 4010 -> 4694 bytes | |||
-rw-r--r-- | app/gdp-hmi-panel/assets/GDP_Square.png | bin | 10057 -> 0 bytes | |||
-rw-r--r-- | app/gdp-hmi-panel/gdp-hmi-panel.bb | 6 | ||||
-rw-r--r-- | app/gdp-hmi-panel/gdp-hmi-panel.h | 12 | ||||
-rw-r--r-- | app/gdp-hmi-panel/main.cpp | 5 | ||||
-rw-r--r-- | app/gdp-hmi-panel/main.qml | 19 |
7 files changed, 16 insertions, 26 deletions
diff --git a/app/gdp-hmi-panel/assets/GDP_Hamburger.png b/app/gdp-hmi-panel/assets/GDP_Hamburger.png Binary files differdeleted file mode 100644 index 85222a3..0000000 --- a/app/gdp-hmi-panel/assets/GDP_Hamburger.png +++ /dev/null diff --git a/app/gdp-hmi-panel/assets/GDP_Hamburger_white.png b/app/gdp-hmi-panel/assets/GDP_Quadrat.png Binary files differindex 72a20d0..5adf745 100644 --- a/app/gdp-hmi-panel/assets/GDP_Hamburger_white.png +++ b/app/gdp-hmi-panel/assets/GDP_Quadrat.png diff --git a/app/gdp-hmi-panel/assets/GDP_Square.png b/app/gdp-hmi-panel/assets/GDP_Square.png Binary files differdeleted file mode 100644 index cf28057..0000000 --- a/app/gdp-hmi-panel/assets/GDP_Square.png +++ /dev/null diff --git a/app/gdp-hmi-panel/gdp-hmi-panel.bb b/app/gdp-hmi-panel/gdp-hmi-panel.bb index 697f033..f959153 100644 --- a/app/gdp-hmi-panel/gdp-hmi-panel.bb +++ b/app/gdp-hmi-panel/gdp-hmi-panel.bb @@ -20,9 +20,7 @@ FILES_${PN} += "\ do_install_append() { install -d ${D}${datadir}/gdp - install -m 0444 ${S}/assets/GDP_Square.png \ - ${D}${datadir}/gdp/GDP_Square.png - install -m 0444 ${S}/assets/GDP_Hamburger_white.png \ - ${D}${datadir}/gdp/GDP_Hamburger_white.png + install -m 0444 ${S}/assets/GDP_Quadrat.png \ + ${D}${datadir}/gdp/GDP_Quadrat.png install -m 0444 ${S}/assets/GDP_Panel.png ${D}${datadir}/gdp/GDP_Panel.png } diff --git a/app/gdp-hmi-panel/gdp-hmi-panel.h b/app/gdp-hmi-panel/gdp-hmi-panel.h index 96e173e..1f3759a 100644 --- a/app/gdp-hmi-panel/gdp-hmi-panel.h +++ b/app/gdp-hmi-panel/gdp-hmi-panel.h @@ -14,6 +14,7 @@ * List of changes: * 06.Feb.2014, Holger Behrens, written, inspired by Qt5 documentation * http://doc.qt.io/qt-5/qtqml-cppintegration-interactqmlfromcpp.html + * 16.feb.2015, Holger Behrens, cleanup signal handling */ #ifndef GDP_HMI_PANEL_H @@ -36,23 +37,14 @@ public: ~GDPPanelClass(); public slots: - void cppSlot(const QString &msg) { + void homeSlot() { int rtn = -1; - qDebug() << "Called the C++ slot with message:" << msg; rtn = kill(m_hmiControllerPid, SIGUSR1); // show launcher if (-1 == rtn) { sd_journal_print(LOG_ERR, "Error: Signaling PID (%d) failed (SIGUSR1).\n", m_hmiControllerPid); } - #if 0 - rtn = kill(m_hmiControllerPid, SIGUSR2); // show background - if (-1 == rtn) { - sd_journal_print(LOG_ERR, - "Error: Signaling PID (%d) failed (SIGUSR2).\n", - m_hmiControllerPid); - } - #endif } private: diff --git a/app/gdp-hmi-panel/main.cpp b/app/gdp-hmi-panel/main.cpp index 62c3180..c274931 100644 --- a/app/gdp-hmi-panel/main.cpp +++ b/app/gdp-hmi-panel/main.cpp @@ -13,7 +13,7 @@ * * List of changes: * 06.Feb.2015, Holger Behrens, written based on template created by QtCreator - * + * 16.feb.2015, Holger Behrens, cleanup signal handling */ #include <QApplication> @@ -38,8 +38,7 @@ int main(int argc, char *argv[]) object = (QObject *)view.rootObject(); GDPPanelClass panel; - QObject::connect(object, SIGNAL(qmlSignal(QString)), - &panel, SLOT(cppSlot(QString))); + QObject::connect(object, SIGNAL(homeSignal()), &panel, SLOT(homeSlot())); view.setProperty("IVI-Surface-ID", GDP_PANEL_SURFACE_ID); view.show(); diff --git a/app/gdp-hmi-panel/main.qml b/app/gdp-hmi-panel/main.qml index 3bb149d..48c831f 100644 --- a/app/gdp-hmi-panel/main.qml +++ b/app/gdp-hmi-panel/main.qml @@ -13,7 +13,7 @@ * * List of changes: * 06.Feb.2015, Holger Behrens, written based on template created by QtCreator - * + * 16.Feb.2015, Holger Behrens, cleanup signal and image handling */ import QtQuick 2.3 @@ -25,7 +25,7 @@ Rectangle { width: 1024 height: 68 - signal qmlSignal(string msg) + signal homeSignal() Image { id: background_image @@ -37,17 +37,19 @@ Rectangle { id: home_button width: 50 height: 50 + visible: true anchors.left: parent.left - anchors.leftMargin: 10 + anchors.leftMargin: 14 anchors.bottom: parent.bottom anchors.bottomMargin: 0 anchors.top: parent.top anchors.topMargin: 0 - iconName: "HomeIcon" - iconSource: "file:///usr/share/gdp/GDP_Square.png" - onClicked: { - console.log("homeButton clicked") - gdp_panel.qmlSignal("homeButton") + onClicked: gdp_panel.homeSignal() + Image { + id: home_image + fillMode: Image.PreserveAspectFit + anchors.fill: parent + source: "file:///usr/share/gdp/GDP_Quadrat.png" } } @@ -63,4 +65,3 @@ Rectangle { anchors.rightMargin: 8 } } - |