X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=HomeScreen%2Fsrc%2Fpopupwidget.h;h=7f3aaa8cf46854a7f97cd42269f08f4b1275d464;hb=09f2f0036f122e49aa49e6c446d723850192a725;hp=a8765761bdef2b74b4f4e1ba0924ca9f7b1158a6;hpb=ca3605ea664834acdf712e691be8f0358b1c6b6f;p=staging%2FHomeScreen.git diff --git a/HomeScreen/src/popupwidget.h b/HomeScreen/src/popupwidget.h index a876576..7f3aaa8 100644 --- a/HomeScreen/src/popupwidget.h +++ b/HomeScreen/src/popupwidget.h @@ -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. @@ -18,11 +18,8 @@ #define POPUPWIDGET_H #include -#include "../interfaces/popup.h" -#include "popup_adapter.h" -#include "../interfaces/daynightmode.h" -#include "daynightmode_proxy.h" - +#include +#include "popup_adaptor.h" namespace Ui { class PopupWidget; @@ -35,24 +32,27 @@ class PopupWidget : public QWidget public: explicit PopupWidget(QWidget *parent = 0); ~PopupWidget(); +public slots: + void updateColorScheme(); -// day/night mode -public Q_SLOTS: - void dayNightModeSlot(int mode); - - // from popup_adapter.h + // from popup_adaptor.h public Q_SLOTS: // METHODS - void showPopup(int type, const QString &text); + void showPopup(int /*type*/, const QString &text); + void showPopupComboBox(const QString &text, const QStringList &choices); private slots: void on_pushButton_OK_clicked(); +signals: + void comboBoxResult(QString choice); + private: Ui::PopupWidget *mp_ui; - SystemDayNight::eDayNightMode m_dayNightMode; - org::agl::daynightmode *mp_dayNightModeProxy; PopupAdaptor *mp_popupAdaptor; + bool m_sendComboBoxChoice; + // for showPupupFor LayoutSelection + //QList m_pushButtons; }; #endif // POPUPWIDGET_H