19593 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Matthieu Gallien	39c70c1f22	make highlight indicator in activity list have rounded corners ... Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>	2023-05-17 18:16:10 +02:00
Matthieu Gallien	f8feb6403f	to dismiss an activity use a round button with hover enabled ... change size of dismiss button for items in activity list fix #5275 Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>	2023-05-17 18:16:10 +02:00
Matthieu Gallien	4c1ab7092b	use Fusion qml style ... allows use of more standard qml styling and components Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>	2023-05-17 18:16:09 +02:00
Matthieu Gallien	7d03007fa8	use standard and existing property to set icon url in buttons ... replace custom property imageSource by the use of the standard icon.source will make our code closer to Qt Quick Controls v2 and less our own controls toolkit Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>	2023-05-17 18:16:09 +02:00
Matthieu Gallien	e69a544b71	improve again qml bindings to notifications data ... Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>	2023-05-17 18:16:09 +02:00
Matthieu Gallien	98ec08097b	make the API easier to read ... make a protected method overriding a public method be a public method also Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>	2023-05-17 18:16:09 +02:00
Matthieu Gallien	0d2742d88a	provide the full OCC::Activity instance to ActivityItemContent ... should allow accessing the required properties of teh activity to fine tune the display of it Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>	2023-05-17 18:16:09 +02:00
Matthieu Gallien	f51af1734d	expose some properties of OCC::Activity gadget class ... Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>	2023-05-17 18:16:09 +02:00
Matthieu Gallien	ce69856bfa	improve qml binding for more element of OCC::Activity ... Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>	2023-05-17 18:16:09 +02:00
Matthieu Gallien	10f9ef5cd5	to store subjectRichParameters use a QVariantMap that is qml friendly ... will make it much easier to access fom qml in order to use the data inside to improve activity list items Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>	2023-05-17 18:16:08 +02:00
Matthieu Gallien	bc9b7a05f4	repay some desbt in ActivityListModel::data ... only valid index are sent to QAbstractItemModel::data we may want to do more checks in debug mode, let's do it if we are going to show data, let's use a const variable to contain the current activity item Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>	2023-05-17 18:16:08 +02:00
Matthieu Gallien	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
Matthieu Gallien	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
Matthieu Gallien	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
Matthieu Gallien	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
Matthieu Gallien	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
Matthieu Gallien	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
Camila	b62ea907be	Merge pull request #5706 from nextcloud/update/changelog ... Update CHANGELOG.	2023-05-17 13:10:10 -03:00
Camila	bbb723d1da	Update CHANGELOG. ... Signed-off-by: Camila <hello@camila.codes>	2023-05-17 13:09:48 -03:00
Matthieu Gallien	d7d52a11c1	Merge pull request #5635 from nextcloud/feature/resolveAllConflicts ... Feature/resolve all conflicts	2023-05-17 10:35:04 +02:00
Matthieu Gallien	6c7f810095	improve code in activity list model ... Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>	2023-05-17 08:43:54 +02:00
Matthieu Gallien	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
Matthieu Gallien	8faab817a0	improve automated tests ... Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>	2023-05-17 08:43:54 +02:00
Matthieu Gallien	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
Matthieu Gallien	5349395063	model improvements ... Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>	2023-05-17 08:43:54 +02:00
Matthieu Gallien	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
Matthieu Gallien	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
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	230e2de23a	solve multiple conflicts from choose resolution ... 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	8d52d4e4cc	implement more feedback ... Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>	2023-05-17 08:43:54 +02:00
Matthieu Gallien	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
Matthieu Gallien	382a58c6bd	allow the conflicts dialog to close ... Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>	2023-05-17 08:43:54 +02:00
Matthieu Gallien	30bba4c906	fix automated tests ... 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	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
Matthieu Gallien	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
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	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
Matthieu Gallien	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
Matthieu Gallien	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
Matthieu Gallien	280094b220	model: first step ... Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>	2023-05-17 08:43:54 +02:00
Matthieu Gallien	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
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
Matthieu Gallien	7b4245a3c3	fix #include header style ... Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>	2023-05-17 08:43:54 +02:00
Nextcloud bot	37bd3f3db5	Fix(l10n): Update translations from Transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2023-05-17 02:23:51 +00:00
Claudio Cambra	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