alex-z
|
a7fdf14196
|
Display correct conflict part in multiple conflicts resolution dialog.
Signed-off-by: alex-z <blackslayer4@gmail.com>
|
2023-09-12 09:04:21 +02:00 |
|
Matthieu Gallien
|
635b1ec729
|
define constants specific for font sizes in conflict dialog
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
|
2023-05-17 08:43:54 +02:00 |
|
Matthieu Gallien
|
31e4dede62
|
refactor common parts of conflict delegate into a separate component
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
|
2023-05-17 08:43:54 +02:00 |
|
Matthieu Gallien
|
739c56c04a
|
allow selecting conflict resolutions for many conflicts
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
|
2023-05-17 08:43:54 +02:00 |
|
Matthieu Gallien
|
2e501f0c75
|
add some margins at bottom of items in conflicts list view
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
|
2023-05-17 08:43:54 +02:00 |
|
Matthieu Gallien
|
789ca7230a
|
plug models into the dialog
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
|
2023-05-17 08:43:54 +02:00 |
|
Matthieu Gallien
|
4bd93e39d6
|
more qml feedback
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
|
2023-05-17 08:43:54 +02:00 |
|
Matthieu Gallien
|
396accd208
|
feedback from design review
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
|
2023-05-17 08:43:54 +02:00 |
|
Matthieu Gallien
|
1491c134c3
|
basic implementation of a dialog to resolve conflicts as a batch
will allow solving all conflicts at once
FIX #2786
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
|
2023-05-17 08:43:54 +02:00 |
|