X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=HomeScreen%2Fsrc%2Fstatusbarwidget.h;fp=src%2Fstatusbarwidget.h;h=e17f13ee5192b9ab9ea5acda3553fa5aa0a5ca6d;hb=ca3605ea664834acdf712e691be8f0358b1c6b6f;hp=2547d34e451cebfdfc2cf180faf66d023f0fc361;hpb=ff25a2a06428ffb0d6d8aeddb5faaa301b4201fe;p=staging%2FHomeScreen.git

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
--- 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