Skip to content

GitLab

  • Menu
Projects Groups Snippets
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in
  • KDiff3 KDiff3
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 5
    • Issues 5
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 0
    • Merge requests 0
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Releases
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • SDK
  • KDiff3KDiff3
  • Merge requests
  • !34

Closed
Created Jul 10, 2021 by Léo Flaventin Hauchecorne@lhauchecorne
  • Report abuse
Report abuse

Draft: DirectoryMergeWindow as a dockable widget

  • Overview 7
  • Commits 1
  • Pipelines 9
  • Changes 5

Hi,

This MR implements https://bugs.kde.org/show_bug.cgi?id=439640.

Also, it fixes https://bugs.kde.org/show_bug.cgi?id=439676 but in a naive way.

DirectoryMergeWindow and DirectoryMergeWidget are placed inside a QDockWidget to make them movable and fix the frustrating space waste. The DockWidgets are not closable to match the current behavior. Maybe the Action "Folder & Text Split Sreen View" should be re-thought if using dock widget. Another solution could be to add an action to revert the QSplitters... I forked because for me, it's much easier to work with kdiff3 with this GUI layout.

I think the discussion should be opened about a customizable layout. This MR is to provide a preview of such a feature =)

Edited Jul 10, 2021 by Léo Flaventin Hauchecorne
Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: work/hl037/dockable