X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=HomeScreen%2Fsrc%2Fmainwindow.h;h=ebcfea29963d6401adc139f98ce6d9ebe517b7bb;hb=09f2f0036f122e49aa49e6c446d723850192a725;hp=d94546af1958130150c4e5ee9a7ae6b056658f4e;hpb=cf8cd699e91df40c3f9070019f7c561432b4b4dd;p=staging%2FHomeScreen.git diff --git a/HomeScreen/src/mainwindow.h b/HomeScreen/src/mainwindow.h index d94546a..ebcfea2 100644 --- a/HomeScreen/src/mainwindow.h +++ b/HomeScreen/src/mainwindow.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. @@ -19,13 +19,14 @@ #include #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" @@ -47,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(); @@ -64,13 +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; };