mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-29 12:19:03 +03:00
Code Issues Projects Releases Packages Wiki Activity
19483 commits 482 branches 256 tags 516 MiB
Commit graph

9131 commits

Author SHA1 Message Date
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
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
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
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
Claudio Cambra
3dd838d28d Rename forcelegacyimport option to clearer forcelegacyconfigimport 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 21:23:43 +08:00
Claudio Cambra
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
Claudio Cambra
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
Claudio Cambra
e43f627c9f Add forceLegacyImport property to accountmanager 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 21:23:43 +08:00
Claudio Cambra
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
Claudio Cambra
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
Claudio Cambra
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
Claudio Cambra
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
Claudio Cambra
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
Claudio Cambra
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
Claudio Cambra
191d8350c1 Replace use of magic numbers for animation durations in copy share link button with constants defined in Style.qml 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 21:16:11 +08:00
Claudio Cambra
4e12bbf3e4 Smoothly animate change of state for copy share link button 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 21:16:11 +08:00
Claudio Cambra
7db143469a Reset state of copy share link button after 3 seconds 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 21:16:11 +08:00
Claudio Cambra
c345b22bf2 Upon copying share link, trigger a change in the button to make copy action completed obvious 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 21:16:11 +08:00
allexzander
79c0fdc9f6
Merge pull request #5686 from nextcloud/bugfix/edit-locally-allow-opening-item-in-root 
Allow opening a file or folder in the local sync root.
 2023-05-16 13:33:33 +02:00
alex-z
81ecba8daa Allow opening a file or folder in the local sync root. 
Signed-off-by: alex-z <blackslayer4@gmail.com>
 2023-05-16 12:33:34 +02:00
Claudio Cambra
b440e3011d Display tooltip showing names of overflowing tags in FileDetailsPage's overflow tag 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
 2023-05-16 18:23:33 +08:00