X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=HomeScreenSimulator%2Fsrc%2Fmainwindow.cpp;h=ffc44fe4eab0b4ea688745372e72ca2eb9aba1b9;hb=09f2f0036f122e49aa49e6c446d723850192a725;hp=74c02d7c01f5deba230a056c2aff2c8cf2c19afe;hpb=0a468d9b5ae7b3e5ba106facf17698d89b1ce200;p=staging%2FHomeScreen.git

diff --git a/HomeScreenSimulator/src/mainwindow.cpp b/HomeScreenSimulator/src/mainwindow.cpp
index 74c02d7..ffc44fe 100644
--- a/HomeScreenSimulator/src/mainwindow.cpp
+++ b/HomeScreenSimulator/src/mainwindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Mentor Graphics Development (Deutschland) GmbH
+ * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,9 +20,11 @@
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
     mp_ui(new Ui::MainWindow),
-    mp_dBusDayNightModeAdapter(0),
+    mp_dBusDayNightModeAdaptor(0),
     mp_dBusStatusBarProxy(0),
-    mp_dBusPopupProxy(0)
+    mp_dBusPopupProxy(0),
+    mp_dBusProximityProxy(0),
+    mp_dBusHomeScreenProxy(0)
 {
     mp_ui->setupUi(this);
 
@@ -30,7 +32,7 @@ MainWindow::MainWindow(QWidget *parent) :
     QDBusConnection dbus = QDBusConnection::sessionBus();
 
     // publish dbus day night mode interface
-    mp_dBusDayNightModeAdapter = new DaynightmodeAdaptor((QObject*)this);
+    mp_dBusDayNightModeAdaptor = new DaynightmodeAdaptor((QObject*)this);
 
     dbus.registerService("org.agl.homescreen.simulator");
     dbus.registerObject("/", this);
@@ -43,6 +45,15 @@ MainWindow::MainWindow(QWidget *parent) :
                                               "/Popup",
                                               QDBusConnection::sessionBus(),
                                               0);
+    mp_dBusProximityProxy = new org::agl::proximity("org.agl.homescreen",
+                                              "/Proximity",
+                                              QDBusConnection::sessionBus(),
+                                              0);
+    mp_dBusHomeScreenProxy = new org::agl::homescreen("org.agl.homescreen",
+                                                     "/HomeScreen",
+                                                     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,12 +67,14 @@ MainWindow::~MainWindow()
     settings.setValue("homescreensimulator/daymode", mp_ui->radioButton_DayMode->isChecked());
     settings.setValue("homescreensimulator/nightmode", mp_ui->radioButton_NightMode->isChecked());
 
+    delete mp_dBusHomeScreenProxy;
+    delete mp_dBusProximityProxy;
     delete mp_dBusPopupProxy;
     delete mp_dBusStatusBarProxy;
 
-    if (0 == mp_dBusDayNightModeAdapter)
+    if (0 == mp_dBusDayNightModeAdaptor)
     {
-        delete mp_dBusDayNightModeAdapter;
+        delete mp_dBusDayNightModeAdaptor;
     }
     delete mp_ui;
 }
@@ -149,3 +162,18 @@ void MainWindow::on_pushButton_PopupExample_clicked()
 {
     mp_dBusPopupProxy->showPopup(0, "Hello Popup!\nNice to see you!");
 }
+
+void MainWindow::on_pushButton_comboBoxExample_clicked()
+{
+    QStringList choices;
+    choices.append("Item1");
+    choices.append("Item2");
+    choices.append("Item3");
+    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());
+}