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
Merge "Add sample qml application"
[staging/HomeScreen.git]
/
HomeScreen
/
src
/
controlbarwidget.h
diff --git
a/HomeScreen/src/controlbarwidget.h
b/HomeScreen/src/controlbarwidget.h
index
618fa35
..
74067f8
100644
(file)
--- a/
HomeScreen/src/controlbarwidget.h
+++ b/
HomeScreen/src/controlbarwidget.h
@@
-18,9
+18,7
@@
#define CONTROLBARWIDGET_H
#include <QWidget>
#define CONTROLBARWIDGET_H
#include <QWidget>
-#include "../interfaces/daynightmode.h"
-#include "daynightmode_proxy.h"
-#include "settingswidget.h"
+#include "inputevent_proxy.h"
namespace Ui {
class ControlBarWidget;
namespace Ui {
class ControlBarWidget;
@@
-33,24
+31,24
@@
class ControlBarWidget : public QWidget
public:
explicit ControlBarWidget(QWidget *parent = 0);
~ControlBarWidget();
public:
explicit ControlBarWidget(QWidget *parent = 0);
~ControlBarWidget();
+public slots:
+ void updateColorScheme();
+signals:
+ void hideAppLayer();
-// day/night mode
-public Q_SLOTS:
- void dayNightModeSlot(int mode);
+ void settingsButtonPressed();
+ void homeButtonPressed();
private slots:
private slots:
- void on_pushButton_Settings_clicked();
+ void on_pushButton_home_clicked();
+ void on_pushButton_settings_clicked();
+ void on_pushButton_nav_clicked();
- void on_pushButton_
Home
_clicked();
+ void on_pushButton_
media
_clicked();
private:
Ui::ControlBarWidget *mp_ui;
private:
Ui::ControlBarWidget *mp_ui;
- SettingsWidget *mp_settingsWidget;
- org::agl::daynightmode *mp_dBusDayNightMode_SettingsWidget;
-
- // D-Bus day/night
- SystemDayNight::eDayNightMode m_dayNightMode;
- org::agl::daynightmode *mp_dayNightModeProxy;
+ org::agl::inputevent *mp_dBusInputEventProxy;
};
#endif // CONTROLBARWIDGET_H
};
#endif // CONTROLBARWIDGET_H