9a90f15ceb
remove scary warning that is a false alarm
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-05-17 18:16:08 +02:00
ad868daebe
remove custom property to set a source model in a sort proxy model
...
custom property for source model is not needed
remove code that is not needed
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-05-17 18:16:08 +02:00
32ee1a962f
remove custom property and use standard sourceModel for our proxy model
...
a QSortFilterProxyModel will trigger a new sort whenever needed, so
custom code is not needed
we might have someone that would use the standard property and loose teh
side effects of setting the source model via thet non standard property
this makes it more complicated to read as one might wonder why a custom
property was needed
deletes a bunch of code not really needed
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-05-17 18:16:08 +02:00
9bbabd3baa
prevent a 0 size to assert when creating icon from svg
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-05-17 18:16:08 +02:00
d6d1a6dcd2
fix a few debug logs to use proper categorized logging
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-05-17 18:16:08 +02:00
dc66a1254d
add missing copyright notices and upgrade qml module imports
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-05-17 18:16:07 +02:00
b62ea907be
Merge pull request #5706 from nextcloud/update/changelog
...
Update CHANGELOG.
2023-05-17 13:10:10 -03:00
bbb723d1da
Update CHANGELOG.
...
Signed-off-by: Camila <hello@camila.codes>
2023-05-17 13:09:48 -03:00
d7d52a11c1
Merge pull request #5635 from nextcloud/feature/resolveAllConflicts
...
Feature/resolve all conflicts
2023-05-17 10:35:04 +02:00
6c7f810095
improve code in activity list model
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-05-17 08:43:54 +02:00
8f60518d6f
small qml cleanup to make code faster to read
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-05-17 08:43:54 +02:00
8faab817a0
improve automated tests
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-05-17 08:43:54 +02:00
14bce6fdc2
improve reliability of memeory management when creating conflicts dialog
...
use more automatyed memory management to reduce possible errors
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-05-17 08:43:54 +02:00
5349395063
model improvements
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-05-17 08:43:54 +02:00
8d81257db0
improve translations for strings with placeholder to display numbers
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-05-17 08:43:54 +02:00
b285b89605
define minimum sizes of conflict dialogs in Style component
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-05-17 08:43:54 +02:00
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
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
230e2de23a
solve multiple conflicts from choose resolution
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-05-17 08:43:54 +02:00
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
8d52d4e4cc
implement more feedback
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-05-17 08:43:54 +02:00
fa135a4228
ensure the URL to mimetype icons are correct
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-05-17 08:43:54 +02:00
382a58c6bd
allow the conflicts dialog to close
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-05-17 08:43:54 +02:00
30bba4c906
fix automated tests
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-05-17 08:43:54 +02:00
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
6efa9f81be
prevent close of conflicts dialog on focus lost
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-05-17 08:43:54 +02:00
779cc3a75b
display icons for files when solving many conflicts
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-05-17 08:43:54 +02:00
789ca7230a
plug models into the dialog
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-05-17 08:43:54 +02:00
f799d8c697
tune the pipes to really get a dialog to show for many conflicts
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-05-17 08:43:54 +02:00
c118958d3d
do not show many conflicts dialog for a single conflict
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-05-17 08:43:54 +02:00
72b78c9011
replace "Sync now" button by "Solve all conflicts" for many conflicts
...
offer an easy way to open a dialog to solve all conflicts at once
replacing the "Sync now" button
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-05-17 08:43:54 +02:00
280094b220
model: first step
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-05-17 08:43:54 +02:00
8f61d539da
replace "OK" button by "Resolve conflicts" to help users
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-05-17 08:43:54 +02:00
4bd93e39d6
more qml feedback
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-05-17 08:43:54 +02:00
396accd208
feedback from design review
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-05-17 08:43:54 +02:00
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
7b4245a3c3
fix #include header style
...
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2023-05-17 08:43:54 +02:00
37bd3f3db5
Fix(l10n): Update translations from Transifex
...
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-05-17 02:23:51 +00:00
6ff45bf342
Merge pull request #5654 from nextcloud/bugfix/ask-before-importing-legacy
...
Ask before importing accounts from legacy clients
2023-05-16 22:01:00 +08:00
3dd838d28d
Rename forcelegacyimport option to clearer forcelegacyconfigimport
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2023-05-16 21:23:43 +08:00
b864bef2e8
Add application argument to force import of legacy accounts
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2023-05-16 21:23:43 +08:00
c8f8c9cd2c
Don't ask user whether to import legacy account configs if forcing legacy import
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2023-05-16 21:23:43 +08:00
e43f627c9f
Add forceLegacyImport property to accountmanager
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2023-05-16 21:23:43 +08:00
efce1b6abf
Declare void setters and methods in accountmanager as slots
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2023-05-16 21:23:43 +08:00
c3fda69e33
Place signals and slots for accountmanager in line with how this is done in other classes
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2023-05-16 21:23:43 +08:00
6eb2fd1cc0
Notify result of attempted account import with messagebox
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2023-05-16 21:23:43 +08:00
fba808103c
Ask before attempting to import legacy accounts
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2023-05-16 21:23:43 +08:00
4dfab45d5f
Merge pull request #5672 from nextcloud/bugfix/provide-feedback-on-share-link-copy
...
Provide feedback on share link copy
2023-05-16 21:18:52 +08:00
a9375c4d64
Animate copy share link button in share delegate
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2023-05-16 21:16:11 +08:00
0419e29395
Also customise appearance of copy button in sharedelegate when clicked
...
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2023-05-16 21:16:11 +08:00
Matthieu Gallien
Camila
Matthieu Gallien
Nextcloud bot
Claudio Cambra