homescreenhandler: use applaunchd for app activation

[apps/homescreen.git] / homescreen / src / statusbarmodel.cpp

diff --git a/homescreen/src/statusbarmodel.cpp b/homescreen/src/statusbarmodel.cpp
index 5e63b7d..8b46cd1 100644 (file)
--- a/homescreen/src/statusbarmodel.cpp
+++ b/homescreen/src/statusbarmodel.cpp
@@ -17,10 +17,9 @@
 
 #include "statusbarmodel.h"
 #include "statusbarserver.h"
-
-#include <QtDBus/QDBusConnection>
-
+#if 0
 #include "network.h"
+#endif
 
 class StatusBarModel::Private
 {
@@ -32,15 +31,15 @@ private:
 public:
     StatusBarServer server;
     QString iconList[StatusBarServer::SupportedCount];
+#if 0
     Network *network;
+    WifiAdapter *wifi_a;
+#endif
 };
 
 StatusBarModel::Private::Private(StatusBarModel *parent)
     : q(parent)
 {
-    QDBusConnection dbus = QDBusConnection::sessionBus();
-    dbus.registerObject("/StatusBar", &server);
-    dbus.registerService("org.agl.homescreen");
     connect(&server, &StatusBarServer::statusIconChanged, [&](int placeholderIndex, const QString &icon) {
         if (placeholderIndex < 0 || StatusBarServer::SupportedCount <= placeholderIndex) return;
         if (iconList[placeholderIndex] == icon) return;
@@ -63,20 +62,28 @@ StatusBarModel::~StatusBarModel()
     delete d;
 }
 
-void StatusBarModel::init(QUrl &url, QQmlContext *context)
+void StatusBarModel::init(QQmlContext *context)
 {
+#if 0
     d->network = new Network(url, context);
     context->setContextProperty("network", d->network);
-
-    QObject::connect(d->network, &Network::wifiConnectedChanged, this, &StatusBarModel::onWifiConnectedChanged);
-    QObject::connect(d->network, &Network::wifiEnabledChanged, this, &StatusBarModel::onWifiEnabledChanged);
-    QObject::connect(d->network, &Network::wifiStrengthChanged, this, &StatusBarModel::onWifiStrengthChanged);
-
-    setWifiStatus(d->network->wifiConnected(), d->network->wifiEnabled(), d->network->wifiStrength());
+    d->wifi_a = static_cast<WifiAdapter*>(d->network->findAdapter("wifi"));
+    Q_CHECK_PTR(d->wifi_a);
+
+    QObject::connect(d->wifi_a, &WifiAdapter::wifiConnectedChanged,
+                    this, &StatusBarModel::onWifiConnectedChanged);
+    QObject::connect(d->wifi_a, &WifiAdapter::wifiEnabledChanged,
+                    this, &StatusBarModel::onWifiEnabledChanged);
+    QObject::connect(d->wifi_a, &WifiAdapter::wifiStrengthChanged,
+                    this, &StatusBarModel::onWifiStrengthChanged);
+
+    setWifiStatus(d->wifi_a->wifiConnected(), d->wifi_a->wifiEnabled(), d->wifi_a->wifiStrength());
+#endif
 }
 
 void StatusBarModel::setWifiStatus(bool connected, bool enabled, int strength)
 {
+#if 0
     if (enabled && connected)
         if (strength < 30)
             d->server.setStatusIcon(0, QStringLiteral("qrc:/images/Status/HMI_Status_Wifi_1Bar-01.png"));
@@ -88,22 +95,29 @@ void StatusBarModel::setWifiStatus(bool connected, bool enabled, int strength)
             d->server.setStatusIcon(0, QStringLiteral("qrc:/images/Status/HMI_Status_Wifi_Full-01.png"));
     else
         d->server.setStatusIcon(0, QStringLiteral("qrc:/images/Status/HMI_Status_Wifi_NoBars-01.png"));
+#endif
 }
 
 void StatusBarModel::onWifiConnectedChanged(bool connected)
 {
-    setWifiStatus(connected, d->network->wifiEnabled(), d->network->wifiStrength());
+#if 0
+    setWifiStatus(connected, d->wifi_a->wifiEnabled(), d->wifi_a->wifiStrength());
+#endif
 }
 
 void StatusBarModel::onWifiEnabledChanged(bool enabled)
 {
-    setWifiStatus(d->network->wifiConnected(), enabled, d->network->wifiStrength());
+#if 0
+    setWifiStatus(d->wifi_a->wifiConnected(), enabled, d->wifi_a->wifiStrength());
+#endif
 }
 
 void StatusBarModel::onWifiStrengthChanged(int strength)
 {
+#if 0
     qInfo() << "Strength changed: " << strength;
-    setWifiStatus(d->network->wifiConnected(), d->network->wifiEnabled(), strength);
+    setWifiStatus(d->wifi_a->wifiConnected(), d->wifi_a->wifiEnabled(), strength);
+#endif
 }
 
 int StatusBarModel::rowCount(const QModelIndex &parent) const