From 197bd586617d3fac24b8fe0f0ce3baa322939b05 Mon Sep 17 00:00:00 2001 From: quadbyte Date: Mon, 11 Aug 2025 23:03:01 -0400 Subject: [PATCH] Settings: minor adjustments --- Modules/Settings/SettingsWindow.qml | 27 +++++++++++++++------------ Modules/Settings/Tabs/General.qml | 1 + Modules/Settings/Tabs/TimeWeather.qml | 3 ++- Services/Style.qml | 1 + 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/Modules/Settings/SettingsWindow.qml b/Modules/Settings/SettingsWindow.qml index 405f7b5..d9dac3d 100644 --- a/Modules/Settings/SettingsWindow.qml +++ b/Modules/Settings/SettingsWindow.qml @@ -19,40 +19,40 @@ NLoader { readonly property real scaling: Scaling.scale(screen) property int currentTabIndex: 0 property var tabsModel: [{ - "icon": "tune", "label": "General", + "icon": "tune", "source": "Tabs/General.qml" }, { - "icon": "web_asset", "label": "Bar", + "icon": "web_asset", "source": "Tabs/Bar.qml" }, { - "icon": "schedule", "label": "Time & Weather", + "icon": "schedule", "source": "Tabs/TimeWeather.qml" }, { - "icon": "videocam", "label": "Screen Recorder", + "icon": "videocam", "source": "Tabs/ScreenRecorder.qml" }, { - "icon": "wifi", "label": "Network", + "icon": "wifi", "source": "Tabs/Network.qml" }, { - "icon": "monitor", "label": "Display", + "icon": "monitor", "source": "Tabs/Display.qml" }, { - "icon": "image", "label": "Wallpaper", + "icon": "image", "source": "Tabs/Wallpaper.qml" }, { - "icon": "more_horiz", "label": "Misc", + "icon": "more_horiz", "source": "Tabs/Misc.qml" }, { - "icon": "info", "label": "About", + "icon": "info", "source": "Tabs/About.qml" }] @@ -96,7 +96,7 @@ NLoader { Column { anchors.fill: parent anchors.margins: Style.marginSmall * scaling - spacing: 2 * scaling // Minimal spacing between tabs + spacing: Style.spacingTiny * 1.5 * scaling // Minimal spacing between tabs Repeater { id: sections @@ -119,18 +119,20 @@ NLoader { anchors.fill: parent anchors.leftMargin: Style.marginSmall * scaling anchors.rightMargin: Style.marginSmall * scaling - spacing: Style.marginTiny * scaling + spacing: Style.marginSmall * scaling NText { text: modelData.icon font.family: "Material Symbols Outlined" font.variableAxes: { "wght": (Font.Normal + Font.Bold) / 2.0 } + font.pointSize: Style.fontSizeLarge * scaling color: selected ? Colors.onAccent : (tabItem.hovering ? Colors.onAccent : Colors.textSecondary) } NText { text: modelData.label color: selected ? Colors.onAccent : (tabItem.hovering ? Colors.onAccent : Colors.textPrimary) + font.pointSize: Style.fontSizeMediumLarge * scaling font.weight: Style.fontWeightBold Layout.fillWidth: true } @@ -172,8 +174,9 @@ NLoader { spacing: Style.marginSmall * scaling NText { text: settingsPanel.tabsModel[settingsPanel.currentTabIndex].label + font.pointSize: Style.fontSizeLarge * scaling font.weight: Style.fontWeightBold - color: Colors.textPrimary + color: Colors.accentPrimary Layout.fillWidth: true } NIconButton { diff --git a/Modules/Settings/Tabs/General.qml b/Modules/Settings/Tabs/General.qml index 8c7c35b..3d24a71 100644 --- a/Modules/Settings/Tabs/General.qml +++ b/Modules/Settings/Tabs/General.qml @@ -62,6 +62,7 @@ Item { NText { text: "Your profile picture displayed in various places throughout the shell" color: Colors.textSecondary + font.pointSize: Style.fontSizeSmall * scaling } NTextBox { text: Settings.data.general.avatarImage diff --git a/Modules/Settings/Tabs/TimeWeather.qml b/Modules/Settings/Tabs/TimeWeather.qml index b282157..bffb4a3 100644 --- a/Modules/Settings/Tabs/TimeWeather.qml +++ b/Modules/Settings/Tabs/TimeWeather.qml @@ -49,13 +49,14 @@ Item { } NText { - text: "City" + text: "Location" color: Colors.textPrimary font.weight: Style.fontWeightBold } NText { text: "Your city name for weather information" color: Colors.textSecondary + font.pointSize: Style.fontSizeSmall * scaling } NTextBox { text: Settings.data.location.name diff --git a/Services/Style.qml b/Services/Style.qml index 0b21d1d..4b9daf2 100644 --- a/Services/Style.qml +++ b/Services/Style.qml @@ -16,6 +16,7 @@ Singleton { property real fontSizeTiny: 7 property real fontSizeSmall: 9 property real fontSizeMedium: 11 + property real fontSizeMediumLarge: 12 property real fontSizeLarge: 13 property real fontSizeXL: 18 property real fontSizeXXL: 24