lp:~jeremywootten/pantheon-files/fix-1470945-open-folder-in-trash-icon-view

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~elementary-apps/pantheon-files/trunk at revision 1915

elementary Apps team: Pending requested 2015-07-21

Diff: 710 lines (+222/-149)

11 files modified

libcore/AbstractSlot.vala (+4/-0)
libcore/gof-directory-async.vala (+0/-1)
libcore/marlin-file-operations.c (+0/-1)
libcore/marlin-file-utilities.c (+42/-31)
libwidgets/LocationBar.vala (+5/-1)
plugins/pantheon-files-trash/plugin.vala (+21/-24)
src/View/AbstractDirectoryView.vala (+66/-49)
src/View/ListView.vala (+57/-34)
src/View/Miller.vala (+10/-1)
src/View/Slot.vala (+1/-3)
src/View/ViewContainer.vala (+16/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1470945: Cannot browse folders in trash in Icon View, but can in List and Column View	Low	Fix Released
Bug #1470958: In trash, the context menu appears for files within folders	Low	Fix Released

Link a bug report

Related blueprints

1880. By Jeremy Wootten on 2015-07-24

Fix handling of expanded subdirectories in ListView when restoring parent from trash

1879. By Jeremy Wootten on 2015-07-24

Merge trunk to r1899

1878. By Jeremy Wootten on 2015-07-24

Change error message to title case, move period

1877. By Jeremy Wootten on 2015-07-21

Do not try to create folder in trash when not found

1876. By Jeremy Wootten on 2015-07-21

Alter style and message of infobar when not in trash root; update trash infobar when slot activated

1875. By Jeremy Wootten on 2015-07-21

Merge trunk r1889

1874. By Jeremy Wootten on 2015-07-18

Merge fix-1470958-only-show-context-menu-in-trash-root

1873. By Jeremy Wootten on 2015-07-18

Merge trunk r1884

1872. By Jeremy Wootten on 2015-07-02

Allow folder to open in in trash in Icon View

1871. By Adam Bieńkowski on 2015-06-28

Fix for hardcoded module path: #1467060