First integration of new HMI design

[staging/HomeScreen.git] / HomeScreen / src / mainwindow.h

diff --git a/HomeScreen/src/mainwindow.h b/HomeScreen/src/mainwindow.h
index af725fd..0747e46 100644 (file)
--- a/HomeScreen/src/mainwindow.h
+++ b/HomeScreen/src/mainwindow.h
@@ -18,13 +18,19 @@
 #define MAINWINDOW_H
 
 #include <QMainWindow>
-#include "../interfaces/daynightmode.h"
 #include "daynightmode_proxy.h"
+#include "proximity_adaptor.h"
 
-#include "popupwidget.h"
+#include "homescreencontrolinterface.h"
 
 #include "statusbarwidget.h"
 #include "controlbarwidget.h"
+#include "settingswidget.h"
+//#include "applauncher.h"
+#include "popupwidget.h"
+
+#include "layouthandler.h"
+
 
 namespace Ui {
 class MainWindow;
@@ -42,10 +48,18 @@ public:
 public Q_SLOTS:
     void dayNightModeSlot(int mode);
 
+// from proximity_adaptor.h
+public Q_SLOTS:
+    void setObjectDetected(bool detected);
+
+public slots:
+    void updateColorScheme();
+
 protected:
     // called when the translator loaded a new language set
     void changeEvent(QEvent* event);
 
+
 private:
     Ui::MainWindow *mp_ui;
 
@@ -53,11 +67,17 @@ private:
     org::agl::daynightmode *mp_dBusDayNightMode_StatusBarWidget;
     ControlBarWidget *mp_controlBarWidget;
     org::agl::daynightmode *mp_dBusDayNightMode_ControlBarWidget;
+    SettingsWidget *mp_settingsWidget;
+    //AppLauncherWidget *mp_applauncherwidget;
+    PopupWidget *mp_popupWidget;
 
-    SystemDayNight::eDayNightMode m_dayNightMode;
-    org::agl::daynightmode *mp_dayNightModeProxy;
+    LayoutHandler *mp_layoutHandler;
 
-    PopupWidget *mp_popupWidget;
+    org::agl::daynightmode *mp_dBusDayNightModeProxy;
+
+    ProximityAdaptor *mp_proximityAdaptor;
+
+    HomeScreenControlInterface *mp_homeScreenControlInterface;
 };
 
 #endif // MAINWINDOW_H