Browse Source

define constants specific for font sizes in conflict dialog

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien 2 years ago
parent
commit
635b1ec729

+ 1 - 1
src/gui/ConflictDelegate.qml

@@ -43,7 +43,7 @@ Item {
         text: root.existingFileName
 
         font.weight: Font.Bold
-        font.pixelSize: 15
+        font.pixelSize: Style.fontPixelSizeResolveConflictsDialog
     }
 
     RowLayout {

+ 3 - 3
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 {

+ 4 - 4
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() {

+ 3 - 0
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