From 918e411b107f1c8b362c0718334140553efa0360 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Mon, 15 Jan 2024 17:14:52 +0800 Subject: [PATCH] Use font sizes in Style.qml in FileProviderSettings Signed-off-by: Claudio Cambra --- src/gui/macOS/ui/FileProviderSettings.qml | 4 ++-- src/gui/macOS/ui/FileProviderSyncStatus.qml | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/gui/macOS/ui/FileProviderSettings.qml b/src/gui/macOS/ui/FileProviderSettings.qml index 5083b7616..f3844f245 100644 --- a/src/gui/macOS/ui/FileProviderSettings.qml +++ b/src/gui/macOS/ui/FileProviderSettings.qml @@ -70,7 +70,7 @@ Page { Layout.fillWidth: true text: qsTr("General settings") font.bold: true - font.pointSize: root.font.pointSize + 2 + font.pointSize: Style.subheaderFontPtSize elide: Text.ElideRight } @@ -131,7 +131,7 @@ Page { Layout.topMargin: Style.standardSpacing text: qsTr("Advanced") font.bold: true - font.pointSize: root.font.pointSize + 2 + font.pointSize: Style.subheaderFontPtSize elide: Text.ElideRight } diff --git a/src/gui/macOS/ui/FileProviderSyncStatus.qml b/src/gui/macOS/ui/FileProviderSyncStatus.qml index f9b202435..8a898d30c 100644 --- a/src/gui/macOS/ui/FileProviderSyncStatus.qml +++ b/src/gui/macOS/ui/FileProviderSyncStatus.qml @@ -29,15 +29,6 @@ GridLayout { rows: syncStatus.syncing ? 2 : 1 - EnforcedPlainTextLabel { - Layout.row: 0 - Layout.column: 1 - Layout.columnSpan: root.syncStatus.syncing ? 2 : 1 - Layout.fillWidth: true - font.bold: true - text: root.syncStatus.syncing ? qsTr("Syncing") : qsTr("All synced!") - } - NCBusyIndicator { id: syncIcon @@ -54,6 +45,16 @@ GridLayout { running: root.syncStatus.syncing } + EnforcedPlainTextLabel { + Layout.row: 0 + Layout.column: 1 + Layout.columnSpan: root.syncStatus.syncing ? 2 : 1 + Layout.fillWidth: true + font.bold: true + font.pointSize: Style.headerFontPtSize + text: root.syncStatus.syncing ? qsTr("Syncing") : qsTr("All synced!") + } + ProgressBar { Layout.row: 1 Layout.column: 1 -- 2.39.5