From fb89df3ee609e9f3e63e0679b3635516603092b5 Mon Sep 17 00:00:00 2001 From: "kali kaneko (leap communications)" Date: Wed, 5 Aug 2020 19:01:12 +0200 Subject: [feat] load provider json in qml --- gui/main.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'gui/main.cpp') diff --git a/gui/main.cpp b/gui/main.cpp index e3b8530..8c7de4f 100644 --- a/gui/main.cpp +++ b/gui/main.cpp @@ -40,7 +40,6 @@ void signalHandler(int) { int main(int argc, char **argv) { signal(SIGINT, signalHandler); - bool debugQml = getEnv("DEBUG_QML_DATA") == "yes"; Backend backend; @@ -104,19 +103,27 @@ int main(int argc, char **argv) { QTranslator translator; translator.load(QLocale(), QLatin1String("main"), QLatin1String("_"), QLatin1String(":/i18n")); app.installTranslator(&translator); - + QQmlApplicationEngine engine; QQmlContext *ctx = engine.rootContext(); QJsonModel *model = new QJsonModel; + /* load providers json */ + QFile providerJson (":/providers.json"); + providerJson.open(QIODevice::ReadOnly | QIODevice::Text); + QJsonModel *providers = new QJsonModel; + providers->loadJson(providerJson.readAll()); + /* the backend handler has slots for calling back to Go when triggered by signals in Qml. */ ctx->setContextProperty("backend", &backend); - /* we pass the json model and set some useful flags */ + /* set the json model, load providers.json */ ctx->setContextProperty("jsonModel", model); - ctx->setContextProperty("debugQml", debugQml); + ctx->setContextProperty("providers", providers); + + /* set some useful flags */ ctx->setContextProperty("systrayVisible", !hideSystray); engine.load(QUrl(QStringLiteral("qrc:/qml/main.qml"))); @@ -133,7 +140,6 @@ int main(int argc, char **argv) { QGuiApplication::quit(); }); - /* register statusChanged callback with CGO */ const char *stCh = "OnStatusChanged"; GoString statusChangedEvt = {stCh, (long int)strlen(stCh)}; -- cgit v1.2.3