Merge lp://staging/~donadigo/scratch/open-dir-sidebar into lp://staging/~elementary-apps/scratch/scratch

Proposed by Adam Bieńkowski
Status: Work in progress
Proposed branch: lp://staging/~donadigo/scratch/open-dir-sidebar
Merge into: lp://staging/~elementary-apps/scratch/scratch
Diff against target: 74 lines (+18/-3)
4 files modified
plugins/filemanager/FileManagerPlugin.vala (+5/-0)
src/MainWindow.vala (+4/-0)
src/Scratch.vala (+7/-3)
src/Services/PluginManager.vala (+2/-0)
To merge this branch: bzr merge lp://staging/~donadigo/scratch/open-dir-sidebar
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+317472@code.staging.launchpad.net

Commit message

* Passing directory will now open it in the sidebar

Description of the change

This branch fixes bug #1570661: "Open directory in sidebar if passed a directory".

If given a directory, Scratch will no longer throw an error, instead it will pass the file through the new "request_open_folder" signal to inform plugins that a directory was opened.

I still don't feel really confident about this solution, and if there should be other changes in the code to perhaps improve handling other directories / arguments etc. Please feel free to ping me on Slack or tell me in a review.

To post a comment you must log in.
Revision history for this message
Jeremy Wootten (jeremywootten) wrote :

Will this work or conflict with lp:~matzipan/scratch/folder-manager-improvement?

Revision history for this message
Adam Bieńkowski (donadigo) wrote :

jeremywootten: I don't think so, it completely removes the filemanager plugin so it will conflict. I guess this branch shouldn't be merged then, and we should just wait until the other one gets merged so this one can get updated.

Unmerged revisions

1821. By Adam Bieńkowski

Opening directory will now open it in the sidebar

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches