X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=HomeScreen%2Fsrc%2Fpopupwidget.cpp;h=1f062f1013f8ae578dfe12956dc0e3e1bca184bd;hb=09f2f0036f122e49aa49e6c446d723850192a725;hp=919bea0fe635d6315f7651c5ebcc2a269001c108;hpb=cf8cd699e91df40c3f9070019f7c561432b4b4dd;p=staging%2FHomeScreen.git

diff --git a/HomeScreen/src/popupwidget.cpp b/HomeScreen/src/popupwidget.cpp
index 919bea0..1f062f1 100644
--- a/HomeScreen/src/popupwidget.cpp
+++ b/HomeScreen/src/popupwidget.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.
@@ -51,38 +51,41 @@ 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->hide();
+    mp_ui->comboBox_choice->hide();
     this->show();
     this->raise();
-    mp_ui->label_Text->setText(text);
+    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->addItems(choices);
-    mp_ui->comboBox->show();
+    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->currentText());
+        emit comboBoxResult(mp_ui->comboBox_choice->currentText());
         m_sendComboBoxChoice = false;
     }
     this->close();