1 files changed, 24 insertions, 15 deletions

diff --git a/src/browser.cpp b/src/browser.cpp
index f748e2f..74da540 100644
--- a/src/browser.cpp
+++ b/src/browser.cpp
@@ -31,7 +31,7 @@
 #include <QTimer>
 #include <QTranslator>
 #include <QVersionNumber>
-#include <pluginloader.h>
+// #include <pluginloader.h>
 #include <spdlog/spdlog.h>
 #include <version.h>
 
@@ -40,11 +40,11 @@ Browser::Browser(int &argc, char *argv[], bool allowSecondary)
 {
     Configuration conf;
 
-    setApplicationName(conf.value<QString>("poi.name").value());
-    setWindowIcon(QIcon(conf.value<QString>("poi.icon").value()));
+    setApplicationName(conf.value<QString>("poi/name").value());
+    setWindowIcon(QIcon(conf.value<QString>("poi/icon").value()));
     setApplicationVersion(QVersionNumber::fromString(QLatin1String(poi_Version)).toString());
 
-    if(const auto _translation = conf.value<QString>("browser.translation")) {
+    if(const auto _translation = conf.value<QString>("browser/translation")) {
         auto *translator = new QTranslator(this);
         if(translator->load(_translation.value()))
             installTranslator(translator);
@@ -52,7 +52,7 @@ Browser::Browser(int &argc, char *argv[], bool allowSecondary)
             delete translator;
     }
 
-    if(const auto _locale = conf.value<QString>("browser.locale")) {
+    if(const auto _locale = conf.value<QString>("browser/locale")) {
         auto *locale = new QTranslator(this);
         if(locale->load("qt_" + _locale.value(), QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
             installTranslator(locale);
@@ -60,11 +60,11 @@ Browser::Browser(int &argc, char *argv[], bool allowSecondary)
             delete locale;
     }
 
-    if(auto iconTheme = conf.value<QString>("browser.iconTheme")) {
+    if(auto iconTheme = conf.value<QString>("browser/iconTheme")) {
         QIcon::setThemeName(iconTheme.value());
     }
 
-    if(auto stylesheet = conf.value<QString>("browser.stylesheet")) {
+    if(auto stylesheet = conf.value<QString>("browser/stylesheet")) {
         QFile f(stylesheet.value());
         if(f.open(QIODevice::ReadOnly)) {
             setStyleSheet(f.readAll());
@@ -74,11 +74,11 @@ Browser::Browser(int &argc, char *argv[], bool allowSecondary)
 
     // load profiles
     {
-        const auto profiles = Util::files(conf.value<QString>("profile.path").value(), { "*.profile" });
-        const auto search = conf.value<QString>("profile.search").value();
-        const auto homepage = QUrl::fromUserInput(conf.value<QString>("profile.homepage").value());
-        const auto newtab = QUrl::fromUserInput(conf.value<QString>("profile.newtab").value());
-        const auto default_id = conf.value<QString>("profile.default").value();
+        const auto profiles = Util::files(conf.value<QString>("profile/path").value(), { "*.profile" });
+        const auto search = conf.value<QString>("profile/search").value();
+        const auto homepage = QUrl::fromUserInput(conf.value<QString>("profile/homepage").value());
+        const auto newtab = QUrl::fromUserInput(conf.value<QString>("profile/newtab").value());
+        const auto default_id = conf.value<QString>("profile/default").value();
         m_profileManager = std::make_unique<WebProfileManager<false>>(profiles, default_id, search, homepage, newtab);
         m_profileManager->make_global();
 
@@ -92,13 +92,13 @@ Browser::Browser(int &argc, char *argv[], bool allowSecondary)
     }
 
     // downloads
-    m_downloads = std::make_unique<DownloadsWidget>(conf.value<QString>("downloads.path").value());
+    m_downloads = std::make_unique<DownloadsWidget>(conf.value<QString>("downloads/path").value());
     m_profileManager->walk([this](const QString &, WebProfile *profile, QSettings *) {
         connect(profile, &QWebEngineProfile::downloadRequested, m_downloads.get(), &DownloadsWidget::addDownload);
     });
 
     // bookmarks
-    m_bookmarks = std::make_shared<BookmarksWidget>(QString::fromStdString(conf.value<std::string>("bookmarks.path").value()));
+    m_bookmarks = std::make_shared<BookmarksWidget>(QString::fromStdString(conf.value<std::string>("bookmarks/path").value()));
     connect(m_bookmarks.get(), &BookmarksWidget::openUrl, this, [this](const QUrl &url) {
         m_windows.last()->createTab(url);
     });
@@ -142,22 +142,31 @@ bool Browser::loadPlugin(const QString &path)
     }
 
     Configuration conf;
+    bool loaded = false;
+
+#ifdef HAVE_PLUGINLOADER
     const auto state = PluginLoader::signature_state(
         conf.value<bool>("plugins.signature.ignored").value(),
         conf.value<bool>("plugins.signature.checked").value(),
         conf.value<bool>("plugins.signature.enforced").value());
 
     auto *loader = new PluginLoader(path, state, this);
-    const bool loaded = loader->load();
+    loaded = loader->load();
+#endif
 
     if(!loaded) {
+#ifdef HAVE_PLUGINLOADER
         delete loader;
+#endif
         return false;
     }
+#ifdef HAVE_PLUGINLOADER
     auto *info = new PluginInfo(loader);
     m_plugins.append(info);
 
     emit pluginAdded(loader);
+#endif
+
     return true;
 }