From: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Date: Tue, 16 May 2023 07:04:11 +0000 (+0200)
Subject: define constants specific for font sizes in conflict dialog
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~10^2~44^2~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=635b1ec729f5cc51d9f54dae8e2c3ed0a2844f6f;p=nextcloud-desktop.git

define constants specific for font sizes in conflict dialog

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
---

diff --git a/src/gui/ConflictDelegate.qml b/src/gui/ConflictDelegate.qml
index 6786fb998..ff6b48eb0 100644
--- a/src/gui/ConflictDelegate.qml
+++ b/src/gui/ConflictDelegate.qml
@@ -43,7 +43,7 @@ Item {
         text: root.existingFileName
 
         font.weight: Font.Bold
-        font.pixelSize: 15
+        font.pixelSize: Style.fontPixelSizeResolveConflictsDialog
     }
 
     RowLayout {
diff --git a/src/gui/ConflictItemFileInfo.qml b/src/gui/ConflictItemFileInfo.qml
index 156f1273c..be345f7e8 100644
--- a/src/gui/ConflictItemFileInfo.qml
+++ b/src/gui/ConflictItemFileInfo.qml
@@ -72,7 +72,7 @@ Item {
 
             Layout.fillWidth: true
 
-            font.pixelSize: 15
+            font.pixelSize: Style.fontPixelSizeResolveConflictsDialog
         }
 
         EnforcedPlainTextLabel {
@@ -80,7 +80,7 @@ Item {
 
             Layout.fillWidth: true
 
-            font.pixelSize: 15
+            font.pixelSize: Style.fontPixelSizeResolveConflictsDialog
         }
 
         EnforcedPlainTextLabel {
@@ -88,7 +88,7 @@ Item {
 
             Layout.fillWidth: true
 
-            font.pixelSize: 15
+            font.pixelSize: Style.fontPixelSizeResolveConflictsDialog
         }
 
         Item {
diff --git a/src/gui/ResolveConflictsDialog.qml b/src/gui/ResolveConflictsDialog.qml
index b0a320e9f..7b6efb180 100644
--- a/src/gui/ResolveConflictsDialog.qml
+++ b/src/gui/ResolveConflictsDialog.qml
@@ -53,14 +53,14 @@ QtWindow.Window {
         EnforcedPlainTextLabel {
             text: qsTr("%1 files in conflict").arg(delegateModel.count)
             font.bold: true
-            font.pixelSize: 20
+            font.pixelSize: Style.bigFontPixelSizeResolveConflictsDialog
             Layout.fillWidth: true
         }
 
         EnforcedPlainTextLabel {
             text: qsTr("Choose if you want to keep the local version, server version, or both. If you choose both, the local file will have a number added to its name.")
             wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-            font.pixelSize: 15
+            font.pixelSize: Style.fontPixelSizeResolveConflictsDialog
             Layout.fillWidth: true
             Layout.topMargin: -15
         }
@@ -79,7 +79,7 @@ QtWindow.Window {
                 leftPadding: 0
                 implicitWidth: 100
 
-                font.pixelSize: 15
+                font.pixelSize: Style.fontPixelSizeResolveConflictsDialog
 
                 checked: realModel.allExistingsSelected
                 onToggled: function() {
@@ -97,7 +97,7 @@ QtWindow.Window {
                 leftPadding: 0
                 implicitWidth: 100
 
-                font.pixelSize: 15
+                font.pixelSize: Style.fontPixelSizeResolveConflictsDialog
 
                 checked: realModel.allConflictingSelected
                 onToggled: function() {
diff --git a/theme/Style/Style.qml b/theme/Style/Style.qml
index 21bfeb460..34f2470ab 100644
--- a/theme/Style/Style.qml
+++ b/theme/Style/Style.qml
@@ -131,6 +131,9 @@ QtObject {
 
     readonly property var fontMetrics: FontMetrics {}
 
+    readonly property int bigFontPixelSizeResolveConflictsDialog: 20
+    readonly property int fontPixelSizeResolveConflictsDialog: 15
+
     readonly property int activityContentSpace: 4
 
     readonly property double smallIconScaleFactor: 0.6