Improve conflict handling gui #2527
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
er-vin
requested review from
camilasan,
jancborchardt,
nicolasfella,
DominiqueFuchs and
misch7
er-vin
force-pushed
the
improve_conflict_handling_gui
branch
from
21764f1 to
9b48a2b
Compare
|
/rebase |
github-actions
bot
force-pushed
the
improve_conflict_handling_gui
branch
from
9b48a2b to
cef651f
Compare
jancborchardt
approved these changes
Oct 8, 2020
er-vin
force-pushed
the
improve_conflict_handling_gui
branch
from
cef651f to
a118c86
Compare
er-vin
force-pushed
the
improve_conflict_handling_gui
branch
from
a118c86 to
1baa696
Compare
jancborchardt
approved these changes
Oct 8, 2020
There was a problem hiding this comment.
Looks super nice! Great work @er-vin – will hopefully make it a more relaxing experience for anyone who is stressed cause there’s conflicts. :)
|
/rebase |
github-actions
bot
force-pushed
the
improve_conflict_handling_gui
branch
from
1baa696 to
ff5cb66
Compare
4 tasks
camilasan
requested changes
Oct 19, 2020
er-vin
force-pushed
the
improve_conflict_handling_gui
branch
from
ff5cb66 to
9ffc010
Compare
camilasan
reviewed
Oct 22, 2020
We want to use it for deleting directory conflicts.
For conflicts generally as well as new files in read-only directories the context menu will now present delete and move options. Signed-off-by: Kevin Ottens <[email protected]>
This could only work at the root of the sync folder where the record for the parent folder would be invalid. Otherwise the negation would be wrong... assuming you can add a file only if the permission is not there. Signed-off-by: Kevin Ottens <[email protected]>
The socket api move and delete commands are not strictly about conflicts since they also deal with files which couldn't be uploaded for some other reason. Still the new ConflictSolver could be used in those cases. This opens the door at reusing that logic in other places. Signed-off-by: Kevin Ottens <[email protected]>
Signed-off-by: Kevin Ottens <[email protected]>
added 6 commits
October 22, 2020 16:40
Signed-off-by: Kevin Ottens <[email protected]>
This should be safe in the case of conflicts in folders on which the user can write. For other cases we still use the older actions. Signed-off-by: Kevin Ottens <[email protected]>
Signed-off-by: Kevin Ottens <[email protected]>
This was completely disabled code and the connect was gone... So let's introduce the connect back and have it trigger the main window while selecting the right user. This way the new activity list is displayed and since the conflicts are shown at the top this is hopefully obvious again. Signed-off-by: Kevin Ottens <[email protected]>
We better do this before this business logic grows in the QML side and gets out of control. We'll need finer grained information due to the conflict handling anyway. Signed-off-by: Kevin Ottens <[email protected]>
No need to go to the file manager first to then have the user go through the context menu, just popup the dialog directly. Signed-off-by: Kevin Ottens <[email protected]>
er-vin
force-pushed
the
improve_conflict_handling_gui
branch
from
9ffc010 to
b835092
Compare
camilasan
approved these changes
Oct 22, 2020
|
AppImage file: Nextcloud-PR-2527-b835092ae9b3ca2859a830c7d485f0c9025a6399-x86_64.AppImage |
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #1195
Also adopts commits from owncloud/client#6541
As for the conflict dialog itself it looks like this on a Plasma desktop:
On system for which there's no icon theme by default (typically Windows and Mac) I'm using a fallback icon provided in Qt resources. Here is how it looks:
I guess shipping a full icon theme (or at least the mimetype icons from said theme...) is an option but honestly that's for later. :-)
Note that clicking the icons (they are buttons which raise on over) also open the corresponding file for preview (just like the more discoverable links).