refactor: use the same settings component for overrides

luisbocanegra · Sep 23, 2024 · 4f23428 · 4f23428
1 parent 6a2ede1
commit 4f23428
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 282 deletions.
diff --git a/package/contents/ui/components/FormPerWidgetSettings.qml b/package/contents/ui/components/FormPerWidgetSettings.qml
diff --git a/package/contents/ui/components/FormWidgetSettings.qml b/package/contents/ui/components/FormWidgetSettings.qml
@@ -19,7 +19,7 @@ ColumnLayout {
     // internal config objects to be sent, both string and json
     property string configString: "{}"
     property var config: handleString ? JSON.parse(configString) : undefined
-    property var configLocal: config[keyName]
+    property var configLocal: keyName ? config[keyName] : config
     signal updateConfigString(configString: string, config: var)
     // whether the current item supports foreground customization, e.g the panel does not
     property bool supportsForeground: true
@@ -40,7 +40,11 @@ ColumnLayout {
     }
 
     function updateConfig() {
-        config[keyName] = configLocal
+        if (keyName) {
+            config[keyName] = configLocal
+        } else {
+            config = configLocal
+        }
         configString = JSON.stringify(config, null, null)
         // console.error(configString)
         updateConfigString(configString, config)

diff --git a/package/contents/ui/configPerWidget.qml b/package/contents/ui/configPerWidget.qml
@@ -263,10 +263,9 @@ KCM.SimpleKCM {
 
             Component {
                 id: settingsComp
-                Components.FormPerWidgetSettings {
+                Components.FormWidgetSettings {
                     currentTab: 0
                     handleString: false
-                    keyName: "configuration"
                 }
             }
         }