diff options
| author | Javier S. Pedro <maemo@javispedro.com> | 2013-06-28 15:41:41 +0200 |
|---|---|---|
| committer | Javier S. Pedro <maemo@javispedro.com> | 2013-06-28 15:41:41 +0200 |
| commit | 43cc84270ffd27506287aeb96f7b1e6e72344fbb (patch) | |
| tree | e361f0b269e478567641afc5c1112f121d945dca | |
| parent | 5590661cddb1a87c56fd4e95e69b00f2f2daff45 (diff) | |
| download | sowatch-43cc84270ffd27506287aeb96f7b1e6e72344fbb.tar.gz sowatch-43cc84270ffd27506287aeb96f7b1e6e72344fbb.zip | |
fix mw config issues
| -rw-r--r-- | qtc_packaging/debian_fremantle/changelog | 14 | ||||
| -rw-r--r-- | qtc_packaging/debian_harmattan/changelog | 6 | ||||
| -rw-r--r-- | sowatchui/watchesmodel.cpp | 16 |
3 files changed, 35 insertions, 1 deletions
diff --git a/qtc_packaging/debian_fremantle/changelog b/qtc_packaging/debian_fremantle/changelog index 5c97e59..1cbd548 100644 --- a/qtc_packaging/debian_fremantle/changelog +++ b/qtc_packaging/debian_fremantle/changelog @@ -1,3 +1,17 @@ +sowatch (0.5.1) unstable; urgency=low + + * Fix issues with MW configuration crashing. + + -- Javier S. Pedro <maemo@javispedro.com> Fri, 28 Jun 2013 15:40:46 +0200 + +sowatch (0.5.0) unstable; urgency=low + + * MetaWatch face and notifications are now rendered using QML. + * Sony's LiveView watch is now supported. + * Removal of lots of old code. + + -- Javier S. Pedro <maemo@javispedro.com> Mon, 13 May 2013 01:06:03 +0200 + sowatch (0.4.6) unstable; urgency=low * New status bar for metawatch watchlets diff --git a/qtc_packaging/debian_harmattan/changelog b/qtc_packaging/debian_harmattan/changelog index 3a89d7f..1cbd548 100644 --- a/qtc_packaging/debian_harmattan/changelog +++ b/qtc_packaging/debian_harmattan/changelog @@ -1,3 +1,9 @@ +sowatch (0.5.1) unstable; urgency=low + + * Fix issues with MW configuration crashing. + + -- Javier S. Pedro <maemo@javispedro.com> Fri, 28 Jun 2013 15:40:46 +0200 + sowatch (0.5.0) unstable; urgency=low * MetaWatch face and notifications are now rendered using QML. diff --git a/sowatchui/watchesmodel.cpp b/sowatchui/watchesmodel.cpp index 0f1fa3d..0cc162f 100644 --- a/sowatchui/watchesmodel.cpp +++ b/sowatchui/watchesmodel.cpp @@ -102,9 +102,23 @@ void WatchesModel::addFoundWatch(const QVariantMap &info) } // Set some defaults + const QString watchModel = info["model"].toString(); Registry *registry = Registry::registry(); + newkey->set("providers", registry->allNotificationProviders()); - newkey->set("watchlets", registry->allWatchlets()); + + QStringList allWatchlets = registry->allWatchlets(); + QStringList configuredWatchlets; + foreach(const QString& watchletId, allWatchlets) { + WatchletPluginInterface *plugin = registry->getWatchletPlugin(watchletId); + if (plugin) { + WatchletPluginInterface::WatchletInfo info = plugin->describeWatchlet(watchletId, watchModel); + if (info.visible) { + configuredWatchlets += watchletId; + } + } + } + newkey->set("watchlets", configuredWatchlets); // Now add to the watches list QStringList active = _watches_list->value().toStringList(); |