feedback from design review

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

diff --git a/src/gui/ConflictDelegate.qml b/src/gui/ConflictDelegate.qml
index aa2a138f31192c4401d02ecc880eb132de3d9ac3..6ebb8d20408f040dd0a8427277d990daa0e68563 100644 (file)
--- a/src/gui/ConflictDelegate.qml
+++ b/src/gui/ConflictDelegate.qml
@@ -31,6 +31,8 @@ Item {
     required property string conflictDate
     required property bool existingSelected
     required property bool conflictSelected
+    required property url existingPreviewUrl
+    required property url conflictPreviewUrl
 
     EnforcedPlainTextLabel {
         id: existingFileNameLabel
@@ -40,7 +42,7 @@ Item {
 
         text: root.existingFileName
 
-        font.weight: Font.Light
+        font.weight: Font.Bold
         font.pixelSize: 15
     }
 
@@ -54,17 +56,29 @@ Item {
             Layout.fillWidth: true
             Layout.fillHeight: true
 
+            CheckBox {
+                id: selectExisting
+
+                anchors.left: parent.left
+                anchors.verticalCenter: parent.verticalCenter
+
+                leftPadding: 0
+                spacing: 0
+
+                checked: root.existingSelected
+            }
+
             Image {
                 id: existingPreview
 
-                anchors.top: parent.top
-                anchors.left: parent.left
+                anchors.left: selectExisting.right
+                anchors.verticalCenter: parent.verticalCenter
 
-                source: 'https://nextcloud.local/index.php/apps/theming/img/core/filetypes/text.svg?v=b9feb2d6'
-                width: 64
-                height: 64
-                sourceSize.width: 64
-                sourceSize.height: 64
+                source: root.existingPreviewUrl
+                width: 48
+                height: 48
+                sourceSize.width: 48
+                sourceSize.height: 48
             }
 
             ColumnLayout {
@@ -72,13 +86,15 @@ Item {
                 anchors.bottom: parent.bottom
                 anchors.left: existingPreview.right
                 anchors.right: parent.right
+                anchors.leftMargin: 10
+                spacing: 0
 
-                CheckBox {
-                    id: selectExisting
+                EnforcedPlainTextLabel {
+                    Layout.fillWidth: true
 
-                    Layout.alignment: Layout.TopLeft
+                    text: qsTr('Local version')
 
-                    checked: root.existingSelected
+                    font.pixelSize: 15
                 }
 
                 EnforcedPlainTextLabel {
@@ -103,17 +119,30 @@ Item {
             Layout.fillWidth: true
             Layout.fillHeight: true
 
+            CheckBox {
+                id: selectConflict
+
+                anchors.left: parent.left
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.leftMargin: 0
+
+                leftPadding: 0
+                spacing: 0
+
+                checked: root.conflictSelected
+            }
+
             Image {
                 id: conflictPreview
 
-                anchors.top: parent.top
-                anchors.left: parent.left
+                anchors.left: selectConflict.right
+                anchors.verticalCenter: parent.verticalCenter
 
-                source: 'https://nextcloud.local/index.php/apps/theming/img/core/filetypes/text.svg?v=b9feb2d6'
-                width: 64
-                height: 64
-                sourceSize.width: 64
-                sourceSize.height: 64
+                source: root.conflictPreviewUrl
+                width: 48
+                height: 48
+                sourceSize.width: 48
+                sourceSize.height: 48
             }
 
             ColumnLayout {
@@ -121,13 +150,15 @@ Item {
                 anchors.bottom: parent.bottom
                 anchors.left: conflictPreview.right
                 anchors.right: parent.right
+                anchors.leftMargin: 10
+                spacing: 0
 
-                CheckBox {
-                    id: selectConflict
+                EnforcedPlainTextLabel {
+                    Layout.fillWidth: true
 
-                    Layout.alignment: Layout.TopLeft
+                    text: qsTr('Server version')
 
-                    checked: root.conflictSelected
+                    font.pixelSize: 15
                 }
 
                 EnforcedPlainTextLabel {

diff --git a/src/gui/ResolveConflictsDialog.qml b/src/gui/ResolveConflictsDialog.qml
index 251d4d2ad620de7880d6c33d10af01c0c65b96fb..a73efe068604dd6b2f9b9d7632ad41e1f7a3e297 100644 (file)
--- a/src/gui/ResolveConflictsDialog.qml
+++ b/src/gui/ResolveConflictsDialog.qml
@@ -32,6 +32,7 @@ Window {
     height: 800
     minimumWidth: 600
     minimumHeight: 800
+    title: qsTr('Solve sync conflicts')
 
     onClosing: function() {
         Systray.destroyDialog(root);
@@ -63,13 +64,8 @@ Window {
         }
 
         EnforcedPlainTextLabel {
-            text: qsTr("Which files do you want to keep?")
-            font.pixelSize: 15
-            Layout.fillWidth: true
-        }
-
-        EnforcedPlainTextLabel {
-            text: qsTr("If you select both versions, 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
             Layout.topMargin: -15
@@ -83,9 +79,11 @@ Window {
                 id: selectExisting
 
                 Layout.fillWidth: true
-                Layout.alignment: Layout.TopLeft
 
-                text: qsTr('Local version')
+                text: qsTr('All local versions')
+
+                leftPadding: 0
+                implicitWidth: 100
 
                 font.pixelSize: 15
             }
@@ -94,9 +92,11 @@ Window {
                 id: selectConflict
 
                 Layout.fillWidth: true
-                Layout.alignment: Layout.TopLeft
 
-                text: qsTr('Server version')
+                text: qsTr('All server versions')
+
+                leftPadding: 0
+                implicitWidth: 100
 
                 font.pixelSize: 15
             }
@@ -131,6 +131,8 @@ Window {
                             conflictDate: '28 avril 2023 09:53'
                             existingSelected: false
                             conflictSelected: false
+                            existingPreviewUrl: 'https://nextcloud.local/index.php/apps/theming/img/core/filetypes/text.svg?v=b9feb2d6'
+                            conflictPreviewUrl: 'https://nextcloud.local/index.php/apps/theming/img/core/filetypes/text.svg?v=b9feb2d6'
                         }
 
                         ListElement {
@@ -142,6 +144,8 @@ Window {
                             conflictDate: '28 avril 2023 09:53'
                             existingSelected: false
                             conflictSelected: false
+                            existingPreviewUrl: 'https://nextcloud.local/index.php/apps/theming/img/core/filetypes/text.svg?v=b9feb2d6'
+                            conflictPreviewUrl: 'https://nextcloud.local/index.php/apps/theming/img/core/filetypes/text.svg?v=b9feb2d6'
                         }
 
                         ListElement {
@@ -153,6 +157,8 @@ Window {
                             conflictDate: '28 avril 2023 09:53'
                             existingSelected: false
                             conflictSelected: false
+                            existingPreviewUrl: 'https://nextcloud.local/index.php/apps/theming/img/core/filetypes/text.svg?v=b9feb2d6'
+                            conflictPreviewUrl: 'https://nextcloud.local/index.php/apps/theming/img/core/filetypes/text.svg?v=b9feb2d6'
                         }
                     }