From 24c7c2f6f1429103d922ef940c0e17a3d4778059 Mon Sep 17 00:00:00 2001
From: "Javier S. Pedro" <maemo@javispedro.com>
Date: Sun, 5 May 2013 01:44:40 +0200
Subject: ABI change: Watchlet now depends on Watch, not WatchServer

---
 metawatch/metawatch.pro                       |  9 +++++++--
 metawatch/metawatchdigital.cpp                |  2 +-
 metawatch/metawatchdigitalfacewatchlet.cpp    |  8 ++++++++
 metawatch/metawatchdigitalfacewatchlet.h      | 18 ++++++++++++++++++
 metawatch/qml/metawatch-digital-watchface.qml |  7 +++++++
 5 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 metawatch/metawatchdigitalfacewatchlet.cpp
 create mode 100644 metawatch/metawatchdigitalfacewatchlet.h
 create mode 100644 metawatch/qml/metawatch-digital-watchface.qml

(limited to 'metawatch')

diff --git a/metawatch/metawatch.pro b/metawatch/metawatch.pro
index 536ccee..1437b71 100644
--- a/metawatch/metawatch.pro
+++ b/metawatch/metawatch.pro
@@ -18,7 +18,8 @@ SOURCES += metawatchplugin.cpp \
     metawatchanalog.cpp \
     metawatchscanner.cpp \
     metawatchdigitalsimulator.cpp \
-    metawatchdigitalsimulatorform.cpp
+    metawatchdigitalsimulatorform.cpp \
+    metawatchdigitalfacewatchlet.cpp
 
 HEADERS += metawatchplugin.h \
     metawatchpaintengine.h \
@@ -27,7 +28,8 @@ HEADERS += metawatchplugin.h \
     metawatchanalog.h \
     metawatchscanner.h \
     metawatchdigitalsimulator.h \
-    metawatchdigitalsimulatorform.h
+    metawatchdigitalsimulatorform.h \
+    metawatchdigitalfacewatchlet.h
 
 FORMS += \
     metawatchdigitalsimulatorform.ui
@@ -51,3 +53,6 @@ DEPENDPATH += $$PWD/../libsowatch
 	qml_files.path = /usr/share/sowatch/qml
 }
 INSTALLS += target res_files qml_files
+
+OTHER_FILES += \
+    qml/metawatch-digital-watchface.qml
diff --git a/metawatch/metawatchdigital.cpp b/metawatch/metawatchdigital.cpp
index 147fd79..9145336 100644
--- a/metawatch/metawatchdigital.cpp
+++ b/metawatch/metawatchdigital.cpp
@@ -339,7 +339,7 @@ void MetaWatchDigital::handleWatchConnected()
 	// Grab all of the buttons that are of interest to us
 	// We do not grab the F button, as it triggers the LED.
 	grabButton(IdleMode, BtnA); // Required for app-switch
-	// TODO: Grabbing these buttons seems to break everything
+	// TODO: Grabbing these buttons seems to break everything since gen2 firmware.
 	//grabButton(IdleMode, BtnB); // What does this do?
 	//grabButton(IdleMode, BtnE); // Music mode is currently not supported
 	grabButton(ApplicationMode, BtnA);
diff --git a/metawatch/metawatchdigitalfacewatchlet.cpp b/metawatch/metawatchdigitalfacewatchlet.cpp
new file mode 100644
index 0000000..08d8ac4
--- /dev/null
+++ b/metawatch/metawatchdigitalfacewatchlet.cpp
@@ -0,0 +1,8 @@
+#include "metawatchdigitalfacewatchlet.h"
+
+using namespace sowatch;
+
+MetaWatchDigitalFaceWatchlet::MetaWatchDigitalFaceWatchlet(Watch *watch) :
+    DeclarativeWatchlet(watch, "crap")
+{
+}
diff --git a/metawatch/metawatchdigitalfacewatchlet.h b/metawatch/metawatchdigitalfacewatchlet.h
new file mode 100644
index 0000000..b4b92ca
--- /dev/null
+++ b/metawatch/metawatchdigitalfacewatchlet.h
@@ -0,0 +1,18 @@
+#ifndef METAWATCHDIGITALFACEWATCHLET_H
+#define METAWATCHDIGITALFACEWATCHLET_H
+
+#include <sowatch.h>
+
+namespace sowatch
+{
+
+class MetaWatchDigitalFaceWatchlet : public DeclarativeWatchlet
+{
+    Q_OBJECT
+public:
+	explicit MetaWatchDigitalFaceWatchlet(Watch* watch);
+};
+
+}
+
+#endif // METAWATCHDIGITALFACEWATCHLET_H
diff --git a/metawatch/qml/metawatch-digital-watchface.qml b/metawatch/qml/metawatch-digital-watchface.qml
new file mode 100644
index 0000000..d2abbf0
--- /dev/null
+++ b/metawatch/qml/metawatch-digital-watchface.qml
@@ -0,0 +1,7 @@
+// import QtQuick 1.0 // to target S60 5th Edition or Maemo 5
+import QtQuick 1.1
+
+Rectangle {
+	width: 100
+	height: 62
+}
-- 
cgit v1.2.3