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
fix typo
[staging/HomeScreen.git]
/
HomeScreen
/
src
/
popupwidget.h
diff --git
a/HomeScreen/src/popupwidget.h
b/HomeScreen/src/popupwidget.h
index
a54a602
..
97db3ba
100644
(file)
--- a/
HomeScreen/src/popupwidget.h
+++ b/
HomeScreen/src/popupwidget.h
@@
-18,8
+18,8
@@
#define POPUPWIDGET_H
#include <QWidget>
#define POPUPWIDGET_H
#include <QWidget>
-#include
"../interfaces/popup.h"
-#include "popup_adapt
e
r.h"
+#include
<include/popup.hpp>
+#include "popup_adapt
o
r.h"
namespace Ui {
class PopupWidget;
namespace Ui {
class PopupWidget;
@@
-35,17
+35,24
@@
public:
public slots:
void updateColorScheme();
public slots:
void updateColorScheme();
- // from popup_adapt
e
r.h
+ // from popup_adapt
o
r.h
public Q_SLOTS: // METHODS
void showPopup(int /*type*/, const QString &text);
public Q_SLOTS: // METHODS
void showPopup(int /*type*/, const QString &text);
+ void showPopupComboBox(const QString &text, const QStringList &choices);
private slots:
void on_pushButton_OK_clicked();
private slots:
void on_pushButton_OK_clicked();
+signals:
+ void comboBoxResult(QString choice);
+
private:
Ui::PopupWidget *mp_ui;
PopupAdaptor *mp_popupAdaptor;
private:
Ui::PopupWidget *mp_ui;
PopupAdaptor *mp_popupAdaptor;
+ bool m_sendComboBoxChoice;
+ // for showPupupFor LayoutSelection
+ //QList<QPushButton> m_pushButtons;
};
#endif // POPUPWIDGET_H
};
#endif // POPUPWIDGET_H