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
v0.1.0
[staging/HomeScreen.git]
/
HomeScreen
/
src
/
mainwindow.h
diff --git
a/src/mainwindow.h
b/HomeScreen/src/mainwindow.h
similarity index 72%
rename from
src/mainwindow.h
rename to
HomeScreen/src/mainwindow.h
index
a87d88d
..
af725fd
100644
(file)
--- a/
src/mainwindow.h
+++ b/
HomeScreen/src/mainwindow.h
@@
-18,13
+18,10
@@
#define MAINWINDOW_H
#include <QMainWindow>
#define MAINWINDOW_H
#include <QMainWindow>
-#include "include/daynightmode.h"
-#include "daynightmode_adapter.h"
+#include "../interfaces/daynightmode.h"
#include "daynightmode_proxy.h"
#include "daynightmode_proxy.h"
+
#include "popupwidget.h"
#include "popupwidget.h"
-#include "include/popup.h"
-#include "popup_adapter.h"
-#include "popup_proxy.h"
#include "statusbarwidget.h"
#include "controlbarwidget.h"
#include "statusbarwidget.h"
#include "controlbarwidget.h"
@@
-41,17
+38,9
@@
public:
explicit MainWindow(QWidget *parent = 0);
~MainWindow();
explicit MainWindow(QWidget *parent = 0);
~MainWindow();
-//
from daynightmode_adapter.h
+//
day/night mode
public Q_SLOTS:
public Q_SLOTS:
- void setDayNightMode(int mode);
- inline int getDayNightMode()
- {
- return (int)m_dayNightMode;
- }
-
-// from popup_adapter.h
-public Q_SLOTS: // METHODS
- void showPopup(int type, const QString &text);
+ void dayNightModeSlot(int mode);
protected:
// called when the translator loaded a new language set
protected:
// called when the translator loaded a new language set
@@
-65,13
+54,8
@@
private:
ControlBarWidget *mp_controlBarWidget;
org::agl::daynightmode *mp_dBusDayNightMode_ControlBarWidget;
ControlBarWidget *mp_controlBarWidget;
org::agl::daynightmode *mp_dBusDayNightMode_ControlBarWidget;
- // dbus daynightmode
SystemDayNight::eDayNightMode m_dayNightMode;
SystemDayNight::eDayNightMode m_dayNightMode;
- DaynightmodeAdaptor *mp_daynightmodeAdaptor;
-
- // dbus popup
- PopupAdaptor *mp_popupAdaptor;
- org::agl::popup *mp_dBusPopup;
+ org::agl::daynightmode *mp_dayNightModeProxy;
PopupWidget *mp_popupWidget;
};
PopupWidget *mp_popupWidget;
};