v0.1.0

[staging/HomeScreen.git] / HomeScreen / src / statusbarwidget.h

diff --git a/src/statusbarwidget.h b/HomeScreen/src/statusbarwidget.h
similarity index 69%
rename from src/statusbarwidget.h
rename to HomeScreen/src/statusbarwidget.h
index 2547d34..e17f13e 100644 (file)
--- a/src/statusbarwidget.h
+++ b/HomeScreen/src/statusbarwidget.h
@@ -18,8 +18,9 @@
 #define STATUSBARWIDGET_H
 
 #include <QWidget>
-#include "include/daynightmode.h"
-#include "daynightmode_adapter.h"
+#include "../interfaces/daynightmode.h"
+#include "daynightmode_proxy.h"
+
 #include "statusbar_adapter.h"
 
 namespace Ui {
@@ -34,29 +35,26 @@ public:
     explicit StatusBarWidget(QWidget *parent = 0);
     ~StatusBarWidget();
 
-// from daynightmode_adapter.h
+// day/night mode
 public Q_SLOTS:
-    void setDayNightMode(int mode);
-    inline int getDayNightMode()
-    {
-        return (int)m_dayNightMode;
-    }
+    void dayNightModeSlot(int mode);
 
 // from statusbar_adapter.h
 public Q_SLOTS: // METHODS
-    void setStatus(int index, const QString &text);
-
-protected:
-    void timerEvent(QTimerEvent *e);
+    QList<int> getAvailablePlaceholders();
+    QString getStatusIcon(int placeholderIndex);
+    QString getStatusText(int placeholderIndex);
+    void setStatusIcon(int placeholderIndex, const QString &iconURI);
+    void setStatusText(int placeholderIndex, const QString &text);
 
 private:
     Ui::StatusBarWidget *mp_ui;
 
     SystemDayNight::eDayNightMode m_dayNightMode;
-    DaynightmodeAdaptor *mp_daynightmodeAdaptor;
+    org::agl::daynightmode *mp_dayNightModeProxy;
     StatusbarAdaptor *mp_statusbarAdaptor;
 
-    int m_secondsTimerId;
+    QMap<int, QString> *mp_statusbarIconURIs;
 };
 
 #endif // STATUSBARWIDGET_H