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 6786fb998c8dfcfbe068ac41475c7ff019438d95..ff6b48eb00e71ca4bf887610cc13ac24ec68162d 100644 (file)
--- 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 156f1273c5521d63431f3a9cf6ff3207d6d2b85d..be345f7e8a9455de30c7aa03e72f3a16db708edd 100644 (file)
--- 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 b0a320e9f3ff603be5728ecc8ea62a694e95a3aa..7b6efb18088f4da3df8d03d8cac0b4aca1510f04 100644 (file)
--- 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 21bfeb460e8837b68f4792412f0486ccd54c0d6f..34f2470abb12e7a6bf223a1ce3424df81b387777 100644 (file)
--- a/theme/Style/Style.qml
+++ b/theme/Style/Style.qml
@@ -131,6 +131,9 @@ QtObject {
 \r
     readonly property var fontMetrics: FontMetrics {}\r
 \r
+    readonly property int bigFontPixelSizeResolveConflictsDialog: 20\r
+    readonly property int fontPixelSizeResolveConflictsDialog: 15\r
+\r
     readonly property int activityContentSpace: 4\r
 \r
     readonly property double smallIconScaleFactor: 0.6\r