more qml feedback

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

diff --git a/src/gui/ConflictDelegate.qml b/src/gui/ConflictDelegate.qml
index 6ebb8d20408f040dd0a8427277d990daa0e68563..7d386404bac52552446a9e4af7fb07d29a245350 100644 (file)
--- a/src/gui/ConflictDelegate.qml
+++ b/src/gui/ConflictDelegate.qml
@@ -87,8 +87,13 @@ Item {
                 anchors.left: existingPreview.right
                 anchors.right: parent.right
                 anchors.leftMargin: 10
+
                 spacing: 0
 
+                Item {
+                    Layout.fillHeight: true
+                }
+
                 EnforcedPlainTextLabel {
                     Layout.fillWidth: true
 
@@ -112,6 +117,10 @@ Item {
 
                     font.pixelSize: 15
                 }
+
+                Item {
+                    Layout.fillHeight: true
+                }
             }
         }
 
@@ -151,8 +160,13 @@ Item {
                 anchors.left: conflictPreview.right
                 anchors.right: parent.right
                 anchors.leftMargin: 10
+
                 spacing: 0
 
+                Item {
+                    Layout.fillHeight: true
+                }
+
                 EnforcedPlainTextLabel {
                     Layout.fillWidth: true
 
@@ -176,6 +190,10 @@ Item {
 
                     font.pixelSize: 15
                 }
+
+                Item {
+                    Layout.fillHeight: true
+                }
             }
         }
     }

diff --git a/src/gui/ResolveConflictsDialog.qml b/src/gui/ResolveConflictsDialog.qml
index a73efe068604dd6b2f9b9d7632ad41e1f7a3e297..e03404fd8a16595154dd31668f850a0d88726381 100644 (file)
--- a/src/gui/ResolveConflictsDialog.qml
+++ b/src/gui/ResolveConflictsDialog.qml
@@ -64,7 +64,7 @@ Window {
         }
 
         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.")
+            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
             Layout.fillWidth: true