#include "statusbarmodel.h"
#include "statusbarserver.h"
-
-#include <QtDBus/QDBusConnection>
-
-#include "network.h"
+#include <network.h>
+#include <wifiadapter.h>
class StatusBarModel::Private
{
StatusBarServer server;
QString iconList[StatusBarServer::SupportedCount];
Network *network;
+ WifiAdapter *wifi_a;
};
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;
delete d;
}
-void StatusBarModel::init(QUrl &url, QQmlContext *context)
+void StatusBarModel::init(QQmlContext *context)
{
- d->network = new Network(url, context);
+ d->network = new Network(false, context);
context->setContextProperty("network", d->network);
+ d->wifi_a = static_cast<WifiAdapter*>(d->network->findAdapter("wifi"));
+ Q_CHECK_PTR(d->wifi_a);
- 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);
+ 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->network->wifiConnected(), d->network->wifiEnabled(), d->network->wifiStrength());
+ setWifiStatus(d->wifi_a->wifiConnected(), d->wifi_a->wifiEnabled(), d->wifi_a->wifiStrength());
}
void StatusBarModel::setWifiStatus(bool connected, bool enabled, int strength)
void StatusBarModel::onWifiConnectedChanged(bool connected)
{
- setWifiStatus(connected, d->network->wifiEnabled(), d->network->wifiStrength());
+ setWifiStatus(connected, d->wifi_a->wifiEnabled(), d->wifi_a->wifiStrength());
}
void StatusBarModel::onWifiEnabledChanged(bool enabled)
{
- setWifiStatus(d->network->wifiConnected(), enabled, d->network->wifiStrength());
+ setWifiStatus(d->wifi_a->wifiConnected(), enabled, d->wifi_a->wifiStrength());
}
void StatusBarModel::onWifiStrengthChanged(int strength)
{
qInfo() << "Strength changed: " << strength;
- setWifiStatus(d->network->wifiConnected(), d->network->wifiEnabled(), strength);
+ setWifiStatus(d->wifi_a->wifiConnected(), d->wifi_a->wifiEnabled(), strength);
}
int StatusBarModel::rowCount(const QModelIndex &parent) const