Settings: minor adjustments

This commit is contained in:
quadbyte 2025-08-11 23:03:01 -04:00
parent 402c626ff8
commit 197bd58661
4 changed files with 19 additions and 13 deletions

View file

@ -19,40 +19,40 @@ NLoader {
readonly property real scaling: Scaling.scale(screen) readonly property real scaling: Scaling.scale(screen)
property int currentTabIndex: 0 property int currentTabIndex: 0
property var tabsModel: [{ property var tabsModel: [{
"icon": "tune",
"label": "General", "label": "General",
"icon": "tune",
"source": "Tabs/General.qml" "source": "Tabs/General.qml"
}, { }, {
"icon": "web_asset",
"label": "Bar", "label": "Bar",
"icon": "web_asset",
"source": "Tabs/Bar.qml" "source": "Tabs/Bar.qml"
}, { }, {
"icon": "schedule",
"label": "Time & Weather", "label": "Time & Weather",
"icon": "schedule",
"source": "Tabs/TimeWeather.qml" "source": "Tabs/TimeWeather.qml"
}, { }, {
"icon": "videocam",
"label": "Screen Recorder", "label": "Screen Recorder",
"icon": "videocam",
"source": "Tabs/ScreenRecorder.qml" "source": "Tabs/ScreenRecorder.qml"
}, { }, {
"icon": "wifi",
"label": "Network", "label": "Network",
"icon": "wifi",
"source": "Tabs/Network.qml" "source": "Tabs/Network.qml"
}, { }, {
"icon": "monitor",
"label": "Display", "label": "Display",
"icon": "monitor",
"source": "Tabs/Display.qml" "source": "Tabs/Display.qml"
}, { }, {
"icon": "image",
"label": "Wallpaper", "label": "Wallpaper",
"icon": "image",
"source": "Tabs/Wallpaper.qml" "source": "Tabs/Wallpaper.qml"
}, { }, {
"icon": "more_horiz",
"label": "Misc", "label": "Misc",
"icon": "more_horiz",
"source": "Tabs/Misc.qml" "source": "Tabs/Misc.qml"
}, { }, {
"icon": "info",
"label": "About", "label": "About",
"icon": "info",
"source": "Tabs/About.qml" "source": "Tabs/About.qml"
}] }]
@ -96,7 +96,7 @@ NLoader {
Column { Column {
anchors.fill: parent anchors.fill: parent
anchors.margins: Style.marginSmall * scaling anchors.margins: Style.marginSmall * scaling
spacing: 2 * scaling // Minimal spacing between tabs spacing: Style.spacingTiny * 1.5 * scaling // Minimal spacing between tabs
Repeater { Repeater {
id: sections id: sections
@ -119,18 +119,20 @@ NLoader {
anchors.fill: parent anchors.fill: parent
anchors.leftMargin: Style.marginSmall * scaling anchors.leftMargin: Style.marginSmall * scaling
anchors.rightMargin: Style.marginSmall * scaling anchors.rightMargin: Style.marginSmall * scaling
spacing: Style.marginTiny * scaling spacing: Style.marginSmall * scaling
NText { NText {
text: modelData.icon text: modelData.icon
font.family: "Material Symbols Outlined" font.family: "Material Symbols Outlined"
font.variableAxes: { font.variableAxes: {
"wght": (Font.Normal + Font.Bold) / 2.0 "wght": (Font.Normal + Font.Bold) / 2.0
} }
font.pointSize: Style.fontSizeLarge * scaling
color: selected ? Colors.onAccent : (tabItem.hovering ? Colors.onAccent : Colors.textSecondary) color: selected ? Colors.onAccent : (tabItem.hovering ? Colors.onAccent : Colors.textSecondary)
} }
NText { NText {
text: modelData.label text: modelData.label
color: selected ? Colors.onAccent : (tabItem.hovering ? Colors.onAccent : Colors.textPrimary) color: selected ? Colors.onAccent : (tabItem.hovering ? Colors.onAccent : Colors.textPrimary)
font.pointSize: Style.fontSizeMediumLarge * scaling
font.weight: Style.fontWeightBold font.weight: Style.fontWeightBold
Layout.fillWidth: true Layout.fillWidth: true
} }
@ -172,8 +174,9 @@ NLoader {
spacing: Style.marginSmall * scaling spacing: Style.marginSmall * scaling
NText { NText {
text: settingsPanel.tabsModel[settingsPanel.currentTabIndex].label text: settingsPanel.tabsModel[settingsPanel.currentTabIndex].label
font.pointSize: Style.fontSizeLarge * scaling
font.weight: Style.fontWeightBold font.weight: Style.fontWeightBold
color: Colors.textPrimary color: Colors.accentPrimary
Layout.fillWidth: true Layout.fillWidth: true
} }
NIconButton { NIconButton {

View file

@ -62,6 +62,7 @@ Item {
NText { NText {
text: "Your profile picture displayed in various places throughout the shell" text: "Your profile picture displayed in various places throughout the shell"
color: Colors.textSecondary color: Colors.textSecondary
font.pointSize: Style.fontSizeSmall * scaling
} }
NTextBox { NTextBox {
text: Settings.data.general.avatarImage text: Settings.data.general.avatarImage

View file

@ -49,13 +49,14 @@ Item {
} }
NText { NText {
text: "City" text: "Location"
color: Colors.textPrimary color: Colors.textPrimary
font.weight: Style.fontWeightBold font.weight: Style.fontWeightBold
} }
NText { NText {
text: "Your city name for weather information" text: "Your city name for weather information"
color: Colors.textSecondary color: Colors.textSecondary
font.pointSize: Style.fontSizeSmall * scaling
} }
NTextBox { NTextBox {
text: Settings.data.location.name text: Settings.data.location.name

View file

@ -16,6 +16,7 @@ Singleton {
property real fontSizeTiny: 7 property real fontSizeTiny: 7
property real fontSizeSmall: 9 property real fontSizeSmall: 9
property real fontSizeMedium: 11 property real fontSizeMedium: 11
property real fontSizeMediumLarge: 12
property real fontSizeLarge: 13 property real fontSizeLarge: 13
property real fontSizeXL: 18 property real fontSizeXL: 18
property real fontSizeXXL: 24 property real fontSizeXXL: 24