diff --git a/Modules/SettingsPanel/Tabs/AudioTab.qml b/Modules/SettingsPanel/Tabs/AudioTab.qml index fa0c0c0..fe7782c 100644 --- a/Modules/SettingsPanel/Tabs/AudioTab.qml +++ b/Modules/SettingsPanel/Tabs/AudioTab.qml @@ -123,9 +123,7 @@ ColumnLayout { label: "Mute Audio Input" description: "Mute or unmute the default audio input (microphone)." checked: AudioService.inputMuted - onToggled: checked => { - AudioService.setInputMuted(checked) - } + onToggled: checked => AudioService.setInputMuted(checked) } } @@ -249,18 +247,14 @@ ColumnLayout { label: "Show Album Art In Bar Media Player" description: "Show the album art of the currently playing song next to the title." checked: Settings.data.audio.showMiniplayerAlbumArt - onToggled: checked => { - Settings.data.audio.showMiniplayerAlbumArt = checked - } + onToggled: checked => Settings.data.audio.showMiniplayerAlbumArt = checked } NToggle { label: "Show Audio Visualizer In Bar Media Player" description: "Shows an audio visualizer in the background of the miniplayer." checked: Settings.data.audio.showMiniplayerCava - onToggled: checked => { - Settings.data.audio.showMiniplayerCava = checked - } + onToggled: checked => Settings.data.audio.showMiniplayerCava = checked } // Preferred player (persistent) NTextInput { @@ -412,9 +406,7 @@ ColumnLayout { } } currentKey: Settings.data.audio.visualizerType - onSelected: key => { - Settings.data.audio.visualizerType = key - } + onSelected: key => Settings.data.audio.visualizerType = key } NComboBox { @@ -451,9 +443,7 @@ ColumnLayout { } } currentKey: Settings.data.audio.cavaFrameRate - onSelected: key => { - Settings.data.audio.cavaFrameRate = key - } + onSelected: key => Settings.data.audio.cavaFrameRate = key } } // Divider diff --git a/Modules/SettingsPanel/Tabs/BarTab.qml b/Modules/SettingsPanel/Tabs/BarTab.qml index b1d064d..88bdb4d 100644 --- a/Modules/SettingsPanel/Tabs/BarTab.qml +++ b/Modules/SettingsPanel/Tabs/BarTab.qml @@ -43,7 +43,7 @@ ColumnLayout { } NText { - text: "Adjust the background opacity of the bar" + text: "Adjust the background opacity of the bar." font.pointSize: Style.fontSizeXS * scaling color: Color.mOnSurfaceVariant wrapMode: Text.WordWrap @@ -74,32 +74,26 @@ ColumnLayout { label: "Show Active Window's Icon" description: "Display the app icon next to the title of the currently focused window." checked: Settings.data.bar.showActiveWindowIcon - onToggled: checked => { - Settings.data.bar.showActiveWindowIcon = checked - } + onToggled: checked => Settings.data.bar.showActiveWindowIcon = checked } NToggle { label: "Show Battery Percentage" description: "Display battery percentage at all times." checked: Settings.data.bar.alwaysShowBatteryPercentage - onToggled: checked => { - Settings.data.bar.alwaysShowBatteryPercentage = checked - } + onToggled: checked => Settings.data.bar.alwaysShowBatteryPercentage = checked } NToggle { label: "Show Network Statistics" description: "Display network upload and download speeds in the system monitor." checked: Settings.data.bar.showNetworkStats - onToggled: checked => { - Settings.data.bar.showNetworkStats = checked - } + onToggled: checked => Settings.data.bar.showNetworkStats = checked } NComboBox { label: "Show Workspaces Labels" - description: "Display the workspace name or index in the workspace indicator" + description: "Show the workspace name or index within the workspace indicator." model: ListModel { ListElement { key: "none" @@ -115,9 +109,7 @@ ColumnLayout { } } currentKey: Settings.data.bar.showWorkspaceLabel - onSelected: key => { - Settings.data.bar.showWorkspaceLabel = key - } + onSelected: key => Settings.data.bar.showWorkspaceLabel = key } } @@ -142,7 +134,7 @@ ColumnLayout { NText { text: "Drag and drop widgets to reorder them within each section, or use the add/remove buttons to manage widgets." - font.pointSize: Style.fontSizeXS * scaling + font.pointSize: Style.fontSizeM * scaling color: Color.mOnSurfaceVariant wrapMode: Text.WordWrap Layout.fillWidth: true diff --git a/Modules/SettingsPanel/Tabs/BrightnessTab.qml b/Modules/SettingsPanel/Tabs/BrightnessTab.qml index 7751350..4bbcace 100644 --- a/Modules/SettingsPanel/Tabs/BrightnessTab.qml +++ b/Modules/SettingsPanel/Tabs/BrightnessTab.qml @@ -298,9 +298,8 @@ ColumnLayout { model: timeOptions currentKey: Settings.data.nightLight.manualSunrise placeholder: "Select start time" - onSelected: key => { - Settings.data.nightLight.manualSunrise = key - } + onSelected: key => Settings.data.nightLight.manualSunrise = key + preferredWidth: 120 * scaling } @@ -316,9 +315,8 @@ ColumnLayout { model: timeOptions currentKey: Settings.data.nightLight.manualSunset placeholder: "Select stop time" - onSelected: key => { - Settings.data.nightLight.manualSunset = key - } + onSelected: key => Settings.data.nightLight.manualSunset = key + preferredWidth: 120 * scaling } } diff --git a/Modules/SettingsPanel/Tabs/GeneralTab.qml b/Modules/SettingsPanel/Tabs/GeneralTab.qml index 7fb4f5f..4d38d23 100644 --- a/Modules/SettingsPanel/Tabs/GeneralTab.qml +++ b/Modules/SettingsPanel/Tabs/GeneralTab.qml @@ -1,6 +1,7 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts +import Quickshell import qs.Commons import qs.Services import qs.Widgets @@ -15,8 +16,8 @@ ColumnLayout { // Avatar preview NImageCircled { - width: 128 * scaling - height: 128 * scaling + width: 108 * scaling + height: 108 * scaling imagePath: Settings.data.general.avatarImage fallbackIcon: "person" borderColor: Color.mPrimary @@ -24,7 +25,7 @@ ColumnLayout { } NTextInput { - label: "Profile Picture" + label: `${Quickshell.env("USER") || "user"}'s profile picture` description: "Your profile picture that appears throughout the interface." text: Settings.data.general.avatarImage placeholderText: "/home/user/.face" @@ -57,27 +58,27 @@ ColumnLayout { label: "Show Corners" description: "Display rounded corners on the edge of the screen." checked: Settings.data.general.showScreenCorners - onToggled: checked => { + onToggled: checked => Settings.data.general.showScreenCorners = checked - } + } NToggle { label: "Dim Desktop" description: "Dim the desktop when panels or menus are open." checked: Settings.data.general.dimDesktop - onToggled: checked => { + onToggled: checked => Settings.data.general.dimDesktop = checked - } + } NToggle { label: "Auto-hide Dock" description: "Automatically hide the dock when not in use." checked: Settings.data.dock.autoHide - onToggled: checked => { + onToggled: checked => Settings.data.dock.autoHide = checked - } + } ColumnLayout { diff --git a/Modules/SettingsPanel/Tabs/LauncherTab.qml b/Modules/SettingsPanel/Tabs/LauncherTab.qml index 49db62e..f303273 100644 --- a/Modules/SettingsPanel/Tabs/LauncherTab.qml +++ b/Modules/SettingsPanel/Tabs/LauncherTab.qml @@ -56,9 +56,7 @@ ColumnLayout { label: "Enable Clipboard History" description: "Show clipboard history in the launcher." checked: Settings.data.appLauncher.enableClipboardHistory - onToggled: checked => { - Settings.data.appLauncher.enableClipboardHistory = checked - } + onToggled: checked => Settings.data.appLauncher.enableClipboardHistory = checked } ColumnLayout { diff --git a/Modules/SettingsPanel/Tabs/ScreenRecorderTab.qml b/Modules/SettingsPanel/Tabs/ScreenRecorderTab.qml index 900b971..58f1e8d 100644 --- a/Modules/SettingsPanel/Tabs/ScreenRecorderTab.qml +++ b/Modules/SettingsPanel/Tabs/ScreenRecorderTab.qml @@ -37,9 +37,7 @@ ColumnLayout { label: "Show Cursor" description: "Record mouse cursor in the video." checked: Settings.data.screenRecorder.showCursor - onToggled: checked => { - Settings.data.screenRecorder.showCursor = checked - } + onToggled: checked => Settings.data.screenRecorder.showCursor = checked } } } @@ -66,7 +64,7 @@ ColumnLayout { // Source NComboBox { label: "Video Source" - description: "We recommend using portal, if you get artifacts try screen." + description: "Portal is recommend, if you get artifacts try Screen." model: ListModel { ListElement { key: "portal" @@ -78,9 +76,7 @@ ColumnLayout { } } currentKey: Settings.data.screenRecorder.videoSource - onSelected: key => { - Settings.data.screenRecorder.videoSource = key - } + onSelected: key => Settings.data.screenRecorder.videoSource = key } // Frame Rate @@ -118,9 +114,7 @@ ColumnLayout { } } currentKey: Settings.data.screenRecorder.frameRate - onSelected: key => { - Settings.data.screenRecorder.frameRate = key - } + onSelected: key => Settings.data.screenRecorder.frameRate = key } // Video Quality @@ -146,15 +140,13 @@ ColumnLayout { } } currentKey: Settings.data.screenRecorder.quality - onSelected: key => { - Settings.data.screenRecorder.quality = key - } + onSelected: key => Settings.data.screenRecorder.quality = key } // Video Codec NComboBox { label: "Video Codec" - description: "Different codecs offer different compression and compatibility." + description: "h264 is the most common codec." model: ListModel { ListElement { key: "h264" @@ -178,9 +170,7 @@ ColumnLayout { } } currentKey: Settings.data.screenRecorder.videoCodec - onSelected: key => { - Settings.data.screenRecorder.videoCodec = key - } + onSelected: key => Settings.data.screenRecorder.videoCodec = key } // Color Range @@ -198,9 +188,7 @@ ColumnLayout { } } currentKey: Settings.data.screenRecorder.colorRange - onSelected: key => { - Settings.data.screenRecorder.colorRange = key - } + onSelected: key => Settings.data.screenRecorder.colorRange = key } } @@ -242,9 +230,7 @@ ColumnLayout { } } currentKey: Settings.data.screenRecorder.audioSource - onSelected: key => { - Settings.data.screenRecorder.audioSource = key - } + onSelected: key => Settings.data.screenRecorder.audioSource = key } // Audio Codec @@ -262,9 +248,7 @@ ColumnLayout { } } currentKey: Settings.data.screenRecorder.audioCodec - onSelected: key => { - Settings.data.screenRecorder.audioCodec = key - } + onSelected: key => Settings.data.screenRecorder.audioCodec = key } } diff --git a/Modules/SettingsPanel/Tabs/TimeWeatherTab.qml b/Modules/SettingsPanel/Tabs/TimeWeatherTab.qml index 6e63738..4bf1b2c 100644 --- a/Modules/SettingsPanel/Tabs/TimeWeatherTab.qml +++ b/Modules/SettingsPanel/Tabs/TimeWeatherTab.qml @@ -63,27 +63,21 @@ ColumnLayout { label: "Use 12-Hour Clock" description: "Display time in 12-hour format (AM/PM) instead of 24-hour." checked: Settings.data.location.use12HourClock - onToggled: checked => { - Settings.data.location.use12HourClock = checked - } + onToggled: checked => Settings.data.location.use12HourClock = checked } NToggle { label: "Reverse Day/Month" - description: "Display date as DD/MM instead of MM/DD." + description: "Display date as dd/mm instead of mm/dd." checked: Settings.data.location.reverseDayMonth - onToggled: checked => { - Settings.data.location.reverseDayMonth = checked - } + onToggled: checked => Settings.data.location.reverseDayMonth = checked } NToggle { label: "Show Date with Clock" description: "Display date alongside time (e.g., 18:12 - Sat, 23 Aug)." checked: Settings.data.location.showDateWithClock - onToggled: checked => { - Settings.data.location.showDateWithClock = checked - } + onToggled: checked => Settings.data.location.showDateWithClock = checked } } @@ -109,9 +103,7 @@ ColumnLayout { label: "Use Fahrenheit" description: "Display temperature in Fahrenheit instead of Celsius." checked: Settings.data.location.useFahrenheit - onToggled: checked => { - Settings.data.location.useFahrenheit = checked - } + onToggled: checked => Settings.data.location.useFahrenheit = checked } } diff --git a/Modules/SidePanel/Cards/ProfileCard.qml b/Modules/SidePanel/Cards/ProfileCard.qml index d58abe8..951beba 100644 --- a/Modules/SidePanel/Cards/ProfileCard.qml +++ b/Modules/SidePanel/Cards/ProfileCard.qml @@ -43,9 +43,10 @@ NBox { NText { text: Quickshell.env("USER") || "user" font.weight: Style.fontWeightBold + font.capitalization: Font.Capitalize } NText { - text: `System Uptime: ${uptimeText}` + text: `System uptime: ${uptimeText}` color: Color.mOnSurface } } diff --git a/Widgets/NLabel.qml b/Widgets/NLabel.qml index e05604c..b9dc96e 100644 --- a/Widgets/NLabel.qml +++ b/Widgets/NLabel.qml @@ -17,6 +17,7 @@ ColumnLayout { text: label font.pointSize: Style.fontSizeL * scaling font.weight: Style.fontWeightBold + font.capitalization: Font.Capitalize color: labelColor visible: label !== "" } diff --git a/Widgets/NSectionEditor.qml b/Widgets/NSectionEditor.qml index c878eeb..91ce657 100644 --- a/Widgets/NSectionEditor.qml +++ b/Widgets/NSectionEditor.qml @@ -75,9 +75,8 @@ NBox { label: "" description: "" placeholder: "Select a widget to add..." - onSelected: key => { - comboBox.currentKey = key - } + onSelected: key => comboBox.currentKey = key + Layout.alignment: Qt.AlignVCenter }