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 cb2243e..0747e46 100644 (file)
--- a/HomeScreen/src/mainwindow.h
+++ b/HomeScreen/src/mainwindow.h
@@ -19,15 +19,18 @@
 
 #include <QMainWindow>
 #include "daynightmode_proxy.h"
+#include "proximity_adaptor.h"
 
 #include "homescreencontrolinterface.h"
 
 #include "statusbarwidget.h"
 #include "controlbarwidget.h"
 #include "settingswidget.h"
-#include "applauncherwidget.h"
+//#include "applauncher.h"
 #include "popupwidget.h"
 
+#include "layouthandler.h"
+
 
 namespace Ui {
 class MainWindow;
@@ -45,6 +48,9 @@ public:
 public Q_SLOTS:
     void dayNightModeSlot(int mode);
 
+// from proximity_adaptor.h
+public Q_SLOTS:
+    void setObjectDetected(bool detected);
 
 public slots:
     void updateColorScheme();
@@ -53,8 +59,6 @@ protected:
     // called when the translator loaded a new language set
     void changeEvent(QEvent* event);
 
-private slots:
-    void on_pushButton_clicked();
 
 private:
     Ui::MainWindow *mp_ui;
@@ -64,11 +68,15 @@ private:
     ControlBarWidget *mp_controlBarWidget;
     org::agl::daynightmode *mp_dBusDayNightMode_ControlBarWidget;
     SettingsWidget *mp_settingsWidget;
-    AppLauncherWidget *mp_applauncherwidget;
+    //AppLauncherWidget *mp_applauncherwidget;
     PopupWidget *mp_popupWidget;
 
+    LayoutHandler *mp_layoutHandler;
+
     org::agl::daynightmode *mp_dBusDayNightModeProxy;
 
+    ProximityAdaptor *mp_proximityAdaptor;
+
     HomeScreenControlInterface *mp_homeScreenControlInterface;
 };