Added startup configuration.

Author: dinusv

application/src/livekeys.cpp

@@ -349,44 +349,30 @@ void Livekeys::loadInternalPackages(){
 
     m_engine->setPackageGraph(m_packageGraph);
 
-    std::vector<std::string> internalPackages = {
-        "editor",
-        "editqml",
-        "fs",
-        "live",
-        "lcvcore",
-        "lcvfeatures2d",
-        "lcvimgproc",
-        "lcvphoto",
-        "lcvvideo"
-    };
+    const MLNode& defaults = ApplicationContext::instance().startupConfiguration();
+    if ( defaults.hasKey("internalPackages") ){
+        const MLNode& internalPackages = defaults["internalPackages"];
 
-    for ( auto it = internalPackages.begin(); it != internalPackages.end(); ++it ){
+        for ( auto it = internalPackages.asArray().begin(); it != internalPackages.asArray().end(); ++it ){
 
-        std::string packagePath = ApplicationContext::instance().pluginPath() + "/" + *it;
+            std::string packagePath = ApplicationContext::instance().pluginPath() + "/" + it->asString();
 
-        if ( Package::existsIn(packagePath) ){
-            PackageGraph::addInternalPackage(Package::createFromPath(packagePath));
+            if ( Package::existsIn(packagePath) ){
+                PackageGraph::addInternalPackage(Package::createFromPath(packagePath));
+            }
         }
     }
 
-    std::vector<std::string> qtPackages = {
-        "Qt",
-        "QtQml",
-        "QtQuick",
-        "QtCanvas3D",
-        "QtGraphicalEffects",
-        "QtMultimedia",
-        "QtWebSockets"
-    };
-
-    for ( auto it = qtPackages.begin(); it != qtPackages.end(); ++it ){
-        Package::Ptr package = Package::createFromNode(*it, "", {
-            {"name", *it},
-            {"version", QT_VERSION_STR},
-            {"documentation", "editor/loadqtdocs.qml"}
-        });
-        PackageGraph::addInternalPackage(package);
+    if ( defaults.hasKey("internalQtPackages") ){
+        const MLNode& qtPackages = defaults["internalQtPackages"];
+        for ( auto it = qtPackages.asArray().begin(); it != qtPackages.asArray().end(); ++it ){
+            Package::Ptr package = Package::createFromNode(it->asString(), "", {
+                {"name", *it},
+                {"version", QT_VERSION_STR},
+                {"documentation", "editor/loadqtdocs.qml"}
+            });
+            PackageGraph::addInternalPackage(package);
+        }
     }
 }
 
@@ -416,9 +402,13 @@ void Livekeys::initializeProject(){
 }
 
 void Livekeys::addDefaultLayers(){
-    addLayer("window", ":/windowlayer.qml");
-    addLayer("workspace", ":/workspacelayer.qml");
-    addLayer("editor", ":/editorlayer.qml");
+    const MLNode& defaults = ApplicationContext::instance().startupConfiguration();
+    if ( defaults.hasKey("layers") ){
+        const MLNode& layers = defaults["layers"];
+        for ( auto it = layers.begin(); it != layers.end(); ++it ){
+            addLayer(QString::fromStdString(it.key()), QString::fromStdString(it.value().asString()));
+        }
+    }
 }
 
 std::vector<std::string> Livekeys::packageImportPaths() const{
@@ -451,6 +441,37 @@ QQmlPropertyMap *Livekeys::layers(){
     return m_layers;
 }
 
+const MLNode &Livekeys::startupConfiguration(){
+    static MLNode config = {
+        {"layers", {
+             {"window",    ":/windowlayer.qml"},
+             {"workspace", ":/workspacelayer.qml"},
+             {"editor",    ":/editorlayer.qml"}
+         }},
+         {"internalPackages",{
+              "editor",
+              "editqml",
+              "fs",
+              "live",
+              "lcvcore",
+              "lcvfeatures2d",
+              "lcvimgproc",
+              "lcvphoto",
+              "lcvvideo"
+          }},
+         {"internalQtPackages",{
+              "Qt",
+              "QtQml",
+              "QtQuick",
+              "QtCanvas3D",
+              "QtGraphicalEffects",
+              "QtMultimedia",
+              "QtWebSockets"
+          }}
+    };
+    return config;
+}
+
 QObject *Livekeys::layerPlaceholder() const{
     if ( !m_layerPlaceholder ){
         QList<QObject*> rootObjects = static_cast<QQmlApplicationEngine*>(m_engine->engine())->rootObjects();

application/src/livekeys.h

@@ -115,6 +115,8 @@ class Livekeys : public QObject{
     VisualLogModel* log();
     QQmlPropertyMap* layers();
 
+    static const MLNode& startupConfiguration();
+
 public slots:
     QObject* layerPlaceholder() const;
     void engineError(QJSValue error);

application/src/main.cpp

@@ -32,7 +32,7 @@ using namespace lv;
 
 int main(int argc, char *argv[]){
 
-    ApplicationContext::initialize();
+    ApplicationContext::initialize(Livekeys::startupConfiguration());
 
     QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
     QGuiApplication::addLibraryPath(QString::fromStdString(lv::ApplicationContext::instance().librariesPath()));

lib/lvbase/src/applicationcontext.cpp

@@ -16,6 +16,7 @@
 
 #include "live/applicationcontext.h"
 #include "live/exception.h"
+#include "live/mlnode.h"
 
 #include <QCoreApplication>
 #include <QStandardPaths>
@@ -49,6 +50,8 @@ class ApplicationContextPrivate{
     std::string developmentPath;
     std::string configPath;
     std::string appDataPath;
+
+    MLNode      defaults;
 };
 
 std::unique_ptr<ApplicationContext> ApplicationContextPrivate::ApplicationContextPrivate::instance;
@@ -63,13 +66,14 @@ ApplicationContext::~ApplicationContext(){
 /**
  * Initalizes the singleton instance of the context
  */
-void ApplicationContext::initialize(){
-    ApplicationContextPrivate::instance.reset(new ApplicationContext);
+void ApplicationContext::initialize(const lv::MLNode &defaults){
+    ApplicationContextPrivate::instance.reset(new ApplicationContext(defaults));
 }
 
-ApplicationContext::ApplicationContext()
+ApplicationContext::ApplicationContext(const lv::MLNode &defaults)
     : m_d(new ApplicationContextPrivate)
 {
+    m_d->defaults = defaults;
     initializePaths();
 }
 
@@ -182,6 +186,13 @@ const std::string &ApplicationContext::appDataPath(){
     return m_d->appDataPath;
 }
 
+/**
+ * \brief Returns the startup configuration for Livekeys
+ */
+const MLNode &ApplicationContext::startupConfiguration(){
+    return m_d->defaults;
+}
+
 /** Executable path getter */
 const std::string &ApplicationContext::executablePath(){
     return m_d->executablePath;

lib/lvbase/src/applicationcontext.h

@@ -24,7 +24,7 @@ class QString;
 
 namespace lv{
 
-class ViewEngine;
+class MLNode;
 class Settings;
 
 class ApplicationContextPrivate;
@@ -34,7 +34,7 @@ class LV_BASE_EXPORT ApplicationContext{
 public:
     ~ApplicationContext();
 
-    static void initialize();
+    static void initialize(const MLNode& defaults);
     static ApplicationContext& instance();
 
     const std::string& applicationPath();
@@ -50,8 +50,10 @@ class LV_BASE_EXPORT ApplicationContext{
     const std::string& configPath();
     const std::string& appDataPath();
 
+    const MLNode& startupConfiguration();
+
 private:
-    ApplicationContext();
+    ApplicationContext(const MLNode& defaults);
     void initializePaths();
 
     static std::string applicationFilePathImpl();

tests/unit/lvelementstest/main.cpp

@@ -40,7 +40,7 @@
 
 
 int main(int argc, char *argv[]){
-    lv::ApplicationContext::initialize();
+    lv::ApplicationContext::initialize({});
 
     QCoreApplication app(argc, argv);
     app.setAttribute(Qt::AA_Use96Dpi, true);