diff options
| -rw-r--r-- | qmafwwatchlet/qmafwwatchletplugin.cpp | 15 | ||||
| -rw-r--r-- | qmafwwatchlet/qmafwwatchletplugin.h | 3 | ||||
| -rw-r--r-- | qmapwatchlet/qmapwatchlet.cpp | 1 | ||||
| -rw-r--r-- | qmapwatchlet/qmapwatchletplugin.cpp | 15 | ||||
| -rw-r--r-- | qmapwatchlet/qmapwatchletplugin.h | 3 | ||||
| -rw-r--r-- | qmsgwatchlet/qmsgwatchlet.pro | 6 | ||||
| -rw-r--r-- | qmsgwatchlet/qmsgwatchletplugin.cpp | 15 | ||||
| -rw-r--r-- | qmsgwatchlet/qmsgwatchletplugin.h | 3 | ||||
| -rw-r--r-- | qtc_packaging/debian_harmattan/changelog | 11 | ||||
| -rw-r--r-- | qtc_packaging/debian_harmattan/control | 3 | ||||
| -rw-r--r-- | sowatch.pro | 8 | ||||
| -rw-r--r-- | sowatchd/watchhandler.cpp | 2 |
12 files changed, 63 insertions, 22 deletions
diff --git a/qmafwwatchlet/qmafwwatchletplugin.cpp b/qmafwwatchlet/qmafwwatchletplugin.cpp index 09984b4..713c199 100644 --- a/qmafwwatchlet/qmafwwatchletplugin.cpp +++ b/qmafwwatchlet/qmafwwatchletplugin.cpp @@ -19,10 +19,19 @@ QStringList QMafwWatchletPlugin::watchlets() return l; } -Watchlet* QMafwWatchletPlugin::getWatchlet(const QString& driver, QSettings& settings, WatchServer *server) +WatchletPluginInterface::WatchletInfo QMafwWatchletPlugin::describeWatchlet(const QString &id) { - Q_UNUSED(driver); - Q_UNUSED(settings); + WatchletInfo info; + if (id != "com.javispedro.sowatch.qmafw") return info; + info.name = "Music player"; + info.icon = QUrl::fromLocalFile(SOWATCH_QML_DIR "/qmafwwatchlet/icon.png"); + return info; +} + +Watchlet* QMafwWatchletPlugin::getWatchlet(const QString &id, ConfigKey *config, WatchServer *server) +{ + Q_UNUSED(config); + if (id != "com.javispedro.sowatch.qmafw") return 0; return new QMafwWatchlet(server); } diff --git a/qmafwwatchlet/qmafwwatchletplugin.h b/qmafwwatchlet/qmafwwatchletplugin.h index c4ff3ef..11e99af 100644 --- a/qmafwwatchlet/qmafwwatchletplugin.h +++ b/qmafwwatchlet/qmafwwatchletplugin.h @@ -16,7 +16,8 @@ public: ~QMafwWatchletPlugin(); QStringList watchlets(); - Watchlet* getWatchlet(const QString& driver, QSettings& settings, WatchServer* server); + WatchletInfo describeWatchlet(const QString &id); + Watchlet* getWatchlet(const QString &id, ConfigKey *config, WatchServer *server); }; } diff --git a/qmapwatchlet/qmapwatchlet.cpp b/qmapwatchlet/qmapwatchlet.cpp index 5c8109b..6f39641 100644 --- a/qmapwatchlet/qmapwatchlet.cpp +++ b/qmapwatchlet/qmapwatchlet.cpp @@ -5,7 +5,6 @@ using namespace sowatch; QMapWatchlet::QMapWatchlet(WatchServer* server) : DeclarativeWatchlet(server, "com.javispedro.sowatch.qmap") { - setSource(QUrl(SOWATCH_QML_DIR "/qmapwatchlet/" + server->watch()->model() + ".qml")); } diff --git a/qmapwatchlet/qmapwatchletplugin.cpp b/qmapwatchlet/qmapwatchletplugin.cpp index 5b72482..e8e1c43 100644 --- a/qmapwatchlet/qmapwatchletplugin.cpp +++ b/qmapwatchlet/qmapwatchletplugin.cpp @@ -19,10 +19,19 @@ QStringList QMapWatchletPlugin::watchlets() return l; } -Watchlet* QMapWatchletPlugin::getWatchlet(const QString& driver, QSettings& settings, WatchServer *server) +WatchletPluginInterface::WatchletInfo QMapWatchletPlugin::describeWatchlet(const QString &id) { - Q_UNUSED(driver); - Q_UNUSED(settings); + WatchletInfo info; + if (id != "com.javispedro.sowatch.qmap") return info; + info.name = "Moving map"; + info.icon = QUrl::fromLocalFile(SOWATCH_QML_DIR "/qmapwatchlet/icon.png"); + return info; +} + +Watchlet* QMapWatchletPlugin::getWatchlet(const QString &id, ConfigKey *config, WatchServer *server) +{ + Q_UNUSED(config); + if (id != "com.javispedro.sowatch.qmap") return 0; return new QMapWatchlet(server); } diff --git a/qmapwatchlet/qmapwatchletplugin.h b/qmapwatchlet/qmapwatchletplugin.h index e594209..04ff348 100644 --- a/qmapwatchlet/qmapwatchletplugin.h +++ b/qmapwatchlet/qmapwatchletplugin.h @@ -16,7 +16,8 @@ public: ~QMapWatchletPlugin(); QStringList watchlets(); - Watchlet* getWatchlet(const QString& driver, QSettings& settings, WatchServer* server); + WatchletInfo describeWatchlet(const QString &id); + Watchlet* getWatchlet(const QString &id, ConfigKey *config, WatchServer *server); }; } diff --git a/qmsgwatchlet/qmsgwatchlet.pro b/qmsgwatchlet/qmsgwatchlet.pro index ef02f16..9e18e42 100644 --- a/qmsgwatchlet/qmsgwatchlet.pro +++ b/qmsgwatchlet/qmsgwatchlet.pro @@ -1,4 +1,3 @@ - TARGET = qmsgwatchlet TEMPLATE = lib CONFIG += plugin @@ -11,10 +10,7 @@ HEADERS += qmsgwatchletplugin.h qmsgwatchlet.h qml_files.files = metawatch-digital.qml icon.png -win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../libsowatch/release/ -lsowatch -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../libsowatch/debug/ -lsowatch -else:symbian: LIBS += -lsowatch -else:unix: LIBS += -L$$OUT_PWD/../libsowatch/ -lsowatch +LIBS += -L$$OUT_PWD/../libsowatch/ -lsowatch INCLUDEPATH += $$PWD/../libsowatch DEPENDPATH += $$PWD/../libsowatch diff --git a/qmsgwatchlet/qmsgwatchletplugin.cpp b/qmsgwatchlet/qmsgwatchletplugin.cpp index 64a4157..2471d03 100644 --- a/qmsgwatchlet/qmsgwatchletplugin.cpp +++ b/qmsgwatchlet/qmsgwatchletplugin.cpp @@ -19,10 +19,19 @@ QStringList QMsgWatchletPlugin::watchlets() return l; } -Watchlet* QMsgWatchletPlugin::getWatchlet(const QString& driver, QSettings& settings, WatchServer *server) +WatchletPluginInterface::WatchletInfo QMsgWatchletPlugin::describeWatchlet(const QString &id) { - Q_UNUSED(driver); - Q_UNUSED(settings); + WatchletInfo info; + if (id != "com.javispedro.sowatch.qmsg") return info; + info.name = "Inbox"; + info.icon = QUrl::fromLocalFile(SOWATCH_QML_DIR "/qmsgwatchlet/icon.png"); + return info; +} + +Watchlet* QMsgWatchletPlugin::getWatchlet(const QString &id, ConfigKey *config, WatchServer *server) +{ + Q_UNUSED(config); + if (id != "com.javispedro.sowatch.qmsg") return 0; return new QMsgWatchlet(server); } diff --git a/qmsgwatchlet/qmsgwatchletplugin.h b/qmsgwatchlet/qmsgwatchletplugin.h index 4d08e94..01cb83e 100644 --- a/qmsgwatchlet/qmsgwatchletplugin.h +++ b/qmsgwatchlet/qmsgwatchletplugin.h @@ -16,7 +16,8 @@ public: ~QMsgWatchletPlugin(); QStringList watchlets(); - Watchlet* getWatchlet(const QString& driver, QSettings& settings, WatchServer* server); + WatchletInfo describeWatchlet(const QString &id); + Watchlet* getWatchlet(const QString &id, ConfigKey *config, WatchServer *server); }; } diff --git a/qtc_packaging/debian_harmattan/changelog b/qtc_packaging/debian_harmattan/changelog index d7f6d4b..2c1a390 100644 --- a/qtc_packaging/debian_harmattan/changelog +++ b/qtc_packaging/debian_harmattan/changelog @@ -1,3 +1,14 @@ +sowatch (0.4.0) unstable; urgency=low + + * Brand new configuration user interface. + * Use ConfigKey abstraction instead of directly hitting QSettings + * Add GConfKey backend to ConfigKey. + * Daemon now dynamically loads/unloads watches & watchlets as the + settings change. + * New Qt Messaging Framework based watchlet. + + -- Javier S. Pedro <maemo@javispedro.com> Fri, 10 Aug 2012 17:46:00 +0200 + sowatch (0.3.1) unstable; urgency=low * No longer using Qt Resources for anything. diff --git a/qtc_packaging/debian_harmattan/control b/qtc_packaging/debian_harmattan/control index 07e5042..5a3bc5c 100644 --- a/qtc_packaging/debian_harmattan/control +++ b/qtc_packaging/debian_harmattan/control @@ -18,5 +18,6 @@ Description: Bluetooth smartwatch manager - Notifications support: incoming calls, messages, etc. - Watchlets: control the media player or view a map. . - Currently, only the MetaWatch is supported. + Currently, only the digital MetaWatch is supported. XSBC-Maemo-Display-Name: Sowatch +XB-Maemo-Icon-26: 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 diff --git a/sowatch.pro b/sowatch.pro index 63b541d..7fc85a0 100644 --- a/sowatch.pro +++ b/sowatch.pro @@ -1,4 +1,6 @@ TEMPLATE = subdirs + +# Core library SUBDIRS = libsowatch # The MetaWatch driver plugin @@ -7,7 +9,7 @@ metawatch.depends = libsowatch # Some watchlets SUBDIRS += notificationswatchlet sysinfowatchlet -#SUBDIRS += qmsgwatchlet qmapwatchlet +SUBDIRS += qmsgwatchlet qmapwatchlet notificationswatchlet.depends = libsowatch sysinfowatchlet.depends = libsowatch qmsgwatchlet.depends = libsowatch @@ -22,14 +24,16 @@ unix { } contains(MEEGO_EDITION,harmattan) { + # Harmattan specific stuff SUBDIRS += meegohandsetnotification ckitcallnotification harmaccuweather - #SUBDIRS += qmafwwatchlet + SUBDIRS += qmafwwatchlet meegohandsetnotification.depends = libsowatch ckitcallnotification.depends = libsowatch harmaccuweather.depends = libsowatch qmafwwatchlet.depends = libsowatch } else:simulator { + # This notification provider builds almost everywhere so it's good enough as testcase SUBDIRS += harmaccuweather harmaccuweather.depends = libsowatch } diff --git a/sowatchd/watchhandler.cpp b/sowatchd/watchhandler.cpp index e396c17..00d0641 100644 --- a/sowatchd/watchhandler.cpp +++ b/sowatchd/watchhandler.cpp @@ -35,7 +35,7 @@ WatchHandler::WatchHandler(ConfigKey *config, QObject *parent) // Setup watch status connections connect(_watch, SIGNAL(connected()), SIGNAL(statusChanged())); - connect(_watch, SIGNAL(connected()), + connect(_watch, SIGNAL(disconnected()), SIGNAL(statusChanged())); // Now create the UI server |