X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=HomeScreen%2Fsrc%2Fpopupwidget.cpp;h=6f7d9cb59b7b98725df52c800b96ef984207a205;hb=824bfd42b0105b0aeffbc33a87285578abda2f3b;hp=4a8977161e000ca61851dd06239d30da6cd3f666;hpb=3478f65b39560b333ba189e7d86e2c2cebfc9c7a;p=staging%2FHomeScreen.git

diff --git a/HomeScreen/src/popupwidget.cpp b/HomeScreen/src/popupwidget.cpp
index 4a89771..6f7d9cb 100644
--- a/HomeScreen/src/popupwidget.cpp
+++ b/HomeScreen/src/popupwidget.cpp
@@ -16,12 +16,13 @@
 
 #include "popupwidget.h"
 #include "ui_popupwidget.h"
-#include "../interfaces/daynightmode.h"
+#include <include/daynightmode.hpp>
 
 PopupWidget::PopupWidget(QWidget *parent) :
     QWidget(parent),
     mp_ui(new Ui::PopupWidget),
-    mp_popupAdaptor(0)
+    mp_popupAdaptor(0),
+    m_sendComboBoxChoice(false)
 {
     // publish dbus popup interface
     mp_popupAdaptor = new PopupAdaptor((QObject*)this);
@@ -29,7 +30,11 @@ PopupWidget::PopupWidget(QWidget *parent) :
     dbus.registerObject("/Popup", this);
     dbus.registerService("org.agl.homescreen");
 
+    // no window decoration
+    setWindowFlags(Qt::FramelessWindowHint);
+
     mp_ui->setupUi(this);
+
     this->close();
 }
 
@@ -46,22 +51,42 @@ void PopupWidget::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);
 
-    mp_ui->widget_Popup->setStyleSheet(settings_cs.value(QString("PopupWidget/widget_Popup")).toString());
-    mp_ui->label_Text->setStyleSheet(settings_cs.value(QString("PopupWidget/label_Text")).toString());
+    mp_ui->widget_popup->setStyleSheet(settings_cs.value(QString("PopupWidget/widget_popup_css")).toString());
+    mp_ui->label_text->setStyleSheet(settings_cs.value(QString("PopupWidget/label_text_css")).toString());
 }
 
 void PopupWidget::showPopup(int /*type*/, const QString &text)
 {
+    m_sendComboBoxChoice = false;
+    mp_ui->comboBox_choice->hide();
+    this->show();
+    this->raise();
+    mp_ui->label_text->setText(text);
+}
+
+void PopupWidget::showPopupComboBox(const QString &text, const QStringList &choices)
+{
+    mp_ui->comboBox_choice->clear();
+    m_sendComboBoxChoice = true;
+    mp_ui->comboBox_choice->addItems(choices);
+    mp_ui->comboBox_choice->show();
     this->show();
     this->raise();
-    mp_ui->label_Text->setText(text);
+    mp_ui->label_text->setText(text);
 }
 
 void PopupWidget::on_pushButton_OK_clicked()
 {
+    if (m_sendComboBoxChoice)
+    {
+        comboBoxResult(mp_ui->comboBox_choice->currentText());
+        m_sendComboBoxChoice = false;
+    }
     this->close();
 }