Files

Merge lp://staging/~jeremywootten/pantheon-files/refactor-location-bar-part2 into lp://staging/~elementary-apps/pantheon-files/trunk

refactor-location-bar-part2
Merge into trunk

Proposed by Jeremy Wootten on 2015-10-21

Status:

Superseded

Proposed branch:

lp://staging/~jeremywootten/pantheon-files/refactor-location-bar-part2

Merge into:

lp://staging/~elementary-apps/pantheon-files/trunk

Prerequisite:

lp://staging/~jeremywootten/pantheon-files/refactor-location-bar-preparation

Diff against target:

5567 lines (+2414/-2183)

29 files modified

filechooser-module/CMakeLists.txt (+13/-8)
filechooser-module/FileChooserDialog.vala (+9/-9)
libcore/CMakeLists.txt (+0/-3)
libcore/pantheon-files-core-C.vapi (+5/-0)
libwidgets/CMakeLists.txt (+22/-26)
libwidgets/Chrome/BasicBreadcrumbsEntry.vala (+621/-845)
libwidgets/Chrome/BasicLocationBar.vala (+114/-230)
libwidgets/Chrome/BreadcrumbElement.vala (+144/-61)
libwidgets/Chrome/BreadcrumbIconList.vala (+152/-0)
libwidgets/Chrome/TopMenu.vala (+35/-15)
libwidgets/Chrome/ViewWindowInterface.vala (+0/-35)
libwidgets/Chrome/Viewable.vala (+0/-32)
libwidgets/Dialogs/ChooseAppDialog.vala (+6/-2)
libwidgets/FileUtils.vala (+28/-1)
libwidgets/Interfaces/LocatableInterface.vala (+26/-0)
libwidgets/Interfaces/NavigatableInterface.vala (+43/-0)
libwidgets/Interfaces/SearchableInterface.vala (+33/-0)
libwidgets/MimeActions.vala (+22/-0)
libwidgets/Resources.vala (+11/-2)
libwidgets/View/BreadcrumbsEntry.vala (+543/-0)
libwidgets/View/LocationBar.vala (+189/-550)
libwidgets/View/SearchResults.vala (+250/-245)
src/CMakeLists.txt (+1/-0)
src/View/AbstractDirectoryView.vala (+1/-1)
src/View/AbstractTreeView.vala (+10/-8)
src/View/DirectoryNotFound.vala (+3/-2)
src/View/IconView.vala (+8/-7)
src/View/ViewContainer.vala (+50/-29)
src/View/Window.vala (+75/-72)

To merge this branch:

bzr merge lp://staging/~jeremywootten/pantheon-files/refactor-location-bar-part2

Related bugs:

Bug #1284363: "This folder does not exist." message when going up on NTFS filesystem	High	Fix Released
Bug #1341841: Pathbar is backwards for RTL languages	Medium	Fix Released
Bug #1400609: unfocused window breadcrumb icons don't lower their opacity	Low	Fix Released
Bug #1480538: Navigating to "~/~xyz" gives unexpected result	Medium	Fix Released
Bug #1482527: Cancelling pathbar entry after completion displays incorrect path	Medium	Fix Released
Bug #1499960: Backspace shouldn't close searchbox	Medium	Fix Released
Bug #1500000: scroll to the location of found item	Wishlist	Fix Released
Bug #1508835: Renaming not cancelled in list view with primary click on blank space	Low	Fix Released
Bug #1510561: An extra "/" is put on path when I access a remote filesystem over SSH	Medium	Fix Released

Link a bug report

Reviewer	Date Requested	Status
xapantu (community)		Disapprove on 2015-10-30
Adam Bieńkowski	2015-10-21	Pending
Review via email: mp+275220@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2015-10-31.

Commit message

Refactor pathbar widgets to give browser-like behaviour

Description of the change

The pathbar widgets in /libwidgets have been refactored to make them more modular and to achieve a more browser-like behaviour. Explicit interfaces between the widgets have been defined.

The need for a separate filechooser widget has been removed; the base BreadcrumbEntry widget can be used instead.

A number of existing bugs in the old widgets have been addressed along the way.

lp://staging/~jeremywootten/pantheon-files/refactor-location-bar-part2 updated on 2015-10-24

1974. By Jeremy Wootten on 2015-10-22: Remove some redundant CMakeLists.txt lines
1975. By Jeremy Wootten on 2015-10-22: Update pantheon-files-core.deps
1976. By Jeremy Wootten on 2015-10-24: Ensure search window releases device grab on close
1977. By Jeremy Wootten on 2015-10-24: Pass modified key press from SearchResults to parent

Revision history for this message

xapantu (xapantu) wrote on 2015-10-30:

Please use bzr mv when you move files, the diff is not readable.

Please split your changes into different branch, I can't see why the build system is touched here.

But of course, as always, it looks like good work ;)

review: Disapprove

Revision history for this message

Jeremy Wootten (jeremywootten) wrote on 2015-10-31:

xapantu: Thanks for the review. I think most of the changes to the CMakeList.txt files were required to make the branch compile although e.g. r1974 and r1975 may not be strictly essential for this branch. Which changes are you disapproving?

I have split the intended changes into three parts already (see parts 1 and 3 also proposed), but this part is not so easy to split, while maintaining buildability and full functionality, as most of the changes are interdependent. Do you have any advice as to how this branch may be further split?

I'll remake the branch using bzr mv as suggested.

lp://staging/~jeremywootten/pantheon-files/refactor-location-bar-part2 updated on 2015-11-15

1978. By Jeremy Wootten on 2015-11-14: Merge parent r1958 (trunk r1979)
1979. By Jeremy Wootten on 2015-11-15: Fix bug in completion on remote filesystem
1980. By Jeremy Wootten on 2015-11-15: Merge parent (trunk r1981)

Unmerged revisions

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

to all changes:

Cody Garver

Jeremy Wootten