From cb554f106b3e1ed8042102f772a588aa31b689dc Mon Sep 17 00:00:00 2001 From: LemmyCook Date: Thu, 21 Aug 2025 21:24:30 -0400 Subject: [PATCH] Autoformating --- Modules/Background/ScreenCorners.qml | 6 +- Modules/Bar/Battery.qml | 3 +- Modules/Bar/Brightness.qml | 12 +- Modules/Launcher/ClipboardHistory.qml | 15 ++- Modules/LockScreen/LockScreen.qml | 8 +- .../Notification/NotificationHistoryPanel.qml | 2 - Modules/SettingsPanel/Tabs/AudioTab.qml | 4 +- Modules/SettingsPanel/Tabs/BarTab.qml | 4 +- Modules/SettingsPanel/Tabs/LauncherTab.qml | 36 ++++-- .../SettingsPanel/Tabs/ScreenRecorderTab.qml | 28 ++--- Modules/SettingsPanel/Tabs/WallpaperTab.qml | 8 +- Services/CavaService.qml | 6 +- Services/CliphistService.qml | 110 ++++++++++++------ Services/CompositorService.qml | 19 +-- Widgets/NSpinBox.qml | 12 +- 15 files changed, 170 insertions(+), 103 deletions(-) diff --git a/Modules/Background/ScreenCorners.qml b/Modules/Background/ScreenCorners.qml index e10ba45..3dd596a 100644 --- a/Modules/Background/ScreenCorners.qml +++ b/Modules/Background/ScreenCorners.qml @@ -43,9 +43,11 @@ Loader { } margins { - top: ((modelData && Settings.data.bar.monitors.includes(modelData.name)) || (Settings.data.bar.monitors.length === 0)) + top: ((modelData && Settings.data.bar.monitors.includes(modelData.name)) + || (Settings.data.bar.monitors.length === 0)) && Settings.data.bar.position === "top" ? Math.floor(Style.barHeight * scaling) : 0 - bottom: ((modelData && Settings.data.bar.monitors.includes(modelData.name)) || (Settings.data.bar.monitors.length === 0)) + bottom: ((modelData && Settings.data.bar.monitors.includes(modelData.name)) + || (Settings.data.bar.monitors.length === 0)) && Settings.data.bar.position === "bottom" ? Math.floor(Style.barHeight * scaling) : 0 } diff --git a/Modules/Bar/Battery.qml b/Modules/Bar/Battery.qml index edc346a..ef09f18 100644 --- a/Modules/Bar/Battery.qml +++ b/Modules/Bar/Battery.qml @@ -77,7 +77,8 @@ NPill { if (root.battery.changeRate !== undefined) { const rate = root.battery.changeRate if (rate > 0) { - lines.push(root.charging ? "Charging rate: " + rate.toFixed(2) + " W" : "Discharging rate: " + rate.toFixed(2) + " W") + lines.push(root.charging ? "Charging rate: " + rate.toFixed(2) + " W" : "Discharging rate: " + rate.toFixed( + 2) + " W") } else if (rate < 0) { lines.push("Discharging rate: " + Math.abs(rate).toFixed(2) + " W") } else { diff --git a/Modules/Bar/Brightness.qml b/Modules/Bar/Brightness.qml index c6a40aa..39c0fb8 100644 --- a/Modules/Bar/Brightness.qml +++ b/Modules/Bar/Brightness.qml @@ -22,7 +22,8 @@ Item { function getIcon() { var monitor = getMonitor() var brightness = monitor ? monitor.brightness : 0 - return brightness <= 0 ? "brightness_1" : brightness < 0.33 ? "brightness_low" : brightness < 0.66 ? "brightness_medium" : "brightness_high" + return brightness <= 0 ? "brightness_1" : brightness < 0.33 ? "brightness_low" : brightness + < 0.66 ? "brightness_medium" : "brightness_high" } // Connection used to open the pill when brightness changes @@ -64,13 +65,16 @@ Item { } tooltipText: { var monitor = getMonitor() - if (!monitor) return "" - return "Brightness: " + Math.round(monitor.brightness * 100) + "%\nMethod: " + monitor.method + "\nLeft click for advanced settings.\nScroll up/down to change brightness." + if (!monitor) + return "" + return "Brightness: " + Math.round(monitor.brightness * 100) + "%\nMethod: " + monitor.method + + "\nLeft click for advanced settings.\nScroll up/down to change brightness." } onWheel: function (angle) { var monitor = getMonitor() - if (!monitor) return + if (!monitor) + return if (angle > 0) { monitor.increaseBrightness() } else if (angle < 0) { diff --git a/Modules/Launcher/ClipboardHistory.qml b/Modules/Launcher/ClipboardHistory.qml index 5f74a72..c52ddb1 100644 --- a/Modules/Launcher/ClipboardHistory.qml +++ b/Modules/Launcher/ClipboardHistory.qml @@ -9,8 +9,14 @@ QtObject { function parseImageMeta(preview) { const re = /\[\[\s*binary data\s+([\d\.]+\s*(?:KiB|MiB|GiB|B))\s+(\w+)\s+(\d+)x(\d+)\s*\]\]/i const m = (preview || "").match(re) - if (!m) return null - return { size: m[1], fmt: (m[2] || "").toUpperCase(), w: Number(m[3]), h: Number(m[4]) } + if (!m) + return null + return { + "size": m[1], + "fmt": (m[2] || "").toUpperCase(), + "w": Number(m[3]), + "h": Number(m[4]) + } } function formatTextPreview(preview) { @@ -23,7 +29,10 @@ QtObject { } else { subtitle = `${normalized.length} chars` } - return { title, subtitle } + return { + "title": title, + "subtitle": subtitle + } } function createClipboardEntry(item) { diff --git a/Modules/LockScreen/LockScreen.qml b/Modules/LockScreen/LockScreen.qml index 2f840af..5cdb340 100644 --- a/Modules/LockScreen/LockScreen.qml +++ b/Modules/LockScreen/LockScreen.qml @@ -305,7 +305,7 @@ Loader { border.width: Math.max(1, Style.borderL * scaling) anchors.horizontalCenter: parent.horizontalCenter - // Circular audio visualizer when music is playing + // Circular audio visualizer when music is playing Loader { active: MediaService.isPlaying && Settings.data.audio.visualizerType == "linear" anchors.centerIn: parent @@ -351,10 +351,12 @@ Loader { model: CavaService.values.length * 2 Rectangle { - property int mirroredValueIndex: index < CavaService.values.length ? index : (CavaService.values.length * 2 - 1 - index) + property int mirroredValueIndex: index < CavaService.values.length ? index : (CavaService.values.length + * 2 - 1 - index) property real mirroredAngle: (index / (CavaService.values.length * 2)) * 2 * Math.PI property real mirroredRadius: 70 * scaling - property real mirroredBarLength: Math.max(2, CavaService.values[mirroredValueIndex] * 30 * scaling) + property real mirroredBarLength: Math.max(2, + CavaService.values[mirroredValueIndex] * 30 * scaling) property real mirroredBarWidth: 3 * scaling width: mirroredBarWidth diff --git a/Modules/Notification/NotificationHistoryPanel.qml b/Modules/Notification/NotificationHistoryPanel.qml index 36a8109..c68d45f 100644 --- a/Modules/Notification/NotificationHistoryPanel.qml +++ b/Modules/Notification/NotificationHistoryPanel.qml @@ -176,8 +176,6 @@ NPanel { hoverEnabled: true } } - - } } } diff --git a/Modules/SettingsPanel/Tabs/AudioTab.qml b/Modules/SettingsPanel/Tabs/AudioTab.qml index 9b64ac0..a644a47 100644 --- a/Modules/SettingsPanel/Tabs/AudioTab.qml +++ b/Modules/SettingsPanel/Tabs/AudioTab.qml @@ -305,8 +305,8 @@ ColumnLayout { } currentKey: Settings.data.audio.visualizerType onSelected: key => { - Settings.data.audio.visualizerType = key - } + Settings.data.audio.visualizerType = key + } } } } diff --git a/Modules/SettingsPanel/Tabs/BarTab.qml b/Modules/SettingsPanel/Tabs/BarTab.qml index f7f774c..5ab810c 100644 --- a/Modules/SettingsPanel/Tabs/BarTab.qml +++ b/Modules/SettingsPanel/Tabs/BarTab.qml @@ -73,8 +73,8 @@ ColumnLayout { } currentKey: Settings.data.bar.position onSelected: key => { - Settings.data.bar.position = key - } + Settings.data.bar.position = key + } } } diff --git a/Modules/SettingsPanel/Tabs/LauncherTab.qml b/Modules/SettingsPanel/Tabs/LauncherTab.qml index 8650f96..ae10ade 100644 --- a/Modules/SettingsPanel/Tabs/LauncherTab.qml +++ b/Modules/SettingsPanel/Tabs/LauncherTab.qml @@ -49,7 +49,11 @@ ColumnLayout { } } - NDivider { Layout.fillWidth: true; Layout.topMargin: Style.marginL * scaling; Layout.bottomMargin: Style.marginS * scaling } + NDivider { + Layout.fillWidth: true + Layout.topMargin: Style.marginL * scaling + Layout.bottomMargin: Style.marginS * scaling + } NText { text: "Launcher Position" @@ -65,21 +69,33 @@ ColumnLayout { description: "Choose where the Launcher panel appears." Layout.fillWidth: true model: ListModel { - ListElement { key: "center"; name: "Center (default)" } - ListElement { key: "top_left"; name: "Top Left" } - ListElement { key: "top_right"; name: "Top Right" } - ListElement { key: "bottom_left"; name: "Bottom Left" } - ListElement { key: "bottom_right"; name: "Bottom Right" } + ListElement { + key: "center" + name: "Center (default)" + } + ListElement { + key: "top_left" + name: "Top Left" + } + ListElement { + key: "top_right" + name: "Top Right" + } + ListElement { + key: "bottom_left" + name: "Bottom Left" + } + ListElement { + key: "bottom_right" + name: "Bottom Right" + } } currentKey: Settings.data.appLauncher.position - onSelected: function(key) { + onSelected: function (key) { Settings.data.appLauncher.position = key } } - } } } } - - diff --git a/Modules/SettingsPanel/Tabs/ScreenRecorderTab.qml b/Modules/SettingsPanel/Tabs/ScreenRecorderTab.qml index 88b4b06..836ca6c 100644 --- a/Modules/SettingsPanel/Tabs/ScreenRecorderTab.qml +++ b/Modules/SettingsPanel/Tabs/ScreenRecorderTab.qml @@ -108,8 +108,8 @@ ColumnLayout { } currentKey: Settings.data.screenRecorder.videoSource onSelected: key => { - Settings.data.screenRecorder.videoSource = key - } + Settings.data.screenRecorder.videoSource = key + } } // Frame Rate @@ -136,8 +136,8 @@ ColumnLayout { } currentKey: Settings.data.screenRecorder.frameRate onSelected: key => { - Settings.data.screenRecorder.frameRate = key - } + Settings.data.screenRecorder.frameRate = key + } } // Video Quality @@ -164,8 +164,8 @@ ColumnLayout { } currentKey: Settings.data.screenRecorder.quality onSelected: key => { - Settings.data.screenRecorder.quality = key - } + Settings.data.screenRecorder.quality = key + } } // Video Codec @@ -196,8 +196,8 @@ ColumnLayout { } currentKey: Settings.data.screenRecorder.videoCodec onSelected: key => { - Settings.data.screenRecorder.videoCodec = key - } + Settings.data.screenRecorder.videoCodec = key + } } // Color Range @@ -216,8 +216,8 @@ ColumnLayout { } currentKey: Settings.data.screenRecorder.colorRange onSelected: key => { - Settings.data.screenRecorder.colorRange = key - } + Settings.data.screenRecorder.colorRange = key + } } } @@ -260,8 +260,8 @@ ColumnLayout { } currentKey: Settings.data.screenRecorder.audioSource onSelected: key => { - Settings.data.screenRecorder.audioSource = key - } + Settings.data.screenRecorder.audioSource = key + } } // Audio Codec @@ -280,8 +280,8 @@ ColumnLayout { } currentKey: Settings.data.screenRecorder.audioCodec onSelected: key => { - Settings.data.screenRecorder.audioCodec = key - } + Settings.data.screenRecorder.audioCodec = key + } } } } diff --git a/Modules/SettingsPanel/Tabs/WallpaperTab.qml b/Modules/SettingsPanel/Tabs/WallpaperTab.qml index af81eb8..f8da98d 100644 --- a/Modules/SettingsPanel/Tabs/WallpaperTab.qml +++ b/Modules/SettingsPanel/Tabs/WallpaperTab.qml @@ -189,8 +189,8 @@ ColumnLayout { } currentKey: Settings.data.wallpaper.swww.resizeMethod onSelected: key => { - Settings.data.wallpaper.swww.resizeMethod = key - } + Settings.data.wallpaper.swww.resizeMethod = key + } } // Transition Type @@ -257,8 +257,8 @@ ColumnLayout { } currentKey: Settings.data.wallpaper.swww.transitionType onSelected: key => { - Settings.data.wallpaper.swww.transitionType = key - } + Settings.data.wallpaper.swww.transitionType = key + } } // Transition FPS diff --git a/Services/CavaService.qml b/Services/CavaService.qml index fede625..4d41a91 100644 --- a/Services/CavaService.qml +++ b/Services/CavaService.qml @@ -37,9 +37,9 @@ Singleton { Process { id: process stdinEnabled: true - running: (Settings.data.audio.visualizerType !== "none") && (PanelService.sidePanel.active - || Settings.data.audio.showMiniplayerCava - || (PanelService.lockScreen && PanelService.lockScreen.active)) + running: (Settings.data.audio.visualizerType !== "none") + && (PanelService.sidePanel.active || Settings.data.audio.showMiniplayerCava + || (PanelService.lockScreen && PanelService.lockScreen.active)) command: ["cava", "-p", "/dev/stdin"] onExited: { stdinEnabled = true diff --git a/Services/CliphistService.qml b/Services/CliphistService.qml index 9ddeee7..d7f8f0b 100644 --- a/Services/CliphistService.qml +++ b/Services/CliphistService.qml @@ -34,7 +34,8 @@ Singleton { // Start/stop watchers when enabled changes Component.onCompleted: { - if (root.active) startWatchers() + if (root.active) + startWatchers() } onActiveChanged: { if (root.active) { @@ -64,30 +65,40 @@ Singleton { const lines = out.split('\n').filter(l => l.length > 0) // cliphist list default format: " " or "\t" const parsed = lines.map(l => { - let id = "" - let preview = "" - const m = l.match(/^(\d+)\s+(.+)$/) - if (m) { - id = m[1] - preview = m[2] - } else { - const tab = l.indexOf('\t') - id = tab > -1 ? l.slice(0, tab) : l - preview = tab > -1 ? l.slice(tab + 1) : "" - } - const lower = preview.toLowerCase() - const isImage = lower.startsWith("[image]") || lower.includes(" binary data ") - // Best-effort mime guess from preview - var mime = "text/plain" - if (isImage) { - if (lower.includes(" png")) mime = "image/png" - else if (lower.includes(" jpg") || lower.includes(" jpeg")) mime = "image/jpeg" - else if (lower.includes(" webp")) mime = "image/webp" - else if (lower.includes(" gif")) mime = "image/gif" - else mime = "image/*" - } - return { id, preview, isImage, mime } - }) + let id = "" + let preview = "" + const m = l.match(/^(\d+)\s+(.+)$/) + if (m) { + id = m[1] + preview = m[2] + } else { + const tab = l.indexOf('\t') + id = tab > -1 ? l.slice(0, tab) : l + preview = tab > -1 ? l.slice(tab + 1) : "" + } + const lower = preview.toLowerCase() + const isImage = lower.startsWith("[image]") || lower.includes(" binary data ") + // Best-effort mime guess from preview + var mime = "text/plain" + if (isImage) { + if (lower.includes(" png")) + mime = "image/png" + else if (lower.includes(" jpg") || lower.includes(" jpeg")) + mime = "image/jpeg" + else if (lower.includes(" webp")) + mime = "image/webp" + else if (lower.includes(" gif")) + mime = "image/gif" + else + mime = "image/*" + } + return { + "id": id, + "preview": preview, + "isImage": isImage, + "mime": mime + } + }) items = parsed loading = false } @@ -99,7 +110,11 @@ Singleton { onExited: (exitCode, exitStatus) => { const out = String(stdout.text) if (root._decodeCallback) { - try { root._decodeCallback(out) } finally { root._decodeCallback = null } + try { + root._decodeCallback(out) + } finally { + root._decodeCallback = null + } } } } @@ -117,7 +132,11 @@ Singleton { const b64 = String(stdout.text).trim() if (root._b64CurrentCb) { const url = `data:${root._b64CurrentMime};base64,${b64}` - try { root._b64CurrentCb(url) } finally { /* noop */ } + try { + root._b64CurrentCb(url) + } finally { + + /* noop */ } } if (root._b64CurrentId !== "") { root.imageDataById[root._b64CurrentId] = `data:${root._b64CurrentMime};base64,${b64}` @@ -136,19 +155,26 @@ Singleton { stdout: StdioCollector {} onExited: (exitCode, exitStatus) => { // Auto-restart if watcher dies - if (root.autoWatch) Qt.callLater(() => { running = true }) + if (root.autoWatch) + Qt.callLater(() => { + running = true + }) } } Process { id: watchImage stdout: StdioCollector {} onExited: (exitCode, exitStatus) => { - if (root.autoWatch) Qt.callLater(() => { running = true }) + if (root.autoWatch) + Qt.callLater(() => { + running = true + }) } } function startWatchers() { - if (!root.active || !autoWatch || watchersStarted) return + if (!root.active || !autoWatch || watchersStarted) + return watchersStarted = true // Start text watcher watchText.command = ["wl-paste", "--type", "text", "--watch", "cliphist", "store"] @@ -159,15 +185,19 @@ Singleton { } function stopWatchers() { - if (!watchersStarted) return + if (!watchersStarted) + return watchText.running = false watchImage.running = false watchersStarted = false } function list(maxPreviewWidth) { - if (!root.active) { return } - if (listProc.running) return + if (!root.active) { + return + } + if (listProc.running) + return loading = true const width = maxPreviewWidth || 100 listProc.command = ["cliphist", "list", "-preview-width", String(width)] @@ -183,18 +213,24 @@ Singleton { function decodeToDataUrl(id, mime, cb) { // If cached, return immediately if (root.imageDataById[id]) { - if (cb) cb(root.imageDataById[id]) + if (cb) + cb(root.imageDataById[id]) return } // Queue request; ensures single process handles sequentially - root._b64Queue.push({ id, mime: mime || "image/*", cb }) + root._b64Queue.push({ + "id": id, + "mime": mime || "image/*", + "cb": cb + }) if (!decodeB64Proc.running && root._b64CurrentCb === null) { _startNextB64() } } function _startNextB64() { - if (root._b64Queue.length === 0) return + if (root._b64Queue.length === 0) + return const job = root._b64Queue.shift() root._b64CurrentCb = job.cb root._b64CurrentMime = job.mime @@ -219,5 +255,3 @@ Singleton { Qt.callLater(() => list()) } } - - diff --git a/Services/CompositorService.qml b/Services/CompositorService.qml index a36b1f0..f657cb1 100644 --- a/Services/CompositorService.qml +++ b/Services/CompositorService.qml @@ -131,6 +131,7 @@ Singleton { } } } catch (e2) { + // ignore occupancy errors; fall back to false } for (var i = 0; i < hlWorkspaces.length; i++) { @@ -284,10 +285,10 @@ Singleton { } else if (event.WindowOpenedOrChanged) { try { const windowData = event.WindowOpenedOrChanged.window - + // Find if this window already exists const existingIndex = windows.findIndex(w => w.id === windowData.id) - + const newWindow = { "id": windowData.id, "title": windowData.title || "", @@ -295,7 +296,7 @@ Singleton { "workspaceId": windowData.workspace_id || null, "isFocused": windowData.is_focused === true } - + if (existingIndex >= 0) { // Update existing window windows[existingIndex] = newWindow @@ -304,14 +305,14 @@ Singleton { windows.push(newWindow) windows.sort((a, b) => a.id - b.id) } - + // Update focused window index if this window is focused if (newWindow.isFocused) { focusedWindowIndex = windows.findIndex(w => w.id === windowData.id) updateFocusedWindowTitle() activeWindowChanged() } - + windowListChanged() } catch (e) { Logger.error("Compositor", "Error parsing WindowOpenedOrChanged event:", e) @@ -319,7 +320,7 @@ Singleton { } else if (event.WindowClosed) { try { const windowId = event.WindowClosed.id - + // Remove the window from the list const windowIndex = windows.findIndex(w => w.id === windowId) if (windowIndex >= 0) { @@ -329,15 +330,15 @@ Singleton { updateFocusedWindowTitle() activeWindowChanged() } - + // Remove the window windows.splice(windowIndex, 1) - + // Adjust focused window index if needed if (focusedWindowIndex > windowIndex) { focusedWindowIndex-- } - + windowListChanged() } } catch (e) { diff --git a/Widgets/NSpinBox.qml b/Widgets/NSpinBox.qml index 1d2b5b1..f8e1007 100644 --- a/Widgets/NSpinBox.qml +++ b/Widgets/NSpinBox.qml @@ -84,12 +84,12 @@ RowLayout { root.exited() } onWheel: wheel => { - if (wheel.angleDelta.y > 0 && spinBox.value < spinBox.to) { - spinBox.increase() - } else if (wheel.angleDelta.y < 0 && spinBox.value > spinBox.from) { - spinBox.decrease() - } - } + if (wheel.angleDelta.y > 0 && spinBox.value < spinBox.to) { + spinBox.increase() + } else if (wheel.angleDelta.y < 0 && spinBox.value > spinBox.from) { + spinBox.decrease() + } + } } // Decrease button (left)