Skip to content
GitLab
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • Files Files
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 372
    • Issues 372
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 52
    • Merge requests 52
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Container Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • GNOMEGNOME
  • FilesFiles
  • Merge requests
  • !727

WIP: File conflict dialog redesign

  • Review changes

  • Download
  • Email patches
  • Plain diff
Open Joshua Lee requested to merge lsw/nautilus:file-conflict-dialog-redesign into master Nov 18, 2021
  • Overview 5
  • Commits 1
  • Pipelines 3
  • Changes 3

I've been doing some exploratory work on how I might implement the designs in #603. Even without any UI changes, I thought it might be useful to open this for an early sanity check on my approach of knowing all conflicts before the dialog is created.

The patch works by teaching copy/move operations to add each conflict encountered to a list of FileConflictInfo instead of running the file conflict dialog in place. Conflicts can then be processed as a batch and sent back into the copy/move machinery with their FileConflictResponse already set. This commit leaves the dialog itself working as it currently does.

Beyond this, my rough plan is to repurpose NautilusFileConflictDialog as the a multi-file dialog based on the mock-ups and implement a new GtkMessageDialog subclass to handle the single file case.

Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: file-conflict-dialog-redesign