Replaced tinytoml with libconfig

3 files changed, 59 insertions, 87 deletions

diff --git a/data/poi.cfg b/data/poi.cfg
new file mode 100644
index 0000000..68503e1
--- /dev/null
+++ b/data/poi.cfg
@@ -0,0 +1,58 @@
+// smolbote default configuration file
+// Uses libconfig format, for details refer to:
+// https://hyperrealm.github.io/libconfig/libconfig_manual.html#Configuration-Files
+
+// Browser default settings
+browser = {
+    // true to generate user settings when run
+    firstRun = true;
+
+    // default profile name the browser should use; "" is off-the-record
+    profile = "";
+
+    // default window size
+    window = {
+        height = 720;
+        width = 1280;
+        maximized = true;
+        title = "title — smolbote [profile]";
+    };
+
+    ui = {
+        navtoolbarMovable = false;
+        tabtoolbarMovable = false;
+    };
+
+    shortcuts = {
+        // browser menu
+        newWindow = "Ctrl+N";
+        newTab = "Ctrl+T";
+        about = "F1";
+        quit = "Ctrl+Q";
+        
+        focusAddress = "F4";
+        fullscreen = "F11";
+
+        // tabs
+        tabClose = "Ctrl+X";
+        tabLeft = "Shift+Left";
+        tabRight = "Shift+Right";
+    };
+};
+
+// Profile settings
+profile = {
+    path = "~/.config/smolbote/Profiles";
+    homepage = "about:blank";
+    newtab = "about:blank";
+};
+
+// Bookmark settings
+bookmarks = {
+    path = "~/.config/smolbote/bookmarks.xbel";
+};
+
+// Downloads settings
+downloads = {
+    path = "~/Downloads"
+};
diff --git a/data/poi.toml b/data/poi.toml
deleted file mode 100644
index 4a84692..0000000
--- a/data/poi.toml
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# poi.conf
-#
-## Settings and default settings
-# There are two parts to the settings - default values and user overrides.
-# The default settings are read from:
-# - /usr/local/share/smolbote/poi.conf
-# - /usr/share/smolbote/poi.conf
-# - /etc/smolbote.d/poi.conf
-# - :/poi.toml
-# The user settings are read from:
-# - any location specified with -c/--config
-# - QStandardPaths::AppConfigLocation + "/poi.conf"
-#
-## Variables
-# §home is QStandardPaths::HomeLocation, usually /home/username
-# $cache is QStandardPaths::CacheLocation, usually /home/username/.cache/smolbote
-# $settings is the directory where the settings file is located, usually /home/username/.config/smolbote
-
-# General
-[general]
-search="https://duckduckgo.com/?q=$term"    # FIXME remove; move to profile
-
-# Browser: application-wide settings
-[browser]
-#sessionPath="$cache/session.json"
-
-# Profile
-[browser.profile]
-# Which profile should be used by default for new windows
-# A nameless ("") profile is off-the-record
-default=""
-# Where to look for profiles
-path="$home/.config/smolbote/profiles/"
-storagePath="$home/.config/smolbote/profiles/"
-cachePath="$home/.cache/smolbote/profiles/"
-
-[browser.profile.new]
-homepage="https://duckduckgo.com"
-newtab="about:blank"
-search="https://duckduckgo.com/lite?q=$term"    # FIXME
-
-# Main window settings
-[window]
-height=720
-width=1280
-maximized=true
-title="title — smolbote [profile]"
-
-# Main window shortcuts
-[window.shortcuts]
-focusAddress="F4"
-fullscreen="F11"
-tabNew="Ctrl+T"
-tabClose="Ctrl+X"
-tabLeft="Shift+Left"
-tabRight="Shift+Right"
-windowNew="Ctrl+N"
-windowClose="Ctrl+Q"
-
-# Main window UI
-[window.ui]
-navtoolbarMovable=false
-tabtoolbarMovable=false
-
-# URL blocker
-[blocker]
-shortcut="Ctrl+Shift+F"
-path="$settings/"
-subscriptions=[
-    "filter.json"
-#    "https://easylist.to/easylist/easylist.txt",
-#    "https://easylist-downloads.adblockplus.org/easylist_noelemhide.txt",
-#    "https://easylist.to/easylist/easyprivacy.txt"
-]
-
-# Bookmark manager
-[bookmarks]
-dialogShortcut="Ctrl+Shift+B"
-path="$settings/bookmarks.xbel"
-
-# Download manager
-[downloads]
-dialogShortcut="Ctrl+Shift+D"
-path="$home/Downloads"
-auto=false
diff --git a/data/resources.qrc b/data/resources.qrc
index b2b6be5..529bf43 100644
--- a/data/resources.qrc
+++ b/data/resources.qrc
@@ -1,6 +1,6 @@
 <RCC>
     <qresource prefix="/">
         <file alias="icon.svg">poi.svg</file>
-        <file>poi.toml</file>
+        <file>poi.cfg</file>
     </qresource>
 </RCC>