From 5a8da9695da8a5d0e101082812f0d8a88ead6257 Mon Sep 17 00:00:00 2001 From: lysec Date: Sat, 11 Oct 2025 16:58:23 +0200 Subject: [PATCH] MediaCard: resize, made title text bigger SystemMonitorCard: made more compact WeatherCard: made more compact ControlCenterPanel: adjust height --- Modules/ControlCenter/Cards/MediaCard.qml | 4 +- .../ControlCenter/Cards/SystemMonitorCard.qml | 85 ++++++++++--------- Modules/ControlCenter/Cards/WeatherCard.qml | 2 +- Modules/ControlCenter/ControlCenterPanel.qml | 12 ++- 4 files changed, 56 insertions(+), 47 deletions(-) diff --git a/Modules/ControlCenter/Cards/MediaCard.qml b/Modules/ControlCenter/Cards/MediaCard.qml index 2b362fb0..b4d7b7a6 100644 --- a/Modules/ControlCenter/Cards/MediaCard.qml +++ b/Modules/ControlCenter/Cards/MediaCard.qml @@ -110,7 +110,7 @@ NBox { } } - // Player selector - positioned at the very top + // Player selector Rectangle { id: playerSelectorButton anchors.top: parent.top @@ -306,7 +306,7 @@ NBox { NText { visible: MediaService.trackTitle !== "" text: MediaService.trackTitle - pointSize: Style.fontSizeM * scaling + pointSize: Style.fontSizeL * scaling font.weight: Style.fontWeightBold elide: Text.ElideRight wrapMode: Text.Wrap diff --git a/Modules/ControlCenter/Cards/SystemMonitorCard.qml b/Modules/ControlCenter/Cards/SystemMonitorCard.qml index 67ca2c68..4e7254a3 100644 --- a/Modules/ControlCenter/Cards/SystemMonitorCard.qml +++ b/Modules/ControlCenter/Cards/SystemMonitorCard.qml @@ -9,49 +9,52 @@ import qs.Widgets NBox { id: root - ColumnLayout { + Item { id: content - anchors.left: parent.left - anchors.right: parent.right - anchors.top: parent.top - anchors.leftMargin: Style.marginS * scaling - anchors.rightMargin: Style.marginS * scaling - anchors.topMargin: Style.marginXS * scaling - anchors.bottomMargin: Style.marginM * scaling - spacing: Style.marginS * scaling + anchors.fill: parent + anchors.margins: Style.marginS * scaling - NCircleStat { - value: SystemStatService.cpuUsage - icon: "cpu-usage" - flat: true - contentScale: 0.8 - width: 72 * scaling - height: 68 * scaling - } - NCircleStat { - value: SystemStatService.cpuTemp - suffix: "°C" - icon: "cpu-temperature" - flat: true - contentScale: 0.8 - width: 72 * scaling - height: 68 * scaling - } - NCircleStat { - value: SystemStatService.memPercent - icon: "memory" - flat: true - contentScale: 0.8 - width: 72 * scaling - height: 68 * scaling - } - NCircleStat { - value: SystemStatService.diskPercent - icon: "storage" - flat: true - contentScale: 0.8 - width: 72 * scaling - height: 68 * scaling + ColumnLayout { + anchors.centerIn: parent + spacing: 0 + + NCircleStat { + value: SystemStatService.cpuUsage + icon: "cpu-usage" + flat: true + contentScale: 0.8 + width: 70 * scaling + height: 65 * scaling + Layout.alignment: Qt.AlignHCenter + } + NCircleStat { + value: SystemStatService.cpuTemp + suffix: "°C" + icon: "cpu-temperature" + flat: true + contentScale: 0.8 + width: 70 * scaling + height: 65 * scaling + Layout.alignment: Qt.AlignHCenter + } + NCircleStat { + value: SystemStatService.memPercent + icon: "memory" + flat: true + contentScale: 0.8 + width: 70 * scaling + height: 65 * scaling + Layout.alignment: Qt.AlignHCenter + } + NCircleStat { + value: SystemStatService.diskPercent + icon: "storage" + flat: true + contentScale: 0.8 + width: 70 * scaling + height: 65 * scaling + Layout.alignment: Qt.AlignHCenter + } } } } diff --git a/Modules/ControlCenter/Cards/WeatherCard.qml b/Modules/ControlCenter/Cards/WeatherCard.qml index 8e6257a1..9b7d6aec 100644 --- a/Modules/ControlCenter/Cards/WeatherCard.qml +++ b/Modules/ControlCenter/Cards/WeatherCard.qml @@ -85,7 +85,7 @@ NBox { model: weatherReady ? LocationService.data.weather.daily.time : [] delegate: ColumnLayout { Layout.alignment: Qt.AlignHCenter - spacing: Style.marginL * scaling + spacing: Style.marginXS * scaling NText { text: { var weatherDate = new Date(LocationService.data.weather.daily.time[index].replace(/-/g, "/")) diff --git a/Modules/ControlCenter/ControlCenterPanel.qml b/Modules/ControlCenter/ControlCenterPanel.qml index aa9a8b47..07a2cf4e 100644 --- a/Modules/ControlCenter/ControlCenterPanel.qml +++ b/Modules/ControlCenter/ControlCenterPanel.qml @@ -11,7 +11,7 @@ NPanel { id: root preferredWidth: 460 - preferredHeight: 734 + preferredHeight: 740 panelKeyboardFocus: true // Positioning @@ -44,13 +44,13 @@ NPanel { WeatherCard { Layout.fillWidth: true - Layout.preferredHeight: Math.max(220 * scaling) + Layout.preferredHeight: Math.max(190 * scaling) } // Middle section: media + stats column RowLayout { Layout.fillWidth: true - Layout.preferredHeight: Math.max(310 * scaling) + Layout.preferredHeight: Math.max(260 * scaling) spacing: content.cardSpacing // Media card @@ -66,6 +66,12 @@ NPanel { } } + // Audio card below media and system monitor + AudioCard { + Layout.fillWidth: true + Layout.preferredHeight: Math.max(120 * scaling) + } + // Bottom actions (two grouped rows of round buttons) RowLayout { Layout.fillWidth: true