Refactor: Panels and Bar background are now drawn separately with Shapes.

2026-08-15 18:43:59 +00:00 · 2025-11-06 10:41:48 -05:00
parent 76a182a90c
commit e29c6ee1a6
109 changed files with 2381 additions and 2192 deletions
@@ -0,0 +1,373 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import Quickshell
+import Quickshell.Io
+import qs.Commons
+import qs.Services
+import qs.Widgets
+
+ColumnLayout {
+  id: root
+
+  // Time dropdown options (00:00 .. 23:30)
+  ListModel {
+    id: timeOptions
+  }
+  Component.onCompleted: {
+    for (var h = 0; h < 24; h++) {
+      for (var m = 0; m < 60; m += 30) {
+        var hh = ("0" + h).slice(-2)
+        var mm = ("0" + m).slice(-2)
+        var key = hh + ":" + mm
+        timeOptions.append({
+                             "key": key,
+                             "name": key
+                           })
+      }
+    }
+  }
+
+  // Check for wlsunset availability when enabling Night Light
+  Process {
+    id: wlsunsetCheck
+    command: ["which", "wlsunset"]
+    running: false
+
+    onExited: function (exitCode) {
+      if (exitCode === 0) {
+        Settings.data.nightLight.enabled = true
+        NightLightService.apply()
+        ToastService.showNotice(I18n.tr("settings.display.night-light.section.label"), I18n.tr("toast.night-light.enabled"), "nightlight-on")
+      } else {
+        Settings.data.nightLight.enabled = false
+        ToastService.showWarning(I18n.tr("settings.display.night-light.section.label"), I18n.tr("toast.night-light.not-installed"))
+      }
+    }
+
+    stdout: StdioCollector {}
+    stderr: StdioCollector {}
+  }
+
+  spacing: Style.marginL
+
+  NHeader {
+    label: I18n.tr("settings.display.monitors.section.label")
+    description: I18n.tr("settings.display.monitors.section.description")
+  }
+
+  ColumnLayout {
+    spacing: Style.marginL
+
+    Repeater {
+      model: Quickshell.screens || []
+      delegate: Rectangle {
+        Layout.fillWidth: true
+        implicitHeight: contentCol.implicitHeight + Style.marginL * 2
+        radius: Style.radiusM
+        color: Color.mSurfaceVariant
+        border.color: Color.mOutline
+        border.width: Style.borderS
+
+        property var brightnessMonitor: BrightnessService.getMonitorForScreen(modelData)
+
+        ColumnLayout {
+          id: contentCol
+          width: parent.width - 2 * Style.marginL
+          x: Style.marginL
+          y: Style.marginL
+          spacing: Style.marginXXS
+
+          NLabel {
+            label: modelData.name || "Unknown"
+            description: {
+              const compositorScale = CompositorService.getDisplayScale(modelData.name)
+              I18n.tr("system.monitor-description", {
+                        "model": modelData.model,
+                        "width": modelData.width * compositorScale,
+                        "height": modelData.height * compositorScale,
+                        "scale": compositorScale
+                      })
+            }
+          }
+
+          // Brightness
+          ColumnLayout {
+            spacing: Style.marginS
+            Layout.fillWidth: true
+            visible: brightnessMonitor !== undefined && brightnessMonitor !== null
+
+            RowLayout {
+              Layout.fillWidth: true
+              spacing: Style.marginL
+
+              NText {
+                text: I18n.tr("settings.display.monitors.brightness")
+                Layout.preferredWidth: 90
+                Layout.alignment: Qt.AlignVCenter
+              }
+
+              NValueSlider {
+                id: brightnessSlider
+                from: 0
+                to: 1
+                value: brightnessMonitor ? brightnessMonitor.brightness : 0.5
+                stepSize: 0.01
+                enabled: brightnessMonitor ? brightnessMonitor.brightnessControlAvailable : false
+                onMoved: value => {
+                           if (brightnessMonitor && brightnessMonitor.brightnessControlAvailable) {
+                             brightnessMonitor.setBrightness(value)
+                           }
+                         }
+                onPressedChanged: (pressed, value) => {
+                                    if (brightnessMonitor && brightnessMonitor.brightnessControlAvailable) {
+                                      brightnessMonitor.setBrightness(value)
+                                    }
+                                  }
+                Layout.fillWidth: true
+              }
+
+              NText {
+                text: brightnessMonitor ? Math.round(brightnessSlider.value * 100) + "%" : "N/A"
+                Layout.preferredWidth: 55
+                horizontalAlignment: Text.AlignRight
+                Layout.alignment: Qt.AlignVCenter
+                opacity: brightnessMonitor && !brightnessMonitor.brightnessControlAvailable ? 0.5 : 1.0
+              }
+
+              Item {
+                Layout.preferredWidth: 30
+                Layout.fillHeight: true
+                NIcon {
+                  icon: brightnessMonitor && brightnessMonitor.method == "internal" ? "device-laptop" : "device-desktop"
+                  anchors.centerIn: parent
+                  opacity: brightnessMonitor && !brightnessMonitor.brightnessControlAvailable ? 0.5 : 1.0
+                }
+              }
+            }
+
+            // Show message when brightness control is not available
+            NText {
+              visible: brightnessMonitor && !brightnessMonitor.brightnessControlAvailable
+              text: !Settings.data.brightness.enableDdcSupport ? I18n.tr("settings.display.monitors.brightness-unavailable.ddc-disabled") : I18n.tr("settings.display.monitors.brightness-unavailable.generic")
+              pointSize: Style.fontSizeS
+              color: Color.mOnSurfaceVariant
+              Layout.fillWidth: true
+              wrapMode: Text.WordWrap
+            }
+          }
+        }
+      }
+    }
+
+    // Brightness Step
+    NSpinBox {
+      Layout.fillWidth: true
+      label: I18n.tr("settings.display.monitors.brightness-step.label")
+      description: I18n.tr("settings.display.monitors.brightness-step.description")
+      minimum: 1
+      maximum: 50
+      value: Settings.data.brightness.brightnessStep
+      stepSize: 1
+      suffix: "%"
+      onValueChanged: Settings.data.brightness.brightnessStep = value
+    }
+
+    NToggle {
+      Layout.fillWidth: true
+      label: I18n.tr("settings.display.monitors.enforce-minimum.label")
+      description: I18n.tr("settings.display.monitors.enforce-minimum.description")
+      checked: Settings.data.brightness.enforceMinimum
+      onToggled: checked => Settings.data.brightness.enforceMinimum = checked
+    }
+
+    NToggle {
+      Layout.fillWidth: true
+      label: I18n.tr("settings.display.monitors.external-brightness.label")
+      description: I18n.tr("settings.display.monitors.external-brightness.description")
+      checked: Settings.data.brightness.enableDdcSupport
+      onToggled: checked => {
+                   Settings.data.brightness.enableDdcSupport = checked
+                   // DDC detection will run on next monitor change when enabled
+                   // Monitors will stop using DDC immediately when disabled
+                 }
+    }
+  }
+
+  NDivider {
+    Layout.fillWidth: true
+    Layout.topMargin: Style.marginXL
+    Layout.bottomMargin: Style.marginXL
+  }
+
+  // Night Light Section
+  ColumnLayout {
+    spacing: Style.marginXS
+    Layout.fillWidth: true
+
+    NHeader {
+      label: I18n.tr("settings.display.night-light.section.label")
+      description: I18n.tr("settings.display.night-light.section.description")
+    }
+  }
+
+  NToggle {
+    label: I18n.tr("settings.display.night-light.enable.label")
+    description: I18n.tr("settings.display.night-light.enable.description")
+    checked: Settings.data.nightLight.enabled
+    onToggled: checked => {
+                 if (checked) {
+                   // Verify wlsunset exists before enabling
+                   wlsunsetCheck.running = true
+                 } else {
+                   Settings.data.nightLight.enabled = false
+                   Settings.data.nightLight.forced = false
+                   NightLightService.apply()
+                   ToastService.showNotice(I18n.tr("settings.display.night-light.section.label"), I18n.tr("toast.night-light.disabled"), "nightlight-off")
+                 }
+               }
+  }
+
+  // Temperature
+  ColumnLayout {
+    spacing: Style.marginXS
+    Layout.alignment: Qt.AlignVCenter
+
+    NLabel {
+      label: I18n.tr("settings.display.night-light.temperature.label")
+      description: I18n.tr("settings.display.night-light.temperature.description")
+    }
+
+    RowLayout {
+      visible: Settings.data.nightLight.enabled
+      spacing: Style.marginM
+      Layout.fillWidth: false
+      Layout.fillHeight: true
+      Layout.alignment: Qt.AlignVCenter
+
+      NText {
+        text: I18n.tr("settings.display.night-light.temperature.night")
+        pointSize: Style.fontSizeM
+        color: Color.mOnSurfaceVariant
+        Layout.alignment: Qt.AlignVCenter
+      }
+
+      NTextInput {
+        text: Settings.data.nightLight.nightTemp
+        inputMethodHints: Qt.ImhDigitsOnly
+        Layout.alignment: Qt.AlignVCenter
+        onEditingFinished: {
+          var nightTemp = parseInt(text)
+          var dayTemp = parseInt(Settings.data.nightLight.dayTemp)
+          if (!isNaN(nightTemp) && !isNaN(dayTemp)) {
+            // Clamp value between [1000 .. (dayTemp-500)]
+            var clampedValue = Math.min(dayTemp - 500, Math.max(1000, nightTemp))
+            text = Settings.data.nightLight.nightTemp = clampedValue.toString()
+          }
+        }
+      }
+
+      NText {
+        text: I18n.tr("settings.display.night-light.temperature.day")
+        pointSize: Style.fontSizeM
+        color: Color.mOnSurfaceVariant
+        Layout.alignment: Qt.AlignVCenter
+      }
+      NTextInput {
+        text: Settings.data.nightLight.dayTemp
+        inputMethodHints: Qt.ImhDigitsOnly
+        Layout.alignment: Qt.AlignVCenter
+        onEditingFinished: {
+          var dayTemp = parseInt(text)
+          var nightTemp = parseInt(Settings.data.nightLight.nightTemp)
+          if (!isNaN(nightTemp) && !isNaN(dayTemp)) {
+            // Clamp value between [(nightTemp+500) .. 6500]
+            var clampedValue = Math.max(nightTemp + 500, Math.min(6500, dayTemp))
+            text = Settings.data.nightLight.dayTemp = clampedValue.toString()
+          }
+        }
+      }
+    }
+  }
+
+  NToggle {
+    label: I18n.tr("settings.display.night-light.auto-schedule.label")
+    description: I18n.tr("settings.display.night-light.auto-schedule.description", {
+                           "location": LocationService.stableName
+                         })
+    checked: Settings.data.nightLight.autoSchedule
+    onToggled: checked => Settings.data.nightLight.autoSchedule = checked
+    visible: Settings.data.nightLight.enabled
+  }
+
+  // Manual scheduling
+  ColumnLayout {
+    spacing: Style.marginS
+    visible: Settings.data.nightLight.enabled && !Settings.data.nightLight.autoSchedule && !Settings.data.nightLight.forced
+
+    NLabel {
+      label: I18n.tr("settings.display.night-light.manual-schedule.label")
+      description: I18n.tr("settings.display.night-light.manual-schedule.description")
+    }
+
+    RowLayout {
+      Layout.fillWidth: false
+      spacing: Style.marginS
+
+      NText {
+        text: I18n.tr("settings.display.night-light.manual-schedule.sunrise")
+        pointSize: Style.fontSizeM
+        color: Color.mOnSurfaceVariant
+      }
+
+      NComboBox {
+        model: timeOptions
+        currentKey: Settings.data.nightLight.manualSunrise
+        placeholder: I18n.tr("settings.display.night-light.manual-schedule.select-start")
+        onSelected: key => Settings.data.nightLight.manualSunrise = key
+        minimumWidth: 120
+      }
+
+      Item {
+        Layout.preferredWidth: 20
+      }
+
+      NText {
+        text: I18n.tr("settings.display.night-light.manual-schedule.sunset")
+        pointSize: Style.fontSizeM
+        color: Color.mOnSurfaceVariant
+      }
+
+      NComboBox {
+        model: timeOptions
+        currentKey: Settings.data.nightLight.manualSunset
+        placeholder: I18n.tr("settings.display.night-light.manual-schedule.select-stop")
+        onSelected: key => Settings.data.nightLight.manualSunset = key
+        minimumWidth: 120
+      }
+    }
+  }
+
+  // Force activation toggle
+  NToggle {
+    label: I18n.tr("settings.display.night-light.force-activation.label")
+    description: I18n.tr("settings.display.night-light.force-activation.description")
+    checked: Settings.data.nightLight.forced
+    onToggled: checked => {
+                 Settings.data.nightLight.forced = checked
+                 if (checked && !Settings.data.nightLight.enabled) {
+                   // Ensure enabled when forcing
+                   wlsunsetCheck.running = true
+                 } else {
+                   NightLightService.apply()
+                 }
+               }
+    visible: Settings.data.nightLight.enabled
+  }
+
+  NDivider {
+    Layout.fillWidth: true
+    Layout.topMargin: Style.marginXL
+    Layout.bottomMargin: Style.marginXL
+  }
+}