From 85fb48bc51fed06a50b6178727fdf9e96aea4fc4 Mon Sep 17 00:00:00 2001 From: "Javier S. Pedro" Date: Sat, 13 Sep 2014 22:40:39 +0200 Subject: UI can now add some widgets around --- src/controller.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/controller.cpp') diff --git a/src/controller.cpp b/src/controller.cpp index 047ad96..9d1961c 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -13,7 +13,7 @@ Controller::Controller(const QString &settingsPrefix, QQuickView *view, QObject _settings(new MDConfGroup(this)), _metawatch(0), _reconnect(new ReconnectTimer(this)), - _view(new WidgetView(settingsPrefix, view, this)), + _widgets(new WidgetInfoModel(settingsPrefix, this)), _batteryCharge(0), _batteryCharging(false) { _settings->setPath(settingsPrefix); @@ -25,6 +25,7 @@ Controller::Controller(const QString &settingsPrefix, QQuickView *view, QObject connect(_metawatch, &MetaWatch::disconnected, _reconnect, &ReconnectTimer::scheduleNextAttempt); connect(_metawatch, &MetaWatch::batteryStatus, this, &Controller::handleMetaWatchBatteryStatus); connect(_reconnect, &ReconnectTimer::tryReconnect, _metawatch, &MetaWatch::connectDevice); + connect(_recc) _reconnect->scheduleNextAttempt(); @@ -69,7 +70,7 @@ void Controller::handleMetaWatchConnected() _metawatch->setDateTime(QDateTime::currentDateTime()); _metawatch->updateLcdDisplay(); - _metawatch->updateWidgetList(_view->widgets()); + // TODO _metawatch->updateWidgetList(_view->widgets()); } void Controller::handleMetaWatchBatteryStatus(bool charging, int charge) -- cgit v1.2.3