able to navigate watchlets in liveview

2 files changed, 5 insertions, 3 deletions

diff --git a/metawatch/metawatch.cpp b/metawatch/metawatch.cpp
index c7e0db3..b5aec49 100644
--- a/metawatch/metawatch.cpp
+++ b/metawatch/metawatch.cpp
@@ -576,7 +576,11 @@ void MetaWatch::handleButtonEventMessage(const Message &msg)
 	qDebug() << "button event" << button << " (" << press << ")";
 
 	if (press == PressOnly) {
-		emit buttonPressed(button);
+		if (button == BtnA) { // This is the next watchlet button
+			emit nextWatchletRequested();
+		} else {
+			emit buttonPressed(button);
+		}
 	} else if (press == PressAndRelease) {
 		emit buttonReleased(button);
 	}
diff --git a/metawatch/metawatchscanner.cpp b/metawatch/metawatchscanner.cpp
index 3742092..822f41e 100644
--- a/metawatch/metawatchscanner.cpp
+++ b/metawatch/metawatchscanner.cpp
@@ -24,12 +24,10 @@ void MetaWatchScanner::handleDiscoveredService(const QBluetoothServiceInfo &info
 		if (deviceName.contains("Analog")) {
 			// This is Analog metawatch.
 			foundInfo["driver"] = QString("metawatch-analog");
-			foundInfo["next-watchlet-button"] = QString("A");
 			emit watchFound(foundInfo);
 		} else {
 			// For now, assume Digital metawatch.
 			foundInfo["driver"] = QString("metawatch-digital");
-			foundInfo["next-watchlet-button"] = QString("A");
 			foundInfo["idle-watchlet"] = QString("com.javispedro.sowatch.metawatch.watchface");
 			foundInfo["notification-watchlet"] = QString("com.javispedro.sowatch.metawatch.notification");
 			emit watchFound(foundInfo);