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
Modification for dynamic speed sign (not activated)
[staging/HomeScreen.git]
/
HomeScreen
/
src
/
mainwindow.h
diff --git
a/HomeScreen/src/mainwindow.h
b/HomeScreen/src/mainwindow.h
index
d984c3e
..
0747e46
100644
(file)
--- a/
HomeScreen/src/mainwindow.h
+++ b/
HomeScreen/src/mainwindow.h
@@
-19,12
+19,18
@@
#include <QMainWindow>
#include "daynightmode_proxy.h"
#include <QMainWindow>
#include "daynightmode_proxy.h"
+#include "proximity_adaptor.h"
+
+#include "homescreencontrolinterface.h"
#include "statusbarwidget.h"
#include "controlbarwidget.h"
#include "settingswidget.h"
#include "statusbarwidget.h"
#include "controlbarwidget.h"
#include "settingswidget.h"
+//#include "applauncher.h"
#include "popupwidget.h"
#include "popupwidget.h"
+#include "layouthandler.h"
+
namespace Ui {
class MainWindow;
namespace Ui {
class MainWindow;
@@
-42,6
+48,10
@@
public:
public Q_SLOTS:
void dayNightModeSlot(int mode);
public Q_SLOTS:
void dayNightModeSlot(int mode);
+// from proximity_adaptor.h
+public Q_SLOTS:
+ void setObjectDetected(bool detected);
+
public slots:
void updateColorScheme();
public slots:
void updateColorScheme();
@@
-49,6
+59,7
@@
protected:
// called when the translator loaded a new language set
void changeEvent(QEvent* event);
// called when the translator loaded a new language set
void changeEvent(QEvent* event);
+
private:
Ui::MainWindow *mp_ui;
private:
Ui::MainWindow *mp_ui;
@@
-57,9
+68,16
@@
private:
ControlBarWidget *mp_controlBarWidget;
org::agl::daynightmode *mp_dBusDayNightMode_ControlBarWidget;
SettingsWidget *mp_settingsWidget;
ControlBarWidget *mp_controlBarWidget;
org::agl::daynightmode *mp_dBusDayNightMode_ControlBarWidget;
SettingsWidget *mp_settingsWidget;
+ //AppLauncherWidget *mp_applauncherwidget;
PopupWidget *mp_popupWidget;
PopupWidget *mp_popupWidget;
- org::agl::daynightmode *mp_dayNightModeProxy;
+ LayoutHandler *mp_layoutHandler;
+
+ org::agl::daynightmode *mp_dBusDayNightModeProxy;
+
+ ProximityAdaptor *mp_proximityAdaptor;
+
+ HomeScreenControlInterface *mp_homeScreenControlInterface;
};
#endif // MAINWINDOW_H
};
#endif // MAINWINDOW_H