From a2ef9f1e7dee575ff3bff70ba701257f3c24a8c4 Mon Sep 17 00:00:00 2001
From: "kali kaneko (leap communications)" <kali@leap.se>
Date: Fri, 24 Sep 2021 21:56:59 +0200
Subject: [ui] use configuration file

---
 gui/components/Preferences.qml | 5 +++--
 gui/gui.qrc                    | 1 +
 gui/main.cpp                   | 6 +++++-
 gui/qtquickcontrols2.conf      | 6 ++++++
 4 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 gui/qtquickcontrols2.conf

(limited to 'gui')

diff --git a/gui/components/Preferences.qml b/gui/components/Preferences.qml
index 3620471..720454b 100644
--- a/gui/components/Preferences.qml
+++ b/gui/components/Preferences.qml
@@ -9,8 +9,9 @@ ThemedPage {
 
     Column {
         id: prefCol
-        // FIXME the checkboxes seem to have a bigger lineHeight themselves, need to pack more.
-        spacing: 1
+        // FIXME checkboxes in Material style force lineHeights too big.
+        // need to override the style
+        // See: https://bugreports.qt.io/browse/QTBUG-95385
         topPadding: root.width * 0.05
         leftPadding: root.width * 0.1
         rightPadding: root.width * 0.15
diff --git a/gui/gui.qrc b/gui/gui.qrc
index 67da45c..e4d1cd6 100644
--- a/gui/gui.qrc
+++ b/gui/gui.qrc
@@ -2,6 +2,7 @@
     <qresource prefix="/">
 
         <file>main.qml</file>
+        <file>qtquickcontrols2.conf</file>
 
         <!-- gui components -->
         <file>themes/themes.js</file>
diff --git a/gui/main.cpp b/gui/main.cpp
index d136c3c..be1be0a 100644
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -173,6 +173,7 @@ int main(int argc, char **argv) {
 
     QJsonModel *model = new QJsonModel;
 
+    // FIXME use qgetenv
     QString desktop = QString::fromStdString(getEnv("XDG_CURRENT_DESKTOP"));
     QString debug = QString::fromStdString(getEnv("DEBUG"));
 
@@ -190,7 +191,10 @@ int main(int argc, char **argv) {
     ctx->setContextProperty("systrayAvailable", availableSystray);
     ctx->setContextProperty("qmlDebug", debug == "1");
 
-    QQuickStyle::setStyle("Material");
+    //XXX we're doing configuration via config file, but this is a mechanism
+    //to change to Dark Theme if desktop has it.
+    //qputenv("QT_QUICK_CONTROLS_MATERIAL_VARIANT", "Dense");
+    //QQuickStyle::setStyle("Material");
     engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
 
     /* connect the jsonChanged signal explicitely.
diff --git a/gui/qtquickcontrols2.conf b/gui/qtquickcontrols2.conf
new file mode 100644
index 0000000..1e387cc
--- /dev/null
+++ b/gui/qtquickcontrols2.conf
@@ -0,0 +1,6 @@
+[Controls]
+Style=Material
+
+[Material]
+Theme=Light
+Variant=Dense
-- 
cgit v1.2.3