Merge lp:~jeremywootten/pantheon-files/all-views-vala into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

* Convert Slot, Miller, DirectoryView, ListView, ColumnView and IconView to Vala.
* Use standard Gtk.TreeView and Gtk.IconView
* Address a number of bugs associated with the views.
* Some changes made to ViewContainer - new slots only made when view mode changes, not when location changes.
* For improved accessibility, helper emblem appears in all views but only when the icons are above a minimum size.
* Implemented bookmarking from context menu
* Implemented "Open in New Window" in context menu
* Context menu and app menu reimplemented without deprecated code.

Convert Slot, Miller, DirectoryView, ListView, ColumnView and IconView to Vala.
Use standard Gtk.TreeView and Gtk.IconView
Address a number of bugs associated with the views.
Some changes made to ViewContainer - new slots only made when view mode changes, not when location changes.

Use of standard Gtk widgets means that multi-item dragging is only possible with the secondary button or by using primary button in combination with a modifier key.

Automatic switching to icon-view in certain directories not (yet) implemented. Is this desirable?

Rename by clicking on name implemented. Is this desirable?

In list and column view, right clicking on any blank space treats it as background allowing operations on root directory even when window filled with rows. Blank space click initiates rubber-banding, not drag.

For improved accessibility, helper emblem appears in all views but only when the icons are above a minimum size. Is this desirable?

Items activate only when clicked on icon. Clicking on name starts on renaming, clicking on blank space selects only. Is this desirable?

Implemented bookmarking from context menu
Implemented "Open in New Window" in context menu

Context menu and app menu reimplemented without deprecated code.

Design input required
Code will be cleaned up before merge

[Danielle Foré (danrabbit)]

I can see a menubar and a GNOME-style appmenu. That's a pretty undesirable change.

I get an "edit"/I-beam anytime I'm anywhere over the icon view. That should probably only happen over the label (which btw, clicking the label to edit is awesome).

When there's no back/forward history the respective button should become insensitive (regression)

There's no visible rubberband for selection files/folders in any view (regression)

No Ctrl F to search (regression)

"Open In" menu is interesting. Does this show the same items as "Open With" would, but with the addition of "New Tab" and "New Window"? It's possible to get both menus which shows the duplicate entry "Terminal". I think we should choose one or the other.

I like that the selection emblems automatically appear based on icon size. That's a pretty cool feature.

Not being able to drag multiple items is a regression and a pretty big one. I think this is pretty important functionality we need to preserve.

I don't think we need to automatically switch to a certain view when in a directory. Users should be in control of the view imo.

I can no longer show hidden files by right clicking in the view (regression)

If I have a selection and then right click on the view, the selection should be lost. It's kind of confusing to see context items for the selection when I haven't right clicked on the selection.

Submenus don't need ellipsis. (Open with, Open in, New etc)

I don't think we need to specify "Empty Folder" since there isn't really a way to create a populated folder. "Folder" is probably okay here.

review: Needs Fixing

[Danielle Foré (danrabbit)]

I can't appear to open anything (file or folder) in the column view other than the first folder. Clicking another folder selects and opens the top folder.

clicking the object to go in and the title to rename seems to be a lot less awesome in the column and list view where the actual icon is very small. In these views, I would expect clicking empty rows or the title to still open the directory.

I like the way the list view is intelligent about which context menu to pull up depending on where you click.

[Danielle Foré (danrabbit)]

I also get a "Run" menu item on folders which appears to do nothing.

[Cody Garver (codygarver)]

Nodes in Entire Network should not be editable

The "Empty Trash" button is sorta selected on hover. It's not bad but I don't know if it's desired by design.

review: Needs Fixing

[Cody Garver (codygarver)]

Disregard what I said about Empty Trash, apparently it already behaved like that in trunk

[Danielle Foré (danrabbit)]

I don't get the I-beam cursor anymore. But I also don't get it when hovering a file/folder name. If we get the cursor showing properly, I wonder if we really need to have a menu item for this.

The way labels are wrapped in the icon view is kind of weird. I'm getting stuff like "Document \n s"

I think the Open/Open in/Open with items should be back at the top of the context menu.

I'm now unable to drag and drop any items in icon view.

Items open on click instead of on release.

[Danielle Foré (danrabbit)]

Labels in icon view seem to be centered vertically instead of aligned to the top.

Whenever I select something using an emblem, it launches

[Danielle Foré (danrabbit)]

typing to select a folder/file in a directory no longer works

[Shawn McTear (syst3mfailur3)]

> I don't get the I-beam cursor anymore. But I also don't get it when hovering a
> file/folder name. If we get the cursor showing properly, I wonder if we really
> need to have a menu item for this.
>

If the menu item for renaming is removed, maybe adding a tooltip when hovering over the file/folder name to also specify that its editable would be a good idea.

[Jeremy Wootten (jeremywootten)]

> typing to select a folder/file in a directory no longer works

It should be working in list and column views. It is not working in icon view because Gtk.IconView does not support it - another unforeseen side-effect of switching.

It is possible to apparently 'lock up' the function in list and column view by pressing a second key, creating a non-existent filename, very quickly, before the overlay appears. You have to click on the view again to restart it. This occurs in trunk as well.

[Jeremy Wootten (jeremywootten)]

> I don't get the I-beam cursor anymore. But I also don't get it when hovering a
> file/folder name. If we get the cursor showing properly, I wonder if we really
> need to have a menu item for this.
>
> The way labels are wrapped in the icon view is kind of weird. I'm getting
> stuff like "Document \n s"
>
> I think the Open/Open in/Open with items should be back at the top of the
> context menu.
>
> I'm now unable to drag and drop any items in icon view.
>
> Items open on click instead of on release.

The cursor doesn't change over the filenames in trunk, but I can try and arrange this.
Items were intended to open on click unless a drag is started - it was working - I'll look into this regression.
I'll address the formating issues you mention

[Danielle Foré (danrabbit)]

Let's kill the font zoom thing. We can discuss that in another branch. In the interest of making a review as easy as possible, I think we should avoid introducing new features in this branch. I think it'd be better to keep the diff as small as possible.

Not being able to type to find a file in the directory is a pretty big regression.

Also, Ctrl + F to search seems to not work again

[Jeremy Wootten (jeremywootten)]

OK, no problem - I'll revert the font zooming in the next revision. Sorry about the re-regression with Ctrl + F, I didn't notice that. I'll not be able to work on this for a couple of days though.

[Danielle Foré (danrabbit)]

Looks like I also can't copy folders

[Danielle Foré (danrabbit)]

When you rename something, the name isn't save on lose focus. It's only saved if you press enter.

We should truncate (ellipsis in the center) file/folder names after like 3 lines.

Clicking the title to rename seems to be broken. On releasing the button the entry loses focus

[Danielle Foré (danrabbit)]

The click-to-rename area seems to extend the height of whatever the tallest label is. I'm not sure this is good as it means you can't start a rubberband from a seemingly blank space

[Sam Hewitt (snwh)]

I've found a few regressions with this branch as well:

1. The navigation arrows are not using their symbolic variants.
2. Long folder/file strings seem to be cut off.

[Jeremy Wootten (jeremywootten)]

Revision 1564 fixes:
Name saved when focus lost during renaming
Single click to rename
Does not rename when click on blank part of name in icon view
The cursor changes when over the editable part of the name label
The height of the name label is limited to three lines.

The following problems remain due mainly to limitations of the Gtk.IconView:
Rubberbanding is not initiated by clicking on the blank part of the name renderer (unlike in Gtk.TreeView)
The editable widget used by Gtk.Iconview is a simple one line Entry which is limited in size to the width of the items in the view. This causes only part of the name to be visible when renaming.
The default Gtk.CellRendererText in IconView will either ellipsize on one line or will wrap over several lines - but not both.

To solve these issues will probably meaning implementing our own rubberbanding and name renderer and editable widget.

[Jeremy Wootten (jeremywootten)]

> I've found a few regressions with this branch as well:
>
> 1. The navigation arrows are not using their symbolic variants.
> 2. Long folder/file strings seem to be cut off.

1. OK, will change.
2. Which view are you referring to? Do you mean during renaming? In Column view there is a maximum width set for autosizing which could cause truncation of long names but the limit can be exceeded manually.

[Jeremy Wootten (jeremywootten)]

Revision 1566 is an attempt to give visual feedback by means of the cursor on the effect of (primary) clicking at the cursor position. In particular this helps in icon view to distinguish the blank area in the name label (no rubberbanding) from the blank space between the items (will rubberband). A different cursor is also used depending on whether clicking (or double clicking) will activate the item or just select it.

[Danielle Foré (danrabbit)]

It sounds like there's going to be a *lot* of work to get the views back to where the exo views are.

Is it possible to split this into multiple merges so we can at least get some of your work merged in?

[Jeremy Wootten (jeremywootten)]

> It sounds like there's going to be a *lot* of work to get the views back to
> where the exo views are.
>
> Is it possible to split this into multiple merges so we can at least get some
> of your work merged in?

I wish! I originally was going to change one file to Vala but could get it to work without changing another file to Vala and that wouldn't work without changing ... etc. I was hoping that it would be possible to use the Gtk TreeView and IconView widgets to produce something usable even if not exactly the same as the Exo views. This would make the code lighter and easier to maintain. The Gtk IconView is the main problem - it needs a lot of customisation to behave like the exo view, although it would still be easier (probably) than converting the Exo IconView (ca 12000 lines of code) to Vala.

I will have another look at getting the Exo IconView to work in this branch but it would need some new functions.

[Jeremy Wootten (jeremywootten)]

The last two revisions implement much of the functionality of the original customised text renderer and editable label but using Vala to create customised Gtk.CellRendererText and to add Gtk.Editable and Gtk.CellEditable interfaces to Gtk.TextView.

[Danielle Foré (danrabbit)]

[ 39%] Built target pantheon-files-widgets
make[2]: *** No rule to make target `../src/EditableLabel.vala', needed by `src/pantheon-files_valac.stamp'. Stop.
make[1]: *** [src/CMakeFiles/../pantheon-files.dir/all] Error 2
make: *** [all] Error 2

[Jeremy Wootten (jeremywootten)]

Oops - sorry - forgot to add the new file to bzr.

[Danielle Foré (danrabbit)]

When you drag something over a folder, it changes to the "folder-drag-accept" icon as expected, but it gets stuck there and doesn't change back if you drag the something away and don't complete the drop there.

If you put the label in edit mode, then click away, the label text will still be selected.

Is there a way to remove that blue coloration from selected items since you already have the grey box?

[Cody Garver (codygarver)]

* Should be "elementary Developers" not "Elementary Developers"

* Warnings:

src/TextRenderer.vala:173.103-173.118: warning: use of possibly unassigned parameter `y_offset'
        public override void get_size (Gtk.Widget widget, Gdk.Rectangle? cell_area, out int x_offset, out int y_offset, out int width, out int height) {
                                                                                                      ^^^^^^^^^^^^^^^^
src/TextRenderer.vala:173.85-173.100: warning: use of possibly unassigned parameter `x_offset'
        public override void get_size (Gtk.Widget widget, Gdk.Rectangle? cell_area, out int x_offset, out int y_offset, out int width, out int height) {
                                                                                    ^^^^^^^^^^^^^^^^

review: Needs Fixing

[Cody Garver (codygarver)]

There are .vala files listed in the .bzrignore

[Jeremy Wootten (jeremywootten)]

The last five revisions address the follow issues:
1) Rubberbanding from any visually blank area on Icon view
2) Drop highlighting works correctly according to whether the target has write permissions and unhighlights correctly
3) Compilation warnings removed
4) .bzrignore files removed
5) When editing a long file name a smaller font is used if it would not otherwise fit in the available area.
6) Ctrl-Z restores original file name during renaming (but does not end rename)
7) Folder names with dots are fully selected during rename
8) ViewContainer now correctly forgets selected files after selecting them after a view change.

[Jeremy Wootten (jeremywootten)]

9) Editable widget correctly hides when loses focus

[Jeremy Wootten (jeremywootten)]

A number of other bugs/wish-list items have now been fixed.

review: Needs Resubmitting

[Cody Garver (codygarver)]

I get a target reticle cursor when I'm not hovering over a file in Grid view

Right click > Copy is grayed out for me for every file in Grid view

Some, seemingly random files are italicized in Grid view

[Jeremy Wootten (jeremywootten)]

> I get a target reticle cursor when I'm not hovering over a file in Grid view
>
> Right click > Copy is grayed out for me for every file in Grid view
>
> Some, seemingly random files are italicized in Grid view

The target reticle cursor is used to indicate that rubberbanding is active. The arrow cursor indicates that selection (or row expansion) will occur but not activation. The hand cursor indicates activation will occur, the I-bar cursor indicates that renaming will occur.

It will be a design team decision whether any of this cursor shape feedback is necessary or desirable - it is easily disabled.

The italicized filenames indicate that you do not have write permission for the file and cannot rename it. Again, a design team decision whether it is desirable to have some visual feedback as to the read/write permissions.

I am not getting a greyed out Copy in the Icon View context menu usually, but I have found a bug that causes this if you right click while in renaming. I'll fix this. Thanks.

[Viko Adi Rahmawan (vikoadi)]

Hello Jeremy,
this is a few regression a found during testing:
1. pressing enter key now open folder in a new tab,
2. and after that the notebook get the focus, so pressing left/right key will change tab.
3. F2 key doesn't rename, delete key doesn't delete file.
4. cannot undo file renaming
5. when i undo file deletion, it doesn't get focused
6. if i search for file and press enter, the file is selected but i cant navigate to other file by arrow key
7. Renaming file in miller column and List, even if its short name, reduce the font size

I will install this branch and see what more that i can get,
Viko

[Jeremy Wootten (jeremywootten)]

Thanks for these Viko - a fresh pair of eyes can always find new things!

On 11 October 2014 10:40, Viko Adi Rahmawan <email address hidden> wrote:

> Hello Jeremy,
> this is a few regression a found during testing:
> 1. pressing enter key now open folder in a new tab,
> 2. and after that the notebook get the focus, so pressing left/right key
> will change tab.
> 3. F2 key doesn't rename, delete key doesn't delete file.
> 4. cannot undo file renaming
> 5. when i undo file deletion, it doesn't get focused
> 6. if i search for file and press enter, the file is selected but i cant
> navigate to other file by arrow key
> 7. Renaming file in miller column and List, even if its short name, reduce
> the font size
>
> I will install this branch and see what more that i can get,
> Viko
>
> --
>
> https://code.launchpad.net/~jeremywootten/pantheon-files/all-views-vala/+merge/235107
> You are the owner of lp:~jeremywootten/pantheon-files/all-views-vala.
>

[Jeremy Wootten (jeremywootten)]

> Hello Jeremy,
> this is a few regression a found during testing:
> 1. pressing enter key now open folder in a new tab, --- FIXED
> 2. and after that the notebook get the focus, so pressing left/right key will
> change tab. --- FIXED
> 3. F2 key doesn't rename, delete key doesn't delete file. --- FIXED
> 4. cannot undo file renaming --- Trunk does not have this feature?
> 5. when i undo file deletion, it doesn't get focused --- Trunk does not have this feature?
> 6. if i search for file and press enter, the file is selected but i cant
> navigate to other file by arrow key --- FIXED
> 7. Renaming file in miller column and List, even if its short name, reduce the
> font size --- FIXED
>
> I will install this branch and see what more that i can get,
> Viko

[Jeremy Wootten (jeremywootten)]

> Hello Jeremy,
> this is a few regression a found during testing:
> 1. pressing enter key now open folder in a new tab, --- FIXED
> 2. and after that the notebook get the focus, so pressing left/right key will
> change tab. --- FIXED
> 3. F2 key doesn't rename, delete key doesn't delete file. --- FIXED
> 4. cannot undo file renaming --- Trunk does not have this feature?
> 5. when i undo file deletion, it doesn't get focused --- Trunk does not have this feature?
> 6. if i search for file and press enter, the file is selected but i cant
> navigate to other file by arrow key --- FIXED
> 7. Renaming file in miller column and List, even if its short name, reduce the
> font size --- FIXED
>
> I will install this branch and see what more that i can get,
> Viko

[Viko Adi Rahmawan (vikoadi)]

just one more thing Jeremy,
1. in Icon View open a folder with rather large number of item, scroll to the bottom, start rubberbanding from last row to the last row-1, I get scrolled up to the top and dont want to scrolled down by placing mouse in the bottom
Other than that everything seems solid for me.
Thanks

[Jeremy Wootten (jeremywootten)]

Thanks again Viko. The last revision fixes this.

[Danielle Foré (danrabbit)]

I don't really like that the icon spacing changes per-folder. I feel like this is a regression.

There's no longer any border around entries for renaming. I think this makes it unclear that you've actually entered renaming mode.

When there's a long label, renaming makes the text small. I'm not sure I like that. Either way, it's an unnecessary change from trunk. It should be proposed in its own branch.

[Danielle Foré (danrabbit)]

While renaming in column or list views,text should be centered vertically on the line instead of aligned to top.

[Viko Adi Rahmawan (vikoadi)]

Been using this all day and feels solid enough for me
great work Jeremy

[Cassidy James Blaede (cassidyjames)]

Here's a relatively play-by-play look at me testing this for a bit today:

1. Icons in the icon view feel weirdly spaced out; I do like that they evenly space out, though. There just feels like there's a LOT of padding around each icon. Much lower information density.

2. Clicking things in the miller view just doesn't work... Oh, I have to click the icon. Clicking next to the text doesn't do anything and clicking right on it renames, which I guess is nice. I'd recommend only showing the rename if you click the text once it's already selected, otherwise it's a tiny target for browsing (which is a 1000x more important). Clicking the blank space anywhere on the line should open that folder. This is a regression.

3. There's a flash of "Loading..." every time I click a folder anywhere (even on the local SSD), which feels really, really glitchy. I'd consider it a regression.

4. Some things are italic and I don't know why. (Folders in /, things in the trash, maybe more.) I'd consider this a regression as well, or at least a weird design decision that isn't obvious.

[Cassidy James Blaede (cassidyjames)]

As a note to number 4 from above, our interface font doesn't even have a true italic and I don't think we use italics anywhere else in the entire OS.

[Cassidy James Blaede (cassidyjames)]

5. I feel like the list view should work similarly to how I described the miller view above: clicking anywhere on the line should to the "default" action, which in that case is opening the file or folder. The icon is too tiny of a target.

[Cassidy James Blaede (cassidyjames)]

6. If I have a file highlighted in the icon view, then go to ctrl+click+drag to rubberband select another file, it looks like it starts rubberband selecting but then also starts dragging the highlighted file (even when not click+dragging near it).

[Cassidy James Blaede (cassidyjames)]

7. Hitting F2 to rename doesn't work anymore.

[Cassidy James Blaede (cassidyjames)]

After a while of having Files open, it will no longer open any files. Clicking an image does nothing, right-clicking and telling it to open in a different app does nothing. I'm not 100% sure this is the fault of this branch as I seem to recall this happening in the past.

[Jeremy Wootten (jeremywootten)]

I have made the item width in icon view a fixed ratio of the icon size rather than automatic. The column and row spacings are also scaled to the icon size. I have set the ratios to give a more compact view.

[Jeremy Wootten (jeremywootten)]

In order to distinguish more clearly, in icon view, the text of a selected item and a renaming item I have reimplemented the black border when renaming and also stopped displaying the text in the "selected" state when the item is selected so that there is a distinct state change when renaming (when the text becomes selected).

[Jeremy Wootten (jeremywootten)]

Italic font for unwritable files reverted. Small font for editing long filenames reverted.

[Jeremy Wootten (jeremywootten)]

> 7. Hitting F2 to rename doesn't work anymore.

I cannot reproduce this - F2 functionality was restore in version 1596 of this branch.

[Jeremy Wootten (jeremywootten)]

> 7. Hitting F2 to rename doesn't work anymore.

I cannot reproduce this - F2 functionality was restore in version 1596 of this branch.

[Jeremy Wootten (jeremywootten)]

> After a while of having Files open, it will no longer open any files. Clicking
> an image does nothing, right-clicking and telling it to open in a different
> app does nothing. I'm not 100% sure this is the fault of this branch as I seem
> to recall this happening in the past.

Is this cleared by changing to another view and back? It sounds like the view has become stuck in the "updates_frozen" state somehow. There was a bug like this in an earlier version due to renaming not unfreezing the view in some circumstances but that was fixed.

[Jeremy Wootten (jeremywootten)]

> 6. If I have a file highlighted in the icon view, then go to ctrl+click+drag
> to rubberband select another file, it looks like it starts rubberband
> selecting but then also starts dragging the highlighted file (even when not
> click+dragging near it).

I cannot reproduce this in the later versions. Dragging with the primary button (left) should only occur when the cursor is in the hand shape (on the icon). However, dragging with the secondary button (right) occurs on both the icon and the text at the moment.

[Jeremy Wootten (jeremywootten)]

> 5. I feel like the list view should work similarly to how I described the
> miller view above: clicking anywhere on the line should to the "default"
> action, which in that case is opening the file or folder. The icon is too tiny
> of a target.

An aim of this branch was to make the different views behave consistently - a lot more of the code is now shared. So clicking on an icon activates in all three views, clicking on the name text starts renaming in all three views, click on a blank area starts rubberbanding in all three view etc.

One of the bugs that this branch was intended to fix was the inability to access background functions in list and column views when the window was filled with files. This is why the rows do not activate everywhere. The blank part of a row in list and column views behaves pretty much like the background in icon view. Note also that in column view clicking on the far right of the row behaves like the extra columns in list view - i.e. clicking here deselects all selected files and does not select that row.

I accept that there may be a discoverability issue here and I am open to suggestions. The size of the target could be an issue at some zoom-levels. I already hide the selection helpers on small icons to ameliorate this. Another possibility would be to make the whole row activatable at small icon sizes but I feel that could be confusing.

[Cassidy James Blaede (cassidyjames)]

Hey Jeremy, I get this when trying to make the latest revision:

make[2]: *** No rule to make target `../src/AbstractEditableLabel.vala', needed by `src/pantheon-files_valac.stamp'. Stop.
make[1]: *** [src/CMakeFiles/../pantheon-files.dir/all] Error 2
make: *** [all] Error 2

Am I doing something wrong? :P

[Jeremy Wootten (jeremywootten)]

As usual, I forgot to add the new files to bzr - sorry. Now added.

[Jeremy Wootten (jeremywootten)]

Rev 1608 was necessary to get the vertical centering of the editable widget in list and column view. Prior to that I was using the same widget (a Gtk.TextView subclass) for both in the interest of simplicity and code economy, but I couldn't find an obvious way of having Gtk.TextView display vertically centred text. Now I use a different subclass of AbstractEditableLabel depending on the view, one of which displays a Gtk.TextView and the other a Gtk.Entry. This way at least DirectoryView remains agnostic as to which type of view it is. However, you do lose text wrapping in list and column view (not a regression as it is the same in trunk).

[Danielle Foré (danrabbit)]

Jeremy can you resolve conflicts with trunk? :)

[Jeremy Wootten (jeremywootten)]

Conflicts with current trunk now resolved.

[Danielle Foré (danrabbit)]

Can we change the border on the editable label back to just 1px width?

[Jeremy Wootten (jeremywootten)]

The original C code used an 'illegal' fractional value for an int parameter, which I rounded up in Vala. I've now rounded it down and this has restored the 1px outline.

[PerfectCarl (name-is-carl)]

Here's the issues I found:

 1) the empty trash is not always displayed.
    Open the app, go to trash, close the app.
    Re-open the app. The trash folder is opened by default but the top banner is missing

[PerfectCarl (name-is-carl)]

Here's the issues I found:

  2) not a regression per se, but this still applies
     https://bugs.launchpad.net/pantheon-files/+bug/1383019

  3) when I search for a file (Ctrl+F) I once add in the console
    [_LOG_LEVEL_FATAL 21:05:42.727155] [GLib-GIO] g_file_equal: assertion 'G_IS_FILE (file2)' failed
    [_LOG_LEVEL_FATAL 21:05:42.727236] Files will not function properly.
    I cannot reproduce it though.

Suggestion seeing the amount of work that went into this branch maybe a version bump (from 0.2) would be fair.

  4) minor warnings that can be ironed out easily

/home/cran/Projects/elementary/pantheon-files/all-views-vala/src/TextRenderer.vala:129.17-129.53: warning: local variable `context' declared but never used
            var context = widget.get_style_context ();
                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
/home/cran/Projects/elementary/pantheon-files/all-views-vala/src/TextRenderer.vala:130.17-130.49: warning: local variable `state' declared but never used
            var state = widget.get_state_flags ();

   5) suspicious warning
/home/cran/Projects/elementary/pantheon-files/all-views-vala/src/View/Miller.vala:181.34-181.34: warning: if-statement without body
            if (increment != 0.0);

[PerfectCarl (name-is-carl)]

6) the files can't be opened with double click anymore. When double clicking a file, the file is getting renamed (if you clicked on the name) or do nothing if you clicked somewhere in the line.

When I single clicked the icon, the file is opened though.
But that's not convenient as the icon is very small: I am on the wrong end of Fitts law here

[Jeremy Wootten (jeremywootten)]

It was intentional that only clicking on the icon activates in all three views (in order to have consistent behaviour, shared code between the views and allow other desired behaviours when clicking on different parts of the filename column, especially in column view). But as several people have commented adversely, I will rethink this.

[Viko Adi Rahmawan (vikoadi)]

Hey Jeremy,
other regression i found:
- cannot type z in rename box
- cannot open menu using menu key
thanks

[Cody Garver (codygarver)]

Regression: can't drag files out of file-roller (opened archive) and onto empty space to extract them (in any view)

[Cassidy James Blaede (cassidyjames)]

Vika, I can confirm the "Z" key issue. Very odd.

[Cassidy James Blaede (cassidyjames)]

Regression: back/forward buttons (like those on mice) don't work inside of the views, but they still do in other parts of the chrome (when the mouse cursor is over the sidebar or headerbar)

[Jeremy Wootten (jeremywootten)]

To avoid unnecessary difficulties in reviewing this branch I have made it respond like trunk to button presses in list and column views. i.e. clicking anywhere on the row will activate it (no single-click rename, blank part of row does not behave like background). However, rubberbanding works in column view unlike trunk.

[Jeremy Wootten (jeremywootten)]

"Z" key issue solved. Silly error in implementing Ctrl-Z to undo while renaming.

[Jeremy Wootten (jeremywootten)]

Dragging and dropping between applications (including FileRoller) now enabled.
Implemented/reinstated the following trunk behaviours:
1) Select on right click
2) Automagically switch to icon view for icon folders
3) Menu key activates context menu
4) Trash infobar shows in column view

[Jeremy Wootten (jeremywootten)]

Extra mouse button actions should now work. Fixed bug preventing display of some thumbnails

[Jeremy Wootten (jeremywootten)]

The latest revisions fix a number of bugs including some causing crashing under rapid random mouse clicking. Most debugging code has been removed and the format consistency of the code improved.

[PerfectCarl (name-is-carl)]

Hey, nice work.
All the bugs I previously found are fixed now.

I found the the following

1) those critical warnings should be investigated:

[_LOG_LEVEL_FATAL 17:34:16.757606] gof_file_update_icon_internal: assertion 'size >= 1' failed
[_LOG_LEVEL_FATAL 17:34:16.757701] Files will not function properly.
[_LOG_LEVEL_FATAL 17:34:16.758011] gof_file_update_icon_internal: assertion 'size >= 1' failed
[_LOG_LEVEL_FATAL 17:34:16.758082] Files will not function properly.
[_LOG_LEVEL_FATAL 17:34:16.758735] gof_file_update_icon_internal: assertion 'size >= 1' failed
[_LOG_LEVEL_FATAL 17:34:16.758800] Files will not function properly.
[_LOG_LEVEL_FATAL 17:34:16.759305] gof_file_update_icon_internal: assertion 'size >= 1' failed
[_LOG_LEVEL_FATAL 17:34:16.759363] Files will not function properly.
[_LOG_LEVEL_FATAL 17:34:16.759540] gof_file_update_icon_internal: assertion 'size >= 1' failed
[_LOG_LEVEL_FATAL 17:34:16.759596] Files will not function properly.
[_LOG_LEVEL_FATAL 17:34:16.762127] gof_file_update_icon_internal: assertion 'size >= 1' failed
[_LOG_LEVEL_FATAL 17:34:16.762194] Files will not function properly.
[_LOG_LEVEL_FATAL 17:35:06.832406] gof_file_update_icon_internal: assertion 'size >= 1' failed
[_LOG_LEVEL_FATAL 17:35:06.832465] Files will not function properly.
[_LOG_LEVEL_FATAL 17:35:06.832664] gof_file_update_icon_internal: assertion 'size >= 1' failed
[_LOG_LEVEL_FATAL 17:35:06.832707] Files will not function properly.

2) minor code warnings: some async methods should be called as method_async.begin ()

/home/cran/Projects/elementary/pantheon-files/all-views-vala/plugins/pantheon-files-ctags/plugin.vala:171.41-171.60: warning: implicit .begin is deprecated
/home/cran/Projects/elementary/pantheon-files/all-views-vala/plugins/pantheon-files-ctags/plugin.vala:183.51-183.72: warning: implicit .begin is deprecated
/home/cran/Projects/elementary/pantheon-files/all-views-vala/plugins/pantheon-files-ctags/plugin.vala:232.13-232.34: warning: implicit .begin is deprecated
/home/cran/Projects/elementary/pantheon-files/all-views-vala/plugins/pantheon-files-ctags/plugin.vala:242.13-242.21: warning: implicit .begin is deprecated
/home/cran/Projects/elementary/pantheon-files/all-views-vala/src/ZeitgeistManager.vala:10.13-10.33: warning: implicit .begin is deprecated

3) not sure it is related to this branch but, when trying to rename a file with an existing file name, I get this pretty ugly looking dialog.
http://i.imgur.com/St2YXBq.png

[Jeremy Wootten (jeremywootten)]

Thanks Carl,

I put those extra assertions in and I thought I had tracked down the only
source of these warnings (its quiet on my machine) but I must have missed
something.

The warnings about async methods are in trunk so not related to this
branch,

I'll check out the dialog - thanks.

On 2 November 2014 16:47, PerfectCarl <email address hidden> wrote:

> Hey, nice work.
> All the bugs I previously found are fixed now.
>
> I found the the following
>
> 1) those critical warnings should be investigated:
>
> [_LOG_LEVEL_FATAL 17:34:16.757606] gof_file_update_icon_internal:
> assertion 'size >= 1' failed
> [_LOG_LEVEL_FATAL 17:34:16.757701] Files will not function properly.
> [_LOG_LEVEL_FATAL 17:34:16.758011] gof_file_update_icon_internal:
> assertion 'size >= 1' failed
> [_LOG_LEVEL_FATAL 17:34:16.758082] Files will not function properly.
> [_LOG_LEVEL_FATAL 17:34:16.758735] gof_file_update_icon_internal:
> assertion 'size >= 1' failed
> [_LOG_LEVEL_FATAL 17:34:16.758800] Files will not function properly.
> [_LOG_LEVEL_FATAL 17:34:16.759305] gof_file_update_icon_internal:
> assertion 'size >= 1' failed
> [_LOG_LEVEL_FATAL 17:34:16.759363] Files will not function properly.
> [_LOG_LEVEL_FATAL 17:34:16.759540] gof_file_update_icon_internal:
> assertion 'size >= 1' failed
> [_LOG_LEVEL_FATAL 17:34:16.759596] Files will not function properly.
> [_LOG_LEVEL_FATAL 17:34:16.762127] gof_file_update_icon_internal:
> assertion 'size >= 1' failed
> [_LOG_LEVEL_FATAL 17:34:16.762194] Files will not function properly.
> [_LOG_LEVEL_FATAL 17:35:06.832406] gof_file_update_icon_internal:
> assertion 'size >= 1' failed
> [_LOG_LEVEL_FATAL 17:35:06.832465] Files will not function properly.
> [_LOG_LEVEL_FATAL 17:35:06.832664] gof_file_update_icon_internal:
> assertion 'size >= 1' failed
> [_LOG_LEVEL_FATAL 17:35:06.832707] Files will not function properly.
>
> 2) minor code warnings: some async methods should be called as
> method_async.begin ()
>
> /home/cran/Projects/elementary/pantheon-files/all-views-vala/plugins/pantheon-files-ctags/plugin.vala:171.41-171.60:
> warning: implicit .begin is deprecated
> /home/cran/Projects/elementary/pantheon-files/all-views-vala/plugins/pantheon-files-ctags/plugin.vala:183.51-183.72:
> warning: implicit .begin is deprecated
> /home/cran/Projects/elementary/pantheon-files/all-views-vala/plugins/pantheon-files-ctags/plugin.vala:232.13-232.34:
> warning: implicit .begin is deprecated
> /home/cran/Projects/elementary/pantheon-files/all-views-vala/plugins/pantheon-files-ctags/plugin.vala:242.13-242.21:
> warning: implicit .begin is deprecated
> /home/cran/Projects/elementary/pantheon-files/all-views-vala/src/ZeitgeistManager.vala:10.13-10.33:
> warning: implicit .begin is deprecated
>
> 3) not sure it is related to this branch but, when trying to rename a file
> with an existing file name, I get this pretty ugly looking dialog.
> http://i.imgur.com/St2YXBq.png
>
>
> --
>
> https://code.launchpad.net/~jeremywootten/pantheon-files/all-views-vala/+merge/240371
> You are the owner of lp:~jeremywootten/pantheon-files/all-views-vala.
>

[lp:~jeremywootten/pantheon-files/all-views-vala]

1649. By Jeremy Wootten on 2014-11-04

Fix rename error dialog and handling

[PerfectCarl (name-is-carl)]

When right clicking on a header I have the new file menu.
Shouldn't we have an option to add columns instead ?

PS : congrats, all the issue I reported are fixed in this version.

PS2: I did post a review message that got deleted it seems. Damn.

[Jeremy Wootten (jeremywootten)]

The suggestion to have an option to add columns in list view is similar to Bug #1181547. Its a good idea - but will need another branch.

[lp:~jeremywootten/pantheon-files/all-views-vala]

1650. By Jeremy Wootten on 2014-11-12

Reinstate interactive search in tree views; not implemented in Gtk.IconView

[PerfectCarl (name-is-carl)]

Okay, here goes the code review.
The QA will go in another comment (or I'll annotate the bug report directly).

So all in all, a good merge, congrats.

1) minor: remove the commented code
- in the cmakelist file
- in the code (mostly g_message )
- remove unused files from filesystem (see comments)

2) deal with the FIXME
- this is not a good thing to leave a FIXME without a bug report on lp.

note: the merge display is truncated by launchpad. I have to do it offline then.

review: Needs Fixing

[PerfectCarl (name-is-carl)]

Damn, I commented the wrong merge proposal.

Please find my code comments there : https://code.launchpad.net/~jeremywootten/pantheon-files/all-views-vala/+merge/235107

[PerfectCarl (name-is-carl)]

remove src/views/View/ViewMode.vala

I would suggest to add you to the AUTHORS file and about dialog as this merge is really non trivial and qualifies as being on the pantheon (ah ah) wall of fame !

Also because this merge is long, I had to take the review offline and annotate the code in a separate branch.
Nothing major though : spotted commented code and public event handlers.

You can make a diff from your branch and mine (https://code.launchpad.net/~name-is-carl/pantheon-files/all-views-vala-review) and see the issues.

review: Needs Fixing

[Danielle Foré (danrabbit)]

Went through and verified that all the currently linked reports are indeed fixed by this branch :)

I did notice a couple of problems though:

1. In Icon view, right click and rename a folder (not the first one)
2. Move your cursor over the text box
3. See the the first folder in the view becomes highlighted

1. In Icon view, right click a folder and Open In > New Window
2. Close the new window
3. Right click the same folder
4. See that both "Open With" and "Open In" are now present.

[lp:~jeremywootten/pantheon-files/all-views-vala]

1651. By Jeremy Wootten on 2014-11-13

Merged trunk

[Jeremy Wootten (jeremywootten)]

Rev 1650 reverts the new "find on typing" function and re-instates the native interactive search in list and column view. Because Gtk.IconView does not have a native interactive search, a different solution will have to be found for this view, for example that implemented in lp:~jeremywootten/pantheon-files/all-views-vala-local-only-search, which uses the location bar find function to rapidly search just the current directory, providing a similar functionality to the native Gtk interactive search, except that at the moment, the found files are not selected (this could be implemented). If acceptable, it might be better to use the same function for all three views, for a consistent user experience.

[lp:~jeremywootten/pantheon-files/all-views-vala]

1652. By Jeremy Wootten on 2014-11-13

Remove unnecessary comment lines, remove redundant files, remove or revise TODOs and FIXMEs, update about dialog authors list and AUTHORS file

1653. By Jeremy Wootten on 2014-11-14

Do not select current directory during actions on background

1654. By Jeremy Wootten on 2014-11-14

Allow 'Open with' menu action for background

1655. By Jeremy Wootten on 2014-11-14

Select focussed location

1656. By Jeremy Wootten on 2014-11-14

Eat motion events while renaming

[Danielle Foré (danrabbit)]

When I go to paste something into the current view, it now reads "Paste into Folder". Can we revert this to just "Paste"? This is kind of disorienting. I'd only expect to see that string if I'd right clicked on a folder not the current view.

[Danielle Foré (danrabbit)]

Can we get type-to-search back in Icon view? Slow completion is better than no completion :/

[Danielle Foré (danrabbit)]

Oh sorry I didn't realize the search thing was fixed in another branch. Please disregard that comment.

[lp:~jeremywootten/pantheon-files/all-views-vala]

1657. By Jeremy Wootten on 2014-11-16

Merge 'Open in' and 'Open with' submenus; Fix 'Open with other application' menuitem; improve app list filtering

1658. By Jeremy Wootten on 2014-11-16

Limit background clipboard actions to 'Paste'; only show paste action menuitem when pasting is possible

[Danielle Foré (danrabbit)]

Small issue, but wouldn't consider it a merge blocker (it can be addressed after the merge if necessary). Similar to before with the open with:

Right click a folder
Open in new window
close new window
Right click same folder
Open in shows Terminal twice.

I think this branch is ready to be merged :) Great work Jeremy!

review: Approve (ux)

[Cody Garver (codygarver)]

Forgive me if any of these are not relevant to this branch, here are my issues:

* Don't change the tab name to "Loading..." for local browsing, but would be nice to keep the spinner if possible; no big deal if it's not easy to implement

Icon View:
 * Third line of long folder and filenames is cropped at the bottom, as is selection highlight

List View:
 * No where to right click on to paste in a full directory
 * Hand cursor appears when you hover over a file or folder icon, but not when you hover on the name (or its + or - icon)

[Jeremy Wootten (jeremywootten)]

I can revert the change that changes the tab name to "loading" but keep the spinner.

The issue of long file names in icon view has come up before. I do not think it a problem that they are truncated when not renaming - that happens in all the views. The perceived problem is the truncation when renaming - which is a regression compared with trunk. This is because trunk uses a custom icon view that does not manage the editable widget, which then overlays as much of the view as needed to display the whole name. This branch uses a standard Gtk.IconView which handles the renaming and limits display of the editable widget to the available cell area (set to 3 lines at the moment). It is by no means trivial to change this. Perhaps a separate rename dialog could be shown? It is always possible to zoom in or switch to list view to edit a long name.

The ability to access the the background in List View with a full directory was implemented in an earlier revision of this branch but was reverted in order to reduce the number of changes introduced. Trunk has the same limitation. This can be re-introduced in a later branch.

The hand cursor is intended to indicate that dragging is possible. If you try and drag on the name you get rubberbanding instead. The code is quite flexible with regards to what actions occur and what cursor is shown when hovering or clicking on different regions of the row so if an agreed specification can be drawn up this can be implemented

[Cody Garver (codygarver)]

The only issue I named that is definitely blocking the merge of this branch is the "Loading..." change, it was confirmed with Dan before posting my review.

The truncation is a problem but I suppose we should just make a report and deal with it some other time.

Accessing the background in a list view pre-dates this code, so ignore it.

We should hear from Dan about the hand cursor though.

[Cody Garver (codygarver)]

Oh and theres a lot of commented out code that should be removed but you may already know this

[lp:~jeremywootten/pantheon-files/all-views-vala]

1659. By Jeremy Wootten on 2014-11-21

Remove commented out code

1660. By Jeremy Wootten on 2014-11-22

Do not show 'Loading ...' on tab

[Jeremy Wootten (jeremywootten)]

I think all the commented code that was added by this branch has now been removed.

I have stopped "Loading ..." being displayed on the tab during loading of the directory but the spinner still appears. A small visual flaw with this is that the name of the tab shifts to the right slightly when the spinner is hidden, since nothing takes the spinner's place and the available space is redistributed. One solution to this would be to display an icon for the directory (or a blank icon) in place of the spinner. DynamicNotebook already permits this.

[lp:~jeremywootten/pantheon-files/all-views-vala]

1661. By Jeremy Wootten on 2014-11-22

Ensure gof_file_icon_update_internal is not called with invalid pix_size

[Danielle Foré (danrabbit)]

If we showed a blank icon it would also make sure the labels are centered since they are already offset a bit by the tab close button. I'm +1 to that solution.

[PerfectCarl (name-is-carl)]

There is still commented code in that branch.

But to be fair this is a minor inconvenience and the codebase of pantheon-files is old enough that it could filed as a separate issue.

Besides, the work of everyone (maintainer and reviewer) will be simpler if that gigantic merge request is not stalled any longer.

review: Approve

[PerfectCarl (name-is-carl)]

There is still commented code in that branch.

But to be fair this is a minor inconvenience and the codebase of pantheon-files is old enough that it could filed as a separate issue.

Besides, the work of everyone (maintainer and reviewer) will be simpler if that gigantic merge request is not stalled any longer.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2011-08-06 10:29:32 +0000
+++ .bzrignore	2014-11-22 15:05:49 +0000
@@ -1,1 +1,1 @@
-build
+

=== modified file 'AUTHORS'
--- AUTHORS	2011-07-02 12:29:59 +0000
+++ AUTHORS	2014-11-22 15:05:49 +0000
@@ -3,3 +3,5 @@
 Robert Roth
 Vadim Rutkovsky
 Rico Tzschichholz
+Mario Guerriero <[e-mail]>
+Jeremy Wootten <[e-mail]>

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-10-05 06:30:05 +0000
+++ CMakeLists.txt	2014-11-22 15:05:49 +0000
@@ -22,7 +22,7 @@
 
 find_package (Vala REQUIRED)
 include (ValaVersion)
-ensure_vala_version ("0.26.0" MINIMUM)
+ensure_vala_version ("0.26" MINIMUM)
 include (ValaPrecompile)
 
 IF (LIB_ONLY)

=== modified file 'data/schemas/org.pantheon.files.gschema.xml'
--- data/schemas/org.pantheon.files.gschema.xml	2014-10-18 17:39:19 +0000
+++ data/schemas/org.pantheon.files.gschema.xml	2014-11-22 15:05:49 +0000
@@ -127,7 +127,7 @@
     </key>
     <key type="a(uss)" name="tab-info-list">
       <summary>Details of open tabs</summary>
-      <default>[(0,"","")]</default>
+      <default>[(0,'','')]</default>
       <description>Array of tab info:  View mode, root uri, tip uri (for Miller view)</description>
     </key>
   </schema>
@@ -176,4 +176,4 @@
     </key>
   </schema>
 
-</schemalist>
\ No newline at end of file
+</schemalist>

=== added file 'libcore/AbstractSlot.vala'
--- libcore/AbstractSlot.vala	1970-01-01 00:00:00 +0000
+++ libcore/AbstractSlot.vala	2014-11-22 15:05:49 +0000
@@ -0,0 +1,76 @@
+/***
+  Copyright (C) 2014 elementary Developers and Jeremy Wootten
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License version 3, as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranties of
+  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+  PURPOSE. See the GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ Authors : Lucas Baudin <[e-mail]>
+           Jeremy Wootten <[e-mail]>
+***/
+
+namespace GOF {
+    public abstract class AbstractSlot : GLib.Object {
+
+        GOF.Directory.Async _directory;
+        public GOF.Directory.Async? directory {
+            get {
+                AbstractSlot? current = get_current_slot ();
+                if (current != null)
+                    return current._directory;
+                else
+                    return null;
+            }
+
+            protected set {_directory = value;}
+        }
+        public GLib.File location  {
+            get {return directory.location;}
+        }
+        public string uri {
+            get { return directory.file.uri;}
+        }
+        protected Gtk.Box extra_location_widgets;
+        protected Gtk.Box content_box;
+        protected int slot_number;
+        protected int width;
+
+        public  void add_extra_widget (Gtk.Widget widget) {
+            extra_location_widgets.pack_start (widget);
+        }
+
+        protected void init () {
+            content_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+            extra_location_widgets = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+            (content_box as Gtk.Box).pack_start (extra_location_widgets, false, false, 0);
+            slot_number = -1;
+        }
+
+        public abstract unowned GLib.List<unowned GOF.File>? get_selected_files ();
+        public abstract void set_active_state (bool set_active);
+        public abstract unowned AbstractSlot? get_current_slot ();
+        public abstract void reload ();
+        public abstract void grab_focus ();
+        public abstract void user_path_change_request (GLib.File loc, bool allow_mode_change = true);
+        public abstract void select_first_for_empty_selection ();
+        public abstract void select_glib_files (GLib.List<GLib.File> locations, GLib.File? focus_location);
+        protected abstract void make_view ();
+        public abstract void cancel ();
+
+        public virtual void zoom_out () {}
+        public virtual void zoom_in () {}
+        public virtual void zoom_normal () {}
+        public virtual bool set_all_selected (bool all_selected) {return false;}
+        public virtual Gtk.Widget get_content_box () {return content_box as Gtk.Widget;}
+        public virtual string? get_root_uri () {return directory.file.uri;}
+        public virtual string? get_tip_uri () {return null;}
+    }
+}

=== modified file 'libcore/CMakeLists.txt'
--- libcore/CMakeLists.txt	2014-08-05 22:40:12 +0000
+++ libcore/CMakeLists.txt	2014-11-22 15:05:49 +0000
@@ -15,6 +15,7 @@
 
 vala_precompile(VALA_C ${PKGNAME}
     AbstractSidebar.vala
+    AbstractSlot.vala
     gof-callwhenready.vala
     gof-directory-async.vala
     gof-preferences.vala
@@ -60,7 +61,7 @@
     marlin-progress-info.c
     marlin-progress-info-manager.c
     marlin-exec.c
-    gof-abstract-slot.c
+#    gof-abstract-slot.c
     gof-file.c
     marlin-icon-info.c
     marlin-trash-monitor.c
@@ -80,7 +81,7 @@
     eel-string.h
     eel-ui.h
     eel-vfs-extensions.h
-    gof-abstract-slot.h
+#    gof-abstract-slot.h
     gof-file.h
     marlin-exec.h
     marlin-file-conflict-dialog.h

=== modified file 'libcore/Plugin.vala'
--- libcore/Plugin.vala	2014-09-05 08:54:51 +0000
+++ libcore/Plugin.vala	2014-11-22 15:05:49 +0000
@@ -1,6 +1,6 @@
 public abstract class Marlin.Plugins.Base {
     public virtual void directory_loaded (void* data) { }
-    public virtual void context_menu (Gtk.Widget? widget, List<GOF.File> files) { }
+    public virtual void context_menu (Gtk.Widget? widget, List<unowned GOF.File> files) { }
     public virtual void ui (Gtk.UIManager? widget) { }
     public virtual void update_sidebar (Gtk.Widget widget) { }
     public virtual void update_file_info (GOF.File file) { }

=== modified file 'libcore/PluginManager.vala'
--- libcore/PluginManager.vala	2014-09-05 08:54:51 +0000
+++ libcore/PluginManager.vala	2014-11-22 15:05:49 +0000
@@ -169,7 +169,7 @@
         }
     }
 
-    public void hook_context_menu (Gtk.Widget menu, List<GOF.File> files) {
+    public void hook_context_menu (Gtk.Widget menu, List<unowned GOF.File> files) {
         drop_menu_references (menu);
 
         if (menu is Gtk.Menu)

=== modified file 'libcore/eel-stock-dialogs.c'
--- libcore/eel-stock-dialogs.c	2013-09-09 03:08:16 +0000
+++ libcore/eel-stock-dialogs.c	2014-11-22 15:05:49 +0000
@@ -55,7 +55,6 @@
                      GtkWindow *parent)
 {
     GtkWidget *dialog;
-
     dialog = gtk_message_dialog_new (parent, 0, type, buttons_type, NULL);
     g_object_set (dialog, "text", primary_text, "secondary-text", secondary_text, NULL);
 
@@ -78,11 +77,9 @@
                 GtkWindow *parent)
 {
     GtkDialog *dialog;
-
     dialog = show_message_dialog (primary_text, secondary_text, type,
                                   GTK_BUTTONS_OK, NULL, parent);
     gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
-
     return dialog;
 }
 

=== modified file 'libcore/fm-list-model.c'
--- libcore/fm-list-model.c	2013-09-09 03:08:16 +0000
+++ libcore/fm-list-model.c	2014-11-22 15:05:49 +0000
@@ -37,6 +37,7 @@
 enum {
     PROP_0,
     PROP_HAS_CHILD,
+    PROP_SIZE,
 };
 
 static GQuark attribute_name_q,
@@ -67,14 +68,11 @@
 
     int stamp;
     gboolean        has_child;
-
-    //GQuark sort_attribute;
     gint            sort_id;
+    gint            icon_size;
     GtkSortType     order;
 
     gboolean sort_directories_first;
-
-    //GPtrArray *columns;
 };
 
 typedef struct FileEntry FileEntry;
@@ -98,7 +96,6 @@
 static void
 file_entry_free (FileEntry *file_entry)
 {
-    //gof_file_unref (file_entry->file);
     if (file_entry->reverse_map) {
         g_hash_table_destroy (file_entry->reverse_map);
         file_entry->reverse_map = NULL;
@@ -117,14 +114,12 @@
 static GtkTreeModelFlags
 fm_list_model_get_flags (GtkTreeModel *tree_model)
 {
-    //return GTK_TREE_MODEL_ITERS_PERSIST;
     return (GTK_TREE_MODEL_LIST_ONLY | GTK_TREE_MODEL_ITERS_PERSIST);
 }
 
 static int
 fm_list_model_get_n_columns (GtkTreeModel *tree_model)
 {
-    //return FM_LIST_MODEL_NUM_COLUMNS + FM_LIST_MODEL (tree_model)->details->columns->len;
     return FM_LIST_MODEL_NUM_COLUMNS;
 }
 
@@ -134,6 +129,8 @@
     switch (index) {
     case FM_LIST_MODEL_FILE_COLUMN:
         return GOF_TYPE_FILE;
+    case FM_LIST_MODEL_PIXBUF:
+        return GDK_TYPE_PIXBUF;
     default:
         if (index < FM_LIST_MODEL_NUM_COLUMNS) {
             return G_TYPE_STRING;
@@ -141,13 +138,6 @@
             return G_TYPE_INVALID;
         }
     }
-    /*default:
-      if (index < FM_LIST_MODEL_NUM_COLUMNS + FM_LIST_MODEL (tree_model)->details->columns->len) {
-      return G_TYPE_STRING;
-      } else {
-      return G_TYPE_INVALID;
-      }
-      }*/
 }
 
 static void
@@ -157,6 +147,7 @@
     if (iter != NULL) {
         iter->stamp = model->details->stamp;
         iter->user_data = ptr;
+    } else {
     }
 }
 
@@ -204,7 +195,7 @@
     g_return_val_if_fail (iter->stamp == model->details->stamp, NULL);
 
     if (g_sequence_iter_is_end (iter->user_data)) {
-        /* FIXME is this right? */
+        /* is this right? */
         return NULL;
     }
 
@@ -275,6 +266,15 @@
             g_value_set_string(value, file->formated_modified);
         break;
 
+    case FM_LIST_MODEL_PIXBUF:
+        g_value_init (value, GDK_TYPE_PIXBUF);
+        if (file != NULL) {
+            gof_file_update_icon (file, model->details->icon_size);
+            if (file->pix != NULL)
+                g_value_set_object(value, file->pix);
+        }
+        break;
+
     }
 }
 
@@ -409,6 +409,8 @@
     FileEntry *file_entry;
     GSequenceIter *ptr, *parent_ptr;
 
+    g_assert (file != NULL);
+
     parent_ptr = NULL;
     if (directory) {
         parent_ptr = g_hash_table_lookup (model->details->directory_reverse_map,
@@ -417,6 +419,7 @@
 
     if (parent_ptr) {
         file_entry = g_sequence_get (parent_ptr);
+        g_assert (file_entry != NULL);
         ptr = g_hash_table_lookup (file_entry->reverse_map, file);
     } else {
         ptr = g_hash_table_lookup (model->details->top_reverse_map, file);
@@ -588,7 +591,6 @@
     }
 
     /* Let the world know about our new order */
-
     g_assert (new_order != NULL);
 
     has_iter = FALSE;
@@ -672,10 +674,7 @@
     FileEntry *dummy_file_entry;
     GtkTreeIter iter;
     GtkTreePath *path;
-
     dummy_file_entry = g_new0 (FileEntry, 1);
-    //amtest
-    //dummy_file_entry->file = parent_entry->file;
     dummy_file_entry->parent = parent_entry;
     dummy_file_entry->ptr = g_sequence_insert_sorted (parent_entry->files, dummy_file_entry,
                                                       fm_list_model_file_entry_compare_func, model);
@@ -696,7 +695,7 @@
     FileEntry *file_entry;
     GSequenceIter *ptr, *parent_ptr;
     GSequence *files;
-    gboolean replace_dummy;
+    gboolean replaced_dummy;
     GHashTable *parent_hash;
 
     g_return_val_if_fail (file != NULL, FALSE);
@@ -711,25 +710,21 @@
     }
 
     if (ptr != NULL) {
-        g_warning ("file already in tree (parent_ptr: %p)!!!\n", parent_ptr);
+        g_debug ("file already in tree (parent_ptr: %p)!!!\n", parent_ptr);
         return FALSE;
     }
 
     file_entry = g_new0 (FileEntry, 1);
-    file_entry->file = file;
+    file_entry->file = file; /* Does not increase reference count */
     file_entry->parent = NULL;
     file_entry->subdirectory = NULL;
     file_entry->files = NULL;
 
     files = model->details->files;
     parent_hash = model->details->top_reverse_map;
-
-    //SPOTTED!
-    //#if 0
-    replace_dummy = FALSE;
+    replaced_dummy = FALSE;
 
     if (parent_ptr != NULL) {
-        //log_printf (LOG_LEVEL_UNDEFINED, "parent_ptr != NULL %s\n", file->name);
         file_entry->parent = g_sequence_get (parent_ptr);
         /* At this point we set loaded. Either we saw
          * "done" and ignored it waiting for this, or we do this
@@ -738,30 +733,25 @@
         file_entry->parent->loaded = 1;
         parent_hash = file_entry->parent->reverse_map;
         files = file_entry->parent->files;
-        if (g_sequence_get_length (files) == 1) {
+        if (g_sequence_get_length (files) == 1) { /* maybe the dummy row */
             GSequenceIter *dummy_ptr = g_sequence_get_iter_at_pos (files, 0);
             FileEntry *dummy_entry = g_sequence_get (dummy_ptr);
-            if (dummy_entry->file == NULL) {
-                /* replace the dummy loading entry */
-                //model->details->stamp++;
+            if (dummy_entry->file == NULL) { /* it is the dummy row  - replace it */
                 g_sequence_remove (dummy_ptr);
-
-                replace_dummy = TRUE;
+                replaced_dummy = TRUE;
             }
         }
     }
-    //#endif
     file_entry->ptr = g_sequence_insert_sorted (files, file_entry,
                                                 fm_list_model_file_entry_compare_func, model);
 
     g_hash_table_insert (parent_hash, file, file_entry->ptr);
 
-    //#if 0
     iter.stamp = model->details->stamp;
     iter.user_data = file_entry->ptr;
 
     path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), &iter);
-    if (replace_dummy) {
+    if (replaced_dummy) {
         gtk_tree_model_row_changed (GTK_TREE_MODEL (model), path, &iter);
     } else {
         gtk_tree_model_row_inserted (GTK_TREE_MODEL (model), path, &iter);
@@ -769,18 +759,11 @@
 
     if (gof_file_is_folder (file)) {
         file_entry->files = g_sequence_new ((GDestroyNotify)file_entry_free);
-
         add_dummy_row (model, file_entry);
-
         gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (model),
                                               path, &iter);
     }
     gtk_tree_path_free (path);
-
-    //file_entry_free (file_entry);
-    //g_object_unref(file);
-    //#endif
-
     return TRUE;
 }
 
@@ -916,11 +899,7 @@
          */
         add_dummy_row (model, parent_file_entry);
     }
-    /* FIXME we don't need to unref file here - clean up this part */
-    /*if (file_entry->file != NULL) {
-    //log_printf (LOG_LEVEL_UNDEFINED, "remove file %s\n", file_entry->file->name);
-    g_object_unref (file_entry->file);
-    }*/
+    /* We don't need to unref file here - we did not add a ref */
 
     if (file_entry->subdirectory != NULL) {
         g_signal_emit (model,
@@ -937,15 +916,6 @@
     gtk_tree_model_row_deleted (GTK_TREE_MODEL (model), path);
 
     gtk_tree_path_free (path);
-
-    if (parent_file_entry && g_sequence_get_length (parent_file_entry->files) == 0) {
-        parent_iter.stamp = model->details->stamp;
-        parent_iter.user_data = parent_file_entry->ptr;
-        path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), &parent_iter);
-        gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (model),
-                                              path, &parent_iter);
-        gtk_tree_path_free (path);
-    }
 }
 
 void
@@ -1014,19 +984,21 @@
     return (file);
 }
 
-void fm_list_model_get_directory_file (FMListModel *model, GtkTreePath *path, GOFDirectoryAsync **directory, GOFFile **file)
+gboolean
+fm_list_model_get_directory_file (FMListModel *model, GtkTreePath *path, GOFDirectoryAsync **directory, GOFFile **file)
 {
     GtkTreeIter iter;
     FileEntry *file_entry;
 
     *directory = NULL;
     *file = NULL;
-    if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (model), &iter, path)) {
-        return;
+    if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (model), &iter, path)) {;
+        return FALSE;
     }
     file_entry = g_sequence_get (iter.user_data);
     *directory = file_entry->subdirectory;
     *file = file_entry->file;
+    return TRUE;
 }
 
 gboolean
@@ -1047,24 +1019,11 @@
 
     file_entry->subdirectory = gof_directory_async_from_file (file_entry->file);
 
-    /* FIXME not sure the hash lookup is really needed gof_driectory_async_get_for_file is a always a new object */
-    if (g_hash_table_lookup (model->details->directory_reverse_map,
-                             file_entry->subdirectory) != NULL) {
-        g_object_unref (file_entry->subdirectory);
-        g_warning ("Already in directory_reverse_map, failing\n");
-        return FALSE;
-    }
-
     g_hash_table_insert (model->details->directory_reverse_map,
                          file_entry->subdirectory, file_entry->ptr);
     file_entry->reverse_map = g_hash_table_new (g_direct_hash, g_direct_equal);
 
-    /* Return a ref too */
-    //gof_directory_ref (file_entry->subdirectory);
-    *directory = file_entry->subdirectory;
-
-    //load_dir_async (file_entry->subdirectory);
-
+    *directory = file_entry->subdirectory; /* AbstractDirectoryView will maintain another reference on this */
     return TRUE;
 }
 
@@ -1087,8 +1046,6 @@
                          file_entry->subdirectory);
     file_entry->loaded = 0;
 
-    g_message ("remove all children\n"); 	
-    //log_printf (LOG_LEVEL_UNDEFINED, "remove all children %d\n", g_sequence_get_length (file_entry->files));
     /* Remove all children */
     while (g_sequence_get_length (file_entry->files) > 0) {
         child_ptr = g_sequence_get_begin_iter (file_entry->files);
@@ -1107,7 +1064,7 @@
                    list_model_signals[SUBDIRECTORY_UNLOADED], 0,
                    file_entry->subdirectory);
 
-    g_object_unref (file_entry->subdirectory);
+    g_object_unref (file_entry->subdirectory); /* AbstractDirectoryView will also release its reference */
     file_entry->subdirectory = NULL;
     g_assert (g_hash_table_size (file_entry->reverse_map) == 0);
     g_hash_table_destroy (file_entry->reverse_map);
@@ -1146,18 +1103,8 @@
 fm_list_model_dispose (GObject *object)
 {
     FMListModel *model;
-    //int i;
-
     model = FM_LIST_MODEL (object);
 
-    /*if (model->details->columns) {
-      for (i = 0; i < model->details->columns->len; i++) {
-      g_object_unref (model->details->columns->pdata[i]);
-      }
-      g_ptr_array_free (model->details->columns, TRUE);
-      model->details->columns = NULL;
-      }*/
-
     if (model->details->files) {
         g_sequence_free (model->details->files);
         model->details->files = NULL;
@@ -1196,7 +1143,6 @@
     model->details->stamp = g_random_int ();
     model->details->sort_id = FM_LIST_MODEL_FILENAME;
     model->details->order = GTK_SORT_ASCENDING;
-    //model->details->columns = g_ptr_array_new ();
 }
 
 static void
@@ -1222,6 +1168,13 @@
                                                            FALSE,
                                                            G_PARAM_READWRITE));
 
+    g_object_class_install_property (object_class,
+                                     PROP_SIZE,
+                                     g_param_spec_int ("size", "size", "icon size",
+                                                        16,  128,
+                                                        32,
+                                                        G_PARAM_READWRITE));
+
 
     list_model_signals[SUBDIRECTORY_UNLOADED] =
         g_signal_new ("subdirectory_unloaded",
@@ -1272,11 +1225,14 @@
     g_return_if_fail (FM_IS_LIST_MODEL (model));
 
     model->details->has_child = has_child;
-    /*if (model->details->has_child != has_child)
-      {
-      model->details->has_child = has_child;
-    //g_object_notify (G_OBJECT (tree_view), "single-click");
-    }*/
+}
+
+static void
+fm_list_model_set_icon_size (FMListModel *model, gint size)
+{
+    g_return_if_fail (FM_IS_LIST_MODEL (model));
+
+    model->details->icon_size = size;
 }
 
 static void
@@ -1293,6 +1249,10 @@
         g_value_set_boolean (value, model->details->has_child);
         break;
 
+    case PROP_SIZE:
+        g_value_set_int (value, model->details->icon_size);
+        break;
+
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
         break;
@@ -1313,57 +1273,16 @@
         fm_list_model_set_has_child (model, g_value_get_boolean (value));
         break;
 
+    case PROP_SIZE:
+        fm_list_model_set_icon_size (model, g_value_get_int (value));
+        break;
+
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
         break;
     }
 }
 
-
-#if 0
-void
-fm_list_model_subdirectory_done_loading (FMListModel *model, NautilusDirectory *directory)
-{
-    GtkTreeIter iter;
-    GtkTreePath *path;
-    FileEntry *file_entry, *dummy_entry;
-    GSequenceIter *parent_ptr, *dummy_ptr;
-    GSequence *files;
-
-    if (model == NULL || model->details->directory_reverse_map == NULL) {
-        return;
-    }
-    parent_ptr = g_hash_table_lookup (model->details->directory_reverse_map,
-                                      directory);
-    if (parent_ptr == NULL) {
-        return;
-    }
-
-    file_entry = g_sequence_get (parent_ptr);
-    files = file_entry->files;
-
-    /* Only swap loading -> empty if we saw no files yet at "done",
-     * otherwise, toggle loading at first added file to the model.
-     */
-    if (!nautilus_directory_is_not_empty (directory) &&
-        g_sequence_get_length (files) == 1) {
-        dummy_ptr = g_sequence_get_iter_at_pos (file_entry->files, 0);
-        dummy_entry = g_sequence_get (dummy_ptr);
-        if (dummy_entry->file == NULL) {
-            /* was the dummy file */
-            file_entry->loaded = 1;
-
-            iter.stamp = model->details->stamp;
-            iter.user_data = dummy_ptr;
-
-            path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), &iter);
-            gtk_tree_model_row_changed (GTK_TREE_MODEL (model), path, &iter);
-            gtk_tree_path_free (path);
-        }
-    }
-}
-#endif
-
 const gchar *
 fm_list_model_get_string_from_column_id (gint id)
 {
@@ -1376,6 +1295,8 @@
         return "type";
     case FM_LIST_MODEL_MODIFIED:
         return "modified";
+    case FM_LIST_MODEL_PIXBUF:
+        return "pixbuf";
     }
 
     g_return_val_if_reached ("name");
@@ -1390,7 +1311,7 @@
     { "name", FM_LIST_MODEL_FILENAME },
     { "size", FM_LIST_MODEL_SIZE },
     { "type", FM_LIST_MODEL_TYPE },
-    { "modified", FM_LIST_MODEL_MODIFIED },
+    { "modified", FM_LIST_MODEL_MODIFIED},
 };
 
 gint

=== modified file 'libcore/fm-list-model.h'
--- libcore/fm-list-model.h	2014-08-05 22:40:12 +0000
+++ libcore/fm-list-model.h	2014-11-22 15:05:49 +0000
@@ -28,6 +28,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 #include "gof-file.h"
+#include "../src/marlin-enum-types.h"
 #include "pantheon-files-core.h"
 
 #ifndef FM_LIST_MODEL_H
@@ -48,6 +49,7 @@
 enum {
     FM_LIST_MODEL_FILE_COLUMN,
     FM_LIST_MODEL_COLOR,
+    FM_LIST_MODEL_PIXBUF,
     FM_LIST_MODEL_FILENAME,
     FM_LIST_MODEL_SIZE,
     FM_LIST_MODEL_TYPE,
@@ -88,19 +90,11 @@
 
 GOFFile *       fm_list_model_file_for_path (FMListModel *model, GtkTreePath *path);
 GOFFile *       fm_list_model_file_for_iter (FMListModel *model, GtkTreeIter *iter);
-void            fm_list_model_get_directory_file (FMListModel *model, GtkTreePath *path,
+gboolean        fm_list_model_get_directory_file (FMListModel *model, GtkTreePath *path,
                                                   GOFDirectoryAsync **directory, GOFFile **file);
 gboolean        fm_list_model_load_subdirectory (FMListModel *model, GtkTreePath *path, GOFDirectoryAsync **directory);
 void            fm_list_model_unload_subdirectory (FMListModel *model, GtkTreeIter *iter);
 
-/*int               fm_list_model_add_column (FMListModel *model,
-  NautilusColumn *column);*/
-/*int               fm_list_model_get_column_number (FMListModel *model,
-  const char *column_name);*/
-
-/*void              fm_list_model_subdirectory_done_loading (FMListModel       *model,
-  NautilusDirectory *directory);*/
-
 const gchar     *fm_list_model_get_string_from_column_id (gint id);
 gint            fm_list_model_get_column_id_from_string (const gchar *colstr);
 

=== removed file 'libcore/gof-abstract-slot.c'
--- libcore/gof-abstract-slot.c	2011-09-08 02:01:24 +0000
+++ libcore/gof-abstract-slot.c	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2011, Lucas Baudin <[e-mail]>
- *
- * Marlin is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * Marlin is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-/*
- * The AbstractSlot may be used by the plugins. They are needed because GOFWindowSlot
- * are in src (ok, they shouldn't, but it would require much work to move them, FIXME).
- **/
-
-#include "gof-abstract-slot.h"
-
-G_DEFINE_ABSTRACT_TYPE (GOFAbstractSlot, gof_abstract_slot, G_TYPE_OBJECT)
-
-
-/**
- * Add a widget in the top part of the slot.
- **/
-void gof_abstract_slot_add_extra_widget (GOFAbstractSlot* slot, GtkWidget* widget)
-{
-    gtk_box_pack_start(GTK_BOX (slot->extra_location_widgets), widget, FALSE, FALSE, 0);
-    gtk_widget_show_all(slot->extra_location_widgets);
-}
-
-static void
-gof_abstract_slot_class_init (GOFAbstractSlotClass *klass)
-{
-}
-
-static void
-gof_abstract_slot_init (GOFAbstractSlot *self)
-{
-}

=== removed file 'libcore/gof-abstract-slot.h'
--- libcore/gof-abstract-slot.h	2011-09-08 02:01:24 +0000
+++ libcore/gof-abstract-slot.h	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2011, Lucas Baudin <[e-mail]>
- *
- * Marlin is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * Marlin is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef _GOF_ABSTRACT_SLOT_H
-#define _GOF_ABSTRACT_SLOT_H
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define GOF_TYPE_ABSTRACT_SLOT gof_abstract_slot_get_type()
-#define GOF_ABSTRACT_SLOT(obj)  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GOF_TYPE_ABSTRACT_SLOT, GOFAbstractSlot))
-#define GOF_ABSTRACT_SLOT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GOF_TYPE_ABSTRACT_SLOT, GOFAbstractSlotClass))
-#define GOF_IS_ABSTRACT_SLOT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GOF_TYPE_ABSTRACT_SLOT))
-#define GOF_IS_ABSTRACT_SLOT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GOF_TYPE_ABSTRACT_SLOT))
-#define GOF_ABSTRACT_SLOT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GOF_TYPE_ABSTRACT_SLOT, GOFAbstractSlotClass))
-
-typedef struct _GOFAbstractSlot GOFAbstractSlot;
-typedef struct _GOFAbstractSlotClass GOFAbstractSlotClass;
-
-struct _GOFAbstractSlot
-{
-    GObject parent;
-
-    GtkWidget* extra_location_widgets;
-};
-
-struct _GOFAbstractSlotClass
-{
-  GObjectClass parent_class;
-};
-
-GType gof_abstract_slot_get_type (void) G_GNUC_CONST;
-
-GOFAbstractSlot *gof_abstract_slot_new (void);
-void            gof_abstract_slot_add_extra_widget (GOFAbstractSlot* slot, GtkWidget* widget);
-
-G_END_DECLS
-
-#endif /* _GOF_ABSTRACT_SLOT_H */

=== modified file 'libcore/gof-directory-async.vala'
--- libcore/gof-directory-async.vala	2014-10-29 15:02:53 +0000
+++ libcore/gof-directory-async.vala	2014-11-22 15:05:49 +0000
@@ -23,6 +23,7 @@
 public class GOF.Directory.Async : Object {
     public GLib.File location;
     public GOF.File file;
+    public int icon_size = 32;
 
     /* we're looking for particular path keywords like *\/icons* .icons ... */
     public bool uri_contain_keypath_icons;
@@ -84,10 +85,9 @@
 
         this.add_toggle_ref ((ToggleNotify) toggle_ref_notify);
         this.unref ();
-        debug ("dir %s ref_count %u", this.file.uri, this.ref_count);
 
+        debug ("created dir %s ref_count %u", this.file.uri, this.ref_count);
         file_hash = new HashTable<GLib.File,GOF.File> (GLib.File.hash, GLib.File.equal);
-
         uri_contain_keypath_icons = "/icons" in file.uri || "/.icons" in file.uri;
     }
 
@@ -101,6 +101,7 @@
                 dir.remove_dir_from_cache ();
 
             dir.remove_toggle_ref ((ToggleNotify) toggle_ref_notify);
+        } else {
         }
     }
 
@@ -114,7 +115,7 @@
         }
     }
 
-    private void clear_directory_info () {
+    public void clear_directory_info () {
         if (idle_consume_changes_id != 0) {
             Source.remove ((uint) idle_consume_changes_id);
             idle_consume_changes_id = 0;
@@ -156,11 +157,13 @@
             bool show_hidden = Preferences.get_default ().pref_show_hidden_files;
 
             foreach (GOF.File gof in file_hash.get_values ()) {
-                if (gof.info != null && (!gof.is_hidden || show_hidden)) {
-                    if (track_longest_name)
-                        update_longest_file_name (gof);
+                if (gof != null) {
+                    if (gof.info != null && (!gof.is_hidden || show_hidden)) {
+                        if (track_longest_name)
+                            update_longest_file_name (gof);
 
-                    file_loaded (gof);
+                        file_loaded (gof);
+                    }
                 }
             }
 
@@ -187,8 +190,8 @@
                 }
             }
         }
-
-        done_loading ();
+        if (!cancellable.is_cancelled ())
+            done_loading ();
     }
 
     public void update_desktop_files () {
@@ -275,17 +278,21 @@
                 file.is_mounted = false;
         }
 
-        //TODO send err code
-        done_loading ();
+        if (!cancellable.is_cancelled ())
+            done_loading ();
     }
 
-    public GOF.File? file_hash_lookup_location (GLib.File location) {
-        GOF.File? result = file_hash.lookup (location);
-        return result;
+    public GOF.File? file_hash_lookup_location (GLib.File? location) {
+        if (location != null && location is GLib.File) {
+            GOF.File? result = file_hash.lookup (location);
+            return result;
+        } else {
+            return null;
+        }
     }
 
     public void file_hash_add_file (GOF.File gof) {
-            file_hash.insert (gof.location, gof);
+        file_hash.insert (gof.location, gof);
     }
 
     /* TODO move this to GOF.File */
@@ -326,8 +333,9 @@
 
         gof.update ();
 
-        if (gof.info != null && (!gof.is_hidden || Preferences.get_default ().pref_show_hidden_files))
+        if (gof.info != null && (!gof.is_hidden || Preferences.get_default ().pref_show_hidden_files)) {
             file_added (gof);
+        }
 
         if (!gof.is_hidden && gof.is_folder ()) {
             /* add to sorted_dirs */
@@ -523,7 +531,7 @@
             dir.file_hash.remove (gof.location);
     }
 
-    public static Async? cache_lookup (GLib.File *file) {
+    public static Async? cache_lookup (GLib.File? file) {
         Async? cached_dir = null;
 
         if (directory_cache == null) {
@@ -532,6 +540,9 @@
             return null;
         }
 
+        if (file == null)
+            return null;
+
         dir_cache_lock.@lock ();
         cached_dir = directory_cache.lookup (file);
 
@@ -575,6 +586,14 @@
         return file.directory;
     }
 
+    public bool is_loading () {
+        return this.state == State.LOADING;
+    }
+
+    public bool is_loaded () {
+        return this.state == State.LOADED;
+    }
+
     public bool is_empty () {
         uint file_hash_count = 0;
 
@@ -605,7 +624,6 @@
     }
 
     /* Thumbnail loading */
-    public int icon_size;
     private uint timeout_thumbsq = 0;
     private bool thumbs_stop;
     private bool thumbs_thread_running;
@@ -619,7 +637,6 @@
             this.unref ();
             return null;
         }
-
         thumbs_thread_running = true;
         thumbs_stop = false;
 
@@ -666,16 +683,21 @@
     }
 
     public void queue_load_thumbnails (int size) {
+        icon_size = size;
+        if (this.state == State.LOADING)
+            return;
+
         /* Do not interrupt loading thumbs at same size for this folder */
-        if (icon_size == size && thumbs_thread_running)
+        if ((icon_size == size) && thumbs_thread_running)
             return;
 
         icon_size = size;
         thumbs_stop = true;
 
         /* Wait for thumbnail thread to stop then start a new thread */
-        if (timeout_thumbsq == 0) {
-            timeout_thumbsq = Timeout.add (40, queue_thumbs_timeout_cb);
-        }
+        if (timeout_thumbsq != 0)
+            GLib.Source.remove (timeout_thumbsq);
+
+        timeout_thumbsq = Timeout.add (40, queue_thumbs_timeout_cb);
     }
 }

=== modified file 'libcore/gof-file.c'
--- libcore/gof-file.c	2014-10-16 16:26:45 +0000
+++ libcore/gof-file.c	2014-11-22 15:05:49 +0000
@@ -111,6 +111,7 @@
         file->directory = g_object_ref (dir);
     else
         file->directory = NULL;
+
     file->basename = g_file_get_basename (file->location);
     //file->parent_dir = g_file_enumerator_get_container (enumerator);
 
@@ -137,7 +138,7 @@
 void
 gof_file_icon_changed (GOFFile *file)
 {
-    GOFDirectoryAsync *dir;
+    GOFDirectoryAsync *dir = NULL;
 
     /* get the DirectoryAsync associated to the file */
     dir = gof_directory_async_cache_lookup (file->directory);
@@ -320,9 +321,10 @@
 
     gof_file_update_formated_type (file);
     /* update icon */
-    //g_message ("%s build new icon", G_STRFUNC);
     file->icon = g_content_type_get_icon (ftype);
-    gof_file_update_icon_internal (file, file->pix_size);
+    if (file->pix_size > 1)
+        gof_file_update_icon_internal (file, file->pix_size);
+
     gof_file_icon_changed (file);
 }
 
@@ -358,7 +360,6 @@
 
     if (file->file_type == G_FILE_TYPE_SHORTCUT || file->file_type == G_FILE_TYPE_MOUNTABLE) {
         const char *target_uri =  g_file_info_get_attribute_string (file->info, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI);
-        /*g_message ("%s target uri: %s", G_STRFUNC, target_uri);*/
         if (target_uri != NULL) {
             file->target_location = g_file_new_for_uri (target_uri);
             gof_file_target_location_update (file);
@@ -471,7 +472,6 @@
             file->icon = g_content_type_get_icon (ftype);
     }
 
-
     file->utf8_collation_key = g_utf8_collate_key_for_filename  (gof_file_get_display_name (file), -1);
     /* mark the thumb flags as state none, we'll load the thumbs once the directory
      * would be loaded on a thread */
@@ -504,7 +504,6 @@
     if (g_file_info_has_attribute (file->info, G_FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT)) {
         file->can_unmount = g_file_info_get_attribute_boolean (file->info, G_FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT);
 	}
-
     gof_file_update_trash_info (file);
     gof_file_update_emblem (file);
 }
@@ -512,6 +511,8 @@
 static MarlinIconInfo *
 gof_file_get_special_icon (GOFFile *file, int size, GOFFileIconFlags flags)
 {
+    g_return_val_if_fail (size >= 1, NULL);
+
     if (file->custom_icon_name != NULL) {
         if (g_path_is_absolute (file->custom_icon_name))
             return marlin_icon_info_lookup_from_path (file->custom_icon_name, size);
@@ -540,6 +541,7 @@
     GIcon *gicon;
 
     g_return_val_if_fail (file, NULL);
+    g_return_val_if_fail (size >= 1, NULL);
 
     icon = gof_file_get_special_icon (file, size, flags);
     if (icon != NULL && !marlin_icon_info_is_fallback (icon))
@@ -574,6 +576,7 @@
 {
     GdkPixbuf *pix;
     MarlinIconInfo *temp_nicon;
+    g_return_val_if_fail (size >= 1, NULL);
 
     pix = marlin_icon_info_get_pixbuf_force_size (nicon, size, force_size);
     if (pix == NULL) {
@@ -592,7 +595,7 @@
 {
     MarlinIconInfo *nicon;
     GdkPixbuf *pix;
-
+    g_return_val_if_fail (size >= 1, NULL);
     nicon = gof_file_get_icon (file, size, flags);
     //nicon = gof_file_get_icon (file, size, 0);
 
@@ -601,8 +604,6 @@
     if (nicon)
         g_object_unref (nicon);
     //pix = gdk_pixbuf_new_from_file_at_size ("/usr/share/icons/hicolor/scalable/apps/marlin.svg", size, size, NULL);
-    /*if (pix && nicon)
-        g_message ("%s ref count %u %u", G_STRFUNC, G_OBJECT (nicon)->ref_count, G_OBJECT (pix)->ref_count);*/
 
     return pix;
 }
@@ -610,8 +611,7 @@
 static void
 gof_file_update_icon_internal (GOFFile *file, gint size)
 {
-    /*g_message ("%s %s %d", G_STRFUNC, file->uri, file->flags);*/
-
+    g_return_if_fail (size >= 1);
     /* destroy pixbuff if already present */
     _g_object_unref0 (file->pix);
     //g_clear_object (&file->pix);
@@ -620,17 +620,17 @@
     file->pix_size = size;
 }
 
-/* This function is used by the icon renderer and only by it.
+/* This function is used by the icon renderer and fm-list-model.
  * Store the pixbuf and update it only for size change.
  */
 void gof_file_update_icon (GOFFile *file, gint size)
 {
-    if (size <=0)
+    if (size <= 1)
         return;
+
     if (!(file->pix == NULL || file->pix_size != size))
         return;
 
-    //g_message ("%s %s %d %d", G_STRFUNC, file->uri, file->flags, size);
     gof_file_update_icon_internal (file, size);
 }
 
@@ -650,8 +650,10 @@
         g_list_free (file->emblems_list);
         file->emblems_list = NULL;
     }
+
     if(plugins != NULL)
         marlin_plugin_manager_update_file_info (plugins, file);
+
     if(gof_file_is_symlink(file) || (file->is_desktop && file->target_gof))
     {
         gof_file_add_emblem(file, "emblem-symbolic-link");
@@ -668,7 +670,6 @@
         else
             gof_file_add_emblem (file, "emblem-unreadable");
     }
-
     /* TODO update signal on real change */
     //g_warning ("update emblem %s", file.uri);
     if (file->emblems_list != NULL)
@@ -750,7 +751,6 @@
         }
         print_error (err);
     }
-
     return info;
 }
 
@@ -784,10 +784,15 @@
     gchar    *base_name;
     gchar    *md5_hash;
 
+    /* Silently ignore invalid requests */
+    if (file->pix_size <= 1)
+        return;
+
     if (gof_file_get_thumbnail_path (file) == NULL) {
         /* get the thumbnail path from md5 filename */
         md5_hash = g_compute_checksum_for_string (G_CHECKSUM_MD5, file->uri, -1);
         base_name = g_strdup_printf ("%s.png", md5_hash);
+        /* TODO Use $XDG_CACHE_HOME specified thumbnail directory instead of hard coding - when Tumbler does*/
         file->thumbnail_path = g_build_filename (g_get_home_dir (), ".thumbnails",
                                                  "normal", base_name, NULL);
         g_free (base_name);
@@ -857,6 +862,8 @@
 
     file->sort_column_id = FM_LIST_MODEL_FILENAME;
     file->sort_order = GTK_SORT_ASCENDING;
+
+    file->is_expanded = FALSE;
 }
 
 static void gof_file_finalize (GObject* obj) {
@@ -1332,11 +1339,14 @@
 
     if (file->target_gof)
         return gof_file_is_executable (file->target_gof);
-    if (file->info == NULL)
+    if (file->info == NULL) {
         return FALSE;
+    }
 
-    if (gof_file_is_desktop_file (file))
+    if (gof_file_is_desktop_file (file)) {
         return TRUE;
+    }
+
     if (g_file_info_get_attribute_boolean (file->info, G_FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE))
     {
         /* get the content type of the file */
@@ -1353,7 +1363,8 @@
              * g_content_type_can_be_executable() for unix because it also returns
              * true for "text/plain" and we don't want that */
             if (g_content_type_is_a (content_type, "application/x-executable")
-                || g_content_type_is_a (content_type, "application/x-shellscript"))
+                || g_content_type_is_a (content_type, "application/x-shellscript")
+                || g_content_type_is_a (content_type, "application/octet-stream"))
             {
                 can_execute = TRUE;
             }
@@ -1411,6 +1422,12 @@
     return _g_object_ref0 (cached_file);
 }
 
+void
+gof_file_set_expanded (GOFFile *file, gboolean expanded) {
+    g_return_if_fail (file != NULL || !file->is_directory);
+    file->is_expanded = expanded;
+}
+
 GOFFile*
 gof_file_get (GFile *location)
 {
@@ -1418,6 +1435,8 @@
     GOFFile *file = NULL;
     GOFDirectoryAsync *dir = NULL;
 
+g_return_val_if_fail (location != NULL && G_IS_FILE (location), NULL);
+ 
     if ((parent = g_file_get_parent (location)) != NULL) {
         dir = gof_directory_async_cache_lookup (parent);
         if (dir != NULL) {
@@ -1639,7 +1658,7 @@
             //printf ("%s actions MOVE %d COPY %d suggested %d\n", G_STRFUNC, GDK_ACTION_MOVE, GDK_ACTION_COPY, suggested_action);
         }
     }
-    else if (gof_file_is_executable (file))
+    else if (!gof_file_is_folder (file) && gof_file_is_executable (file))
     {
         /* determine the possible actions */
         actions = gdk_drag_context_get_actions (context) & (GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK | GDK_ACTION_PRIVATE);
@@ -1689,7 +1708,6 @@
     }
 
     if (error != NULL) {
-        g_message ("Could not start application on terminal: %s", error->message);
         g_error_free (error);
     }
 
@@ -1881,7 +1899,7 @@
 }
 
 gboolean
-gof_files_launch_with (GList *files, GdkScreen *screen, GAppInfo* app_info)
+gof_file_launch_files (GList *files, GdkScreen *screen, GAppInfo* app_info)
 {
     GdkAppLaunchContext *context;
     gboolean             succeed;
@@ -2087,11 +2105,14 @@
     //marlin_file_changes_queue_file_added (new_file);
     if (error == NULL)
         gof_file_update_existing (op->file, new_file);
-    /*else
-        marlin_dialogs_show_error (NULL, error, "Failed to rename %s", op->file->name);*/
+    else
+        marlin_dialogs_show_error (NULL,
+                                   error,
+                                   "Failed to rename %s",
+                                   g_file_get_parse_name (op->file->location));
 
     //g_warning ("%s %u", G_STRFUNC, G_OBJECT (op->file)->ref_count);
-    gof_file_operation_complete (op, NULL, error);
+    gof_file_operation_complete (op, new_file, error);
     if (new_file != NULL) {
         g_object_unref (new_file);
     } else {
@@ -2111,7 +2132,6 @@
     //char *new_file_name;
     //gboolean success, name_changed;
     GError *error;
-
     //g_warning ("%s %u", G_STRFUNC, G_OBJECT (file)->ref_count);
     g_return_if_fail (GOF_IS_FILE (file));
     g_return_if_fail (new_name != NULL);

=== modified file 'libcore/gof-file.h'
--- libcore/gof-file.h	2013-08-10 20:20:23 +0000
+++ libcore/gof-file.h	2014-11-22 15:05:49 +0000
@@ -84,6 +84,7 @@
     gboolean        is_directory;
     gboolean        is_hidden;
     gboolean        is_desktop;
+    gboolean        is_expanded;
     GIcon           *icon;
     gchar           *custom_icon_name;
     GdkPixbuf       *pix;
@@ -200,6 +201,7 @@
 gchar           *gof_file_get_formated_time (GOFFile *file, const char *attr);
 gboolean        gof_file_is_symlink (GOFFile *file);
 gboolean        gof_file_is_desktop_file (GOFFile *file);
+void            gof_file_set_expanded (GOFFile *file, gboolean expanded);
 gchar           *gof_file_list_to_string (GList *list, gsize *len);
 
 gboolean        gof_file_same_filesystem (GOFFile *file_a, GOFFile *file_b);
@@ -208,10 +210,9 @@
                                        GdkDragContext   *context,
                                        GdkDragAction    *suggested_action_return);
 void            gof_file_open_single (GOFFile *file, GdkScreen *screen, GAppInfo *app_info);
-//gboolean        gof_file_launch_with (GOFFile  *file, GdkScreen *screen, GAppInfo* app_info);
-gboolean        gof_files_launch_with (GList *files, GdkScreen *screen, GAppInfo* app_info);
+gboolean        gof_file_launch_files (GList *files, GdkScreen *screen, GAppInfo* app_info);
+gboolean        gof_file_launch (GOFFile  *file, GdkScreen *screen, GAppInfo *app_info);
 gboolean        gof_file_execute (GOFFile *file, GdkScreen *screen, GList *file_list, GError **error);
-gboolean        gof_file_launch (GOFFile  *file, GdkScreen *screen, GAppInfo *app_info);
 GAppInfo        *gof_file_get_default_handler (GOFFile *file);
 
 void            gof_file_icon_changed (GOFFile *file);

=== modified file 'libcore/marlin-file-changes-queue.c'
--- libcore/marlin-file-changes-queue.c	2014-08-05 22:40:12 +0000
+++ libcore/marlin-file-changes-queue.c	2014-11-22 15:05:49 +0000
@@ -86,7 +86,6 @@
 {
     MarlinFileChange *new_item;
     MarlinFileChangesQueue *queue;
-
     queue = marlin_file_changes_queue_get();
 
     new_item = g_new0 (MarlinFileChange, 1);
@@ -146,7 +145,6 @@
     MarlinFileChange *result;
 
     g_assert (queue != NULL);
-
     /* dequeue the tail item while locking down the list */
     g_mutex_lock (&queue->mutex);
 
@@ -205,7 +203,6 @@
     MarlinFileChangesQueue *queue;
     gboolean flush_needed;
 
-
     additions = NULL;
     changes = NULL;
     deletions = NULL;

=== modified file 'libcore/marlin-file-operations.c'
--- libcore/marlin-file-operations.c	2014-09-06 06:20:16 +0000
+++ libcore/marlin-file-operations.c	2014-11-22 15:05:49 +0000
@@ -2801,7 +2801,6 @@
     int response;
 
     dirs = g_queue_new ();
-
 retry:
     error = NULL;
     info = g_file_query_info (file,
@@ -3605,7 +3604,6 @@
         }
         return CREATE_DEST_DIR_FAILED;
     }
-    marlin_file_changes_queue_file_added (*dest);
 
     // Start UNDO-REDO
     marlin_undo_manager_data_add_origin_target_pair (job->undo_redo_data, src, *dest);
@@ -4363,7 +4361,7 @@
         if (copy_job->is_move) {
             marlin_file_changes_queue_file_moved (src, dest);
         } else {
-            marlin_file_changes_queue_file_added (dest);
+           marlin_file_changes_queue_file_added (dest);
         }
 
         /* If copying a trusted desktop file to the desktop,
@@ -4573,8 +4571,8 @@
             g_error_free (error);
             goto out;
         }
-        primary = f (_("Error while copying \"%B\"."), src);
-        secondary = f (_("There was an error copying the file into %F."), dest_dir);
+        primary = f (_("There was an Error while copying \"%s\"."), g_file_get_uri (src));
+        secondary = f (_("There was an error copying the file into %s."), g_file_get_uri (dest_dir));
         details = error->message;
 
         response = run_warning (job,
@@ -5087,7 +5085,7 @@
         if (job->skip_all_error) {
             goto out;
         }
-        primary = f (_("Error while moving \"%B\"."), src);
+        primary = f (_("Error while moving \"%F\"."), src);
         secondary = f (_("There was an error moving the file into %F."), dest_dir);
         details = error->message;
 
@@ -5352,7 +5350,6 @@
     job->debuting_files = g_hash_table_new_full (g_file_hash, (GEqualFunc)g_file_equal, g_object_unref, NULL);
 
     inhibit_power_manager ((CommonJob *)job, _("Moving Files"));
-
     // Start UNDO-REDO
     if (!marlin_undo_manager_is_undo_redo (marlin_undo_manager_instance())) {
         if (g_file_has_uri_scheme (g_list_first(files)->data, "trash")) {
@@ -5476,8 +5473,7 @@
         if (debuting_files) {
             g_hash_table_replace (debuting_files, g_object_ref (dest), GINT_TO_POINTER (TRUE));
         }
-
-        marlin_file_changes_queue_file_added (dest);
+       marlin_file_changes_queue_file_added (dest);
         /*if (position) {
             //marlin_file_changes_queue_schedule_position_set (dest, *position, common->screen_num);
         } else {
@@ -6210,7 +6206,7 @@
 
     if (res) {
         job->created_file = g_object_ref (dest);
-        marlin_file_changes_queue_file_added (dest);
+       marlin_file_changes_queue_file_added (dest);
         /*if (job->has_position) {
             //marlin_file_changes_queue_schedule_position_set (dest, job->position, common->screen_num);
         } else {

=== modified file 'libcore/marlin-icon-info.c'
--- libcore/marlin-icon-info.c	2014-07-09 10:25:45 +0000
+++ libcore/marlin-icon-info.c	2014-11-22 15:05:49 +0000
@@ -378,7 +378,6 @@
     GdkPixbuf *pixbuf;
     char *str_icon = g_icon_to_string (icon);
 
-    g_message ("%s stream %s\n", G_STRFUNC, str_icon);
     pixbuf = gdk_pixbuf_new_from_file (str_icon, NULL);
 
     if (pixbuf != NULL) {
@@ -404,6 +403,8 @@
     //GdkPixbuf *scaled_pixbuf = NULL;
 
     g_return_val_if_fail (icon && G_IS_ICON (icon), NULL);
+    size = MAX (1, size);
+
     if (G_IS_LOADABLE_ICON (icon)) {
         LoadableIconKey lookup_key;
         LoadableIconKey *key;
@@ -456,12 +457,14 @@
         char *str_icon = g_icon_to_string (icon);
         gint width, height;
 
-        if (gdk_pixbuf_get_file_info (str_icon, &width, &height) != NULL)
+        gdk_pixbuf_get_file_info (str_icon, &width, &height);
+        if ((width >= 1 || width == -1) && (height >= 1 || height == -1))
             pixbuf = gdk_pixbuf_new_from_file_at_size (str_icon, MIN (width, size), MIN (height, size), NULL);
+
         /*icon_info = g_object_new (MARLIN_TYPE_ICON_INFO, NULL);
         icon_info->pixbuf = pixbuf;*/
-        icon_info = marlin_icon_info_new_for_pixbuf (pixbuf);
         if (pixbuf != NULL) {
+            icon_info = marlin_icon_info_new_for_pixbuf (pixbuf);
             key = loadable_icon_key_new (icon, size);
             g_hash_table_insert (loadable_icon_cache, key, g_object_ref (icon_info));
             g_free (str_icon);
@@ -555,7 +558,7 @@
 {
     GIcon *icon;
     MarlinIconInfo *info;
-
+    g_return_val_if_fail (size >= 1, NULL);
     icon = g_themed_icon_new (name);
     info = marlin_icon_info_lookup (icon, size);
     g_object_unref (icon);
@@ -570,6 +573,7 @@
     GIcon *icon;
     MarlinIconInfo *info;
 
+    g_return_val_if_fail (size >= 1, NULL);
     icon_file = g_file_new_for_path (path);
     icon = g_file_icon_new (icon_file);
     info = marlin_icon_info_lookup (icon, size);
@@ -745,4 +749,4 @@
     g_object_unref (icon_file);
     g_object_unref (icon);
     loadable_icon_key_free (lookup_key);
-}
\ No newline at end of file
+}

=== modified file 'libcore/pantheon-files-core-C.vapi'
--- libcore/pantheon-files-core-C.vapi	2014-10-18 21:27:05 +0000
+++ libcore/pantheon-files-core-C.vapi	2014-11-22 15:05:49 +0000
@@ -14,20 +14,62 @@
 {
     public class ListModel : GLib.Object, Gtk.TreeModel, Gtk.TreeDragDest, Gtk.TreeSortable
     {
+        [CCode (cprefix = "FM_LIST_MODEL_", cheader_filename = "fm-list-model.h")]
+        public enum ColumnID {
+            FILE_COLUMN,
+            COLOR,
+            PIXBUF,
+            FILENAME,
+            SIZE,
+            TYPE,
+            MODIFIED,
+            NUM_COLUMNS
+        }
+
         public bool load_subdirectory(Gtk.TreePath path, out GOF.Directory.Async dir);
+        public bool unload_subdirectory(Gtk.TreeIter iter);
         public void add_file(GOF.File file, GOF.Directory.Async dir);
-        public GOF.File file_for_path(Gtk.TreePath path);
+        public void remove_file (GOF.File file, GOF.Directory.Async dir);
+        public void file_changed (GOF.File file, GOF.Directory.Async dir);
+        public unowned GOF.File file_for_path(Gtk.TreePath path);
+        public static GLib.Type get_type ();
+        public bool get_first_iter_for_file (GOF.File file, out Gtk.TreeIter iter);
+        public bool get_tree_iter_from_file (GOF.File file, GOF.Directory.Async directory, out Gtk.TreeIter iter);
+        public bool get_directory_file (Gtk.TreePath path, out unowned GOF.Directory.Async directory, out unowned GOF.File file);
+        public GOF.File file_for_iter (Gtk.TreeIter iter);
+        public void clear ();
+        public signal void subdirectory_unloaded (GOF.Directory.Async directory);
     }
 }
 
-[CCode (cprefix = "MarlinFileOperations", lower_case_cprefix = "marlin_file_operations_", cheader_filename = "marlin-file-operations.h")]
-namespace Marlin.FileOperations {
-    static bool has_trash_files (GLib.Mount mount);
-    static int prompt_empty_trash (Gtk.Window? parent_window);
-    static GLib.List<GLib.File> get_trash_dirs_for_mount (GLib.Mount mount);
-    static void empty_trash_dirs (Gtk.Window? parent_window, owned GLib.List<GLib.File> dirs);
-    static void empty_trash (Gtk.Widget? widget);
-    static void copy_move (GLib.List<GLib.File> files, void* relative_item_points, GLib.File target_dir, Gdk.DragAction copy_action, Gtk.Widget? parent_view = null, void* done_callback = null, void* done_callback_data = null);
+
+namespace Marlin {
+    [CCode (cprefix = "MarlinFileOperations", lower_case_cprefix = "marlin_file_operations_", cheader_filename = "marlin-file-operations.h")]
+    namespace FileOperations {
+        static void new_folder(Gtk.Widget? parent_view, Gdk.Point? target_point, GLib.File file, Marlin.CreateCallback? create_callback = null, void* data_callback = null);
+        static void new_folder_with_name(Gtk.Widget? parent_view, Gdk.Point? target_point, GLib.File file, string name, Marlin.CreateCallback? create_callback = null, void* data_callback = null);
+        static void new_folder_with_name_recursive(Gtk.Widget? parent_view, Gdk.Point? target_point, GLib.File file, string name, Marlin.CreateCallback? create_callback = null, void* data_callback = null);
+        static void mount_volume (Gtk.Window? parent_window, GLib.Volume volume, bool allow_autorun);
+        static void mount_volume_full (Gtk.Window? parent_window, GLib.Volume volume, bool allow_autorun, Marlin.MountCallback? mount_callback, GLib.Object? callback_data_object);
+        static void unmount_mount_full (Gtk.Window? parent_window, GLib.Mount mount, bool eject, bool check_trash, Marlin.UnmountCallback? unmount_callback, void* callback_data);
+        static void trash_or_delete (GLib.List<GLib.File> locations, Gtk.Window window, void* callback, void* callback_data);
+        static void @delete (GLib.List<GLib.File> locations, Gtk.Window window, void* callback, void* callback_data);
+        static bool has_trash_files (GLib.Mount mount);
+        static int prompt_empty_trash (Gtk.Window? parent_window);
+        static GLib.List<GLib.File> get_trash_dirs_for_mount (GLib.Mount mount);
+        static void empty_trash_dirs (Gtk.Window? parent_window, owned GLib.List<GLib.File> dirs);
+        static void empty_trash (Gtk.Widget? widget);
+        static void copy_move (GLib.List<GLib.File> files, void* relative_item_points, GLib.File target_dir, Gdk.DragAction copy_action, Gtk.Widget? parent_view = null, void* done_callback = null, void* done_callback_data = null);
+        static void new_file (Gtk.Widget parent_view, Gdk.Point? target_point, string parent_dir, string? target_filename, string? initial_contents, int length, Marlin.CreateCallback? create_callback = null, void* done_callback_data = null);
+        static void new_file_from_template (Gtk.Widget parent_view, Gdk.Point? target_point, GLib.File parent_dir, string? target_filename, GLib.File template, Marlin.CreateCallback? create_callback = null, void* done_callback_data = null);
+    }
+    [CCode (cheader_filename = "marlin-file-operations.h", has_target = false)]
+    public delegate void MountCallback (GLib.Volume volume, void* callback_data_object);
+    [CCode (cheader_filename = "marlin-file-operations.h", has_target = false)]
+    public delegate void UnmountCallback (void* callback_data);
+    [CCode (cheader_filename = "marlin-file-operations.h", has_target = false)]
+    public delegate void CreateCallback (GLib.File new_file, void* callback_data);
+
 }
 
 [CCode (cprefix = "EelGtk", lower_case_cprefix = "eel_gtk_window_", cheader_filename = "eel-gtk-extensions.h")]
@@ -36,6 +78,11 @@
     public void set_initial_geometry_from_string (Gtk.Window win, string geometry, uint w, uint h, bool ignore_position, int left_offset, int top_offset);
 }
 
+[CCode (cprefix = "EelGtk", lower_case_cprefix = "eel_gtk_widget_", cheader_filename = "eel-gtk-extensions.h")]
+namespace EelGtk.Widget {
+    public Gdk.Screen get_screen ();
+}
+
 [CCode (cprefix = "EelGFile", lower_case_cprefix = "eel_g_file_", cheader_filename = "eel-gio-extensions.h")]
 namespace EelGFile {
     public static GLib.List<GLib.File> list_new_from_string (string filelist);
@@ -46,6 +93,7 @@
     public void pop_up_context_menu (Gtk.Menu menu, int16 offset_x, int16 offset_y, Gdk.EventButton event);
     public void gtk_widget_set_shown (Gtk.Widget widget, bool shown);
     public Gtk.MenuItem gtk_menu_append_separator (Gtk.Menu menu);
+    public unowned Gdk.Screen gtk_widget_get_screen (Gtk.Widget? widget);
     public const int16 DEFAULT_POPUP_MENU_DISPLACEMENT;
 }
 
@@ -65,9 +113,16 @@
     public string format_size (uint64 size);
 }
 
+[CCode (cprefix = "Eel", lower_case_cprefix = "eel_", cheader_filename = "eel-string.h")]
+namespace Eel {
+    public string? str_double_underscores (string? str);
+}
+
 [CCode (cprefix = "EelPango", lower_case_cprefix = "eel_pango_", cheader_filename = "eel-pango-extensions.h")]
 namespace EelPango {
     public unowned Pango.AttrList attr_list_small();
+    public unowned Pango.AttrList attr_list_small_italic();
+    public unowned Pango.AttrList attr_list_italic();
     public unowned Pango.AttrList attr_list_big();
 }
 
@@ -82,6 +137,8 @@
         public Gdk.Pixbuf get_pixbuf_nodefault();
         public Gdk.Pixbuf get_pixbuf_at_size(int size);
         public static void clear_caches ();
+        public static void remove_cache (string path, int size);
+        public static void infos_caches ();
     }
     [CCode (cheader_filename = "marlin-trash-monitor.h")]
     public abstract class TrashMonitor : GLib.Object
@@ -152,7 +209,7 @@
     public void changes_consume_changes (bool consume_all);
 }
 
-[CCode (cprefix = "GOF", lower_case_cprefix = "gof_")]
+[CCode (cprefix = "GOF", lower_case_cprefix = "gof_", ref_function = "gof_file_ref", unref_function = "gof_file_unref")]
 namespace GOF {
 
     [CCode (cheader_filename = "gof-file.h")]
@@ -171,9 +228,11 @@
         public const string GIO_DEFAULT_ATTRIBUTES;
 
         public File(GLib.File location, GLib.File? dir);
-        public static GOF.File get(GLib.File location);
+        public static GOF.File @get(GLib.File location);
         public static GOF.File get_by_uri (string uri);
         public static File cache_lookup (GLib.File file);
+        public static bool launch_files (GLib.List<GOF.File> files, Gdk.Screen screen, GLib.AppInfo app);
+        public static void list_free (GLib.List<GOF.File> files);
 
         public void remove_from_caches ();
         public bool is_gone;
@@ -192,14 +251,19 @@
         public string tagstype;
         public Gdk.Pixbuf pix;
         public int pix_size;
+        public int sort_column_id;
+        public Gtk.SortType sort_order;
 
         public GLib.FileType file_type;
         public bool is_hidden;
         public bool is_directory;
         public bool is_desktop;
+        public void set_expanded (bool expanded);
         public bool is_folder();
         public bool is_symlink();
         public bool is_trashed();
+        public bool is_writable ();
+        public bool is_executable ();
         public bool link_known_target;
         public uint flags;
 
@@ -223,6 +287,7 @@
         public bool has_permissions;
         public uint32 permissions;
 
+        public void open_single (Gdk.Screen screen, GLib.AppInfo app_info);
         public void update ();
         public void update_type ();
         public void update_icon (int size);
@@ -250,18 +315,23 @@
         public unowned string get_display_target_uri ();
 
         public GLib.AppInfo get_default_handler ();
+
+        public static string list_to_string (GLib.List<GOF.File> list, out long len);
+
+        public bool execute (Gdk.Screen screen, GLib.List<GLib.File>? files, out GLib.Error error);
+        public void rename (string new_name, GOF.FileOperationCallback callback);
+
+        public GOF.File @ref ();
+        public GOF.File unref ();
     }
 
+    public delegate void FileOperationCallback (GOF.File file, GLib.File? result_location, GLib.Error? error, void* callback_data);
+
     [CCode (cheader_filename = "gof-file.h")]
     public enum FileIconFlags
     {
         NONE,
         USE_THUMBNAILS
     }
-
-    [CCode (cheader_filename = "gof-abstract-slot.h")]
-    public class AbstractSlot : GLib.Object {
-        public void add_extra_widget(Gtk.Widget widget);
-    }
 }
 

=== modified file 'libwidgets/Animations.vala'
--- libwidgets/Animations.vala	2014-05-05 06:19:28 +0000
+++ libwidgets/Animations.vala	2014-11-22 15:05:49 +0000
@@ -1,6 +1,12 @@
 namespace Marlin.Animation {
 
+    private static uint timeout_source_id = 0;
     public static void smooth_adjustment_to (Gtk.Adjustment adj, int final) {
+        if (timeout_source_id > 0) {
+            GLib.Source.remove (timeout_source_id);
+            timeout_source_id = 0;
+        }
+
         var initial = adj.value;
         var to_do = final - initial;
 
@@ -11,14 +17,17 @@
         var newvalue = 0;
         var old_adj_value = adj.value;
 
-        Timeout.add (1000 / 60, () => {
-            /* If the user moves it at the same time, just stop the animation */
-            if(old_adj_value != adj.value)
+        timeout_source_id = Timeout.add (1000 / 60, () => {
+            /* If the user move it at the same time, just stop the animation */
+            if (old_adj_value != adj.value) {
+                timeout_source_id = 0;
                 return false;
+            }
 
             if (newvalue >= to_do - 10) {
                 /* to be sure that there is not a little problem */
                 adj.value = final;
+                timeout_source_id = 0;
                 return false;
             }
 

=== modified file 'libwidgets/BreadcrumbsElements.vala'
--- libwidgets/BreadcrumbsElements.vala	2014-05-24 03:48:19 +0000
+++ libwidgets/BreadcrumbsElements.vala	2014-11-22 15:05:49 +0000
@@ -188,4 +188,4 @@
 
         return x;
     }
-}
\ No newline at end of file
+}

=== modified file 'libwidgets/LocationBar.vala'
--- libwidgets/LocationBar.vala	2014-07-30 02:20:58 +0000
+++ libwidgets/LocationBar.vala	2014-11-22 15:05:49 +0000
@@ -185,14 +185,13 @@
                 escape ();
                 return true;
         }
-        
         return base.key_press_event (event);
     }
 
     public override bool button_press_event (Gdk.EventButton event) {
         if (is_focus)    
             return base.button_press_event (event);
-        
+
         foreach (BreadcrumbsElement element in elements)
             element.pressed = false;
 
@@ -242,7 +241,7 @@
             var el = get_element_from_coordinates ((int) event.x, (int) event.y);
             if (el != null) {
                 selected = elements.index_of (el);
-                var newpath = get_path_from_element (el);
+                var newpath = sanitise_path (get_path_from_element (el));
                 path_changed (get_file_for_path (newpath));
             } else
                 grab_focus ();
@@ -318,14 +317,18 @@
         if (search_mode)
             set_entry_text ("");
         else
-            set_entry_text (GLib.Uri.unescape_string (get_elements_path ()
-                    .replace ("file:////", "/")
-                    .replace ("file:///", "/")
-                    .replace ("trash:///", "")
-                    .replace ("network:///", "")));
+            set_entry_text (sanitise_path (GLib.Uri.unescape_string (get_elements_path ())));
+                    
                 
         return base.focus_in_event (event);
     }
+
+    string sanitise_path (string path) {
+        return path.replace ("file:////", "/")
+                   .replace ("file:///", "/")
+                   .replace ("trash:///", "")
+                   .replace ("network:///", "");
+    }
     
     void on_grab_focus () {
         select_region (0, 0);
@@ -398,7 +401,7 @@
         icons.append (icon);
     }
     
-    public void complete () {        
+    public void complete () {
         if (text_completion.length == 0)
             return;
 
@@ -428,6 +431,7 @@
     
     public void set_entry_cursor (Gdk.Cursor? cursor) {
         /* Only child 13 needs to be modified for the cursor - there may be a better way to do this */
+        /* TODO - this doesn't work ? */
         get_window ().get_children ().nth_data (13).set_cursor (cursor ?? new Gdk.Cursor (Gdk.CursorType.XTERM));
     }
     
@@ -439,7 +443,7 @@
             secondary_icon_tooltip_text = tooltip;
         }
     }
-    
+
     public double get_all_breadcrumbs_width (out int breadcrumbs_count) {
         double total_width = 0.0;
         breadcrumbs_count = 0;
@@ -478,7 +482,6 @@
                     break;
             }
         }
-
         return newpath;
     }
 
@@ -493,7 +496,6 @@
             if (element.display)
                 strpath += element.text + "/";
         }
-
         return strpath;
     }
     
@@ -530,7 +532,7 @@
      * @param event a button event to compute the coords of the new menu.
      *
      **/
-    private bool select_bread_from_coord (Gdk.EventButton event) {    
+    private bool select_bread_from_coord (Gdk.EventButton event) {
         var el = get_element_from_coordinates ((int) event.x, (int) event.y);
 
         if (el != null) {

=== modified file 'plugins/network-places/plugin.vala'
--- plugins/network-places/plugin.vala	2014-09-24 07:03:11 +0000
+++ plugins/network-places/plugin.vala	2014-11-22 15:05:49 +0000
@@ -29,17 +29,22 @@
 }
 
 public class Files.Plugins.NetworkPlaces : Marlin.Plugins.Base {
+    private NetworkInfobar? infobar = null;
+
     public override void directory_loaded (void* user_data) {
         var file = ((Object[]) user_data)[2] as GOF.File;
-        return_if_fail (file != null);
 
         if (file.is_network_uri_scheme ()) {
-            var slot = ((Object[]) user_data)[1] as GOF.AbstractSlot;
-            return_if_fail (slot != null);
-
-            var infobar = new NetworkInfobar ();
-            slot.add_extra_widget (infobar);
-            infobar.show_all ();
+            if (infobar == null) {
+                var slot = ((Object[]) user_data)[1] as GOF.AbstractSlot;
+                return_if_fail (slot != null);
+                infobar = new NetworkInfobar ();
+                slot.add_extra_widget (infobar);
+                infobar.show_all ();
+            }
+        }  else if (infobar != null) {
+            infobar.destroy ();
+            infobar = null;
         }
     }
 

=== modified file 'plugins/pantheon-files-ctags/plugin.vala'
--- plugins/pantheon-files-ctags/plugin.vala	2014-08-05 20:46:06 +0000
+++ plugins/pantheon-files-ctags/plugin.vala	2014-11-22 15:05:49 +0000
@@ -17,7 +17,6 @@
 
 [DBus (name = "org.elementary.pantheonfiles.db")]
 interface MarlinDaemon : Object {
-    //public abstract async HashTable<string,Variant> get_uri_infos_from_directory (string directory) throws IOError;
     public abstract async Variant get_uri_infos (string raw_uri) throws IOError;
     public abstract async bool record_uris (Variant[] entries, string directory)    throws IOError;
 
@@ -26,7 +25,6 @@
 
 public class Marlin.Plugins.CTags : Marlin.Plugins.Base {
     private MarlinDaemon daemon;
-    //GOF.Directory.Async directory;
     GOF.File directory;
     private bool is_user_dir;
     private bool ignore_dir;
@@ -50,41 +48,6 @@
         }
     }
 
-    /*private void file_info_update (HashTable<string,Variant> rc, GOF.File file)
-      {
-      Variant row = rc.lookup (file.uri);
-      if (row == null)
-      return;
-
-      VariantIter iter = row.iterator ();
-      warning ("iter n_children %d", (int) iter.n_children ());
-      assert (iter.n_children () == 1);
-      VariantIter row_iter = iter.next_value ().iterator ();
-      warning ("row_iter n_children %d", (int) row_iter.n_children ());
-
-      if (row_iter.n_children () == 2) {
-      unowned string type = row_iter.next_value ().get_string ();
-      int n = int.parse (row_iter.next_value ().get_string ());
-      file.tagstype = type;
-    //file.color = Preferences.tags_colors[n];
-    file.update_type ();
-    message ("grrrrrr %s %d", type, n);
-    }
-    }*/
-
-    /*private async void files_infos_updates ()
-      {
-      var rc = yield daemon.get_uri_infos_from_directory (directory.file.uri);
-
-      foreach (var file in directory.unknown_types) {
-      message ("unknown %s %s", file.name, file.ftype);
-      file_info_update (rc, file);
-      }
-      directory.unknown_types = null;
-
-
-      }*/
-
     /* Arbitrary user dir list */
     private const string users_dirs[2] = {
         "file:///home",
@@ -112,7 +75,7 @@
     }
 
     public override void directory_loaded (void* user_data) {
-        message  ("CANCEL");
+        debug  ("CANCEL");
         cancellable.cancel ();
 
 
@@ -124,15 +87,12 @@
         unknowns.clear ();
         cancellable.reset ();
 
-        //directory = GOF.Directory.Async.from_file(((Object[])user_data)[2] as GOF.File);
         directory = ((Object[]) user_data)[2] as GOF.File;
-        //warning ("CTags Plugin dir %s", directory.file.uri);
-        warning ("CTags Plugin dir %s", directory.uri);
+        debug ("CTags Plugin dir %s", directory.uri);
         is_user_dir = f_is_user_dir (directory.uri);
         ignore_dir = f_ignore_dir (directory.uri);
     }
 
-    //private Variant add_entry (string uri, string content_type, int modified_time)
     private Variant add_entry (GOF.File gof) {
         char* ptr_arr[4];
         ptr_arr[0] = gof.uri;
@@ -147,12 +107,11 @@
         Variant[] entries = null;
         GOF.File gof;
         while ((gof = knowns.pop_head ()) != null) {
-            //warning ("--- known %s", gof.name);
             entries += add_entry (gof);
         }
 
         if (entries != null) {
-            warning ("--- known entries %d", entries.length);
+            debug ("--- known entries %d", entries.length);
             try {
                 yield daemon.record_uris (entries, directory.uri);
             } catch (Error err) {
@@ -165,7 +124,7 @@
         GOF.File gof = null;
 
         var count = unknowns.get_length ();
-        message ("unknows queue nb: %u", count);
+        debug ("unknowns queue length: %u", count);
         if (count > 10) {
             /* query info the whole dir, we can clear the whole unknowns queue */
             unknowns.clear ();
@@ -188,11 +147,8 @@
             }
         } else {
             while ((gof = unknowns.pop_head ()) != null) {
-                //warning ("--- unknown %s", gof.name);
                 try {
-                    //var info = gof.location.query_info (FileAttribute.STANDARD_CONTENT_TYPE, 0);
                     var info = yield gof.location.query_info_async (FileAttribute.STANDARD_CONTENT_TYPE, 0, 0, cancellable);
-                    warning ("--- unknown query_info %s", gof.info.get_name ());
                     add_to_knowns_queue (gof, info);
                 } catch (Error err2) {
                     warning ("query_info failed: %s %s", err2.message, gof.uri);
@@ -200,7 +156,6 @@
 
             }
         }
-        idle_consume_unknowns = 0;
     }
 
     private void add_to_knowns_queue (GOF.File file, FileInfo info) {
@@ -214,6 +169,7 @@
         }
         t_consume_knowns = Timeout.add (300, () => {
                                         consume_knowns_queue ();
+                                        t_consume_knowns = 0;
                                         return false;
                                         });
     }
@@ -225,25 +181,24 @@
             if (idle_consume_unknowns == 0)
                 idle_consume_unknowns = Idle.add (() => {
                                                   consume_unknowns_queue ();
+                                                  idle_consume_unknowns = 0;
                                                   return false;
                                                   });
         }
     }
 
     private async void rreal_update_file_info (GOF.File file) {
-        //warning ("ctags update %s", file.name);
         try {
             var rc = yield daemon.get_uri_infos (file.uri);
 
             VariantIter iter = rc.iterator ();
-            //warning ("iter n_children %d", (int) iter.n_children ());
+            debug ("iter n_children %d", (int) iter.n_children ());
             assert (iter.n_children () == 1);
             VariantIter row_iter = iter.next_value ().iterator ();
-            //warning ("row_iter n_children %d", (int) row_iter.n_children ());
+            debug ("row_iter n_children %d", (int) row_iter.n_children ());
 
             if (row_iter.n_children () == 3) {
                 uint64 modified = int64.parse (row_iter.next_value ().get_string ());
-                //message ("%s %d %d", file.name, (int) file.info.get_attribute_uint64 (FileAttribute.TIME_MODIFIED), (int) modified);
                 unowned string type = row_iter.next_value ().get_string ();
                 file.color = int.parse (row_iter.next_value ().get_string ());
                 /* check modified time field only on user dirs. We don't want to query again and
@@ -259,7 +214,6 @@
                         file.update_type ();
                     }
                 }
-                //message ("grrrrrr %s %s %d %s", myfile.name, type, n, myfile.ftype);
             } else {
                 add_to_unknowns_queue (file);
             }
@@ -277,9 +231,183 @@
             /*if (file.ftype == "application/octet-stream")*/
             rreal_update_file_info (file);
     }
+
+    public override void context_menu  (Gtk.Widget? widget, GLib.List<unowned GOF.File> selected_files) {
+        if (selected_files.length () < 1 || widget == null)
+            return;
+
+        var menu = widget as Gtk.Menu;
+        var color_menu_item = new ColorWidget ();
+        color_menu_item.color_changed.connect ((ncolor) => {
+            set_color (selected_files, ncolor);
+        });
+
+        add_menuitem (menu, new Gtk.SeparatorMenuItem ());
+        add_menuitem (menu, color_menu_item);
+    }
+
+    private void add_menuitem (Gtk.Menu menu, Gtk.MenuItem menu_item) {
+        menu.append (menu_item);
+        menu_item.show ();
+    }
+
+    private async void set_color (GLib.List<unowned GOF.File> files, int n) throws IOError {
+        Variant[] entries = null;
+        foreach (unowned GOF.File file in files) {
+            file.color = n;
+            entries +=  add_entry (file);
+        }
+
+        if (entries != null) {
+            try {
+                yield daemon.record_uris (entries, ((GOF.File) files.data).uri);
+            } catch (Error err) {
+                warning ("%s", err.message);
+            }
+        }
+    }
+
+    private class ColorWidget : Gtk.MenuItem {
+        private new bool has_focus;
+        private int height;
+        public signal void color_changed (int ncolor);
+        public ColorWidget () {
+            set_size_request (150, 20);
+            height = 20;
+
+            button_press_event.connect (button_pressed_cb);
+            draw.connect (on_draw);
+
+            select.connect (() => {
+                has_focus = true;
+            });
+
+            deselect.connect (() => {
+                has_focus = false;
+            });
+        }
+
+        private bool button_pressed_cb (Gdk.EventButton event) {
+            determine_button_pressed_event (event);
+            return true;
+        }
+
+        private void determine_button_pressed_event (Gdk.EventButton event) {
+            int i;
+            int btnw = 10;
+            int btnh = 10;
+            int y0 = (height - btnh) /2;
+            int x0 = btnw+5;
+            int xpad = 9;
+
+            if (event.y >= y0 && event.y <= y0+btnh)
+                for (i=1; i<=10; i++) {
+                    if (event.x>= xpad+x0*i && event.x <= xpad+x0*i+btnw) {
+                        color_changed (i-1);
+                        break;
+                    }
+                }
+        }
+
+        protected bool on_draw (Cairo.Context cr) {
+            int i;
+            int btnw = 10;
+            int btnh = 10;
+            int y0 = (height - btnh) /2;
+            int x0 = btnw+5;
+            int xpad = 9;
+
+            for (i=1; i<=10; i++) {
+                if (i==1)
+                    DrawCross (cr,xpad + x0*i, y0+1, btnw-2, btnh-2);
+                else {
+                    DrawRoundedRectangle (cr,xpad + x0*i, y0, btnw, btnh, "stroke", i-1);
+                    DrawRoundedRectangle (cr,xpad + x0*i, y0, btnw, btnh, "fill", i-1);
+                    DrawGradientOverlay (cr,xpad + x0*i, y0, btnw, btnh);
+                }
+            }
+
+            return true;
+        }
+
+        private void DrawCross (Cairo.Context cr, int x, int y, int w, int h) {
+            cr.new_path ();
+            cr.set_line_width (2.0);
+            cr.move_to (x, y);
+            cr.rel_line_to (w, h);
+            cr.move_to (x, y+h);
+            cr.rel_line_to (w, -h);
+            cr.set_source_rgba (0,0,0,0.6);
+            cr.stroke();
+
+            cr.close_path ();
+        }
+
+        /*
+         * Create a rounded rectangle using the Bezier curve.
+         * Adapted from http://cairographics.org/cookbook/roundedrectangles/
+         */
+        private void DrawRoundedRectangle (Cairo.Context cr, int x, int y, int w, int h, string style, int color) {
+            int radius_x=2;
+            int radius_y=2;
+            double ARC_TO_BEZIER = 0.55228475;
+
+            if (radius_x > w - radius_x)
+                radius_x = w / 2;
+
+            if (radius_y > h - radius_y)
+                radius_y = h / 2;
+
+            /* approximate (quite close) the arc using a bezier curve */
+            double ca = ARC_TO_BEZIER * radius_x;
+            double cb = ARC_TO_BEZIER * radius_y;
+
+            cr.new_path ();
+            cr.set_line_width (0.7);
+            cr.set_tolerance (0.1);
+            cr.move_to (x + radius_x, y);
+            cr.rel_line_to (w - 2 * radius_x, 0.0);
+            cr.rel_curve_to (ca, 0.0, radius_x, cb, radius_x, radius_y);
+            cr.rel_line_to (0, h - 2 * radius_y);
+            cr.rel_curve_to (0.0, cb, ca - radius_x, radius_y, -radius_x, radius_y);
+            cr.rel_line_to (-w + 2 * radius_x, 0);
+            cr.rel_curve_to (-ca, 0, -radius_x, -cb, -radius_x, -radius_y);
+            cr.rel_line_to (0, -h + 2 * radius_y);
+            cr.rel_curve_to (0.0, -cb, radius_x - ca, -radius_y, radius_x, -radius_y);
+
+            switch (style) {
+            default:
+            case "fill":
+                Gdk.RGBA rgba = Gdk.RGBA ();
+                rgba.parse (GOF.Preferences.TAGS_COLORS[color]);
+                Gdk.cairo_set_source_rgba (cr, rgba);
+                cr.fill ();
+                break;
+            case "stroke":
+                cr.set_source_rgba (0,0,0,0.5);
+                cr.stroke ();
+                break;
+            }
+
+            cr.close_path ();
+        }
+
+        /*
+         * Draw the overlaying gradient
+         */
+        private void DrawGradientOverlay (Cairo.Context cr, int x, int y, int w, int h) {
+            var radial = new Cairo.Pattern.radial (w, h, 1, 0.0, 0.0, 0.0);
+            radial.add_color_stop_rgba (0, 0.3, 0.3, 0.3,0.0);
+            radial.add_color_stop_rgba (1, 0.0, 0.0, 0.0,0.5);
+
+            cr.set_source (radial);
+            cr.rectangle (x,y,w,h);
+            cr.fill ();
+        }
+    }
 }
 
-
 public Marlin.Plugins.Base module_init () {
     return new Marlin.Plugins.CTags ();
 }
+

=== modified file 'plugins/pantheon-files-trash/plugin.vala'
--- plugins/pantheon-files-trash/plugin.vala	2014-01-07 22:25:32 +0000
+++ plugins/pantheon-files-trash/plugin.vala	2014-11-22 15:05:49 +0000
@@ -30,22 +30,26 @@
 
     public override void directory_loaded (void* user_data) {
         GOF.File file = ((Object[]) user_data)[2] as GOF.File;
+        /* Ignore directories other than trash and ignore reloading trash */
         if (file.location.get_uri_scheme () == "trash") {
-            assert (((Object[]) user_data)[1] is GOF.AbstractSlot);
-            GOF.AbstractSlot slot = ((Object[]) user_data)[1] as GOF.AbstractSlot;
-
-            infobar = new Gtk.InfoBar ();
-            (infobar.get_content_area () as Gtk.Box).add (new Gtk.Label (_("These items may be deleted by emptying the trash.")));
-            infobar.add_button (_("Empty the Trash"), 0);
-            infobar.response.connect ((self, response) => {
-                Marlin.FileOperations.empty_trash (self);
-            });
-            infobar.set_message_type (Gtk.MessageType.INFO);
-
-            infobar.set_response_sensitive (0, !TrashMonitor.is_empty ());
-
-            slot.add_extra_widget (infobar);
-            infobar.show_all ();
+            /* Only add infobar once */
+            if (infobar == null || infobar.get_parent () == null) {
+                assert (((Object[]) user_data)[1] is GOF.AbstractSlot);
+                GOF.AbstractSlot slot = ((Object[]) user_data)[1] as GOF.AbstractSlot;
+                infobar = new Gtk.InfoBar ();
+                (infobar.get_content_area () as Gtk.Box).add (new Gtk.Label (_("These items may be deleted by emptying the trash.")));
+                infobar.add_button (_("Empty the Trash"), 0);
+                infobar.response.connect ((self, response) => {
+                    Marlin.FileOperations.empty_trash (self);
+                });
+                infobar.set_message_type (Gtk.MessageType.INFO);
+                infobar.set_response_sensitive (0, !TrashMonitor.is_empty ());
+                slot.add_extra_widget (infobar);
+                infobar.show_all ();
+            }
+        } else if (infobar != null) {
+            infobar.destroy ();
+            infobar = null;
         }
     }
 }

=== added file 'src/AbstractEditableLabel.vala'
--- src/AbstractEditableLabel.vala	1970-01-01 00:00:00 +0000
+++ src/AbstractEditableLabel.vala	2014-11-22 15:05:49 +0000
@@ -0,0 +1,96 @@
+/*
+ Copyright (C) 2014 elementary Developers
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License version 3, as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranties of
+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ PURPOSE. See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ Authors : Jeremy Wootten <[e-mail]>
+*/
+
+
+namespace Marlin {
+    public abstract class AbstractEditableLabel : Gtk.Frame, Gtk.Editable, Gtk.CellEditable {
+
+        public bool editing_canceled { get; set; }
+        public bool small_size { get; set; }
+        public float yalign {get; set;}
+        public float xalign {get; set;}
+        public string original_name;
+        public bool draw_outline {get; set;}
+
+        public Gtk.Widget editable_widget;
+
+        public AbstractEditableLabel () {
+            editable_widget = create_editable_widget ();
+            add (editable_widget);
+            show_all ();
+            get_real_editable ().key_press_event.connect (on_key_press_event);
+        } 
+
+        public bool on_key_press_event (Gdk.EventKey event) {
+            bool control_pressed = ((event.state & Gdk.ModifierType.CONTROL_MASK) != 0);
+            switch (event.keyval) {
+                case Gdk.Key.Return:
+                case Gdk.Key.KP_Enter:
+                    editing_canceled = false;
+                    editing_done ();
+                    remove_widget ();
+                    break;
+
+                case Gdk.Key.Escape:
+                    editing_canceled = true;
+                    editing_done ();
+                    remove_widget ();
+                    break;
+
+                case Gdk.Key.z:
+                    if (control_pressed)
+                        set_text (original_name);
+                    else
+                        return false;
+
+                    break;
+
+                default:
+                    return false;
+            }
+            return true;
+        }
+
+
+        public virtual void set_text (string text) {
+            original_name = text;
+        }
+
+        public virtual void set_line_wrap (bool wrap) {}
+        public virtual void set_line_wrap_mode (Pango.WrapMode mode) {}
+        public virtual void set_justify (Gtk.Justification jtype) {}
+        public virtual void set_padding (int xpad, int ypad) {}
+        
+        public abstract new void set_size_request (int width, int height);
+        public abstract Gtk.Widget create_editable_widget ();
+        public abstract string get_text ();
+        public abstract void select_region (int start_pos, int end_pos);
+        public abstract void do_delete_text (int start_pos, int end_pos);
+        public abstract void do_insert_text (string new_text, int new_text_length, ref int position);
+        public abstract string get_chars (int start_pos, int end_pos);
+        public abstract int get_position ();
+        public abstract bool get_selection_bounds (out int start_pos, out int end_pos);
+        public abstract void set_position (int position);
+        public abstract Gtk.Widget get_real_editable ();
+
+
+        /** CellEditable interface */
+        /* modified gtk+-3.0.vapi required */
+        public virtual void start_editing (Gdk.Event? event) {}
+    }
+}

=== modified file 'src/Application.vala'
--- src/Application.vala	2014-06-06 18:51:14 +0000
+++ src/Application.vala	2014-11-22 15:05:49 +0000
@@ -26,14 +26,15 @@
 
     private VolumeMonitor volume_monitor;
     private Marlin.Progress.UIHandler progress_handler;
-    private Marlin.Clipboard.Manager clipboard;
+    private Marlin.ClipboardManager clipboard;
     private Marlin.Thumbnailer thumbnailer;
 
     private const int MARLIN_ACCEL_MAP_SAVE_DELAY = 15;
-    private bool save_of_accel_map_requested = false;
 
     public int window_count { get; private set; }
 
+    bool quitting = false;
+
     construct {
         /* Needed by Glib.Application */
         this.application_id = "org.pantheon.files";  //Ensures an unique instance.
@@ -83,7 +84,6 @@
         message ("Report any issues/bugs you might find to http://bugs.launchpad.net/pantheon-files");
 
         init_schemas ();
-        init_gtk_accels ();
 
         Gtk.IconTheme.get_default ().changed.connect (() => {
             Marlin.IconInfo.clear_caches ();
@@ -91,11 +91,9 @@
 
         Notify.init (Config.GETTEXT_PACKAGE);
         this.progress_handler = new Marlin.Progress.UIHandler ();
-        this.clipboard = new Marlin.Clipboard.Manager.get_for_display (Gdk.Display.get_default ());
+        this.clipboard = new Marlin.ClipboardManager.get_for_display (Gdk.Display.get_default ());
         this.thumbnailer = Marlin.Thumbnailer.get ();
 
-        tags = new Marlin.View.Tags ();
-
         plugins = new Marlin.PluginManager (Config.PLUGIN_DIR);
 
         /* TODO move the volume manager here? */
@@ -112,6 +110,10 @@
         this.window_removed.connect (() => {window_count--;});
     }
 
+    public unowned Marlin.ClipboardManager get_clipboard_manager () {
+        return this.clipboard;
+    }
+
     public override int command_line (ApplicationCommandLine cmd) {
         this.hold ();
         int result = _command_line (cmd);
@@ -195,7 +197,7 @@
 
         /* Open application */
         if (create_new_window)
-            create_window (File.new_for_path (Environment.get_home_dir ()), Gdk.Screen.get_default ());
+            create_window ();
         else if (open_in_tab)
             open_tabs (files);
         else
@@ -212,34 +214,23 @@
     }
 
     public new void quit () {
-        foreach (var window in this.get_windows ())
-            window.destroy ();
-    }
-
-    public void create_window (File location, Gdk.Screen screen) {
-        open_window (location, screen);
+        /* Protect against holding Ctrl-Q down */
+        if (quitting)
+            return;
+
+        quitting = true;
+        unowned List<Gtk.Window> window_list = this.get_windows ();
+        window_list.@foreach ((window) => {
+            ((Marlin.View.Window)window).quit ();
+        });
+
+        base.quit ();
     }
 
     private void mount_removed_callback (VolumeMonitor monitor, Mount mount) {
-        /* Check and see if any of the open windows are displaying contents from the unmounted mount */
-        unowned List<Gtk.Window> window_list = this.get_windows ();
-        File root = mount.get_root ();
-
-        /* Check each slot from each window, loading home for current tabs and closing the rest */
-        foreach (Gtk.Window window in window_list) {
-            var marlin_window = window as Marlin.View.Window;
-            List<Gtk.Widget> pages = marlin_window.tabs.get_children ();
-
-            foreach (var page in pages) {
-                var view_container = page as Marlin.View.ViewContainer;
-                File location = view_container.slot.location;
-                if (location == null || location.has_prefix (root) || location.equal (root)) {
-                    if (view_container == marlin_window.current_tab)
-                        view_container.path_changed (File.new_for_path (Environment.get_home_dir ()));
-                    else
-                        marlin_window.remove_tab (view_container);
-                }
-            }
+        /* Notify each window */
+        foreach (var window in this.get_windows ()) {
+            ((Marlin.View.Window)window).mount_removed (mount);
         }
     }
 
@@ -252,44 +243,13 @@
 
         /* Bind settings with GOFPreferences */
         Preferences.settings.bind ("show-hiddenfiles",
-                                   GOF.Preferences.get_default (), "show-hidden-files", 0);
+                                   GOF.Preferences.get_default (), "show-hidden-files", GLib.SettingsBindFlags.DEFAULT);
         Preferences.settings.bind ("confirm-trash",
-                                   GOF.Preferences.get_default (), "confirm-trash", 0);
+                                   GOF.Preferences.get_default (), "confirm-trash", GLib.SettingsBindFlags.DEFAULT);
         Preferences.settings.bind ("date-format",
-                                   GOF.Preferences.get_default (), "date-format", 0);
+                                   GOF.Preferences.get_default (), "date-format", GLib.SettingsBindFlags.DEFAULT);
         Preferences.settings.bind ("interpret-desktop-files",
-                                   GOF.Preferences.get_default (), "interpret-desktop-files", 0);
-    }
-
-    /* Load accelerator map, and register save callback */
-    private void init_gtk_accels () {
-        string accel_map_filename = Marlin.get_accel_map_file ();
-        if (accel_map_filename != null) {
-            Gtk.AccelMap.load (accel_map_filename);
-        }
-
-        Gtk.AccelMap.get ().changed.connect (() => {
-            if (!save_of_accel_map_requested) {
-                save_of_accel_map_requested = true;
-                Timeout.add_seconds (MARLIN_ACCEL_MAP_SAVE_DELAY,
-                                     save_accel_map);
-            }
-        });
-    }
-
-    private bool save_accel_map () {
-        if (save_of_accel_map_requested) {
-            string accel_map_filename = Marlin.get_accel_map_file ();
-            if (accel_map_filename != null)
-                Gtk.AccelMap.save (accel_map_filename);
-            save_of_accel_map_requested = false;
-        }
-
-        return false;
-    }
-
-    private void open_window (File location, Gdk.Screen screen = Gdk.Screen.get_default ()) {
-        (add_view_window (screen)).add_tab (location);
+                                   GOF.Preferences.get_default (), "interpret-desktop-files", GLib.SettingsBindFlags.DEFAULT);
     }
 
     private void open_windows (File[]? files) {
@@ -302,6 +262,24 @@
         }
     }
 
+    public void create_window (File location = File.new_for_path (Environment.get_home_dir ()),
+                               Gdk.Screen screen = Gdk.Screen.get_default (),
+                               Marlin.ViewMode viewmode = Marlin.ViewMode.PREFERRED) {
+
+        open_window (location, screen, viewmode);
+    }
+
+    private void open_window (File? location, Gdk.Screen screen = Gdk.Screen.get_default (), Marlin.ViewMode viewmode = Marlin.ViewMode.PREFERRED) {
+        (add_view_window (screen)).add_tab (location, viewmode);
+    }
+
+    private Marlin.View.Window add_view_window (Gdk.Screen screen) {
+        var window = new Marlin.View.Window (this, screen);
+        this.add_window (window as Gtk.Window);
+        plugins.interface_loaded (window as Gtk.Widget);
+        return window;
+    }
+
     private void open_tabs (File[]? files, Gdk.Screen screen = Gdk.Screen.get_default ()) {
         Marlin.View.Window window = null;
 
@@ -316,22 +294,15 @@
             if (!Preferences.settings.get_boolean ("restore-tabs") || window.restore_tabs () < 1) {
                 /* Open a tab pointing at the default location if no tabs restored*/
                 var location = File.new_for_path (Environment.get_home_dir ());
-                window.add_tab (location);
+                window.add_tab (location, Marlin.ViewMode.PREFERRED);
             }
         } else {
             /* Open tabs at each requested location */
             foreach (var file in files)
-                window.add_tab (file);
+                window.add_tab (file, Marlin.ViewMode.PREFERRED);
         }
     }
 
-    private Marlin.View.Window add_view_window (Gdk.Screen screen) {
-        var window = new Marlin.View.Window (this, screen, true);
-        this.add_window (window as Gtk.Window);
-        plugins.interface_loaded (window as Gtk.Widget);
-        return window;
-    }
-
     private bool windows_exist () {
         unowned List<weak Gtk.Window> windows = this.get_windows ();
         return (windows != null && windows.data != null);

=== modified file 'src/BookmarkList.vala'
--- src/BookmarkList.vala	2014-07-22 02:54:40 +0000
+++ src/BookmarkList.vala	2014-11-22 15:05:49 +0000
@@ -88,6 +88,11 @@
             save_bookmarks_file ();
         }
 
+        public void insert_uri_at_end (string uri) {
+            append_internal (new Bookmark.from_uri (uri, null));
+            save_bookmarks_file ();
+        }
+
         public void insert_uris (GLib.List<string> uris, uint index) {
             uris.@foreach ((uri) => {
                 insert_item_internal (new Bookmark.from_uri (uri, null), index);

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-08-05 22:40:12 +0000
+++ src/CMakeLists.txt	2014-11-22 15:05:49 +0000
@@ -48,31 +48,40 @@
         Bookmark.vala
         BookmarkList.vala
         ConnectServerOperation.vala
+        DndHandler.vala
+        AbstractEditableLabel.vala
+        SingleLineEditableLabel.vala
+        MultiLineEditableLabel.vala
         main.vala
         marlin-deep-count.vala
         MimeActions.vala
         ProgressInfoWidget.vala
         ProgressUIHandler.vala
+        TextRenderer.vala
         QuicklistHandler.vala
+        View/ColumnView.vala
+        View/AbstractTreeView.vala
+        View/IconView.vala
+        View/ListView.vala
         ZeitgeistManager.vala
         View/DiskRenderer.vala
         View/IconSpinnerRenderer.vala
         View/DirectoryNotFound.vala
+        View/AbstractDirectoryView.vala
         View/SearchResults.vala
         View/Window.vala
         View/Resources.vala
-        View/DbusTags.vala
         View/ViewContainer.vala
         View/OverlayBar.vala
         View/PropertiesWindow.vala
         View/Browser.vala
-        View/ViewMode.vala
         View/LocationBar.vala
         View/Sidebar.vala
+        View/Slot.vala
+        View/Miller.vala
         View/Chrome/TopMenu.vala
         View/Chrome/ButtonWithMenu.vala
         View/Chrome/ViewSwicher.vala
-        View/Chrome/ColorWidget.vala
         View/Chrome/XsEntry.vala
         View/Chrome/ImgEventBox.vala
     PACKAGES
@@ -104,35 +113,45 @@
         Bookmark.vala
         BookmarkList.vala
         ConnectServerOperation.vala
+        DndHandler.vala
+        AbstractEditableLabel.vala
+        SingleLineEditableLabel.vala
+        MultiLineEditableLabel.vala
         main.vala
         marlin-deep-count.vala
         MimeActions.vala
         ProgressInfoWidget.vala
         ProgressUIHandler.vala
+        TextRenderer.vala
+        View/ColumnView.vala
+        View/AbstractTreeView.vala
+        View/IconView.vala
+        View/ListView.vala
         ZeitgeistManager.vala
         View/SearchResults.vala
         View/DiskRenderer.vala
         View/DirectoryNotFound.vala
+        View/AbstractDirectoryView.vala
         View/Window.vala
         View/Resources.vala
-        View/DbusTags.vala
         View/ViewContainer.vala
         View/IconSpinnerRenderer.vala
         View/OverlayBar.vala
         View/PropertiesWindow.vala
         View/Browser.vala
-        View/ViewMode.vala
         View/LocationBar.vala
         View/Sidebar.vala
+        View/Slot.vala
+        View/Miller.vala
         View/Chrome/TopMenu.vala
         View/Chrome/ButtonWithMenu.vala
         View/Chrome/ViewSwicher.vala
-        View/Chrome/ColorWidget.vala
         View/Chrome/XsEntry.vala
         View/Chrome/ImgEventBox.vala
     PACKAGES
         gtk+-3.0
         gio-2.0
+        pango
         posix
         gee-0.8
         granite
@@ -154,23 +173,10 @@
 ENDIF (WITH_UNITY AND UNITY_FOUND)
 
 add_executable (../pantheon-files
-    eel-editable-label.c
     marlin-enum-types.c
-    marlin-dnd.c
     marlin-clipboard-manager.c
-    marlin-window-columns.c
-    gof-window-slot.c
     marlin-thumbnailer.c
     marlin-icon-renderer.c
-    marlin-text-renderer.c
-    marlin-cell-renderer-text-ellipsized.c
-    fm-directory-view.c
-    exo-icon-view.c
-    exo-tree-view.c
-    fm-abstract-icon-view.c
-    fm-icon-view.c
-    fm-list-view.c
-    fm-columns-view.c
     marlin-connect-server-dialog.c
     ${VALA_C} )
 
@@ -184,5 +190,5 @@
 ENDIF (WITH_UNITY AND UNITY_FOUND)
 
 install (TARGETS ../pantheon-files RUNTIME DESTINATION bin)
-install (FILES pantheon-files-ui.xml fm-directory-view-ui.xml fm-icon-view-ui.xml DESTINATION ${UI_DIR})
+install (FILES View/directory_view_popup.ui DESTINATION ${UI_DIR})
 include (Tests)

=== added file 'src/DndHandler.vala'
--- src/DndHandler.vala	1970-01-01 00:00:00 +0000
+++ src/DndHandler.vala	2014-11-22 15:05:49 +0000
@@ -0,0 +1,272 @@
+/*
+ * DndHandler.vala
+ * 
+ * Copyright 2014 jeremy <jeremy@jeremy-MM061>
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ * 
+ * 
+ */
+
+namespace FM {
+    public class DndHandler : GLib.Object {
+        Gdk.DragAction chosen = Gdk.DragAction.DEFAULT;
+
+        public DndHandler () {}
+
+        public bool dnd_perform (Gtk.Widget widget,
+                                 GOF.File drop_target,
+                                 GLib.List<GLib.File> drop_file_list,
+                                 Gdk.DragAction action) {
+
+            if (drop_target.is_folder ()) {
+                Marlin.FileOperations.copy_move (drop_file_list,
+                                                 null,
+                                                 drop_target.get_target_location (),
+                                                 action,
+                                                 widget,
+                                                 (void*)dnd_done,
+                                                 null);
+                return true;
+            } else if (drop_target.is_executable ()) {
+                GLib.Error error;
+                if (!drop_target.execute (widget.get_screen (), drop_file_list, out error)) {
+                    Eel.show_error_dialog (_("Failed to execute \"%s\"").printf (drop_target.get_display_name ()),
+                                           error.message,
+                                           null);
+                    return false;
+                } else
+                    return true;
+            }
+            return false;
+        }
+
+        private void dnd_done (GLib.List<GLib.File> files, void* data) {}
+
+        public Gdk.DragAction? drag_drop_action_ask (Gtk.Widget dest_widget,
+                                                      Gtk.ApplicationWindow win,
+                                                      Gdk.DragAction possible_actions) {
+            this.chosen = Gdk.DragAction.DEFAULT;
+            add_action (win);
+            var ask_menu = build_menu (possible_actions);
+            ask_menu.set_screen (dest_widget.get_screen ());
+            ask_menu.show_all ();
+            var loop = new GLib.MainLoop (null, false);
+
+            ask_menu.deactivate.connect (() => {
+                if (loop.is_running ())
+                    loop.quit ();
+
+                remove_action (win);
+            });
+
+            ask_menu.popup (null, null, null, 0, Gdk.CURRENT_TIME);
+            loop.run ();
+            Gtk.grab_remove (ask_menu);
+
+            return this.chosen;
+        }
+
+        private void add_action (Gtk.ApplicationWindow win) {
+            var action = new GLib.SimpleAction ("choice", GLib.VariantType.STRING);
+            action.activate.connect (this.on_choice);
+            
+            win.add_action (action);
+        }
+
+        private void remove_action (Gtk.ApplicationWindow win) {
+            win.remove_action ("choice");
+        }
+
+        private Gtk.Menu build_menu (Gdk.DragAction possible_actions) {
+            var menu = new Gtk.Menu ();
+
+            build_and_append_menu_item (menu, _("Move Here"), Gdk.DragAction.MOVE, possible_actions);
+            build_and_append_menu_item (menu, _("Copy Here"), Gdk.DragAction.COPY, possible_actions);
+            build_and_append_menu_item (menu, _("Link Here"), Gdk.DragAction.LINK, possible_actions);
+
+            menu.append (new Gtk.SeparatorMenuItem ());
+            menu.append (new Gtk.MenuItem.with_label (_("Cancel")));
+
+            return menu;
+        }
+
+        private void build_and_append_menu_item (Gtk.Menu menu, string label, Gdk.DragAction? action, Gdk.DragAction possible_actions) {
+            if ((possible_actions & action) != 0) {
+                var item = new Gtk.MenuItem.with_label (label);
+
+                item.activate.connect (() => {
+                    this.chosen = action;
+                });
+
+                menu.append (item);
+            }
+        }
+
+        public void on_choice (GLib.Variant? param) {
+            if (param == null || !param.is_of_type (GLib.VariantType.STRING)) {
+                critical ("Invalid variant type in DndHandler Menu");
+                return;
+            }
+
+            string choice = param.get_string ();
+
+            switch (choice) {
+                case "move":
+                    this.chosen = Gdk.DragAction.MOVE;
+                    break;
+                case "copy":
+                    this.chosen = Gdk.DragAction.COPY;
+                    break;
+                case "link":
+                    this.chosen = Gdk.DragAction.LINK;
+                    break;
+                case "background": /* not implemented yet */
+                case "cancel":
+                default:
+                    this.chosen = Gdk.DragAction.DEFAULT;
+                    break;
+            }
+        }
+
+        public string? get_source_filename (Gdk.DragContext context) {
+            uchar []? data = null;
+            Gdk.Atom property_name = Gdk.Atom.intern_static_string ("XdndDirectSave0");
+            Gdk.Atom property_type = Gdk.Atom.intern_static_string ("text/plain");
+
+            bool exists = Gdk.property_get (context.get_source_window (),
+                                            property_name,
+                                            property_type,
+                                            0, /* offset into property to start getting */
+                                            1024, /* max bytes of data to retrieve */
+                                            0, /* do not delete after retrieving */
+                                            null, null, /* actual property type and format got disregarded */
+                                            out data
+                                           );
+ 
+            if (exists && data != null) {
+                string name = data_to_string (data);
+                if (GLib.Path.DIR_SEPARATOR.to_string () in name) {
+                    warning ("invalid source filename");
+                    return null; /* not a valid filename */
+                } else
+                    return name;
+            } else {
+                warning ("source file does not exist");
+                return null;
+            }
+        }
+
+        public void set_source_uri (Gdk.DragContext context, string uri) {
+            debug ("DNDHANDLER: set source uri to %s", uri);
+            Gdk.Atom property_name = Gdk.Atom.intern_static_string ("XdndDirectSave0");
+            Gdk.Atom property_type = Gdk.Atom.intern_static_string ("text/plain");
+
+            Gdk.property_change (context.get_source_window (),
+                                 property_name,
+                                 property_type,
+                                 8,
+                                 Gdk.PropMode.REPLACE,
+                                 uri.data,
+                                 uri.length);
+        }
+
+        public bool handle_xdnddirectsave (Gdk.DragContext context,
+                                           GOF.File drop_target,
+                                           Gtk.SelectionData selection) {
+            bool success = false;
+
+            if (selection.get_length ()  == 1 && selection.get_format () == 8) {
+                uchar result = selection.get_data ()[0];
+
+                switch (result) {
+                    case 'F':
+                        /* No fallback for XdndDirectSave stage (3), result "F" ("Failed") yet */
+                        break;
+                    case 'S':
+                        /* XdndDirectSave "Success" */
+                        success = true;
+                        break;
+                    default:
+                        warning ("Unhandled XdndDirectSave result %s", result.to_string ());
+                        break;
+                }
+            }
+
+            if (!success)
+                set_source_uri (context, "");
+
+            return success;
+        }
+
+        public bool handle_netscape_url (Gdk.DragContext context, GOF.File drop_target, Gtk.SelectionData selection) {
+            string [] parts = (selection.get_text ()).split ("\n");
+
+            /* _NETSCAPE_URL looks like this: "$URL\n$TITLE" - should be 2 parts */
+            if (parts.length != 2)
+                return false;
+
+            /* NETSCAPE URLs are not currently handled.  No current bug reports */
+            return false;
+        }
+
+        public bool handle_file_drag_actions (Gtk.Widget dest_widget,
+                                              Gtk.ApplicationWindow win,
+                                              Gdk.DragContext context,
+                                              GOF.File drop_target,
+                                              GLib.List<GLib.File> drop_file_list,
+                                              Gdk.DragAction possible_actions,
+                                              Gdk.DragAction suggested_action,
+                                              uint32 timestamp) {
+            bool success = false;
+            Gdk.DragAction action = suggested_action;
+
+            if ((possible_actions & Gdk.DragAction.ASK) != 0)
+                action = drag_drop_action_ask (dest_widget, win, possible_actions);
+
+            if (action != Gdk.DragAction.DEFAULT) {
+                success = dnd_perform (dest_widget,
+                                       drop_target,
+                                       drop_file_list,
+                                       action);
+            }
+            return success;
+        }
+
+
+        public bool selection_data_is_uri_list (Gtk.SelectionData selection_data, uint info, out string? text) {
+            text = null;
+
+            if (info == AbstractDirectoryView.TargetType.TEXT_URI_LIST &&
+                selection_data.get_format () == 8 &&
+                selection_data.get_length () > 0) {
+
+                text = data_to_string (selection_data.get_data_with_length ());
+            }
+            debug ("DNDHANDLER selection data is uri list returning %s", (text != null).to_string ());
+            return (text != null);
+        }
+
+        private string data_to_string (uchar [] cdata) {
+            var sb = new StringBuilder ("");
+
+            foreach (uchar u in cdata)
+                sb.append_c ((char)u);
+
+            return sb.str;
+        }
+    }
+}

=== modified file 'src/MimeActions.vala'
--- src/MimeActions.vala	2014-01-11 14:48:15 +0000
+++ src/MimeActions.vala	2014-11-22 15:05:49 +0000
@@ -23,6 +23,7 @@
 public class Marlin.MimeActions {
 
     public static AppInfo? get_default_application_for_file (GOF.File file) {
+
         AppInfo app = file.get_default_handler ();
 
         if (app == null) {
@@ -35,16 +36,20 @@
         return app;
     }
 
-    public static AppInfo? get_default_application_for_files (List<GOF.File> files) {
+    public static AppInfo? get_default_application_for_files (GLib.List<unowned GOF.File> files) {
         assert (files != null);
+        /* Need to make a new list to avoid corrupting the selection */
+        unowned GLib.List<GOF.File> sorted_files = null;
+        files.@foreach ((file) => {
+            sorted_files.prepend (file);
+        });
 
-        List<GOF.File> sorted_files = files.copy ();
         sorted_files.sort (file_compare_by_mime_type);
 
-        AppInfo app = null;
-        GOF.File previous_file = null;
+        AppInfo? app = null;
+        GOF.File? previous_file = null;
 
-        foreach (var file in sorted_files) {
+        foreach (GOF.File file in sorted_files) {
             if (previous_file == null) {
                 app = get_default_application_for_file (file);
                 previous_file = file;
@@ -67,11 +72,11 @@
 
             previous_file = file;
         }
-
         return app;
     }
 
     public static List<AppInfo>? get_applications_for_file (GOF.File file) {
+
         List<AppInfo> result = AppInfo.get_all_for_type (file.get_ftype ());
         string uri_scheme = file.location.get_uri_scheme ();
 
@@ -109,16 +114,19 @@
         return result;
     }
 
-    public static List<AppInfo>? get_applications_for_files (List<GOF.File> files) {
+    public static List<AppInfo>? get_applications_for_files (GLib.List<unowned GOF.File> files) {
         assert (files != null);
-
-        List<GOF.File> sorted_files = files.copy ();
+        /* Need to make a new list to avoid corrupting the selection */
+        unowned GLib.List<GOF.File> sorted_files = null;
+        files.@foreach ((file) => {
+            sorted_files.prepend (file);
+        });
         sorted_files.sort (file_compare_by_mime_type);
 
         List<AppInfo> result = null;
-        GOF.File previous_file = null;
+        unowned GOF.File previous_file = null;
 
-        foreach (var file in sorted_files) {
+        foreach (unowned GOF.File file in sorted_files) {
             if (previous_file == null) {
                 result = get_applications_for_file (file);
                 previous_file = file;

=== added file 'src/MultiLineEditableLabel.vala'
--- src/MultiLineEditableLabel.vala	1970-01-01 00:00:00 +0000
+++ src/MultiLineEditableLabel.vala	2014-11-22 15:05:49 +0000
@@ -0,0 +1,196 @@
+/*
+ Copyright (C) 2014 elementary Developers
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License version 3, as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranties of
+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ PURPOSE. See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ Authors : Jeremy Wootten <[e-mail]>
+*/
+
+namespace Marlin {
+    public class MultiLineEditableLabel : AbstractEditableLabel {
+
+        protected Gtk.ScrolledWindow scrolled_window;
+        protected Gtk.TextView textview;
+
+        public MultiLineEditableLabel () {}
+
+        public override Gtk.Widget create_editable_widget () {
+            textview = new Gtk.TextView ();
+            scrolled_window = new Gtk.ScrolledWindow (null, null);
+            scrolled_window.add (textview);
+            return scrolled_window as Gtk.Widget;
+        }
+
+        public override Gtk.Widget get_real_editable () {
+            return textview;
+        }
+
+        public override void set_text (string text) {
+            textview.get_buffer ().set_text (text);
+            original_name = text;
+        }
+
+        public override void set_line_wrap (bool wrap) {
+            if (!wrap)
+                textview.set_wrap_mode (Gtk.WrapMode.NONE);
+            else
+                textview.set_wrap_mode (Gtk.WrapMode.CHAR);
+        }
+
+        public override void set_line_wrap_mode (Pango.WrapMode mode) {
+            switch (mode) {
+                case Pango.WrapMode.CHAR:
+                    textview.set_wrap_mode (Gtk.WrapMode.CHAR);
+                    break;
+
+                case Pango.WrapMode.WORD:
+                    textview.set_wrap_mode (Gtk.WrapMode.WORD);
+                    break;
+
+                case Pango.WrapMode.WORD_CHAR:
+                    textview.set_wrap_mode (Gtk.WrapMode.WORD_CHAR);
+                    break;
+
+                default:
+                    break;
+            }
+        }
+
+        public override void set_justify (Gtk.Justification jtype) {
+            textview.justification = jtype;
+        }
+
+        public override void set_padding (int xpad, int ypad) {
+            textview.set_margin_start (xpad);
+            textview.set_margin_end (xpad);
+            textview.set_margin_top (ypad);
+            textview.set_margin_bottom (ypad);
+        }
+
+        public override string get_text () {
+            var buffer = textview.get_buffer ();
+            Gtk.TextIter? start = null;
+            Gtk.TextIter? end = null;
+            buffer.get_start_iter (out start);
+            buffer.get_end_iter (out end);
+            return buffer.get_text (start, end, false);
+        }
+
+        /** Gtk.Editable interface */
+
+        public override void select_region (int start_pos, int end_pos) {
+            var buffer = textview.get_buffer ();
+            Gtk.TextIter? ins = null;
+            Gtk.TextIter? bound = null;
+
+            buffer.get_iter_at_offset (out ins, start_pos);
+
+            if (end_pos > 0)
+                buffer.get_iter_at_offset (out bound, end_pos);
+            else
+                buffer.get_end_iter (out bound);
+
+            buffer.select_range (ins, bound);
+            textview.grab_focus ();
+        }
+
+        public override void do_delete_text (int start_pos, int end_pos) {
+            var buffer = textview.get_buffer ();
+            Gtk.TextIter? start = null;
+            Gtk.TextIter? end = null;
+
+            buffer.get_iter_at_offset (out start, start_pos);
+
+            if (end_pos > 0)
+                buffer.get_iter_at_offset (out end, end_pos);
+            else
+                buffer.get_end_iter (out end);
+
+            buffer.delete_range (start, end);
+        }
+
+        public override void do_insert_text (string new_text, int new_text_length, ref int position) {
+            var buffer = textview.get_buffer ();
+            Gtk.TextIter? pos = null;
+
+            buffer.get_iter_at_offset (out pos, position);
+            buffer.insert (ref pos, new_text, new_text_length);
+        }
+
+        public override string get_chars (int start_pos, int end_pos) {
+            var buffer = textview.get_buffer ();
+            Gtk.TextIter? start = null;
+            Gtk.TextIter? end = null;
+
+            buffer.get_iter_at_offset (out start, start_pos);
+
+            if (end_pos > 0)
+                buffer.get_iter_at_offset (out end, end_pos);
+            else
+                buffer.get_end_iter (out end);
+
+            return buffer.get_text (start, end, false);
+        }
+
+        public override int get_position () {
+            var buffer = textview.get_buffer ();
+            var mark = buffer.get_insert ();
+            Gtk.TextIter? iter = null;
+            buffer.get_iter_at_mark (out iter, mark);
+
+            return iter.get_offset ();
+        }
+
+        public override bool get_selection_bounds (out int start_pos, out int end_pos) {
+            var buffer = textview.get_buffer ();
+            Gtk.TextIter? start = null;
+            Gtk.TextIter? end = null;
+
+            buffer.get_selection_bounds (out start, out end);
+            start_pos = start.get_offset ();
+            end_pos = end.get_offset ();
+
+            return start_pos != end_pos;
+        }
+
+        public override void set_position (int position) {
+            var buffer = textview.get_buffer ();
+            Gtk.TextIter? iter = null;
+            buffer.get_start_iter (out iter);
+            iter.set_offset (position);
+            buffer.place_cursor (iter);
+        }
+
+        public override bool draw (Cairo.Context cr) {
+            bool result = base.draw (cr);
+            if (draw_outline) {
+                Gtk.Allocation allocation;
+                Gdk.RGBA color;
+                Gdk.Rectangle outline;
+
+                get_allocation (out allocation);
+                color = get_style_context ().get_color (get_state_flags ());
+                Gdk.cairo_set_source_rgba (cr, color);
+                cr.set_line_width (1.0);
+                outline = {0, 0, allocation.width, allocation.height};
+                Gdk.cairo_rectangle (cr, outline);
+                cr.stroke ();
+            }
+            return result;
+        }
+
+        public override void set_size_request (int width, int height) {
+            textview.set_size_request (width, height);
+        }
+    }
+}

=== added file 'src/SingleLineEditableLabel.vala'
--- src/SingleLineEditableLabel.vala	1970-01-01 00:00:00 +0000
+++ src/SingleLineEditableLabel.vala	2014-11-22 15:05:49 +0000
@@ -0,0 +1,104 @@
+/*
+ Copyright (C) 2014 elementary Developers
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License version 3, as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranties of
+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ PURPOSE. See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ Authors : Jeremy Wootten <[e-mail]>
+*/
+
+namespace Marlin {
+    public class SingleLineEditableLabel : AbstractEditableLabel {
+
+        protected Gtk.Entry textview;
+
+        public SingleLineEditableLabel () {}
+
+        public override Gtk.Widget create_editable_widget () {
+            textview = new Gtk.Entry ();
+            return textview as Gtk.Widget;
+        }
+
+        public override Gtk.Widget get_real_editable () {
+            return textview;
+        }
+
+        public override void set_text (string text) {
+            textview.set_text (text);
+            original_name = text;
+        }
+
+
+        public override void set_justify (Gtk.Justification jtype) {
+            switch (jtype) {
+                case Gtk.Justification.LEFT:
+                    textview.set_alignment (0.0f);
+                    break;
+
+                case Gtk.Justification.CENTER:
+                    textview.set_alignment (0.5f);
+                    break;
+
+                case Gtk.Justification.RIGHT:
+                    textview.set_alignment (1.0f);
+                    break;
+
+                default:
+                    textview.set_alignment (0.5f);
+                    break;
+            }
+        }
+
+        public override string get_text () {
+            return textview.get_text ();
+        }
+
+        /** Gtk.Editable interface */
+
+        public override void select_region (int start_pos, int end_pos) {
+            textview.select_region (start_pos, end_pos);
+            textview.grab_focus ();
+        }
+
+        public override void do_delete_text (int start_pos, int end_pos) {
+            textview.delete_text (start_pos, end_pos);
+        }
+
+        public override void do_insert_text (string new_text, int new_text_length, ref int position) {
+            textview.insert_text (new_text, new_text_length, ref position);
+        }
+
+        public override string get_chars (int start_pos, int end_pos) {
+            return textview.get_chars (start_pos, end_pos);
+        }
+
+        public override int get_position () {
+            return textview.get_position ();
+        }
+
+        public override bool get_selection_bounds (out int start_pos, out int end_pos) {
+            int start, end;
+            bool result = textview.get_selection_bounds (out start, out end);
+            start_pos = start;
+            end_pos = end;
+            return result;
+        }
+
+        public override void set_position (int position) {
+            textview.set_position (position);
+        }
+
+        public override void set_size_request (int width, int height) {
+            textview.set_size_request (width, height);
+        }
+    }
+}

=== added file 'src/TextRenderer.vala'
--- src/TextRenderer.vala	1970-01-01 00:00:00 +0000
+++ src/TextRenderer.vala	2014-11-22 15:05:49 +0000
@@ -0,0 +1,307 @@
+/*
+ Copyright (C) 2014 elementary Developers
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License version 3, as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranties of
+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ PURPOSE. See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ Authors : Jeremy Wootten <[e-mail]>
+*/
+
+namespace Marlin {
+    public class TextRenderer: Gtk.CellRendererText {
+
+        const int MAX_LINES = 3;
+        const uint BORDER_RADIUS = 6;
+
+        public Marlin.ZoomLevel zoom_level {get; set;}
+        public bool follow_state {get; set;}
+        public new string background { set; private get;}
+        public GOF.File file {set; private get;}
+        public int text_width;
+        public int text_height;
+
+        int char_width;
+        int char_height;
+        int focus_border_width;
+        Pango.Layout layout;
+        Gtk.Widget widget;
+        Marlin.AbstractEditableLabel? entry = null;
+
+        public TextRenderer (Marlin.ViewMode viewmode) {
+            this.mode = Gtk.CellRendererMode.EDITABLE;
+
+            if (viewmode == Marlin.ViewMode.ICON)
+                entry = new Marlin.MultiLineEditableLabel ();
+            else
+                entry = new Marlin.SingleLineEditableLabel ();
+
+            entry.editing_done.connect (on_entry_editing_done);
+            entry.get_real_editable ().focus_out_event.connect_after (on_entry_focus_out_event);
+        }
+
+
+        public override void render (Cairo.Context cr,
+                                     Gtk.Widget widget,
+                                     Gdk.Rectangle background_area,
+                                     Gdk.Rectangle cell_area,
+                                     Gtk.CellRendererState flags) {
+            set_widget (widget);
+            Gtk.StateFlags state = widget.get_state_flags ();
+
+            if ((flags & Gtk.CellRendererState.SELECTED) == Gtk.CellRendererState.SELECTED)
+                state |= Gtk.StateFlags.SELECTED;
+            else if ((flags & Gtk.CellRendererState.PRELIT) == Gtk.CellRendererState.PRELIT)
+                state = Gtk.StateFlags.PRELIGHT;
+            else
+                state = widget.get_sensitive () ? Gtk.StateFlags.NORMAL : Gtk.StateFlags.INSENSITIVE;
+
+            set_up_layout (text, cell_area);
+
+            var style_context = widget.get_parent ().get_style_context ();
+            style_context.save ();
+            style_context.set_state (state);
+
+            if (follow_state || background != null)
+                draw_focus (cr, cell_area, flags, style_context, state);
+
+            int x_offset, y_offset;
+            get_offsets (cell_area, text_width, text_height, xalign, out x_offset, out y_offset);
+
+            /* Adjust text offsets for best appearance in each view */
+            if (xalign == 0.5f) { /* Icon view */
+                x_offset = (cell_area.width - this.wrap_width) / 2;
+                y_offset += focus_border_width + (int)ypad;
+            } else {
+                x_offset += focus_border_width + 2 * (int)xpad;
+                y_offset += focus_border_width;
+            }
+
+            style_context.render_layout (cr,
+                                         cell_area.x + x_offset,
+                                         cell_area.y + y_offset,
+                                         layout);
+
+            style_context.restore ();
+        }
+
+        public void set_up_layout (string? text, Gdk.Rectangle cell_area) {
+            /* render small/normal text depending on the zoom_level */
+            if (text == null)
+                text= " ";
+
+            bool small = this.zoom_level < Marlin.ZoomLevel.NORMAL;
+            if (small)
+                layout.set_attributes (EelPango.attr_list_small ());
+            else
+                layout.set_attributes (null);
+
+            if (wrap_width < 0) {
+                layout.set_width (cell_area.width * Pango.SCALE);
+                layout.set_height (- 1);
+            } else {
+                layout.set_width (wrap_width * Pango.SCALE);
+                layout.set_wrap (this.wrap_mode);
+                layout.set_height (- MAX_LINES);
+            }
+
+            layout.set_ellipsize (Pango.EllipsizeMode.END);
+
+            if (xalign == 0.5f)
+                layout.set_alignment (Pango.Alignment.CENTER);
+
+            layout.set_text (text, -1);
+
+            /* calculate the real text dimension */
+            int width, height;
+            layout.get_pixel_size (out width, out height);
+            text_width = width;
+            text_height = height;
+        }
+
+        /* Needs patched gtk+-3.0.vapi file - incorrect function signature up to version 0.25.4 */
+        public override unowned Gtk.CellEditable? start_editing (Gdk.Event? event,
+                                                                 Gtk.Widget widget,
+                                                                 string  path,
+                                                                 Gdk.Rectangle  background_area,
+                                                                 Gdk.Rectangle  cell_area,
+                                                                 Gtk.CellRendererState flags) {
+
+            if (!visible || mode != Gtk.CellRendererMode.EDITABLE)
+                return null;
+
+            float xalign, yalign;
+            get_alignment (out xalign, out yalign);
+
+            entry.set_text (text);
+            entry.set_line_wrap (true);
+            entry.set_line_wrap_mode (wrap_mode);
+
+            if (wrap_width > 0) { /* Icon view */
+                entry.set_justify (Gtk.Justification.CENTER);
+                entry.draw_outline = true;
+            } else {  /*List and Column views */
+                entry.set_justify (Gtk.Justification.LEFT);
+                entry.draw_outline = false;
+            }
+
+            entry.yalign = this.yalign;
+            entry.set_padding ((int)xpad, (int)ypad);
+            entry.set_size_request (wrap_width, -1);
+            entry.set_position (-1);
+            entry.set_data ("marlin-text-renderer-path", path.dup ());
+            entry.show_all ();
+
+            return entry as Gtk.CellEditable;
+        }
+
+        private void set_widget (Gtk.Widget? _widget) {
+            Pango.FontMetrics metrics;
+            Pango.Context context;
+            int focus_padding;
+            int focus_line_width;
+
+            if (_widget == widget)
+                return;
+
+            /* disconnect from the previously set widget */
+            if (widget != null)
+                disconnect_widget_signals ();
+
+            widget = _widget;
+
+            if (widget != null) {
+                connect_widget_signals ();
+                context = widget.get_pango_context ();
+                layout = new Pango.Layout (context);
+                layout.set_auto_dir (false);
+                layout.set_single_paragraph_mode (true);
+                metrics = context.get_metrics (layout.get_font_description (), context.get_language ());
+                char_width = (metrics.get_approximate_char_width () + 512 ) >> 10;
+                char_height = (metrics.get_ascent () + metrics.get_descent () + 512) >> 10;
+                if (wrap_width < 0)
+                    (this as Gtk.CellRenderer).set_fixed_size (-1, char_height);
+
+                widget.style_get ("focus-padding", out focus_padding, "focus-line-width", out focus_line_width);
+                focus_border_width = int.max (focus_padding + focus_line_width, 2);
+            } else {
+                layout = null;
+                char_width = 0;
+                char_height = 0;
+            }
+        }
+
+        private void connect_widget_signals () {
+            widget.destroy.connect (invalidate);
+            widget.style_set.connect (invalidate);
+        }
+
+        private void disconnect_widget_signals () {
+            widget.destroy.disconnect (invalidate);
+            widget.style_set.disconnect (invalidate);
+        }
+
+        private void invalidate () {
+            set_widget (null);
+        }
+
+        private void on_entry_editing_done () {
+            bool cancelled = entry.editing_canceled;
+            base.stop_editing (cancelled);
+
+            entry.hide ();
+
+            if (!cancelled) {
+                string text = entry.get_text ();
+                string path = entry.get_data ("marlin-text-renderer-path");
+                edited (path, text);
+            }
+        }
+
+        private bool on_entry_focus_out_event (Gdk.Event event) {
+            on_entry_editing_done ();
+            return false;
+        }
+
+        private void draw_focus (Cairo.Context cr,
+                                 Gdk.Rectangle cell_area,
+                                 Gtk.CellRendererState flags,
+                                 Gtk.StyleContext style_context,
+                                 Gtk.StateFlags state) {
+            bool selected = false;
+            float x;
+            int x_offset, y_offset, focus_rect_width, focus_rect_height;
+
+            if (follow_state)
+                selected = ((flags & Gtk.CellRendererState.SELECTED) == Gtk.CellRendererState.SELECTED);
+
+            focus_rect_width = text_width + 4 * this.focus_border_width;
+            focus_rect_height = text_height + 2 * this.focus_border_width;
+
+            if (widget.get_direction () == Gtk.TextDirection.RTL)
+                x = 1.0f - xalign;
+            else
+                x = xalign;
+
+            get_offsets (cell_area, focus_rect_width, focus_rect_height, x, out x_offset, out y_offset);
+
+            /* render the background if selected or colorized */
+            if (selected || this.background != null) {
+                int x0 = cell_area.x + x_offset + (int)xpad;
+                int y0 = cell_area.y + y_offset + (int)ypad;
+                int x1 = x0 + focus_rect_width;
+                int y1 = y0 + focus_rect_height;
+
+                cr.move_to (x0 + BORDER_RADIUS, y0);
+                cr.line_to (x1 - BORDER_RADIUS, y0);
+                cr.curve_to (x1 - BORDER_RADIUS, y0, x1, y0, x1, y0 + BORDER_RADIUS);
+                cr.line_to (x1, y1 - BORDER_RADIUS);
+                cr.curve_to (x1, y1 - BORDER_RADIUS, x1, y1, x1 - BORDER_RADIUS, y1);
+                cr.line_to (x0 + BORDER_RADIUS, y1);
+                cr.curve_to (x0 + BORDER_RADIUS, y1, x0, y1, x0, y1 - BORDER_RADIUS);
+                cr.line_to (x0, y0 + BORDER_RADIUS);
+                cr.curve_to (x0, y0 + BORDER_RADIUS, x0, y0, x0 + BORDER_RADIUS, y0);
+
+                Gdk.RGBA color ={};
+                if (background != null && !selected) {
+                    if (!color.parse (background)) {
+                        critical ("Can't parse this color value: %s", background);
+                        color = style_context.get_background_color (state);
+                    }
+                } else
+                    color = style_context.get_background_color (state);
+
+                Gdk.cairo_set_source_rgba (cr, color);
+                cr.fill ();
+            }
+            /* draw the focus indicator */
+            if (follow_state && (flags & Gtk.CellRendererState.FOCUSED) != 0)
+                style_context.render_focus (cr,
+                                            cell_area.x + x_offset,
+                                            cell_area.y + y_offset,
+                                            focus_rect_width,
+                                            focus_rect_height);
+        }
+
+        private void get_offsets (Gdk.Rectangle cell_area,
+                                  int width,
+                                  int height,
+                                  float x,
+                                  out int x_offset,
+                                  out int y_offset) {
+            x_offset = (int)(x * (cell_area.width - width - 2 * (int)xpad));
+            x_offset = int.max (x_offset, 0);
+
+            y_offset = (int)(yalign * (cell_area.height - height - 2 * (int)ypad));
+            y_offset = int.max (y_offset, 0);
+        }
+    }
+}

=== added file 'src/View/AbstractDirectoryView.vala'
--- src/View/AbstractDirectoryView.vala	1970-01-01 00:00:00 +0000
+++ src/View/AbstractDirectoryView.vala	2014-11-22 15:05:49 +0000
@@ -0,0 +1,2778 @@
+/*
+ Copyright (C) 2014 elementary Developers
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License version 3, as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranties of
+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ PURPOSE. See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ Authors : Jeremy Wootten <[e-mail]>
+*/
+
+/** Implementations of AbstractDirectoryView are
+ * IconView
+ * ListView
+ * ColumnView
+**/
+   
+namespace FM {
+    public abstract class AbstractDirectoryView : Gtk.ScrolledWindow {
+
+        public enum TargetType {
+            STRING,
+            TEXT_URI_LIST,
+            XDND_DIRECT_SAVE0,
+            NETSCAPE_URL
+        }
+
+        protected enum ClickZone {
+            EXPANDER,
+            HELPER,
+            ICON,
+            NAME,
+            BLANK_PATH,
+            BLANK_NO_PATH,
+            INVALID
+        }
+
+        const int MAX_TEMPLATES = 32;
+
+        const Gtk.TargetEntry [] drag_targets = {
+            {"text/plain", 0, TargetType.STRING},
+            {"text/uri-list", 0, TargetType.TEXT_URI_LIST}
+        };
+
+        const Gtk.TargetEntry [] drop_targets = {
+            {"text/uri-list", 0, TargetType.TEXT_URI_LIST},
+            {"XdndDirectSave0", 0, TargetType.TEXT_URI_LIST},
+            {"_NETSCAPE_URL", 0, TargetType.TEXT_URI_LIST}
+        };
+
+        const Gdk.DragAction file_drag_actions = (Gdk.DragAction.COPY | Gdk.DragAction.MOVE | Gdk.DragAction.LINK);
+
+        /* Menu Handling */
+        const GLib.ActionEntry [] selection_entries = {
+            {"open", on_selection_action_open_executable},
+            {"open_with_app", on_selection_action_open_with_app, "s"},
+            {"open_with_default", on_selection_action_open_with_default},
+            {"open_with_other_app", on_selection_action_open_with_other_app},
+            {"rename", on_selection_action_rename},
+            {"cut", on_selection_action_cut},
+            {"trash", on_selection_action_trash},
+            {"delete", on_selection_action_delete},
+            {"restore", on_selection_action_restore}
+        };
+
+        const GLib.ActionEntry [] background_entries = {
+            {"new", on_background_action_new, "s"},
+            {"create_from", on_background_action_create_from, "s"},
+            {"sort_by", on_background_action_sort_by_changed, "s", "'name'"},
+            {"reverse", on_background_action_reverse_changed, null, "false"},
+            {"show_hidden", null, null, "false", change_state_show_hidden}
+        };
+
+        const GLib.ActionEntry [] common_entries = {
+            {"copy", on_common_action_copy},
+            {"paste_into", on_common_action_paste_into},
+            {"open_in", on_common_action_open_in, "s"},
+            {"bookmark", on_common_action_bookmark},
+            {"properties", on_common_action_properties}
+        };
+
+        GLib.SimpleActionGroup common_actions;
+        GLib.SimpleActionGroup selection_actions;
+        GLib.SimpleActionGroup background_actions;
+
+        private Marlin.ZoomLevel _zoom_level;
+        public Marlin.ZoomLevel zoom_level {
+            get {
+                return _zoom_level;
+            }
+
+            set {
+                if (value <= maximum_zoom &&
+                    value >= minimum_zoom &&
+                    value != _zoom_level) {
+
+                        _zoom_level = value;
+                        on_zoom_level_changed (value);
+                }
+            }
+        }
+
+        public int icon_size {
+            get {
+                return Marlin.zoom_level_to_icon_size (_zoom_level);
+            }
+        }
+
+        protected Marlin.ZoomLevel minimum_zoom = Marlin.ZoomLevel.SMALLEST; 
+        protected Marlin.ZoomLevel maximum_zoom = Marlin.ZoomLevel.LARGEST; 
+
+        /* drag support */
+        uint drag_scroll_timer_id = 0;
+        uint drag_timer_id = 0;
+        int drag_x = 0;
+        int drag_y = 0;
+        int drag_button;
+        protected int drag_delay = Gtk.Settings.get_default ().gtk_menu_popup_delay;
+
+        Gdk.DragAction current_suggested_action = Gdk.DragAction.DEFAULT;
+        Gdk.DragAction current_actions = Gdk.DragAction.DEFAULT;
+
+        unowned GLib.List<unowned GOF.File> drag_file_list = null;
+        GOF.File? drop_target_file = null;
+
+
+        /* drop site support */
+        bool _drop_highlight;
+        bool drop_highlight {
+            get {
+                return _drop_highlight;
+            }
+
+            set {
+                if (value != _drop_highlight) {
+                    if (value)
+                        Gtk.drag_highlight (this);
+                    else 
+                        Gtk.drag_unhighlight (this);
+                }
+                _drop_highlight = value;
+            }
+        }
+
+        private bool drop_data_ready = false; /* whether the drop data was received already */
+        private bool drop_occurred = false; /* whether the data was dropped */
+        private bool drag_has_begun = false;
+        protected bool dnd_disabled = false;
+        private void* drag_data;
+        private GLib.List<GLib.File> drop_file_list = null; /* the list of URIs that are contained in the drop data */
+
+        /* support for generating thumbnails */
+        uint thumbnail_request = 0;
+        uint thumbnail_source_id = 0;
+        Marlin.Thumbnailer thumbnailer = null;
+
+        /* TODO Support for preview see bug #1380139 */
+        private string? previewer = null;
+
+        /* Rename support */
+        protected Gtk.TreeViewColumn name_column;
+        protected Marlin.TextRenderer? name_renderer = null;
+        unowned Marlin.AbstractEditableLabel? editable_widget = null;
+        public string original_name = "";
+
+        /* Support for zoom by smooth scrolling */
+        private double total_delta_y = 0.0;
+
+        /* UI options for button press handling */
+        protected bool single_click_rename = false;
+        protected bool activate_on_blank = true;
+        protected bool right_margin_unselects_all = false;
+        public bool single_click_mode {get; set;}
+        protected bool should_activate = false;
+        protected bool should_scroll = true;
+        protected uint click_zone = ClickZone.ICON;
+        protected uint previous_click_zone = ClickZone.ICON;
+
+        /* Cursors for different areas */
+        private Gdk.Cursor editable_cursor;
+        private Gdk.Cursor activatable_cursor;
+        private Gdk.Cursor blank_cursor;
+        private Gdk.Cursor selectable_cursor;
+
+        private GLib.List<GLib.AppInfo> open_with_apps;
+        protected GLib.List<GOF.Directory.Async>? loaded_subdirectories = null;
+        protected GLib.List<unowned GOF.File> selected_files = null ;
+        private GLib.List<unowned GOF.File>? templates = null;
+
+        private GLib.AppInfo default_app;
+        private Gtk.TreePath selection_before_delete;
+        private Gtk.TreePath? hover_path = null;
+
+        private bool selection_was_removed = false;
+        public bool select_added_files = false;
+        protected bool renaming = false;
+        private bool updates_frozen = false;
+        protected bool tree_frozen = false;
+        private bool in_trash = false;
+        protected bool is_loading;
+        protected bool helpers_shown;
+        private uint select_timeout_id = 0;
+
+        private Gtk.Widget view;
+        private unowned Marlin.ClipboardManager clipboard;
+        protected FM.ListModel model;
+        protected Marlin.IconRenderer icon_renderer; 
+        protected unowned Marlin.View.Slot slot;
+        protected unowned Marlin.View.Window window; /*For convenience - this can be derived from slot */
+        protected static DndHandler dnd_handler = new FM.DndHandler ();
+
+        public signal void path_change_request (GLib.File location, int flag = 0, bool new_root = true);
+
+
+        public AbstractDirectoryView (Marlin.View.Slot _slot) {
+            slot = _slot;
+            window = _slot.window;
+            editable_cursor = new Gdk.Cursor (Gdk.CursorType.XTERM);
+            activatable_cursor = new Gdk.Cursor (Gdk.CursorType.HAND1);
+            selectable_cursor = new Gdk.Cursor (Gdk.CursorType.ARROW);
+            blank_cursor = new Gdk.Cursor (Gdk.CursorType.CROSSHAIR);
+            clipboard = ((Marlin.Application)(window.application)).get_clipboard_manager ();
+            icon_renderer = new Marlin.IconRenderer ();
+            thumbnailer = Marlin.Thumbnailer.get ();
+            model = GLib.Object.@new (FM.ListModel.get_type (), null) as FM.ListModel;
+            Preferences.settings.bind ("single-click", this, "single_click_mode", SettingsBindFlags.GET);
+
+             /* Currently, "single-click rename" is disabled, matching existing UI
+              * Currently, "activate on blank" is enabled, matching existing UI
+              * Currently, "right margin unselects all" is disabled, matching existing UI
+              */
+
+            set_up__menu_actions ();
+            set_up_directory_view ();
+            view = create_view ();
+
+            if (view != null) {
+                add (view);
+                show_all ();
+                connect_drag_drop_signals (view);
+                view.add_events (Gdk.EventMask.POINTER_MOTION_MASK);
+                view.motion_notify_event.connect (on_motion_notify_event);
+                view.leave_notify_event.connect (on_leave_notify_event);
+                view.enter_notify_event.connect (on_enter_notify_event);
+                view.key_press_event.connect (on_view_key_press_event);
+                view.button_press_event.connect (on_view_button_press_event);
+                view.button_release_event.connect (on_view_button_release_event);
+                view.draw.connect (on_view_draw);
+            }
+
+            freeze_tree (); /* speed up loading of icon view. Thawed when directory loaded */
+            set_up_zoom_level ();
+            change_zoom_level ();
+        }
+
+        ~AbstractDirectoryView () {
+            loaded_subdirectories.@foreach ((dir) => {
+                remove_subdirectory (dir);
+            });
+        }
+
+        protected virtual void set_up_name_renderer () {
+            name_renderer.editable = false;
+            name_renderer.follow_state = true;
+            name_renderer.edited.connect (on_name_edited);
+            name_renderer.editing_canceled.connect (on_name_editing_canceled);
+            name_renderer.editing_started.connect (on_name_editing_started);
+        }
+
+        private void set_up_directory_view () {
+            set_policy (Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);
+            set_shadow_type (Gtk.ShadowType.NONE);
+
+            size_allocate.connect_after (on_size_allocate);
+            button_press_event.connect (on_button_press_event);
+            popup_menu.connect (on_popup_menu);
+
+            unrealize.connect (() => {
+                clipboard.changed.disconnect (on_clipboard_changed);
+            });
+
+            realize.connect (() => {
+                clipboard.changed.connect (on_clipboard_changed);
+                on_clipboard_changed ();
+            });
+
+            scroll_event.connect (on_scroll_event);           
+
+            get_vadjustment ().value_changed.connect ((alloc) => {
+                schedule_thumbnail_timeout ();
+            });
+
+            (GOF.Preferences.get_default ()).notify["show-hidden-files"].connect (on_show_hidden_files_changed);
+            (GOF.Preferences.get_default ()).notify["interpret-desktop-files"].connect (on_interpret_desktop_files_changed);
+
+            connect_directory_handlers (slot.directory);
+
+            model.row_deleted.connect (on_row_deleted);
+            model.row_deleted.connect_after (after_restore_selection);
+
+            model.sort_column_changed.connect (on_sort_column_changed);
+            model.set_sort_column_id (slot.directory.file.sort_column_id, slot.directory.file.sort_order);
+
+        }
+
+        private void set_up__menu_actions () {
+            selection_actions = new GLib.SimpleActionGroup ();
+            selection_actions.add_action_entries (selection_entries, this);
+            insert_action_group ("selection", selection_actions);
+
+            background_actions = new GLib.SimpleActionGroup ();
+            background_actions.add_action_entries (background_entries, this);
+            insert_action_group ("background", background_actions);
+
+            common_actions = new GLib.SimpleActionGroup ();
+            common_actions.add_action_entries (common_entries, this);
+            insert_action_group ("common", common_actions);
+
+            action_set_state (background_actions, "show_hidden", Preferences.settings.get_boolean ("show-hiddenfiles"));
+        }
+
+        public void zoom_in () {
+                zoom_level = zoom_level + 1;
+        }
+
+        public void zoom_out () {
+                zoom_level = zoom_level - 1;
+        }
+
+        private void set_up_zoom_level () {
+            zoom_level = get_set_up_zoom_level ();
+            model.set_property ("size", icon_size);
+        }
+
+        public void zoom_normal () {
+            zoom_level = get_normal_zoom_level ();
+        }
+
+        public void select_first_for_empty_selection () {
+            if (selected_files == null)
+                set_cursor (new Gtk.TreePath.from_indices (0), false, true, true);
+        }
+
+        public void select_glib_files (GLib.List<GLib.File> location_list, GLib.File? focus_location) {
+            updates_frozen = true;
+            unselect_all ();
+            GLib.List<GOF.File>? file_list = null;
+
+            if (focus_location == null)
+                focus_location = location_list.first ().data;
+
+            location_list.@foreach ((loc) => {
+                file_list.prepend (GOF.File.@get (loc));
+            });
+
+            /* Because the Icon View disconnects the model while loading, we need to wait until
+             * the tree is thawed and the model reconnected before selecting the files */
+            select_timeout_id = GLib.Timeout.add (100, () => {
+                if (tree_frozen)
+                    return true;
+
+                file_list.@foreach ((file) => {
+                    var iter = Gtk.TreeIter ();
+
+                    if (model.get_first_iter_for_file (file, out iter)) {
+                        Gtk.TreePath path = model.get_path (iter);
+                        if (path != null) {
+                            if (focus_location == file.location)
+                                set_cursor (path, false, true, false); /* set cursor and select */
+                            else
+                                select_path (path);
+                        } 
+                    }
+                });
+                select_timeout_id = 0;
+                return false;
+            });
+
+            updates_frozen = false;
+            update_selected_files ();
+            notify_selection_changed ();
+            grab_focus ();
+        }
+
+        public unowned GLib.List<GLib.AppInfo> get_open_with_apps () {
+            return open_with_apps;
+        }
+
+        public unowned GLib.AppInfo get_default_app () {
+            return default_app;
+        }
+
+        public void set_updates_frozen (bool freeze) {
+            if (freeze && !updates_frozen)
+                freeze_updates ();
+            else if (!freeze && updates_frozen)
+                unfreeze_updates ();
+        }
+
+        public bool get_updates_frozen () {
+            return updates_frozen;
+        }
+
+        protected void freeze_updates () {
+            updates_frozen = true;
+            slot.directory.freeze_update = true;
+            action_set_enabled (selection_actions, "cut", false);
+            action_set_enabled (common_actions, "copy", false);
+            action_set_enabled (common_actions, "paste_into", false);
+            action_set_enabled (window.win_actions, "select_all", false);
+
+            size_allocate.disconnect (on_size_allocate);
+            clipboard.changed.disconnect (on_clipboard_changed);
+            view.enter_notify_event.disconnect (on_enter_notify_event);
+            view.key_press_event.disconnect (on_view_key_press_event);
+        }
+
+        protected void unfreeze_updates () {
+            updates_frozen = false;
+            slot.directory.freeze_update = false;;
+            update_menu_actions ();
+            size_allocate.connect (on_size_allocate);
+            clipboard.changed.connect (on_clipboard_changed);
+            view.enter_notify_event.connect (on_enter_notify_event);
+            view.key_press_event.connect (on_view_key_press_event);
+        }
+
+        public new void grab_focus () {
+            if (view.get_realized ())
+                view.grab_focus ();
+            else { /* wait until realized */
+                GLib.Timeout.add (100, () => {
+                    view.grab_focus ();
+                    return !view.get_realized ();
+                });
+            }
+        }
+
+        public unowned GLib.List<unowned GOF.File> get_selected_files () {
+            return selected_files;
+        }
+
+        public bool is_frozen () {
+            return updates_frozen;
+        }
+ 
+/*** Protected Methods */
+        protected void set_active_slot (bool scroll = true) {
+            slot.active (scroll);
+        }
+
+        protected void load_location (GLib.File location) {
+            path_change_request (location, Marlin.OpenFlag.DEFAULT, false);
+        }
+
+        protected void load_root_location (GLib.File location) {
+            path_change_request (location, Marlin.OpenFlag.DEFAULT, true);
+        }
+
+    /** Operations on selections */
+        protected void activate_selected_items (Marlin.OpenFlag flag = Marlin.OpenFlag.DEFAULT,
+                                                GLib.List<unowned GOF.File> selection = get_selected_files ()) {
+            if (updates_frozen || in_trash)
+                return;
+
+            uint nb_elem = selection.length ();
+
+            if (nb_elem < 1)
+                return;
+
+            unowned Gdk.Screen screen = Eel.gtk_widget_get_screen (this);
+            bool only_folders = selection_only_contains_folders (selection);
+
+            if (nb_elem < 10 && (default_app == null || only_folders)) {
+                /* launch each selected file individually ignoring selections greater than 10 */
+                bool only_one_file = (nb_elem == 1);
+
+                foreach (unowned GOF.File file in selection) {
+                    /* Prevent too rapid activation of files - causes New Tab to crash for example */
+                    GLib.Timeout.add (50, () => {
+                        activate_file (file, screen, flag, only_one_file);
+                        return false;
+                    });
+                }
+            } else if (default_app != null)
+                open_files_with (default_app, selection);
+        }
+
+        protected void preview_selected_items () {
+            if (previewer == null)  /* At present this is the case! */
+                activate_selected_items (Marlin.OpenFlag.DEFAULT);
+            else {
+                unowned GLib.List<unowned GOF.File>? selection = get_selected_files ();
+
+                if (selection == null)
+                    return;
+
+                Gdk.Screen screen = Eel.gtk_widget_get_screen (this);
+                GLib.List<GLib.File> location_list = null;
+                GOF.File file = selection.data;
+                location_list.prepend (file.location);
+                Gdk.AppLaunchContext context = screen.get_display ().get_app_launch_context ();
+                try {
+                    GLib.AppInfo previewer_app = GLib.AppInfo.create_from_commandline (previewer, null, 0);
+                    previewer_app.launch (location_list, context as GLib.AppLaunchContext);
+                } catch (GLib.Error error) {
+                    Eel.show_error_dialog (_("Failed to preview"), error.message, null);
+                }
+            }
+        }
+
+        protected void select_gof_file (GOF.File file) {
+            var iter = Gtk.TreeIter ();
+
+            if (!model.get_first_iter_for_file (file, out iter))
+                return; /* file not in model */
+
+            var path = model.get_path (iter);
+            set_cursor (path, false, true, false);
+        }
+
+        protected void add_gof_file_to_selection (GOF.File file) {
+            var iter = Gtk.TreeIter ();
+
+            if (!model.get_first_iter_for_file (file, out iter))
+                return; /* file not in model */
+
+            var path = model.get_path (iter);
+            select_path (path);
+        }
+
+        protected void after_restore_selection (Gtk.TreePath path) {
+            set_cursor (selection_before_delete, false, true, false);
+            selection_before_delete = null;
+        }
+
+    /** Directory signal handlers. */
+        /* Signal could be from subdirectory as well as slot directory */
+        protected void connect_directory_handlers (GOF.Directory.Async dir) {
+            assert (dir != null);
+            dir.file_loaded.connect (on_directory_file_loaded);
+            dir.file_added.connect (on_directory_file_added);
+            dir.file_changed.connect (on_directory_file_changed);
+            dir.file_deleted.connect (on_directory_file_deleted);
+            dir.icon_changed.connect (on_directory_file_icon_changed);
+            dir.done_loading.connect (on_directory_done_loading);
+            dir.thumbs_loaded.connect (on_directory_thumbs_loaded);
+        }
+
+        protected void disconnect_directory_handlers (GOF.Directory.Async dir) {
+            /* If the directory is still loading the file_loaded signal handler
+            /* will not have been disconnected */
+            if (dir.is_loading ())
+                dir.file_loaded.disconnect (on_directory_file_loaded);
+
+            dir.file_added.disconnect (on_directory_file_added);
+            dir.file_changed.disconnect (on_directory_file_changed);
+            dir.file_deleted.disconnect (on_directory_file_deleted);
+            dir.icon_changed.disconnect (on_directory_file_icon_changed);
+            dir.done_loading.disconnect (on_directory_done_loading);
+            dir.thumbs_loaded.disconnect (on_directory_thumbs_loaded);
+        }
+
+        public void change_directory (GOF.Directory.Async old_dir, GOF.Directory.Async new_dir) {
+            cancel_thumbnailing ();
+            freeze_tree ();
+            old_dir.cancel ();
+            disconnect_directory_handlers (old_dir);
+            block_model ();
+
+            loaded_subdirectories.@foreach ((dir) => {
+                remove_subdirectory (dir);
+            });
+
+            loaded_subdirectories = null;
+            model.clear ();
+            unblock_model ();
+
+            connect_directory_handlers (new_dir);
+            update_menu_actions ();
+            model.set_sort_column_id (slot.directory.file.sort_column_id, slot.directory.file.sort_order);
+        }
+
+        public void reload () {
+            change_directory (slot.directory, slot.directory);
+        }
+
+        protected void connect_drag_drop_signals (Gtk.Widget widget) {
+            /* Set up as drop site */
+            Gtk.drag_dest_set (widget, Gtk.DestDefaults.MOTION, drop_targets, Gdk.DragAction.ASK | file_drag_actions);
+            widget.drag_drop.connect (on_drag_drop);
+            widget.drag_data_received.connect (on_drag_data_received);
+            widget.drag_leave.connect (on_drag_leave);
+            widget.drag_motion.connect (on_drag_motion);
+
+            /* Set up as drag source */
+            Gtk.drag_source_set (widget, Gdk.ModifierType.BUTTON1_MASK, drag_targets, file_drag_actions);
+            widget.drag_begin.connect (on_drag_begin);
+            widget.drag_data_get.connect (on_drag_data_get);
+            widget.drag_data_delete.connect (on_drag_data_delete);
+            widget.drag_end.connect (on_drag_end);
+        }
+
+        protected void cancel_drag_timer () {
+            disconnect_drag_timeout_motion_and_release_events ();
+            cancel_timeout (ref drag_timer_id);
+        }
+
+        protected void cancel_thumbnailing () {
+            slot.directory.cancel ();
+            cancel_timeout (ref thumbnail_source_id);
+
+            if (thumbnail_request > 0) {
+                thumbnailer.dequeue (thumbnail_request);
+                thumbnail_request = 0;
+            }
+        }
+
+        protected bool is_drag_pending () {
+            return drag_has_begun;
+        }
+
+        protected bool selection_only_contains_folders (GLib.List<unowned GOF.File> list) {
+            bool only_folders = true;
+
+            list.@foreach ((file) => {
+                if (!file.is_folder ())
+                    only_folders = false;
+            });
+
+            return only_folders;
+        }
+
+    /** Handle scroll events */
+        protected bool handle_scroll_event (Gdk.EventScroll event) {
+            if (updates_frozen)
+                return true;
+
+            if ((event.state & Gdk.ModifierType.CONTROL_MASK) > 0) {
+                switch (event.direction) {
+                    case Gdk.ScrollDirection.UP:
+                        zoom_in ();
+                        return true;
+
+                    case Gdk.ScrollDirection.DOWN:
+                        zoom_out ();
+                        return true;
+
+                    case Gdk.ScrollDirection.SMOOTH:
+                        double delta_x, delta_y;
+                        event.get_scroll_deltas (out delta_x, out delta_y);
+                        /* try to emulate a normal scrolling event by summing deltas.
+                         * step size of 0.5 chosen to match sensitivity */
+                        total_delta_y += delta_y;
+
+                        if (total_delta_y >= 0.5) {
+                            total_delta_y = 0;
+                            zoom_out ();
+                        } else if (total_delta_y <= -0.5) {
+                            total_delta_y = 0;
+                            zoom_in ();
+                        }
+                        return true;
+
+                    default:
+                        break;
+                }
+            }
+            return false;
+        }
+
+        protected void show_or_queue_context_menu (Gdk.Event event) {
+            if (selected_files != null)
+                queue_context_menu (event);
+            else
+                show_context_menu (event);
+        }
+
+        protected unowned GLib.List<unowned GOF.File> get_selected_files_for_transfer (GLib.List<unowned GOF.File> selection = get_selected_files ()) {
+            unowned GLib.List<unowned GOF.File> list = null;
+
+            selection.@foreach ((file) => {
+                list.prepend (file);
+            });
+
+            return list;
+        }
+
+/*** Private methods */
+    /** File operations */
+
+        private void activate_file (GOF.File file, Gdk.Screen? screen, Marlin.OpenFlag flag, bool only_one_file) {
+            if (updates_frozen || in_trash)
+                return;
+
+            debug ("activate file %s  only one file %s", file.uri, only_one_file.to_string ());
+            GLib.File location = file.location.dup ();
+
+            if (screen == null)
+                screen = Eel.gtk_widget_get_screen (this);
+
+            if (file.is_folder ()) {
+                switch (flag) {
+                    case Marlin.OpenFlag.NEW_TAB:
+                        window.add_tab (location, Marlin.ViewMode.CURRENT);
+                        break;
+
+                    case Marlin.OpenFlag.NEW_WINDOW:
+                        window.add_window(location, Marlin.ViewMode.CURRENT);
+                        break;
+
+                    default:
+                        if (only_one_file)
+                            load_location (location);
+
+                        break;
+                }
+            } else if (only_one_file && file.is_root_network_folder ())
+                load_location (location);
+            else if (only_one_file && file.is_executable ())
+                file.execute (screen, null, null);
+            else if (only_one_file && default_app != null)
+                file.open_single (screen, default_app);
+            else
+                warning ("Unable to activate this file.  Default app is %s", default_app != null ? default_app.get_name () : "null");
+        }
+
+        private void trash_or_delete_files (GLib.List<unowned GOF.File> file_list, bool delete_if_already_in_trash) {
+            GLib.List<GLib.File> locations = null;
+
+            file_list.@foreach ((file) => {
+                locations.prepend (file.location);
+            });
+
+            if (locations != null) {
+                locations.reverse ();
+                Marlin.FileOperations.trash_or_delete (locations,
+                                                       window as Gtk.Window,
+                                                       (void*) after_trash_or_delete,
+                                                       null);
+            }
+        }
+
+        private void add_file (GOF.File file, GOF.Directory.Async dir) {
+            model.add_file (file, dir);
+
+            if (select_added_files)
+                add_gof_file_to_selection (file);
+        }
+
+        private void new_empty_file (string? parent_uri = null) {
+            if (parent_uri == null)
+                parent_uri = slot.directory.file.uri;
+
+            Marlin.FileOperations.new_file (this as Gtk.Widget,
+                                            null,
+                                            parent_uri,
+                                            null,
+                                            null,
+                                            0,
+                                            (Marlin.CreateCallback?) create_file_done,
+                                            this);
+        }
+
+        private void new_empty_folder () {
+            Marlin.FileOperations.new_folder (null, null, slot.location, (Marlin.CreateCallback?) create_file_done, this);
+        }
+
+        protected void rename_file (GOF.File file_to_rename) {
+            unselect_all ();
+            select_gof_file (file_to_rename);
+
+            if (file_to_rename.is_writable ())
+                start_renaming_file (file_to_rename, false);
+            else
+                warning ("You do not have permission to rename this file");
+        }
+
+
+/** File operation callbacks */
+        static void create_file_done (GLib.File? new_file, void* data) {
+            if (new_file == null)
+                return;
+
+            var view = (FM.AbstractDirectoryView)data;
+            var file_to_rename = GOF.File.@get (new_file);
+            /* Allow time for the file to appear in the tree model before renaming */
+            GLib.Timeout.add (50, () => {
+                view.rename_file (file_to_rename);
+                return false;
+            });
+        }
+
+        private void after_trash_or_delete (GLib.HashTable? debuting_files, bool user_cancel, void* data) {
+            if (user_cancel)
+                selection_was_removed = false;
+        }
+
+        private void trash_or_delete_selected_files () {
+        /* This might be rapidly called multiple times for the same selection
+         * when using keybindings. So we remember if the current selection
+         * was already removed (but the view doesn't know about it yet).
+         */
+            if (!selection_was_removed) {
+                 unowned GLib.List<unowned GOF.File> selection = get_selected_files_for_transfer ();
+                if (selection != null) {
+                    selection_was_removed = true;
+                    trash_or_delete_files (selection, true);
+                }
+            }
+        }
+
+
+        private void delete_selected_files () {
+             unowned GLib.List<unowned GOF.File> selection = get_selected_files_for_transfer ();
+            if (selection == null)
+                return;
+
+            GLib.List<GLib.File> locations = null;
+
+            selection.@foreach ((file) => {
+                locations.prepend (file.location);
+            });
+
+            locations.reverse ();
+            Marlin.FileOperations.@delete (locations, window as Gtk.Window, null, null);
+        }
+
+/** Signal Handlers */
+
+    /** Menu actions */
+        /** Selection actions */
+
+        private void on_selection_action_rename (GLib.SimpleAction action, GLib.Variant? param) {
+            rename_selected_file ();
+        }
+
+        private void rename_selected_file () {
+            if (selected_files == null)
+                return;
+
+            if (selected_files.next != null)
+                /* TODO invoke batch renamer see bug #1014122*/
+                warning ("Cannot rename multiple files (yet) - renaming first only");
+
+            var file = selected_files.first ().data;
+            bool preselect_whole_name = file.is_folder ();
+
+            start_renaming_file (file, preselect_whole_name);
+        }
+
+        private void on_selection_action_cut (GLib.SimpleAction action, GLib.Variant? param) {
+            unowned GLib.List<unowned GOF.File> selection = get_selected_files_for_transfer ();
+            clipboard.cut_files (selection);
+        }
+
+        private void on_selection_action_trash (GLib.SimpleAction action, GLib.Variant? param) {
+            trash_or_delete_selected_files ();
+        }
+
+        private void on_selection_action_delete (GLib.SimpleAction action, GLib.Variant? param) {
+            delete_selected_files ();
+        }
+
+        private void on_selection_action_restore (GLib.SimpleAction action, GLib.Variant? param) {
+            unowned GLib.List<unowned GOF.File> selection = get_selected_files_for_transfer ();
+            Marlin.restore_files_from_trash (selection, window);
+        }
+
+        private void on_selection_action_open_executable (GLib.SimpleAction action, GLib.Variant? param) {
+            unowned GLib.List<unowned GOF.File> selection = get_files_for_action ();
+            GOF.File file = selection.data as GOF.File;
+            unowned Gdk.Screen screen = Eel.gtk_widget_get_screen (this);
+            file.execute (screen, null, null);
+        }
+
+        private void on_selection_action_open_with_default (GLib.SimpleAction action, GLib.Variant? param) {
+            activate_selected_items (Marlin.OpenFlag.DEFAULT);
+        }
+
+        private void on_selection_action_open_with_app (GLib.SimpleAction action, GLib.Variant? param) {
+            var index = int.parse (param.get_string ());
+            open_files_with (open_with_apps.nth_data ((uint)index), get_files_for_action ());
+        }
+
+        private void on_selection_action_open_with_other_app () {
+            unowned GLib.List<unowned GOF.File> selection = get_files_for_action ();
+            GOF.File file = selection.data as GOF.File;
+
+            Gtk.DialogFlags flags = Gtk.DialogFlags.MODAL |
+                                    Gtk.DialogFlags.DESTROY_WITH_PARENT |
+                                    Gtk.DialogFlags.USE_HEADER_BAR;
+ 
+            var dialog = new Gtk.AppChooserDialog (window, flags, file.location);
+            dialog.set_heading (_("Select an application"));
+
+            var check_default = new Gtk.CheckButton.with_label (_("Set as default"));
+            dialog.get_content_area ().pack_start (check_default, false, false, 0);
+            dialog.show_all ();
+
+            int response = dialog.run ();
+
+            if (response == Gtk.ResponseType.OK) {
+                var app =dialog.get_app_info ();
+                if (check_default.get_active ()) {
+                    try {
+                        app.set_as_default_for_type (file.get_ftype ());
+                    }
+                    catch (GLib.Error error) {
+                        critical ("Could not set as default: %s", error.message);
+                    }
+                }
+                open_files_with (app, selection);
+            }
+
+            dialog.destroy ();
+        }
+
+        private void on_common_action_bookmark (GLib.SimpleAction action, GLib.Variant? param) {
+            if (selected_files != null)
+                window.sidebar.add_uri (selected_files.data.uri);
+            else
+                window.sidebar.add_uri (slot.directory.file.uri);
+        }
+
+        /** Background actions */
+
+        private void change_state_show_hidden (GLib.SimpleAction action) {
+            window.change_state_show_hidden (action);
+        }
+
+        private void on_background_action_new (GLib.SimpleAction action, GLib.Variant? param) {
+            switch (param.get_string ()) {
+                case "FOLDER":
+                    new_empty_folder ();
+                    break;
+
+                case "FILE":
+                    new_empty_file ();
+                    break;
+
+                default:
+                    break;
+            }
+        }
+
+        private void on_background_action_create_from (GLib.SimpleAction action, GLib.Variant? param) {
+            int index = int.parse (param.get_string ());
+            create_from_template (templates.nth_data ((uint)index));
+        }
+
+        private void on_background_action_sort_by_changed (GLib.SimpleAction action, GLib.Variant? val) {
+            string sort = val.get_string ();
+            set_sort (sort, false);
+        }
+        private void on_background_action_reverse_changed (GLib.SimpleAction action, GLib.Variant? val) {
+            set_sort (null, true);
+        }
+
+        private void set_sort (string? col_name, bool reverse) {
+            int sort_column_id;
+            Gtk.SortType sort_order;
+
+            if (model.get_sort_column_id (out sort_column_id, out sort_order)) {
+                if (col_name != null)
+                    sort_column_id = get_column_id_from_string (col_name);
+
+                if (reverse) {
+                    if (sort_order == Gtk.SortType.ASCENDING)
+                        sort_order = Gtk.SortType.DESCENDING;
+                    else
+                        sort_order = Gtk.SortType.ASCENDING;
+                }
+                    
+                model.set_sort_column_id (sort_column_id, sort_order);
+            }
+        }
+
+        /** Common actions */
+
+        private void on_common_action_open_in (GLib.SimpleAction action, GLib.Variant? param) {
+            default_app = null;
+
+            switch (param.get_string ()) {
+                case "TAB":
+                    activate_selected_items (Marlin.OpenFlag.NEW_TAB, get_files_for_action ());
+                    break;
+
+                case "WINDOW":
+                    activate_selected_items (Marlin.OpenFlag.NEW_WINDOW, get_files_for_action ());
+                    break;
+
+                case "TERMINAL":
+                    open_selected_in_terminal (get_files_for_action ());
+                    break;
+
+                default:
+                    break;
+            }
+        }
+
+        private void open_selected_in_terminal (GLib.List<unowned GOF.File> selection = get_selected_files ()) {
+            var terminal = new GLib.DesktopAppInfo (Marlin.OPEN_IN_TERMINAL_DESKTOP_ID);
+
+            if (terminal != null)
+                open_files_with (terminal, selection);
+        }
+
+        private void on_common_action_properties (GLib.SimpleAction action, GLib.Variant? param) {
+            new Marlin.View.PropertiesWindow (get_files_for_action (), this, window);
+        }
+
+        private void on_common_action_copy (GLib.SimpleAction action, GLib.Variant? param) {
+            clipboard.copy_files (get_selected_files_for_transfer (get_files_for_action ()));
+        }
+
+        private void on_common_action_paste_into (GLib.SimpleAction action, GLib.Variant? param) {
+            var file = get_files_for_action ().nth_data (0);
+
+            if (file != null && clipboard.get_can_paste ()) {
+                prepare_to_select_added_files ();
+                if (file.is_folder () && !clipboard.has_file (file))
+                    clipboard.paste_files (file.get_target_location (), this as Gtk.Widget, null);
+                else
+                    clipboard.paste_files (slot.directory.location, this as Gtk.Widget, null);
+            }
+        }
+
+
+        private void on_directory_file_added (GOF.Directory.Async dir, GOF.File file) {
+            add_file (file, dir);
+        }
+
+        private void on_directory_file_loaded (GOF.Directory.Async dir, GOF.File file) {
+            select_added_files = false;
+            add_file (file, dir);
+        }
+
+        private void on_directory_file_changed (GOF.Directory.Async dir, GOF.File file) {
+            remove_marlin_icon_info_cache (file);
+            model.file_changed (file, dir);
+            /* 2nd parameter is for returned request id if required - we do not use it? */
+            /* This is required if we need to dequeue the request */
+            thumbnailer.queue_file (file, null, false);
+        }
+
+        private void on_directory_file_icon_changed (GOF.Directory.Async dir, GOF.File file) {
+            model.file_changed (file, dir);
+        }
+
+        private void on_directory_file_deleted (GOF.Directory.Async dir, GOF.File file) {
+            remove_marlin_icon_info_cache (file);
+            model.remove_file (file, dir);
+            if (file.is_folder ()) {
+                var file_dir = GOF.Directory.Async.cache_lookup (file.location);
+                if (file_dir != null) {
+                    file_dir.purge_dir_from_cache ();
+                    slot.folder_deleted (file, file_dir);
+                }
+            }
+        }
+
+        private void  on_directory_done_loading (GOF.Directory.Async dir) {
+            debug ("DV  directory done loading %s", dir.file.uri);
+            dir.file_loaded.disconnect (on_directory_file_loaded);
+            in_trash = (dir.file.uri == Marlin.TRASH_URI); /* trash cannot be subdirectory */
+            thaw_tree ();
+            queue_draw ();
+        }
+
+        private void on_directory_thumbs_loaded (GOF.Directory.Async dir) {
+            Marlin.IconInfo.infos_caches ();
+        }
+
+    /** Handle zoom level change */
+        private void on_zoom_level_changed (Marlin.ZoomLevel zoom) {
+            model.set_property ("size", icon_size);
+            change_zoom_level ();
+
+            if (get_realized ())
+                load_thumbnails (slot.directory, zoom);
+        }
+
+    /** Handle Preference changes */
+        private void on_show_hidden_files_changed (GLib.Object prefs, GLib.ParamSpec pspec) {
+            bool show = (prefs as GOF.Preferences).show_hidden_files;
+            if (!show) {
+                block_model ();
+                model.clear ();
+            }
+
+            directory_hidden_changed (slot.directory, show);
+            if (loaded_subdirectories != null)
+                loaded_subdirectories.@foreach ((dir) => {
+                    directory_hidden_changed (dir, show);
+                });
+
+            if (!show)
+                unblock_model ();
+
+            action_set_state (background_actions, "show_hidden", show);
+        }
+
+        private void directory_hidden_changed (GOF.Directory.Async dir, bool show) {
+            dir.file_loaded.connect (on_directory_file_loaded); /* disconnected by on_done_loading callback.*/
+
+            if (show)
+                dir.load_hiddens ();
+            else
+                dir.load ();
+        }
+
+        private void on_interpret_desktop_files_changed () {
+            slot.directory.update_desktop_files ();
+        }
+
+    /** Handle popup menu events */
+        private bool on_popup_menu () {
+            Gdk.Event event = Gtk.get_current_event ();
+            show_or_queue_context_menu (event);
+            return true;
+        }
+
+    /** Handle Button events */
+        private bool on_drag_timeout_button_release (Gdk.EventButton event) {
+            /* Only active during drag timeout */
+            cancel_drag_timer ();
+
+            if (drag_button == Gdk.BUTTON_SECONDARY)
+                show_context_menu (event);
+
+            return true;
+        }
+
+        private bool on_button_press_event (Gdk.EventButton event) {
+            /* Extra mouse button action: button8 = "Back" button9 = "Forward" */
+            GLib.Action? action = null;
+            GLib.SimpleActionGroup main_actions = window.get_action_group ();
+            if (event.type == Gdk.EventType.BUTTON_PRESS) {
+                if (event.button == 8)
+                    action = main_actions.lookup_action ("Back");
+                else if (event.button == 9)
+                    action = main_actions.lookup_action ("Forward");
+
+                if (action != null) {
+                    action.activate (null);
+                    return true;
+                }
+            }
+            return false;
+        }
+
+/** Handle Motion events */
+        private bool on_drag_timeout_motion_notify (Gdk.EventMotion event) {
+            /* Only active during drag timeout */
+            Gdk.DragContext context;
+            var widget = get_real_view ();
+            int x = (int)event.x;
+            int y = (int)event.y;
+
+            if (Gtk.drag_check_threshold (widget, drag_x, drag_y, x, y)) {
+                cancel_drag_timer ();
+                should_activate = false;
+                var target_list = new Gtk.TargetList (drag_targets);
+                var actions = file_drag_actions;
+
+                if (drag_button == 3)
+                    actions |= Gdk.DragAction.ASK;
+
+                context = Gtk.drag_begin_with_coordinates (widget,
+                                target_list,
+                                actions,
+                                drag_button,
+                                (Gdk.Event) event,
+                                 x, y);
+                return true;
+            } else
+                return false;
+        }
+
+/** Handle TreeModel events */
+        protected virtual void on_row_deleted (Gtk.TreePath path) {
+             GLib.List<Gtk.TreePath>? selected_paths = get_selected_paths ();
+            selection_before_delete = null;
+
+            /* Do nothing if the deleted row is not selected or there is more than one file selected */
+            if (selected_paths == null ||
+                selected_paths.length () != 1 ||
+                selected_paths.find_custom (path, Gtk.TreePath.compare) == null)
+
+                return;
+
+            /* Create a copy the path (we're not allowed to modify it in this handler) */
+            Gtk.TreePath path_copy = path.copy ();
+
+            /* Remember the selected path so that it can be restored after the row has
+             * been removed. If the first row is removed, select the first row after the
+             * removal, if any other row is removed, select the row before that one */
+            path_copy.prev ();
+            selection_before_delete = path_copy.copy ();
+        }
+
+/** Handle clipboard signal */
+        private void on_clipboard_changed () {
+            update_menu_actions ();
+            /* show possible change in appearance of cut items */
+            queue_draw ();
+        }
+
+/** Handle Selection changes */
+        public void notify_selection_changed () {
+            selection_was_removed = false;
+
+            if (!get_realized ())
+                return;
+
+            if (updates_frozen)
+                return;
+
+            update_menu_actions ();
+            window.selection_changed (get_selected_files ());
+        }
+
+    /** Handle size allocation event */
+        private void on_size_allocate (Gtk.Allocation allocation) {
+            schedule_thumbnail_timeout ();
+        }
+
+/** DRAG AND DROP */
+
+    /** Handle Drag source signals*/
+
+        private void on_drag_begin (Gdk.DragContext context) {
+            drag_has_begun = true;
+            should_activate = false;
+            drag_file_list = get_selected_files_for_transfer ();
+
+            if (drag_file_list == null)
+                return;
+
+            GOF.File file = drag_file_list.first ().data;
+
+            if (file != null && file.pix != null)
+                Gtk.drag_set_icon_pixbuf (context, file.pix, 0, 0);
+            else