From c32114eb2ccbe142d73c06a5992544d6eacb97d0 Mon Sep 17 00:00:00 2001
From: "Bocklage, Jens" <Jens_Bocklage@mentor.com>
Date: Wed, 5 Oct 2016 16:25:19 +0200
Subject: Implemented proximity interface.

Signed-off-by: Bocklage, Jens <Jens_Bocklage@mentor.com>
---
 HomeScreenSimulator/src/main.cpp       |  2 +-
 HomeScreenSimulator/src/mainwindow.cpp | 13 ++++++++++++-
 HomeScreenSimulator/src/mainwindow.h   |  4 ++++
 3 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'HomeScreenSimulator/src')

diff --git a/HomeScreenSimulator/src/main.cpp b/HomeScreenSimulator/src/main.cpp
index 00c7ac2..b81b6cb 100644
--- a/HomeScreenSimulator/src/main.cpp
+++ b/HomeScreenSimulator/src/main.cpp
@@ -36,7 +36,7 @@ int main(int argc, char *argv[])
     QCoreApplication::setOrganizationDomain("LinuxFoundation");
     QCoreApplication::setOrganizationName("AutomotiveGradeLinux");
     QCoreApplication::setApplicationName("HomeScreenSimulator");
-    QCoreApplication::setApplicationVersion("0.3.0");
+    QCoreApplication::setApplicationVersion("0.3.1");
 
     MainWindow w;
     w.show();
diff --git a/HomeScreenSimulator/src/mainwindow.cpp b/HomeScreenSimulator/src/mainwindow.cpp
index d670154..743c854 100644
--- a/HomeScreenSimulator/src/mainwindow.cpp
+++ b/HomeScreenSimulator/src/mainwindow.cpp
@@ -22,7 +22,8 @@ MainWindow::MainWindow(QWidget *parent) :
     mp_ui(new Ui::MainWindow),
     mp_dBusDayNightModeAdapter(0),
     mp_dBusStatusBarProxy(0),
-    mp_dBusPopupProxy(0)
+    mp_dBusPopupProxy(0),
+    mp_dBusProximityProxy(0)
 {
     mp_ui->setupUi(this);
 
@@ -43,6 +44,10 @@ MainWindow::MainWindow(QWidget *parent) :
                                               "/Popup",
                                               QDBusConnection::sessionBus(),
                                               0);
+    mp_dBusProximityProxy = new org::agl::proximity("org.agl.homescreen",
+                                              "/Proximity",
+                                              QDBusConnection::sessionBus(),
+                                              0);
     QSettings settings;
     this->move(settings.value("homescreensimulator/pos").toPoint());
     mp_ui->radioButton_DayMode->setChecked(settings.value("homescreensimulator/daymode", true).toBool()); // if nothing is stored, use "true"
@@ -56,6 +61,7 @@ MainWindow::~MainWindow()
     settings.setValue("homescreensimulator/daymode", mp_ui->radioButton_DayMode->isChecked());
     settings.setValue("homescreensimulator/nightmode", mp_ui->radioButton_NightMode->isChecked());
 
+    delete mp_dBusProximityProxy;
     delete mp_dBusPopupProxy;
     delete mp_dBusStatusBarProxy;
 
@@ -159,3 +165,8 @@ void MainWindow::on_pushButton_comboBoxExample_clicked()
     choices.append("Item4");
     mp_dBusPopupProxy->showPopupComboBox("Make your choice!", choices);
 }
+
+void MainWindow::on_checkBox_ObjectDetected_clicked()
+{
+    mp_dBusProximityProxy->setObjectDetected(Qt::Checked == mp_ui->checkBox_ObjectDetected->checkState());
+}
diff --git a/HomeScreenSimulator/src/mainwindow.h b/HomeScreenSimulator/src/mainwindow.h
index dd412a3..702a338 100644
--- a/HomeScreenSimulator/src/mainwindow.h
+++ b/HomeScreenSimulator/src/mainwindow.h
@@ -23,6 +23,7 @@
 
 #include "statusbar_proxy.h"
 #include "popup_proxy.h"
+#include "proximity_proxy.h"
 
 namespace Ui {
 class MainWindow;
@@ -59,11 +60,14 @@ private slots:
 
     void on_pushButton_comboBoxExample_clicked();
 
+    void on_checkBox_ObjectDetected_clicked();
+
 private:
     Ui::MainWindow *mp_ui;
     DaynightmodeAdaptor *mp_dBusDayNightModeAdapter;
     org::agl::statusbar *mp_dBusStatusBarProxy;
     org::agl::popup *mp_dBusPopupProxy;
+    org::agl::proximity *mp_dBusProximityProxy;
 };
 
 #endif // MAINWINDOW_H
-- 
cgit 1.2.3-korg