From 292337dc00031c6878ee36f502236197946fdba1 Mon Sep 17 00:00:00 2001 From: LemmyCook Date: Tue, 16 Sep 2025 23:26:35 -0400 Subject: [PATCH] Settings: Put monitor configs below other settings on Bar and Notif. tabs --- Modules/SettingsPanel/Tabs/BarTab.qml | 68 +++++++++---------- .../SettingsPanel/Tabs/NotificationTab.qml | 68 +++++++++---------- 2 files changed, 68 insertions(+), 68 deletions(-) diff --git a/Modules/SettingsPanel/Tabs/BarTab.qml b/Modules/SettingsPanel/Tabs/BarTab.qml index c7c2d6b..8a005bc 100644 --- a/Modules/SettingsPanel/Tabs/BarTab.qml +++ b/Modules/SettingsPanel/Tabs/BarTab.qml @@ -192,40 +192,6 @@ ColumnLayout { Layout.bottomMargin: Style.marginXL * scaling } - // Monitor Configuration - ColumnLayout { - spacing: Style.marginM * scaling - Layout.fillWidth: true - - NHeader { - label: "Monitors Configuration" - description: "Show bar on specific monitors. Defaults to all if none are chosen." - } - - Repeater { - model: Quickshell.screens || [] - delegate: NCheckbox { - Layout.fillWidth: true - label: modelData.name || "Unknown" - description: `${modelData.model} - ${modelData.width}x${modelData.height} [x:${modelData.x} y:${modelData.y}]` - checked: (Settings.data.bar.monitors || []).indexOf(modelData.name) !== -1 - onToggled: checked => { - if (checked) { - Settings.data.bar.monitors = addMonitor(Settings.data.bar.monitors, modelData.name) - } else { - Settings.data.bar.monitors = removeMonitor(Settings.data.bar.monitors, modelData.name) - } - } - } - } - } - - NDivider { - Layout.fillWidth: true - Layout.topMargin: Style.marginXL * scaling - Layout.bottomMargin: Style.marginXL * scaling - } - // Widgets Management Section ColumnLayout { spacing: Style.marginXXS * scaling @@ -293,6 +259,40 @@ ColumnLayout { Layout.bottomMargin: Style.marginXL * scaling } + // Monitor Configuration + ColumnLayout { + spacing: Style.marginM * scaling + Layout.fillWidth: true + + NHeader { + label: "Monitors Configuration" + description: "Show bar on specific monitors. Defaults to all if none are chosen." + } + + Repeater { + model: Quickshell.screens || [] + delegate: NCheckbox { + Layout.fillWidth: true + label: modelData.name || "Unknown" + description: `${modelData.model} - ${modelData.width}x${modelData.height} [x:${modelData.x} y:${modelData.y}]` + checked: (Settings.data.bar.monitors || []).indexOf(modelData.name) !== -1 + onToggled: checked => { + if (checked) { + Settings.data.bar.monitors = addMonitor(Settings.data.bar.monitors, modelData.name) + } else { + Settings.data.bar.monitors = removeMonitor(Settings.data.bar.monitors, modelData.name) + } + } + } + } + } + + NDivider { + Layout.fillWidth: true + Layout.topMargin: Style.marginXL * scaling + Layout.bottomMargin: Style.marginXL * scaling + } + // --------------------------------- // Signal functions // --------------------------------- diff --git a/Modules/SettingsPanel/Tabs/NotificationTab.qml b/Modules/SettingsPanel/Tabs/NotificationTab.qml index a996b1e..7d7a7f2 100644 --- a/Modules/SettingsPanel/Tabs/NotificationTab.qml +++ b/Modules/SettingsPanel/Tabs/NotificationTab.qml @@ -46,40 +46,6 @@ ColumnLayout { Layout.bottomMargin: Style.marginXL * scaling } - // Monitor Configuration - ColumnLayout { - spacing: Style.marginM * scaling - Layout.fillWidth: true - - NHeader { - label: "Monitors Configuration" - description: "Show bar on specific monitors. Defaults to all if none are chosen." - } - - Repeater { - model: Quickshell.screens || [] - delegate: NCheckbox { - Layout.fillWidth: true - label: modelData.name || "Unknown" - description: `${modelData.model} - ${modelData.width}x${modelData.height} [x:${modelData.x} y:${modelData.y}]` - checked: (Settings.data.notifications.monitors || []).indexOf(modelData.name) !== -1 - onToggled: checked => { - if (checked) { - Settings.data.notifications.monitors = addMonitor(Settings.data.notifications.monitors, modelData.name) - } else { - Settings.data.notifications.monitors = removeMonitor(Settings.data.notifications.monitors, modelData.name) - } - } - } - } - } - - NDivider { - Layout.fillWidth: true - Layout.topMargin: Style.marginXL * scaling - Layout.bottomMargin: Style.marginXL * scaling - } - // Notification Duration Settings ColumnLayout { spacing: Style.marginL * scaling @@ -159,4 +125,38 @@ ColumnLayout { Layout.topMargin: Style.marginXL * scaling Layout.bottomMargin: Style.marginXL * scaling } + + // Monitor Configuration + ColumnLayout { + spacing: Style.marginM * scaling + Layout.fillWidth: true + + NHeader { + label: "Monitors Configuration" + description: "Show bar on specific monitors. Defaults to all if none are chosen." + } + + Repeater { + model: Quickshell.screens || [] + delegate: NCheckbox { + Layout.fillWidth: true + label: modelData.name || "Unknown" + description: `${modelData.model} - ${modelData.width}x${modelData.height} [x:${modelData.x} y:${modelData.y}]` + checked: (Settings.data.notifications.monitors || []).indexOf(modelData.name) !== -1 + onToggled: checked => { + if (checked) { + Settings.data.notifications.monitors = addMonitor(Settings.data.notifications.monitors, modelData.name) + } else { + Settings.data.notifications.monitors = removeMonitor(Settings.data.notifications.monitors, modelData.name) + } + } + } + } + } + + NDivider { + Layout.fillWidth: true + Layout.topMargin: Style.marginXL * scaling + Layout.bottomMargin: Style.marginXL * scaling + } }