Add Nav and Media app to control bar.

[staging/HomeScreen.git] / HomeScreen / src / controlbarwidget.cpp

diff --git a/HomeScreen/src/controlbarwidget.cpp b/HomeScreen/src/controlbarwidget.cpp
index dee0207..bc78004 100644 (file)
--- a/HomeScreen/src/controlbarwidget.cpp
+++ b/HomeScreen/src/controlbarwidget.cpp
@@ -16,18 +16,27 @@
 
 #include "controlbarwidget.h"
 #include "ui_controlbarwidget.h"
-#include "../interfaces/daynightmode.h"
+#include <include/daynightmode.hpp>
+#include <include/inputevent.hpp>
 #include <QSettings>
 
 ControlBarWidget::ControlBarWidget(QWidget *parent) :
     QWidget(parent),
-    mp_ui(new Ui::ControlBarWidget)
+    mp_ui(new Ui::ControlBarWidget),
+    mp_dBusInputEventProxy()
 {
     mp_ui->setupUi(this);
+
+    qDebug("D-Bus: connect to org.agl.homescreenappframeworkbindertizen /AppFramework");
+    mp_dBusInputEventProxy = new org::agl::inputevent("org.agl.inputeventmanager",
+                                              "/InputEvent",
+                                              QDBusConnection::sessionBus(),
+                                              0);
 }
 
 ControlBarWidget::~ControlBarWidget()
 {
+    delete mp_dBusInputEventProxy;
     delete mp_ui;
 }
 
@@ -38,25 +47,44 @@ void ControlBarWidget::updateColorScheme()
                           "/colorschemes/" +
                           settings.value("systemsettings/colorscheme", "default").toString() +
                           "/" +
+                          QString::number(settings.value("systemsettings/proximityobjectdetected", false).toBool()) +
+                          "/" +
                           QString::number(settings.value("systemsettings/daynightmode", SystemDayNight::DAYNIGHTMODE_DAY).toInt()) +
                           ".ini",
                           QSettings::IniFormat);
 
     QIcon icon;
-    mp_ui->widget_Background->setStyleSheet(settings_cs.value(QString("ControlBarWidget/widget_Background")).toString());
+    mp_ui->widget_background->setStyleSheet(settings_cs.value(QString("ControlBarWidget/widget_background_css")).toString());
+
+    icon.addFile(settings_cs.value(QString("ControlBarWidget/pushButton_homeIcon_icon")).toString(), QSize(), QIcon::Normal, QIcon::Off);
+    mp_ui->pushButton_home->setIcon(icon);
+    mp_ui->pushButton_home->setStyleSheet(settings_cs.value(QString("ControlBarWidget/pushButton_homeIcon_css")).toString());
+    icon.addFile(settings_cs.value(QString("ControlBarWidget/pushButton_settingsIcon_icon")).toString(), QSize(), QIcon::Normal, QIcon::Off);
+    mp_ui->pushButton_settings->setIcon(icon);
+    mp_ui->pushButton_settings->setStyleSheet(settings_cs.value(QString("ControlBarWidget/pushButton_settingsIcon_css")).toString());
+    icon.addFile(settings_cs.value(QString("ControlBarWidget/pushButton_navIcon_icon")).toString(), QSize(), QIcon::Normal, QIcon::Off);
+    mp_ui->pushButton_nav->setIcon(icon);
+    mp_ui->pushButton_nav->setStyleSheet(settings_cs.value(QString("ControlBarWidget/pushButton_navIcon_css")).toString());
+}
 
-    icon.addFile(settings_cs.value(QString("ControlBarWidget/pushButton_Home")).toString(), QSize(), QIcon::Normal, QIcon::Off);
-    mp_ui->pushButton_Home->setIcon(icon);
-    icon.addFile(settings_cs.value(QString("ControlBarWidget/pushButton_Settings")).toString(), QSize(), QIcon::Normal, QIcon::Off);
-    mp_ui->pushButton_Settings->setIcon(icon);
+void ControlBarWidget::on_pushButton_home_clicked()
+{
+    hideAppLayer();
+    homeButtonPressed();
+}
+
+void ControlBarWidget::on_pushButton_settings_clicked()
+{
+    hideAppLayer();
+    settingsButtonPressed();
 }
 
-void ControlBarWidget::on_pushButton_Settings_clicked()
+void ControlBarWidget::on_pushButton_nav_clicked()
 {
-    emit settingsButtonPressed();
+    mp_dBusInputEventProxy->hardKeyPressed(InputEvent::HARDKEY_NAV);
 }
 
-void ControlBarWidget::on_pushButton_Home_clicked()
+void ControlBarWidget::on_pushButton_media_clicked()
 {
-    emit homeButtonPressed();
+    mp_dBusInputEventProxy->hardKeyPressed(InputEvent::HARDKEY_MEDIA);
 }