mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-26 06:55:59 +03:00
Code Issues Projects Releases Packages Wiki Activity

more qml feedback

Browse source 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
This commit is contained in:
Matthieu Gallien 2023-05-02 14:53:53 +02:00 committed by Matthieu Gallien
parent 396accd208
commit 4bd93e39d6
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/gui/ConflictDelegate.qml
View file

@ -87,8 +87,13 @@ Item {
anchors.left: existingPreview.right anchors.left: existingPreview.right
anchors.right: parent.right anchors.right: parent.right
anchors.leftMargin: 10 anchors.leftMargin: 10
spacing: 0 spacing: 0
Item {
Layout.fillHeight: true
}
EnforcedPlainTextLabel { EnforcedPlainTextLabel {
Layout.fillWidth: true Layout.fillWidth: true
@ -112,6 +117,10 @@ Item {
font.pixelSize: 15 font.pixelSize: 15
} }
Item {
Layout.fillHeight: true
}
} }
} }
@ -151,8 +160,13 @@ Item {
anchors.left: conflictPreview.right anchors.left: conflictPreview.right
anchors.right: parent.right anchors.right: parent.right
anchors.leftMargin: 10 anchors.leftMargin: 10
spacing: 0 spacing: 0
Item {
Layout.fillHeight: true
}
EnforcedPlainTextLabel { EnforcedPlainTextLabel {
Layout.fillWidth: true Layout.fillWidth: true
@ -176,6 +190,10 @@ Item {
font.pixelSize: 15 font.pixelSize: 15
} }
Item {
Layout.fillHeight: true
}
} }
} }
} }

2
src/gui/ResolveConflictsDialog.qml
View file

@ -64,7 +64,7 @@ Window {
} }
EnforcedPlainTextLabel { 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 wrapMode: Text.WrapAtWordBoundaryOrAnywhere
font.pixelSize: 15 font.pixelSize: 15
Layout.fillWidth: true Layout.fillWidth: true