From af0f4818d8e1f41ea9756c39d9875652d386ce88 Mon Sep 17 00:00:00 2001 From: LemmyCook Date: Sun, 14 Sep 2025 11:51:04 -0400 Subject: [PATCH] Autoformatting --- Modules/Bar/Widgets/Tray.qml | 8 +- Modules/SettingsPanel/Tabs/AboutTab.qml | 162 ++++++------ Modules/SettingsPanel/Tabs/BarTab.qml | 241 +++++++++--------- Modules/SettingsPanel/Tabs/ColorSchemeTab.qml | 52 ++-- Modules/SettingsPanel/Tabs/DockTab.qml | 2 - Modules/SettingsPanel/Tabs/LauncherTab.qml | 165 ++++++------ Modules/SettingsPanel/Tabs/WallpaperTab.qml | 2 +- Modules/Toast/ToastOverlay.qml | 2 +- 8 files changed, 309 insertions(+), 325 deletions(-) diff --git a/Modules/Bar/Widgets/Tray.qml b/Modules/Bar/Widgets/Tray.qml index aa248ee..daa4c80 100644 --- a/Modules/Bar/Widgets/Tray.qml +++ b/Modules/Bar/Widgets/Tray.qml @@ -21,15 +21,13 @@ Rectangle { readonly property bool isVertical: barPosition === "left" || barPosition === "right" function onLoaded() { - // When the widget is fully initialized with its props - // set the screen for the trayMenu + // When the widget is fully initialized with its props set the screen for the trayMenu if (trayMenu.item) { trayMenu.item.screen = screen } } visible: SystemTray.items.values.length > 0 - // Changed: The binding now refers to 'trayFlow' implicitWidth: isVertical ? Math.round(Style.capsuleHeight * scaling) : (trayFlow.implicitWidth + Style.marginS * scaling * 2) implicitHeight: isVertical ? (trayFlow.implicitHeight + Style.marginS * scaling * 2) : Math.round(Style.capsuleHeight * scaling) radius: Math.round(Style.radiusM * scaling) @@ -41,8 +39,6 @@ Rectangle { id: trayFlow anchors.centerIn: parent spacing: Style.marginS * scaling - - // The key change: Dynamically set the flow direction flow: isVertical ? Flow.TopToBottom : Flow.LeftToRight Repeater { @@ -185,4 +181,4 @@ Rectangle { source: "../Extras/TrayMenu.qml" } } -} \ No newline at end of file +} diff --git a/Modules/SettingsPanel/Tabs/AboutTab.qml b/Modules/SettingsPanel/Tabs/AboutTab.qml index df2231b..f73e0b6 100644 --- a/Modules/SettingsPanel/Tabs/AboutTab.qml +++ b/Modules/SettingsPanel/Tabs/AboutTab.qml @@ -23,101 +23,99 @@ ColumnLayout { RowLayout { spacing: Style.marginL * scaling - - // Versions - GridLayout { - columns: 2 - rowSpacing: Style.marginXS * scaling - columnSpacing: Style.marginS * scaling + // Versions + GridLayout { + columns: 2 + rowSpacing: Style.marginXS * scaling + columnSpacing: Style.marginS * scaling - NText { - text: "Latest Version:" - color: Color.mOnSurface - } - - NText { - text: root.latestVersion - color: Color.mOnSurface - font.weight: Style.fontWeightBold - } - - NText { - text: "Installed Version:" - color: Color.mOnSurface - } - - NText { - text: root.currentVersion - color: Color.mOnSurface - font.weight: Style.fontWeightBold - } - } - - Item { - Layout.fillWidth: true - } - - // Update button - Rectangle { - Layout.alignment: Qt.alignmentRight - Layout.preferredWidth: Math.round(updateRow.implicitWidth + (Style.marginL * scaling * 2)) - Layout.preferredHeight: Math.round(Style.barHeight * scaling) - radius: Style.radiusL * scaling - color: updateArea.containsMouse ? Color.mPrimary : Color.transparent - border.color: Color.mPrimary - border.width: Math.max(1, Style.borderS * scaling) - visible: { - if (root.latestVersion === "Unknown") - return false - - const latest = root.latestVersion.replace("v", "").split(".") - const current = root.currentVersion.replace("v", "").split(".") - for (var i = 0; i < Math.max(latest.length, current.length); i++) { - const l = parseInt(latest[i] || "0") - const c = parseInt(current[i] || "0") - if (l > c) - return true - - if (l < c) - return false - } - return false - } - - RowLayout { - id: updateRow - anchors.centerIn: parent - spacing: Style.marginS * scaling - - NIcon { - icon: "download" - font.pointSize: Style.fontSizeXXL * scaling - color: updateArea.containsMouse ? Color.mSurface : Color.mPrimary + NText { + text: "Latest Version:" + color: Color.mOnSurface } NText { - id: updateText - text: "Download latest release" - font.pointSize: Style.fontSizeL * scaling - color: updateArea.containsMouse ? Color.mSurface : Color.mPrimary + text: root.latestVersion + color: Color.mOnSurface + font.weight: Style.fontWeightBold + } + + NText { + text: "Installed Version:" + color: Color.mOnSurface + } + + NText { + text: root.currentVersion + color: Color.mOnSurface + font.weight: Style.fontWeightBold } } - MouseArea { - id: updateArea + Item { + Layout.fillWidth: true + } - anchors.fill: parent - hoverEnabled: true - cursorShape: Qt.PointingHandCursor - onClicked: { - Quickshell.execDetached(["xdg-open", "https://github.com/Ly-sec/Noctalia/releases/latest"]) + // Update button + Rectangle { + Layout.alignment: Qt.alignmentRight + Layout.preferredWidth: Math.round(updateRow.implicitWidth + (Style.marginL * scaling * 2)) + Layout.preferredHeight: Math.round(Style.barHeight * scaling) + radius: Style.radiusL * scaling + color: updateArea.containsMouse ? Color.mPrimary : Color.transparent + border.color: Color.mPrimary + border.width: Math.max(1, Style.borderS * scaling) + visible: { + if (root.latestVersion === "Unknown") + return false + + const latest = root.latestVersion.replace("v", "").split(".") + const current = root.currentVersion.replace("v", "").split(".") + for (var i = 0; i < Math.max(latest.length, current.length); i++) { + const l = parseInt(latest[i] || "0") + const c = parseInt(current[i] || "0") + if (l > c) + return true + + if (l < c) + return false + } + return false + } + + RowLayout { + id: updateRow + anchors.centerIn: parent + spacing: Style.marginS * scaling + + NIcon { + icon: "download" + font.pointSize: Style.fontSizeXXL * scaling + color: updateArea.containsMouse ? Color.mSurface : Color.mPrimary + } + + NText { + id: updateText + text: "Download latest release" + font.pointSize: Style.fontSizeL * scaling + color: updateArea.containsMouse ? Color.mSurface : Color.mPrimary + } + } + + MouseArea { + id: updateArea + + anchors.fill: parent + hoverEnabled: true + cursorShape: Qt.PointingHandCursor + onClicked: { + Quickshell.execDetached(["xdg-open", "https://github.com/Ly-sec/Noctalia/releases/latest"]) + } } } } -} - NDivider { Layout.fillWidth: true Layout.topMargin: Style.marginXL * scaling diff --git a/Modules/SettingsPanel/Tabs/BarTab.qml b/Modules/SettingsPanel/Tabs/BarTab.qml index c9d24d5..ca5ce47 100644 --- a/Modules/SettingsPanel/Tabs/BarTab.qml +++ b/Modules/SettingsPanel/Tabs/BarTab.qml @@ -11,7 +11,6 @@ ColumnLayout { id: root spacing: Style.marginL * scaling - // Helper functions to update arrays immutably function addMonitor(list, name) { const arr = (list || []).slice() @@ -40,156 +39,154 @@ ColumnLayout { panel.enableBackgroundClick() } } - + NHeader { label: "Appearance" description: "Configure bar appearance and positioning." } + RowLayout { + NComboBox { + Layout.fillWidth: true + label: "Bar Position" + description: "Choose where to place the bar on the screen." + model: ListModel { + ListElement { + key: "top" + name: "Top" + } + ListElement { + key: "bottom" + name: "Bottom" + } + ListElement { + key: "left" + name: "Left" + } + ListElement { + key: "right" + name: "Right" + } + } + currentKey: Settings.data.bar.position + onSelected: key => Settings.data.bar.position = key + } + } + + ColumnLayout { + spacing: Style.marginXXS * scaling + Layout.fillWidth: true + + NLabel { + label: "Background Opacity" + description: "Adjust the background opacity of the bar." + } RowLayout { - NComboBox { + NSlider { Layout.fillWidth: true - label: "Bar Position" - description: "Choose where to place the bar on the screen." - model: ListModel { - ListElement { - key: "top" - name: "Top" - } - ListElement { - key: "bottom" - name: "Bottom" - } - ListElement { - key: "left" - name: "Left" - } - ListElement { - key: "right" - name: "Right" - } - } - currentKey: Settings.data.bar.position - onSelected: key => Settings.data.bar.position = key + from: 0 + to: 1 + stepSize: 0.01 + value: Settings.data.bar.backgroundOpacity + onMoved: Settings.data.bar.backgroundOpacity = value + cutoutColor: Color.mSurface + } + + NText { + text: Math.floor(Settings.data.bar.backgroundOpacity * 100) + "%" + Layout.alignment: Qt.AlignVCenter + Layout.leftMargin: Style.marginS * scaling + color: Color.mOnSurface } } + } + NToggle { + Layout.fillWidth: true + label: "Floating Bar" + description: "Make the bar float with rounded corners and margins. This will hide screen corners." + checked: Settings.data.bar.floating + onToggled: checked => Settings.data.bar.floating = checked + } - ColumnLayout { - spacing: Style.marginXXS * scaling + // Floating bar options - only show when floating is enabled + ColumnLayout { + visible: Settings.data.bar.floating + spacing: Style.marginS * scaling + Layout.fillWidth: true + + NLabel { + label: "Margins" + description: "Adjust the margins around the floating bar." + } + + RowLayout { Layout.fillWidth: true + spacing: Style.marginL * scaling - NLabel { - label: "Background Opacity" - description: "Adjust the background opacity of the bar." - } - - RowLayout { - NSlider { - Layout.fillWidth: true - from: 0 - to: 1 - stepSize: 0.01 - value: Settings.data.bar.backgroundOpacity - onMoved: Settings.data.bar.backgroundOpacity = value - cutoutColor: Color.mSurface - } + ColumnLayout { + spacing: Style.marginXXS * scaling NText { - text: Math.floor(Settings.data.bar.backgroundOpacity * 100) + "%" - Layout.alignment: Qt.AlignVCenter - Layout.leftMargin: Style.marginS * scaling - color: Color.mOnSurface + text: "Vertical" + font.pointSize: Style.fontSizeXS * scaling + color: Color.mOnSurfaceVariant } - } - } - NToggle { - Layout.fillWidth: true - label: "Floating Bar" - description: "Make the bar float with rounded corners and margins. This will hide screen corners." - checked: Settings.data.bar.floating - onToggled: checked => Settings.data.bar.floating = checked - } - // Floating bar options - only show when floating is enabled - ColumnLayout { - visible: Settings.data.bar.floating - spacing: Style.marginS * scaling - Layout.fillWidth: true - - NLabel { - label: "Margins" - description: "Adjust the margins around the floating bar." - } - - RowLayout { - Layout.fillWidth: true - spacing: Style.marginL * scaling - - ColumnLayout { - spacing: Style.marginXXS * scaling + RowLayout { + NSlider { + Layout.fillWidth: true + from: 0 + to: 1 + stepSize: 0.01 + value: Settings.data.bar.marginVertical + onMoved: Settings.data.bar.marginVertical = value + cutoutColor: Color.mSurface + } NText { - text: "Vertical" - font.pointSize: Style.fontSizeXS * scaling - color: Color.mOnSurfaceVariant - } - - RowLayout { - NSlider { - Layout.fillWidth: true - from: 0 - to: 1 - stepSize: 0.01 - value: Settings.data.bar.marginVertical - onMoved: Settings.data.bar.marginVertical = value - cutoutColor: Color.mSurface - } - - NText { - text: Math.round(Settings.data.bar.marginVertical * 100) + "%" - Layout.alignment: Qt.AlignVCenter - Layout.leftMargin: Style.marginXS * scaling - Layout.preferredWidth: 50 - horizontalAlignment: Text.AlignRight - color: Color.mOnSurface - } + text: Math.round(Settings.data.bar.marginVertical * 100) + "%" + Layout.alignment: Qt.AlignVCenter + Layout.leftMargin: Style.marginXS * scaling + Layout.preferredWidth: 50 + horizontalAlignment: Text.AlignRight + color: Color.mOnSurface } } + } - ColumnLayout { - spacing: Style.marginXXS * scaling + ColumnLayout { + spacing: Style.marginXXS * scaling - NText { - text: "Horizontal" - font.pointSize: Style.fontSizeXS * scaling - color: Color.mOnSurfaceVariant + NText { + text: "Horizontal" + font.pointSize: Style.fontSizeXS * scaling + color: Color.mOnSurfaceVariant + } + + RowLayout { + NSlider { + Layout.fillWidth: true + from: 0 + to: 1 + stepSize: 0.01 + value: Settings.data.bar.marginHorizontal + onMoved: Settings.data.bar.marginHorizontal = value + cutoutColor: Color.mSurface } - RowLayout { - NSlider { - Layout.fillWidth: true - from: 0 - to: 1 - stepSize: 0.01 - value: Settings.data.bar.marginHorizontal - onMoved: Settings.data.bar.marginHorizontal = value - cutoutColor: Color.mSurface - } - - NText { - text: Math.round(Settings.data.bar.marginHorizontal * 100) + "%" - Layout.alignment: Qt.AlignVCenter - Layout.leftMargin: Style.marginXS * scaling - Layout.preferredWidth: 50 - horizontalAlignment: Text.AlignRight - color: Color.mOnSurface - } + NText { + text: Math.round(Settings.data.bar.marginHorizontal * 100) + "%" + Layout.alignment: Qt.AlignVCenter + Layout.leftMargin: Style.marginXS * scaling + Layout.preferredWidth: 50 + horizontalAlignment: Text.AlignRight + color: Color.mOnSurface } } } } - + } NDivider { Layout.fillWidth: true diff --git a/Modules/SettingsPanel/Tabs/ColorSchemeTab.qml b/Modules/SettingsPanel/Tabs/ColorSchemeTab.qml index f20b711..69f3c1c 100644 --- a/Modules/SettingsPanel/Tabs/ColorSchemeTab.qml +++ b/Modules/SettingsPanel/Tabs/ColorSchemeTab.qml @@ -10,8 +10,6 @@ ColumnLayout { id: root spacing: Style.marginL * scaling - - // Cache for scheme JSON (can be flat or {dark, light}) property var schemeColorsCache: ({}) @@ -106,43 +104,41 @@ ColumnLayout { } } - // Main Toggles - Dark Mode / Matugen NHeader { label: "Behavior" description: "Main settings for Noctalia's colors." } - // Dark Mode Toggle (affects both Matugen and predefined schemes that provide variants) - NToggle { - label: "Dark Mode" - description: Settings.data.colorSchemes.useWallpaperColors ? "Generate dark theme colors when using Matugen." : "Use a dark variant if available." - checked: Settings.data.colorSchemes.darkMode - enabled: true - onToggled: checked => Settings.data.colorSchemes.darkMode = checked - } + // Dark Mode Toggle (affects both Matugen and predefined schemes that provide variants) + NToggle { + label: "Dark Mode" + description: Settings.data.colorSchemes.useWallpaperColors ? "Generate dark theme colors when using Matugen." : "Use a dark variant if available." + checked: Settings.data.colorSchemes.darkMode + enabled: true + onToggled: checked => Settings.data.colorSchemes.darkMode = checked + } - // Use Matugen - NToggle { - label: "Enable Matugen" - description: "Automatically generate colors based on your active wallpaper." - checked: Settings.data.colorSchemes.useWallpaperColors - onToggled: checked => { - if (checked) { - // Check if matugen is installed - matugenCheck.running = true - } else { - Settings.data.colorSchemes.useWallpaperColors = false - ToastService.showNotice("Matugen", "Disabled") + // Use Matugen + NToggle { + label: "Enable Matugen" + description: "Automatically generate colors based on your active wallpaper." + checked: Settings.data.colorSchemes.useWallpaperColors + onToggled: checked => { + if (checked) { + // Check if matugen is installed + matugenCheck.running = true + } else { + Settings.data.colorSchemes.useWallpaperColors = false + ToastService.showNotice("Matugen", "Disabled") - if (Settings.data.colorSchemes.predefinedScheme) { + if (Settings.data.colorSchemes.predefinedScheme) { - ColorSchemeService.applyScheme(Settings.data.colorSchemes.predefinedScheme) - } + ColorSchemeService.applyScheme(Settings.data.colorSchemes.predefinedScheme) } } - } - + } + } NDivider { Layout.fillWidth: true diff --git a/Modules/SettingsPanel/Tabs/DockTab.qml b/Modules/SettingsPanel/Tabs/DockTab.qml index 7324838..d3b7c64 100644 --- a/Modules/SettingsPanel/Tabs/DockTab.qml +++ b/Modules/SettingsPanel/Tabs/DockTab.qml @@ -10,8 +10,6 @@ ColumnLayout { id: root spacing: Style.marginL * scaling - - // Helper functions to update arrays immutably function addMonitor(list, name) { const arr = (list || []).slice() diff --git a/Modules/SettingsPanel/Tabs/LauncherTab.qml b/Modules/SettingsPanel/Tabs/LauncherTab.qml index 6427918..00165b4 100644 --- a/Modules/SettingsPanel/Tabs/LauncherTab.qml +++ b/Modules/SettingsPanel/Tabs/LauncherTab.qml @@ -14,101 +14,100 @@ ColumnLayout { description: "Configure the launcher behavior and appearance." } - NComboBox { - id: launcherPosition - label: "Position" - 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: "bottom_center" - name: "Bottom Center" - } - ListElement { - key: "top_center" - name: "Top Center" - } + NComboBox { + id: launcherPosition + label: "Position" + description: "Choose where the Launcher panel appears." + Layout.fillWidth: true + model: ListModel { + ListElement { + key: "center" + name: "Center (default)" } - currentKey: Settings.data.appLauncher.position - onSelected: function (key) { - Settings.data.appLauncher.position = key + 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: "bottom_center" + name: "Bottom Center" + } + ListElement { + key: "top_center" + name: "Top Center" } } + currentKey: Settings.data.appLauncher.position + onSelected: function (key) { + Settings.data.appLauncher.position = key + } + } - ColumnLayout { - spacing: Style.marginXXS * scaling + ColumnLayout { + spacing: Style.marginXXS * scaling + Layout.fillWidth: true + + NText { + text: "Background Opacity" + font.pointSize: Style.fontSizeL * scaling + font.weight: Style.fontWeightBold + color: Color.mOnSurface + } + + NText { + text: "Adjust the background opacity of the launcher." + font.pointSize: Style.fontSizeXS * scaling + color: Color.mOnSurfaceVariant + wrapMode: Text.WordWrap Layout.fillWidth: true + } + + RowLayout { + NSlider { + id: launcherBgOpacity + Layout.fillWidth: true + from: 0.0 + to: 1.0 + stepSize: 0.01 + value: Settings.data.appLauncher.backgroundOpacity + onMoved: Settings.data.appLauncher.backgroundOpacity = value + cutoutColor: Color.mSurface + } NText { - text: "Background Opacity" - font.pointSize: Style.fontSizeL * scaling - font.weight: Style.fontWeightBold + text: Math.floor(Settings.data.appLauncher.backgroundOpacity * 100) + "%" + Layout.alignment: Qt.AlignVCenter + Layout.leftMargin: Style.marginS * scaling color: Color.mOnSurface } - - NText { - text: "Adjust the background opacity of the launcher." - font.pointSize: Style.fontSizeXS * scaling - color: Color.mOnSurfaceVariant - wrapMode: Text.WordWrap - Layout.fillWidth: true - } - - RowLayout { - NSlider { - id: launcherBgOpacity - Layout.fillWidth: true - from: 0.0 - to: 1.0 - stepSize: 0.01 - value: Settings.data.appLauncher.backgroundOpacity - onMoved: Settings.data.appLauncher.backgroundOpacity = value - cutoutColor: Color.mSurface - } - - NText { - text: Math.floor(Settings.data.appLauncher.backgroundOpacity * 100) + "%" - Layout.alignment: Qt.AlignVCenter - Layout.leftMargin: Style.marginS * scaling - color: Color.mOnSurface - } - } } + } - NToggle { - label: "Enable Clipboard History" - description: "Show clipboard history in the launcher." - checked: Settings.data.appLauncher.enableClipboardHistory - onToggled: checked => Settings.data.appLauncher.enableClipboardHistory = checked - } + NToggle { + label: "Enable Clipboard History" + description: "Show clipboard history in the launcher." + checked: Settings.data.appLauncher.enableClipboardHistory + onToggled: checked => Settings.data.appLauncher.enableClipboardHistory = checked + } - NToggle { - label: "Use App2Unit for Launching" - description: "Use app2unit -- 'desktop-entry' when launching applications for better systemd integration." - checked: Settings.data.appLauncher.useApp2Unit - onToggled: checked => Settings.data.appLauncher.useApp2Unit = checked - } - + NToggle { + label: "Use App2Unit for Launching" + description: "Use app2unit -- 'desktop-entry' when launching applications for better systemd integration." + checked: Settings.data.appLauncher.useApp2Unit + onToggled: checked => Settings.data.appLauncher.useApp2Unit = checked + } NDivider { Layout.fillWidth: true diff --git a/Modules/SettingsPanel/Tabs/WallpaperTab.qml b/Modules/SettingsPanel/Tabs/WallpaperTab.qml index f36c462..e0f8a2b 100644 --- a/Modules/SettingsPanel/Tabs/WallpaperTab.qml +++ b/Modules/SettingsPanel/Tabs/WallpaperTab.qml @@ -28,7 +28,7 @@ ColumnLayout { visible: Settings.data.wallpaper.enabled spacing: Style.marginL * scaling Layout.fillWidth: true - + NTextInput { label: "Wallpaper Directory" description: "Path to your common wallpaper directory." diff --git a/Modules/Toast/ToastOverlay.qml b/Modules/Toast/ToastOverlay.qml index abbd33d..05cf809 100644 --- a/Modules/Toast/ToastOverlay.qml +++ b/Modules/Toast/ToastOverlay.qml @@ -110,4 +110,4 @@ Variants { } } } -} \ No newline at end of file +}