Code Review
/
staging
/
HomeScreen.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
modification in client def
[staging/HomeScreen.git]
/
HomeScreen
/
src
/
popupwidget.cpp
diff --git
a/HomeScreen/src/popupwidget.cpp
b/HomeScreen/src/popupwidget.cpp
index
e7226dd
..
6cf00b1
100644
(file)
--- a/
HomeScreen/src/popupwidget.cpp
+++ b/
HomeScreen/src/popupwidget.cpp
@@
-72,6
+72,7
@@
void PopupWidget::showPopup(int /*type*/, const QString &text)
void PopupWidget::showPopupComboBox(const QString &text, const QStringList &choices)
{
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();
m_sendComboBoxChoice = true;
mp_ui->comboBox_choice->addItems(choices);
mp_ui->comboBox_choice->show();
@@
-84,7
+85,7
@@
void PopupWidget::on_pushButton_OK_clicked()
{
if (m_sendComboBoxChoice)
{
{
if (m_sendComboBoxChoice)
{
- comboBoxResult(mp_ui->comboBox_choice->currentText());
+
emit
comboBoxResult(mp_ui->comboBox_choice->currentText());
m_sendComboBoxChoice = false;
}
this->close();
m_sendComboBoxChoice = false;
}
this->close();