Merge lastest commit from homescreen-2017

    Merge two lastest commit from homescreen-2017.

1)  StatusBarModel: fix QQmlContext reference
    Fix missing include
    Bug-AGL: SPEC-1628

2)  Improve output of multiple screen resolution
    To improve output on various monitor with various resolution,
    use scale_factor from WM to fit various screen resolution.
    Bug-AGL: SPEC-1568, SPEC-1569, SPEC-1611

Change-Id: I71a6c87187c2b0b81bb0ed10cc8779032aa19300
Signed-off-by: Matt Porter <mporter@konsulko.com>Y
Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
Signed-off-by: zheng_wenlong <wenlong_zheng@nexty-ele.com>

1 files changed, 8 insertions, 0 deletions

diff --git a/homescreen/src/statusbarmodel.h b/homescreen/src/statusbarmodel.h
index 8d6a70b..4e31f19 100644
--- a/homescreen/src/statusbarmodel.h
+++ b/homescreen/src/statusbarmodel.h
@@ -18,6 +18,7 @@
 #define STATUSBARMODEL_H
 
 #include <QtCore/QAbstractListModel>
+#include <QtQml/QQmlContext>
 
 class StatusBarModel : public QAbstractListModel
 {
@@ -26,14 +27,21 @@ public:
     explicit StatusBarModel(QObject *parent = NULL);
     ~StatusBarModel();
 
+    void init(QUrl &url, QQmlContext *context);
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
 
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
     QHash<int, QByteArray> roleNames() const override;
 
+    // slots
+    void onWifiConnectedChanged(bool connected);
+    void onWifiEnabledChanged(bool enabled);
+    void onWifiStrengthChanged(int strength);
+
 private:
     class Private;
     Private *d;
+    void setWifiStatus(bool connected, bool enabled, int strength);
 };
 
 #endif // STATUSBARMODEL_H