dankbar/controlcenter: add VPN, mic, brightness, battery, and printer

options for widget

quickshell/Modules/ControlCenter/Components/DetailHost.qml

@@ -2,7 +2,6 @@ import QtQuick
 import qs.Common
 import qs.Services
 import qs.Modules.ControlCenter.Details
-import qs.Modules.ControlCenter.Models
 
 Item {
     id: root
@@ -11,17 +10,21 @@ Item {
     property var expandedWidgetData: null
     property var bluetoothCodecSelector: null
     property string screenName: ""
+    property string screenModel: ""
 
     property var pluginDetailInstance: null
     property var widgetModel: null
     property var collapseCallback: null
 
     function getDetailHeight(section) {
-        const maxAvailable = parent ? parent.height - Theme.spacingS : 9999
-        if (section === "wifi") return Math.min(350, maxAvailable)
-        if (section === "bluetooth") return Math.min(350, maxAvailable)
-        if (section.startsWith("brightnessSlider_")) return Math.min(400, maxAvailable)
-        return Math.min(250, maxAvailable)
+        const maxAvailable = parent ? parent.height - Theme.spacingS : 9999;
+        if (section === "wifi")
+            return Math.min(350, maxAvailable);
+        if (section === "bluetooth")
+            return Math.min(350, maxAvailable);
+        if (section.startsWith("brightnessSlider_"))
+            return Math.min(400, maxAvailable);
+        return Math.min(250, maxAvailable);
     }
 
     Loader {
@@ -49,18 +52,18 @@ Item {
 
         function onDeviceNameChanged(newDeviceName) {
             if (root.expandedWidgetData && root.expandedWidgetData.id === "brightnessSlider") {
-                const widgets = SettingsData.controlCenterWidgets || []
+                const widgets = SettingsData.controlCenterWidgets || [];
                 const newWidgets = widgets.map(w => {
                     if (w.id === "brightnessSlider" && w.instanceId === root.expandedWidgetData.instanceId) {
-                        const updatedWidget = Object.assign({}, w)
-                        updatedWidget.deviceName = newDeviceName
-                        return updatedWidget
+                        const updatedWidget = Object.assign({}, w);
+                        updatedWidget.deviceName = newDeviceName;
+                        return updatedWidget;
                     }
-                    return w
-                })
-                SettingsData.set("controlCenterWidgets", newWidgets)
+                    return w;
+                });
+                SettingsData.set("controlCenterWidgets", newWidgets);
                 if (root.collapseCallback) {
-                    root.collapseCallback()
+                    root.collapseCallback();
                 }
             }
         }
@@ -73,18 +76,18 @@ Item {
 
         function onMountPathChanged(newMountPath) {
             if (root.expandedWidgetData && root.expandedWidgetData.id === "diskUsage") {
-                const widgets = SettingsData.controlCenterWidgets || []
+                const widgets = SettingsData.controlCenterWidgets || [];
                 const newWidgets = widgets.map(w => {
                     if (w.id === "diskUsage" && w.instanceId === root.expandedWidgetData.instanceId) {
-                        const updatedWidget = Object.assign({}, w)
-                        updatedWidget.mountPath = newMountPath
-                        return updatedWidget
+                        const updatedWidget = Object.assign({}, w);
+                        updatedWidget.mountPath = newMountPath;
+                        return updatedWidget;
                     }
-                    return w
-                })
-                SettingsData.set("controlCenterWidgets", newWidgets)
+                    return w;
+                });
+                SettingsData.set("controlCenterWidgets", newWidgets);
                 if (root.collapseCallback) {
-                    root.collapseCallback()
+                    root.collapseCallback();
                 }
             }
         }
@@ -92,86 +95,97 @@ Item {
 
     onExpandedSectionChanged: {
         if (pluginDetailInstance) {
-            pluginDetailInstance.destroy()
-            pluginDetailInstance = null
+            pluginDetailInstance.destroy();
+            pluginDetailInstance = null;
         }
-        pluginDetailLoader.active = false
-        coreDetailLoader.active = false
+        pluginDetailLoader.active = false;
+        coreDetailLoader.active = false;
 
         if (!root.expandedSection) {
-            return
+            return;
         }
 
         if (root.expandedSection.startsWith("builtin_")) {
-            const builtinId = root.expandedSection
-            let builtinInstance = null
+            const builtinId = root.expandedSection;
+            let builtinInstance = null;
 
             if (builtinId === "builtin_vpn") {
                 if (widgetModel?.vpnLoader) {
-                    widgetModel.vpnLoader.active = true
+                    widgetModel.vpnLoader.active = true;
                 }
-                builtinInstance = widgetModel.vpnBuiltinInstance
+                builtinInstance = widgetModel.vpnBuiltinInstance;
             }
             if (builtinId === "builtin_cups") {
                 if (widgetModel?.cupsLoader) {
-                    widgetModel.cupsLoader.active = true
+                    widgetModel.cupsLoader.active = true;
                 }
-                builtinInstance = widgetModel.cupsBuiltinInstance
+                builtinInstance = widgetModel.cupsBuiltinInstance;
             }
 
             if (!builtinInstance || !builtinInstance.ccDetailContent) {
-                return
+                return;
             }
 
-            pluginDetailLoader.sourceComponent = builtinInstance.ccDetailContent
-            pluginDetailLoader.active = parent.height > 0
-            return
+            pluginDetailLoader.sourceComponent = builtinInstance.ccDetailContent;
+            pluginDetailLoader.active = parent.height > 0;
+            return;
         }
 
         if (root.expandedSection.startsWith("plugin_")) {
-            const pluginId = root.expandedSection.replace("plugin_", "")
-            const pluginComponent = PluginService.pluginWidgetComponents[pluginId]
+            const pluginId = root.expandedSection.replace("plugin_", "");
+            const pluginComponent = PluginService.pluginWidgetComponents[pluginId];
             if (!pluginComponent) {
-                return
+                return;
             }
 
-            pluginDetailInstance = pluginComponent.createObject(null)
+            pluginDetailInstance = pluginComponent.createObject(null);
             if (!pluginDetailInstance || !pluginDetailInstance.ccDetailContent) {
                 if (pluginDetailInstance) {
-                    pluginDetailInstance.destroy()
-                    pluginDetailInstance = null
+                    pluginDetailInstance.destroy();
+                    pluginDetailInstance = null;
                 }
-                return
+                return;
             }
 
-            pluginDetailLoader.sourceComponent = pluginDetailInstance.ccDetailContent
-            pluginDetailLoader.active = parent.height > 0
-            return
+            pluginDetailLoader.sourceComponent = pluginDetailInstance.ccDetailContent;
+            pluginDetailLoader.active = parent.height > 0;
+            return;
         }
 
         if (root.expandedSection.startsWith("diskUsage_")) {
-            coreDetailLoader.sourceComponent = diskUsageDetailComponent
-            coreDetailLoader.active = parent.height > 0
-            return
+            coreDetailLoader.sourceComponent = diskUsageDetailComponent;
+            coreDetailLoader.active = parent.height > 0;
+            return;
         }
 
         if (root.expandedSection.startsWith("brightnessSlider_")) {
-            coreDetailLoader.sourceComponent = brightnessDetailComponent
-            coreDetailLoader.active = parent.height > 0
-            return
+            coreDetailLoader.sourceComponent = brightnessDetailComponent;
+            coreDetailLoader.active = parent.height > 0;
+            return;
         }
 
         switch (root.expandedSection) {
         case "network":
-        case "wifi": coreDetailLoader.sourceComponent = networkDetailComponent; break
-        case "bluetooth": coreDetailLoader.sourceComponent = bluetoothDetailComponent; break
-        case "audioOutput": coreDetailLoader.sourceComponent = audioOutputDetailComponent; break
-        case "audioInput": coreDetailLoader.sourceComponent = audioInputDetailComponent; break
-        case "battery": coreDetailLoader.sourceComponent = batteryDetailComponent; break
-        default: return
+        case "wifi":
+            coreDetailLoader.sourceComponent = networkDetailComponent;
+            break;
+        case "bluetooth":
+            coreDetailLoader.sourceComponent = bluetoothDetailComponent;
+            break;
+        case "audioOutput":
+            coreDetailLoader.sourceComponent = audioOutputDetailComponent;
+            break;
+        case "audioInput":
+            coreDetailLoader.sourceComponent = audioInputDetailComponent;
+            break;
+        case "battery":
+            coreDetailLoader.sourceComponent = batteryDetailComponent;
+            break;
+        default:
+            return;
         }
 
-        coreDetailLoader.active = parent.height > 0
+        coreDetailLoader.active = parent.height > 0;
     }
 
     Component {
@@ -183,12 +197,12 @@ Item {
         id: bluetoothDetailComponent
         BluetoothDetail {
             id: bluetoothDetail
-            onShowCodecSelector: function(device) {
+            onShowCodecSelector: function (device) {
                 if (root.bluetoothCodecSelector) {
-                    root.bluetoothCodecSelector.show(device)
-                    root.bluetoothCodecSelector.codecSelected.connect(function(deviceAddress, codecName) {
-                        bluetoothDetail.updateDeviceCodecDisplay(deviceAddress, codecName)
-                    })
+                    root.bluetoothCodecSelector.show(device);
+                    root.bluetoothCodecSelector.codecSelected.connect(function (deviceAddress, codecName) {
+                        bluetoothDetail.updateDeviceCodecDisplay(deviceAddress, codecName);
+                    });
                 }
             }
         }
@@ -223,6 +237,7 @@ Item {
             initialDeviceName: root.expandedWidgetData?.deviceName || ""
             instanceId: root.expandedWidgetData?.instanceId || ""
             screenName: root.screenName
+            screenModel: root.screenModel
         }
     }
-}
+}