Merge branch 'noctalia-dev:main' into main

2025-08-28 16:45:50 -04:00 · 2025-08-28 16:45:50 -04:00 · 85bd0ed2f8
commit 85bd0ed2f8
parent cd6a183c28 3cc8c8fb03
26 changed files with 929 additions and 650 deletions
--- a/Modules/SettingsPanel/Tabs/AudioTab.qml
+++ b/Modules/SettingsPanel/Tabs/AudioTab.qml
@ -81,6 +81,54 @@ ColumnLayout {
    }
  }

+  // Input Volume
+  ColumnLayout {
+    spacing: Style.marginS * scaling
+    Layout.fillWidth: true
+    Layout.topMargin: Style.marginM * scaling
+
+    NLabel {
+      label: "Input Volume"
+      description: "Microphone input volume level."
+    }
+
+    RowLayout {
+      NSlider {
+        Layout.fillWidth: true
+        from: 0
+        to: 1.0
+        value: AudioService.inputVolume
+        stepSize: 0.01
+        onMoved: {
+          AudioService.setInputVolume(value)
+        }
+      }
+
+      NText {
+        text: Math.floor(AudioService.inputVolume * 100) + "%"
+        Layout.alignment: Qt.AlignVCenter
+        Layout.leftMargin: Style.marginS * scaling
+        color: Color.mOnSurface
+      }
+    }
+  }
+
+  // Input Mute Toggle
+  ColumnLayout {
+    spacing: Style.marginS * scaling
+    Layout.fillWidth: true
+    Layout.topMargin: Style.marginM * scaling
+
+    NToggle {
+      label: "Mute Audio Input"
+      description: "Mute or unmute the default audio input (microphone)."
+      checked: AudioService.inputMuted
+      onToggled: checked => {
+                   AudioService.setInputMuted(checked)
+                 }
+    }
+  }
+
  // Volume Step Size
  ColumnLayout {
    spacing: Style.marginS * scaling
@ -216,8 +264,6 @@ ColumnLayout {
    }
    // Preferred player (persistent)
    NTextInput {
-      Layout.fillWidth: true
-      Layout.alignment: Qt.AlignTop
      label: "Preferred Player"
      description: "Substring to match MPRIS player (identity/bus/desktop)."
      placeholderText: "e.g. spotify, vlc, mpv"
@ -239,8 +285,6 @@ ColumnLayout {

        NTextInput {
          id: blacklistInput
-          Layout.fillWidth: true
-          Layout.alignment: Qt.AlignTop
          label: "Blacklist player"
          description: "Substring, e.g. plex, shim, mpv."
          placeholderText: "type substring and press +"
--- a/Modules/SettingsPanel/Tabs/ColorSchemeTab.qml
+++ b/Modules/SettingsPanel/Tabs/ColorSchemeTab.qml
@ -344,25 +344,24 @@ ColumnLayout {
    visible: Settings.data.colorSchemes.useWallpaperColors

    ColumnLayout {
-        spacing: Style.marginS * scaling
-        Layout.fillWidth: true
+      spacing: Style.marginS * scaling
+      Layout.fillWidth: true

-        NText {
-          text: "Matugen Templates"
-          font.pointSize: Style.fontSizeXXL * scaling
-          font.weight: Style.fontWeightBold
-          color: Color.mSecondary
-        }
-
-        NText {
-          text: "Select which external components Matugen should apply theming to."
-          font.pointSize: Style.fontSizeM * scaling
-          color: Color.mOnSurfaceVariant
-          Layout.fillWidth: true
-          wrapMode: Text.WordWrap
-        }
+      NText {
+        text: "Matugen Templates"
+        font.pointSize: Style.fontSizeXXL * scaling
+        font.weight: Style.fontWeightBold
+        color: Color.mSecondary
      }

+      NText {
+        text: "Select which external components Matugen should apply theming to."
+        font.pointSize: Style.fontSizeM * scaling
+        color: Color.mOnSurfaceVariant
+        Layout.fillWidth: true
+        wrapMode: Text.WordWrap
+      }
+    }

    NCheckbox {
      label: "GTK 4 (libadwaita)"
--- a/Modules/SettingsPanel/Tabs/DisplayTab.qml
+++ b/Modules/SettingsPanel/Tabs/DisplayTab.qml
@ -2,6 +2,7 @@ import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
 import Quickshell
+import Quickshell.Io
 import qs.Commons
 import qs.Services
 import qs.Widgets
@ -27,6 +28,27 @@ ColumnLayout {
    }
  }

+  // 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("Night Light", "Enabled")
+      } else {
+        Settings.data.nightLight.enabled = false
+        ToastService.showWarning("Night Light", "wlsunset not installed")
+      }
+    }
+
+    stdout: StdioCollector {}
+    stderr: StdioCollector {}
+  }
+
  // Helper functions to update arrays immutably
  function addMonitor(list, name) {
    const arr = (list || []).slice()
@ -52,7 +74,6 @@ ColumnLayout {
    color: Color.mOnSurfaceVariant
    wrapMode: Text.WordWrap
    Layout.fillWidth: true
-    Layout.preferredWidth: parent.width - (Style.marginL * 2 * scaling)
  }

  ColumnLayout {
@ -231,7 +252,6 @@ ColumnLayout {
        color: Color.mOnSurfaceVariant
        wrapMode: Text.WordWrap
        Layout.fillWidth: true
-        Layout.preferredWidth: parent.width - (Style.marginL * 2 * scaling)
      }
    }

@ -239,7 +259,16 @@ ColumnLayout {
      label: "Enable Night Light"
      description: "Apply a warm color filter to reduce blue light emission."
      checked: Settings.data.nightLight.enabled
-      onToggled: checked => Settings.data.nightLight.enabled = checked
+      onToggled: checked => {
+                   if (checked) {
+                     // Verify wlsunset exists before enabling
+                     wlsunsetCheck.running = true
+                   } else {
+                     Settings.data.nightLight.enabled = false
+                     NightLightService.apply()
+                     ToastService.showNotice("Night Light", "Disabled")
+                   }
+                 }
    }

    // Intensity settings
@ -247,7 +276,7 @@ ColumnLayout {
      visible: Settings.data.nightLight.enabled
      NLabel {
        label: "Intensity"
-        description: "Higher values create warmer light."
+        description: "Higher values create warmer tones."
      }
      RowLayout {
        spacing: Style.marginS * scaling
@ -257,7 +286,10 @@ ColumnLayout {
          to: 1
          stepSize: 0.01
          value: Settings.data.nightLight.intensity
-          onMoved: Settings.data.nightLight.intensity = value
+          onMoved: {
+            Settings.data.nightLight.intensity = value
+            NightLightService.apply()
+          }
          Layout.fillWidth: true
          Layout.minimumWidth: 150 * scaling
        }
@ -271,11 +303,74 @@ ColumnLayout {
      }
    }

+    // Temperature
+    ColumnLayout {
+      spacing: Style.marginXS * scaling
+      Layout.alignment: Qt.AlignVCenter
+
+      NLabel {
+        label: "Color temperature"
+        description: "Select two temperatures in Kelvin"
+      }
+
+      RowLayout {
+        visible: Settings.data.nightLight.enabled
+        spacing: Style.marginM * scaling
+        Layout.fillWidth: false
+        Layout.fillHeight: true
+        Layout.alignment: Qt.AlignVCenter
+
+        NText {
+          text: "Low"
+          font.pointSize: Style.fontSizeM * scaling
+          color: Color.mOnSurfaceVariant
+          Layout.alignment: Qt.AlignVCenter
+        }
+
+        NTextInput {
+          text: Settings.data.nightLight.lowTemp.toString()
+          inputMethodHints: Qt.ImhDigitsOnly
+          Layout.alignment: Qt.AlignVCenter
+          onEditingFinished: {
+            var v = parseInt(text)
+            if (!isNaN(v)) {
+              Settings.data.nightLight.lowTemp = Math.max(1000, Math.min(6500, v))
+              NightLightService.apply()
+            }
+          }
+        }
+
+        Item {}
+
+        NText {
+          text: "High"
+          font.pointSize: Style.fontSizeM * scaling
+          color: Color.mOnSurfaceVariant
+          Layout.alignment: Qt.AlignVCenter
+        }
+        NTextInput {
+          text: Settings.data.nightLight.highTemp.toString()
+          inputMethodHints: Qt.ImhDigitsOnly
+          Layout.alignment: Qt.AlignVCenter
+          onEditingFinished: {
+            var v = parseInt(text)
+            if (!isNaN(v)) {
+              Settings.data.nightLight.highTemp = Math.max(1000, Math.min(10000, v))
+              NightLightService.apply()
+            }
+          }
+        }
+      }
+    }
+
    NToggle {
      label: "Auto Schedule"
      description: "Automatically enable night light based on time schedule."
      checked: Settings.data.nightLight.autoSchedule
-      onToggled: checked => Settings.data.nightLight.autoSchedule = checked
+      onToggled: checked => {
+                   Settings.data.nightLight.autoSchedule = checked
+                   NightLightService.apply()
+                 }
      visible: Settings.data.nightLight.enabled
    }

@ -303,7 +398,10 @@ ColumnLayout {
          model: timeOptions
          currentKey: Settings.data.nightLight.startTime
          placeholder: "Select start time"
-          onSelected: key => Settings.data.nightLight.startTime = key
+          onSelected: key => {
+                        Settings.data.nightLight.startTime = key
+                        NightLightService.apply()
+                      }
          preferredWidth: 120 * scaling
        }

@ -319,7 +417,10 @@ ColumnLayout {
          model: timeOptions
          currentKey: Settings.data.nightLight.stopTime
          placeholder: "Select stop time"
-          onSelected: key => Settings.data.nightLight.stopTime = key
+          onSelected: key => {
+                        Settings.data.nightLight.stopTime = key
+                        NightLightService.apply()
+                      }
          preferredWidth: 120 * scaling
        }
      }
--- a/Modules/SettingsPanel/Tabs/GeneralTab.qml
+++ b/Modules/SettingsPanel/Tabs/GeneralTab.qml
@ -25,10 +25,9 @@ ColumnLayout {

    NTextInput {
      label: "Profile Picture"
-      description: "Your profile picture displayed in various places throughout the shell."
+      description: "Your profile picture that appears throughout the interface."
      text: Settings.data.general.avatarImage
      placeholderText: "/home/user/.face"
-      Layout.fillWidth: true
      onEditingFinished: {
        Settings.data.general.avatarImage = text
      }
--- a/Modules/SettingsPanel/Tabs/ScreenRecorderTab.qml
+++ b/Modules/SettingsPanel/Tabs/ScreenRecorderTab.qml
@ -24,7 +24,8 @@ ColumnLayout {
      onEditingFinished: {
        Settings.data.screenRecorder.directory = text
      }
-      Layout.fillWidth: true
+
+      Layout.maximumWidth: 420 * scaling
    }

    ColumnLayout {
--- a/Modules/SettingsPanel/Tabs/TimeWeatherTab.qml
+++ b/Modules/SettingsPanel/Tabs/TimeWeatherTab.qml
@ -10,6 +10,7 @@ ColumnLayout {

  // Location section
  RowLayout {
+    Layout.fillWidth: true
    spacing: Style.marginL * scaling

    NTextInput {
@ -25,6 +26,7 @@ ColumnLayout {
          LocationService.resetWeather()
        }
      }
+      Layout.maximumWidth: 420 * scaling
    }

    NText {
--- a/Modules/SettingsPanel/Tabs/WallpaperTab.qml
+++ b/Modules/SettingsPanel/Tabs/WallpaperTab.qml
@ -35,10 +35,10 @@ ColumnLayout {
    label: "Wallpaper Directory"
    description: "Path to your wallpaper directory."
    text: Settings.data.wallpaper.directory
-    Layout.fillWidth: true
    onEditingFinished: {
      Settings.data.wallpaper.directory = text
    }
+    Layout.maximumWidth: 420 * scaling
  }

  NDivider {
@ -79,12 +79,7 @@ ColumnLayout {

        NText {
          // Show friendly H:MM format from current settings
-          text: {
-            const s = Settings.data.wallpaper.randomInterval
-            const h = Math.floor(s / 3600)
-            const m = Math.floor((s % 3600) / 60)
-            return (h > 0 ? (h + "h ") : "") + (m > 0 ? (m + "m") : (h === 0 ? "0m" : ""))
-          }
+          text: Time.formatVagueHumanReadableDuration(Settings.data.wallpaper.randomInterval)
          Layout.alignment: Qt.AlignBottom | Qt.AlignRight
        }
      }
@ -284,14 +279,15 @@ ColumnLayout {

        NTextInput {
          label: "Custom Interval"
-          description: "Enter time as HH:MM (e.g., 1:30)."
+          description: "Enter time as HH:MM (e.g., 01:30)."
+          inputMaxWidth: 100 * scaling
          text: {
            const s = Settings.data.wallpaper.randomInterval
            const h = Math.floor(s / 3600)
            const m = Math.floor((s % 3600) / 60)
            return h + ":" + (m < 10 ? ("0" + m) : m)
          }
-          Layout.fillWidth: true
+
          onEditingFinished: {
            const m = text.trim().match(/^(\d{1,2}):(\d{2})$/)
            if (m) {