From ed40a7f1cbc1da5ae21c58882df241fc0071c2f7 Mon Sep 17 00:00:00 2001
From: "Javier S. Pedro" <dev.git@javispedro.com>
Date: Sat, 6 Sep 2014 03:25:38 +0200
Subject: adding initial UI to select device

---
 src/salmeta.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/salmeta.cpp')

diff --git a/src/salmeta.cpp b/src/salmeta.cpp
index c4bcb0c..f13cd64 100644
--- a/src/salmeta.cpp
+++ b/src/salmeta.cpp
@@ -2,9 +2,10 @@
 #include <sailfishapp.h>
 
 #include "controller.h"
+#include "watchviewitem.h"
 
 static bool launch_daemon = false;
-static QString settings_key_prefix;
+static QString settings_key_prefix("/apps/salmeta/watch0");
 
 int main(int argc, char *argv[])
 {
@@ -24,16 +25,15 @@ int main(int argc, char *argv[])
 		++it;
 	}
 
-	if (launch_daemon) {
-		if (settings_key_prefix.isEmpty()) {
-			settings_key_prefix = "/apps/salmeta/watch0";
-		}
+	qmlRegisterType<WatchViewItem>("com.javispedro.salmeta", 1, 0, "WatchView");
 
+	if (launch_daemon) {
 		qDebug() << "Starting salmeta (daemon) with settings from" << settings_key_prefix;
 
 		new Controller(settings_key_prefix, SailfishApp::createView());
 	} else {
 		QQuickView *view = SailfishApp::createView();
+		view->rootContext()->setContextProperty("settingsPrefix", settings_key_prefix);
 		view->setSource(SailfishApp::pathTo("qml/salmeta.qml"));
 		view->show();
 	}
-- 
cgit v1.2.3