From: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Date: Tue, 2 May 2023 12:53:53 +0000 (+0200)
Subject: more qml feedback
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~10^2~44^2~24
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4bd93e39d638b47a5958c1761cb30b8ced179a16;p=nextcloud-desktop.git

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 6ebb8d204..7d386404b 100644
--- 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 a73efe068..e03404fd8 100644
--- 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