From 85fb48bc51fed06a50b6178727fdf9e96aea4fc4 Mon Sep 17 00:00:00 2001 From: "Javier S. Pedro" Date: Sat, 13 Sep 2014 22:40:39 +0200 Subject: UI can now add some widgets around --- src/salmeta.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/salmeta.cpp') diff --git a/src/salmeta.cpp b/src/salmeta.cpp index f13cd64..46e4e89 100644 --- a/src/salmeta.cpp +++ b/src/salmeta.cpp @@ -2,7 +2,8 @@ #include #include "controller.h" -#include "watchviewitem.h" +#include "widgetinfomodel.h" +#include "availablewidgetsmodel.h" static bool launch_daemon = false; static QString settings_key_prefix("/apps/salmeta/watch0"); @@ -25,7 +26,8 @@ int main(int argc, char *argv[]) ++it; } - qmlRegisterType("com.javispedro.salmeta", 1, 0, "WatchView"); + qmlRegisterUncreatableType("com.javispedro.salmeta", 1, 0, "WidgetInfo", + "Use the models, not this"); if (launch_daemon) { qDebug() << "Starting salmeta (daemon) with settings from" << settings_key_prefix; @@ -33,7 +35,9 @@ int main(int argc, char *argv[]) new Controller(settings_key_prefix, SailfishApp::createView()); } else { QQuickView *view = SailfishApp::createView(); - view->rootContext()->setContextProperty("settingsPrefix", settings_key_prefix); + view->rootContext()->setContextProperty("curSettingsPrefix", settings_key_prefix); + view->rootContext()->setContextProperty("curWidgets", new WidgetInfoModel(settings_key_prefix)); + view->rootContext()->setContextProperty("allWidgets", new AvailableWidgetsModel); view->setSource(SailfishApp::pathTo("qml/salmeta.qml")); view->show(); } -- cgit v1.2.3