Merge lp:~kjtehprogrammer/pantheon-files/editable-pathbar into lp:~elementary-apps/pantheon-files/trunk

[KJ Lawrence]

* Makes the pathbar editable text when it receives focus. The entire path can be modified. It's also possible to put "ssh://user@domain" (or ftp, sftp, smb, etc) and get prompted for a password to connect.
* Switches Gtk.EventBox and custom Entry widget out with Gtk.Entry

Makes the pathbar editable text when it receives focus. The entire path can be modified. It's also possible to put "ssh://user@domain" (or ftp, sftp, smb, etc) and get prompted for a password to connect.

This is a great jumping off point for searching in files. The breadcrumb entry class already attempts to auto-complete what you're typing for the directory path (which still works in this change), we would just need to modify how it displays results and tie it into Zeitgeist.

[Jeremy Wootten (jeremywootten)]

This branch basically works but there a few problems:

1) Upon entering edit mode, the cursor appears at the end of the existing path and the path does not appear selected. If you start typing, the whole of the path disappears. If what is typed next does not begin with "/" then it is appended to the path that disappeared, otherwise a new path is created. This could be confusing to an inexperienced user. I suggest that the current path continue to be displayed and what is typed is appended to it, unless the first character typed is "Delete". This is what you would expect to happen based on the position of the cursor. Need UI team input on this.

2) After entering edit mode, press BackSpace to delete the existing path, then Enter. The path bar shows the root directory but a completely different folder is loaded.

3) Line 50: Remove or change to "debug ( .. )" debugging message that does not indicate an error.
   Line 78: Remove commented out code.
   Line 248, 261, 274: Recommended comment style is /* .... */

review: Needs Fixing

[KJ Lawrence (kjtehprogrammer)]

I'm not sure I follow on #1. When you click an empty area the entire path -should- appear and be completely selected. Typing without unselecting the path (clicking off or pressing an arrow key) should wipe out the entire path, similar to the way Windows Explorer works. Here's how it appears on mine when I clicked an empty area to edit the path: http://imgur.com/P2kn2lC

#2, good catch I'll have to look into that.

[Danielle Foré (danrabbit)]

I really don't like that it selects the entire entry when you click into it. I would expect it to place the cursor at the end without any selection. I'm not sure Windows anything is the best example of good UX :p

I also noticed a bug where auto-completing with tab navigates to the next directory (which of itself feels a little pre-emptive but not necessarily wrong) but the entry doesn't update to reflect the change in path.

I do like the overall concept of just switching to a plain text entry though. I'm sure that would make the code simpler and eliminate bugs caused by the custom widget.

I also noticed a regression where the "go" icon shows in the entry even when you haven't typed a path that is different from your current path.

review: Needs Fixing

[Jeremy Wootten (jeremywootten)]

Looks like it is a theme issue then - I am running it on Ubuntu 14.04
rather than Isis and the path appears in bold rather than highlighted for
some reason but other text selections (e.g. file renaming) appear
highlghted. It looks like Daniel agrees with me that the path should not
be selected initially (i.e. typing just appends).

On 4 May 2014 03:32, KJ Lawrence <email address hidden> wrote:

> I'm not sure I follow on #1. When you click an empty area the entire path
> -should- appear and be completely selected. Typing without unselecting the
> path (clicking off or pressing an arrow key) should wipe out the entire
> path, similar to the way Windows Explorer works. Here's how it appears on
> mine when I clicked an empty area to edit the path:
> http://imgur.com/P2kn2lC
>
> #2, good catch I'll have to look into that.
> --
>
> https://code.launchpad.net/~kjtehprogrammer/pantheon-files/editable-pathbar/+merge/216531
> You are reviewing the proposed merge of
> lp:~kjtehprogrammer/pantheon-files/editable-pathbar into lp:pantheon-files.
>

[lp:~kjtehprogrammer/pantheon-files/editable-pathbar]

1487. By KJ Lawrence on 2014-05-24

- Fixes some code styling and removes some debugging code
- Fixes regression where the "go" icon shows up without changing anything
- Removes auto-highlighting all text
- Fixed path issues with file://, trash:// and network://

1488. By KJ Lawrence on 2014-05-24

Merging with trunk

[KJ Lawrence (kjtehprogrammer)]

Sorry for the long update, a lot going on lately. Give the latest commit a shot. The commit message gives a rundown of everything that was changed.

Daniel, if you make me remove the pre-emptive directory switching with tab you'll have made these last two hours for (almost) nothing! However, it would not be difficult to do so (just one line), your call on how you want it to flow. :) I can say that it is sort of nice to have the pre-emptive directory switching because it gives you a view of all of the files in a folder so you have any idea of what to continue typing going forward. I'm sure it's a draw back on extremely large folders though.

[Jeremy Wootten (jeremywootten)]

Good work, but there are still a few issues with this:

1) Line 358 - unused variable "files"
2) If you type the name of a non-existent folder with a space in the name and then choose "Create folder", the folder is created with "%20" instead of "space" in the name.
3) Keep pressing "Backspace" - you can delete the last "/". Then pressing "Enter" does not load root directory view, although the location bar displays it (because the generated path is invalid - "file://" instead of "file:///").
4) Pressing "Ctrl-Backspace" then "Enter" when the path has spaces gives a "directory not found" error - this is related to point 2).

I like the pre-emptive directory switching.

review: Needs Fixing

[lp:~kjtehprogrammer/pantheon-files/editable-pathbar]

1489. By KJ Lawrence on 2014-05-24

- Fixes escaping issues with the paths (would affect paths with spaces)
- Fixed issue with auto-completion with certain special characters (#)
- Clearing out the entire path takes you to the root folder

[KJ Lawrence (kjtehprogrammer)]

Good catches. It's a pain to track down these encoding issues with spaces and special characters... try this commit and see if everything is working for you. Try testing special characters in the path and everything.

[Avi Romanoff (aroman)]

A few things from an end-user's perspective (haven't even looked at the code)

1. Unlike other entry fields, I can't use <ctrl>+left/right to jump between words. In this case, words = directories. This is really important, I think.

2. Similar to #1, <ctrl>+a doesn't select-all. It should. (Shouldn't we get #1 and #2 for free?)

3. Typing ~/some_dir does not resolve to /home/$USER/some_dir. Instead, it looks like it's resolving to /some_dir.

4. I shouldn't be able to bread-crumb-ize non-existent paths. See: http://i.imgur.com/hxhuba8.png

review: Needs Fixing

[KJ Lawrence (kjtehprogrammer)]

You give me too much credit, Haha. I used the existing text entry field, which pretty much implements all input text field functions , obviously missing those two and connect menus. I can certainly try to switch it out though.

How did you manage #4?

[Avi Romanoff (aroman)]

I didn't have to do anything special for #4 :p

I just clicked in the pathbar, typed "some_directory", and hit enter. The pathbar indicates that I'm viewing a non-existent directory, when in reality the file view never changes.

[Danielle Foré (danrabbit)]

Hm something funny is going on. I can also make the pathbar display stuff that isn't the current directory :p http://imgur.com/91Jmr70

review: Needs Fixing

[lp:~kjtehprogrammer/pantheon-files/editable-pathbar]

1490. By KJ Lawrence on 2014-05-28

Switching Gtk.EventBox and custom Entry widget out with Gtk.Entry

[KJ Lawrence (kjtehprogrammer)]

Not done yet, just wanted to get this committed. Would love for you guys to test it and get opinions!

Switched out Gtk.EventBox and the custom Entry widget we had with an actual Gtk.Entry widget. It plays nicely with elementary theming, but I have no idea beyond that! There are a couple of things I coded around (positioning completion text during the draw for one) that I don't think I did quite right (might be prone to breaking if smaller/larger texts are set for the location bar).

Since it's switched out with a Gtk.Entry widget there are a couple of nice advantages! There's the standard context menu (Copy/Cut/Paste, etc). You can also use CTRL + L/R to move between directories. There's a lot less code (got to completely eliminate a file) and what there is has been simplified. Also, since it's a Gtk.Entry widget you can do a progress bar similar to Midori now - I'm sure that's useful for something.

I'm sure there are plenty of code styling issues and debug statements that have not been cleaned up, so don't worry too much on those right now. I still have to fix some pathing and completion issues and need to get the "Goto" icon back.

[Corentin Noël (tintou)]

I like what you did there, with a lightweight code, Files will be even easier to maintain! There are still some warnings but as you said it's a WIP.

[lp:~kjtehprogrammer/pantheon-files/editable-pathbar]

1491. By KJ Lawrence on 2014-05-30

- Added "Go" arrow back to Location bar
- Fixed file pathing issues with special characters (#, " ", etc)
- Reorganized some of the LocationBar code to make it easier to follow
- Implemented 'up' functionality

[KJ Lawrence (kjtehprogrammer)]

One step closer. Go arrow is back (highlights immediately now). I think I've finally got this pathing issue resolved for everything, but please do try to break it. I also implemented the "Up" functionality since we never had it before (but had the groundwork in place for it).

Besides cleaning the code up and fixing styling, the only thing that's left is to fix Ctrl + A functionality. It looks like the entire Window is handling that instead of just the view, so pressing Ctrl + A highlights everything in the files view - might be a little tricky to track that one down.

Please test! Code should be clean enough for review now too if people want to start looking at that.

[lp:~kjtehprogrammer/pantheon-files/editable-pathbar]

1492. By KJ Lawrence on 2014-05-31

- Code styling fixes and some comments
- Fix for auto-completion where multiple results are turned

1493. By KJ Lawrence on 2014-05-31

Merging with trunk

1494. By KJ Lawrence on 2014-05-31

Fixed auto-complete issue with ~

[KJ Lawrence (kjtehprogrammer)]

Okay, just some final touches. I cleaned up the code a little bit more and fixed an issue with auto-completion where if you found multiple results (I had a folder with "ctags-trunk" and "ctags-better-php") it would auto-complete up until they diverged and then take you to a "Folder 'ctags-' does not exist" page. Now it will auto-complete until they diverge but keep you where you are at.

I'm honestly not sure how to change things to fix selecting with Ctrl+A with the pathbar - accelerators confuse me!

[lp:~kjtehprogrammer/pantheon-files/editable-pathbar]

1495. By KJ Lawrence on 2014-05-31

Fixed issue where multiple directories with the same starting letter (but with different capitalizations) would crash Files when auto-completing

1496. By KJ Lawrence on 2014-05-31

Fixes auto-completion with spaces
Unescapes paths that show up in Back/Forward button

[Jeremy Wootten (jeremywootten)]

The following issues are now fixed:
1) Now handles paths with spaces correctly.
2) Ctrl left and right work as expected
3) ~ resolves to use home directory
4) I cannot reproduce Daniel's problem with this revision, although the steps involved were not stated.

The following issues remain:
1) It is still possible to delete the initial "/"; pressing "Enter" then produces a "Folder '.' can't be found" message. If you select Create folder '.' then an error message is produced. See inline diff comment at line 927.

2) Ctrl-A selects all folders in the current view instead of the whole path. This is because the event goes to the top window default handler first. A solution to this is to intercept the event at the window level and pass directly to the location bar if it has focus. e.g. In Window.vala -

            key_press_event.connect ((event) => {
                if (top_menu.location_bar.bread.is_focus)
                    return top_menu.location_bar.bread.key_press_event (event);
                else
                    return false;
            });

3) Rather than use hex values to compare with event.keyval it would be better to use Gdk.Key.<keyname>. e.g. Gdk.Key.Tab instead of 0xff09: A list of the correct names can be found in /usr/share/vala-0.24/vapi/gdk-3.0.vapi. It would be a good idea to test for alternative keys as well e.g. KP_Tab.

4) The breadcrumbs still pre-emptively display non-existent paths while the view displays the 'Folder not found' dialog, although personally I do not find this objectionable as you have the option to create the path at that point.

5) The entry is in insert mode to begin with. Design team should confirm whether insert or overwrite mode is better.

review: Needs Fixing

[lp:~kjtehprogrammer/pantheon-files/editable-pathbar]

1497. By KJ Lawrence on 2014-06-11

Use Gdk.Key name instead of Hex value
Fixes Ctrl+A in Location Bar
Fixes issue where missing root '/' would try to create a new directory

[KJ Lawrence (kjtehprogrammer)]

1. I could have sworn I got that one... Well, fixed now (hopefully!)
2. That works quite well, thanks!
3. Never did like the hex values - took them from the original entry class, but didn't really think about how to switch them out.

For 4/5 that's really a design team call. I too like the pre-emptive stuff. If the directory I navigate to doesn't exist it's pretty convenient for it to ask me to make it. Otherwise I can just press Ctrl+L or click the pathbar and go back to navigating around. It's nicer than Nautilus' and Windows Explorer's error popup saying it doesn't exist - at least I can do something with it this way.

[Danielle Foré (danrabbit)]

KJ, do you have any idea why the go icon looks so light? Is there perhaps some leftover code where the color is being overridden or the opacity is being changed? It's definitely not the same color as (for example) the clear icon in search entries.

I'm still not sure I'm a massive fan of switching directories before pressing "enter", but I think we can go with it and see if it gets reported as a bug ;)

Anyways, this branch looks awesome. It fixes some minor visual issues with box-shadow in gtk 3.14 as well :)

review: Approve

[Jeremy Wootten (jeremywootten)]

Good work!

Sorry, theres one more issue that I've just noticed - the substitutions for "~", "ssh:" etc happen even when they are just part of the filename and not only at the start of the path. For example, try to create a directory called "a_folder_with_~_in_the_name". This is resolved to "/a_folder_with/home/username/in_the_name". The behaviour should be the same as the "mkdir" command in this respect.

review: Needs Fixing

[KJ Lawrence (kjtehprogrammer)]

Daniel, it's 20% transparent right now. I could make it 10% or even 5% to make it a little more obvious. There wouldn't be as much of an effect when hovering over it, though there might still be enough of one. I'm not sure if there's a way to make it darker. I think I noticed the difference between how dark it looked in Midori and in the current Files, but not sure if the transparency change will get them closer to each other or not.

Jeremy, so I should just swap out the ~ on the first character? Should I still swap it if there's a slash in front of it, or only if it's the first character?

[Danielle Foré (danrabbit)]

KJ, if we're using a regular gtk.entry now the color should be completely handled in the theme :)

[KJ Lawrence (kjtehprogrammer)]

Interesting... I didn't know until you mentioned it, but I guess Gtk.Entry can automatically handle the go icon it looks like. I'll have to update some of the code to use that rather than manually handling it - might make things even more cleaner. I'm still learning Gtk and am honestly amazed by how much the Gtk.Entry widget can do, haha.

Right now the Go icon is being drawn independently so I doubt you'll be able to control it through the theme. After I change it to be drawn by the entry directly you should be good then.

[Danielle Foré (danrabbit)]

Oh wow xD

[KJ Lawrence (kjtehprogrammer)]

Yeah, a lot of my work on this was based off of the original "BreadcrumbsEntry" class that existed before, which basically re-created the entire Gtk.Entry widget. I didn't realize how much so until I actually switched to using an Entry widget instead and half of the code vanished (the big block of red below)...

[Jeremy Wootten (jeremywootten)]

I would take as a guide the behaviour of the 'cd' command when in a terminal in the root directory when followed by the path in the location bar. If you type "cd ~" it takes you to the home directory. If you type "cd /~" it gives "No such file or directory" (unless you happen to have a folder named "~" in your root directory). So I would say only substitute it if it is the first character in the path.

[lp:~kjtehprogrammer/pantheon-files/editable-pathbar]

1498. By KJ Lawrence on 2014-06-13

Use the secondary icon for 'go' instead of manually drawing it

[KJ Lawrence (kjtehprogrammer)]

Okay, ~ is only accepted as the first character and the Go icon is set as the secondary icon for Gtk.Entry, so it should be themable. I didn't notice any difference when hovering, but I may be missing something from my setup. There's no more code to manually drawing the arrow anymore, so I think any hover effect is now out of my control.

Changing the cursor for a Gtk.Entry is a pain in the ass, just an FYI. Not sure if I did it right (line 974 in the diff shows what I had to do), so that should be reviewed, but it works the way you would expect.

[lp:~kjtehprogrammer/pantheon-files/editable-pathbar]

1499. By KJ Lawrence on 2014-06-13

Merging in trunk!

[Cody Garver (codygarver)]

libwidgets/LocationBar.vala:248.13-248.42: warning: local variable `width' declared but never used
        int width = get_allocated_width ();
            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

[lp:~kjtehprogrammer/pantheon-files/editable-pathbar]

1500. By KJ Lawrence on 2014-06-14

Fixes a unused variable warning

[KJ Lawrence (kjtehprogrammer)]

Fixed

[Jeremy Wootten (jeremywootten)]

review: Approve

[Avi Romanoff (aroman)]

Looking really good, but I have three minor issues:

1. Network URI support (which is apparently being targeted by this bug as well) is still buggy. Specifically, typing a URI (ex: `afp://Wan.local/`) does in fact cause Files to display a prompt for username/password, but it also causes the tab bar to show "This folder does not exist", and this title does not go away even when the credentials are entered and the share is loaded.

See: http://i.imgur.com/kL7HB1U.png

I dunno if this is actually supposed to be fixed by this branch, but https://bugs.launchpad.net/pantheon-files/+bug/1123059 is linked.

2. When changing directories, the whole pathbar animates, even if most the breadcrumb hierarchy stayed constant. For example, clicking on a directory "foo" inside ~/Developer/test/foo causes the entire pathbar to be re-drawn/re-animated/re-slide-in, when what should happen is only the "/foo" breadcrumb should be appended/animated in.

3. Clicking on the right-most breadcrumb causes the pathbar to re-animate. Why?

review: Needs Fixing

[Cody Garver (codygarver)]

1 is bug #1198334

[KJ Lawrence (kjtehprogrammer)]

1. The network URI support was actually what I initially started all of this for, the rest was just kind of fill in place. Though, it was just for being able to type in the path, versus using the network dialog box. I can dig into the tab issue and see what I can find.

2. I didn't see that with normal files usage. Just clicking a folder in the normal view was correct, it just appended the extra breadcrumb entry without re-rendering. Though, I did notice that if you click any of the breadcrumbs that it re-renders. Apparently that's the way the existing Files setup is, so I'd have to dig into that to make it a little more smooth. It does it somewhere though, so this shouldn't be too difficult.

3. It does this for the current Files code too - not really sure why, I'd have to dig into it. It re-renders for any of the breadcrumbs that are clicked (but doesn't redraw all of the breadcrumbs when you're just navigating around, which is kind of strange).

[lp:~kjtehprogrammer/pantheon-files/editable-pathbar]

1501. By KJ Lawrence on 2014-06-14

- Fixes issue where breadcrumbs would always fully redraw when clicked
- Removes unused code

[KJ Lawrence (kjtehprogrammer)]

Okay, that commit should fix the breadcrumb fully redrawing issue.

Thanks Cody, I thought I saw something on that before. Should I look at it as part of my changes or leave it alone then, since it has its own bug report? If I leave it alone, do we need to make these changes dependent on it, or just commit anyways?

[Avi Romanoff (aroman)]

I can confirm that the breadcrumb full-redrawing bug is fixed -- awesome!

I think this should be merged to trunk and those other bugs (which were not introduced by this branch) should be fixed separately. I say, approve.

review: Approve

=== modified file 'libwidgets/BreadcrumbsElements.vala'
--- libwidgets/BreadcrumbsElements.vala	2014-05-13 21:10:32 +0000
+++ libwidgets/BreadcrumbsElements.vala	2014-06-14 19:18:12 +0000
@@ -41,6 +41,7 @@
         }
     }
     Gdk.Pixbuf icon;
+    public bool hidden = false;
     public bool display = true;
     public bool display_text = true;
     public string? text_displayed = null;
@@ -187,4 +188,4 @@
 
         return x;
     }
-}
+}
\ No newline at end of file

=== removed file 'libwidgets/BreadcrumbsEntry.vala'
--- libwidgets/BreadcrumbsEntry.vala	2013-08-10 20:32:58 +0000
+++ libwidgets/BreadcrumbsEntry.vala	1970-01-01 00:00:00 +0000
@@ -1,494 +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; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-public class Marlin.View.Chrome.BreadcrumbsEntry : GLib.Object {
-    Gtk.IMContext im_context;
-    public string text = "";
-    public int cursor = 0;
-    public string completion = "";
-    uint timeout;
-    bool blink = true;
-    public Gdk.Pixbuf arrow_img;
-
-    double selection_mouse_start = -1;
-    double selection_mouse_end = -1;
-    double selection_start = 0;
-    double selection_end = 0;
-    int selected_start = -1;
-    int selected_end = -1;
-    internal bool hover = false;
-    bool focus = false;
-
-    bool is_selecting = false;
-    bool need_selection_update = false;
-
-    double text_width;
-    double text_height;
-
-    public signal void enter ();
-    public signal void backspace ();
-    public signal void left ();
-    public signal void up ();
-    public signal void down ();
-    public signal void left_full ();
-    public signal void need_draw ();
-    public signal void paste ();
-    public signal void need_completion ();
-    public signal void completed ();
-    public signal void escape ();
-
-    /**
-     * Create a new BreadcrumbsEntry object. It is used to display the entry
-     * which is a the left of the pathbar. It is *not* a Gtk.Widget, it is
-     * only a class which holds some data and draws an entry to a given
-     * Cairo.Context.
-     * Events must be sent to the appropriate function (key_press_event,
-     * key_release_event, mouse_motion_event, etc...). These events must be
-     * relative to the widget, so, you need to do some things like
-     * event.x -= entry_x before sending the events.
-     * It can be drawn using the draw() function.
-     **/
-    public BreadcrumbsEntry () {
-        im_context = new Gtk.IMMulticontext ();
-        im_context.commit.connect (commit);
-
-        /* Load arrow image */
-        try {
-            arrow_img = Gtk.IconTheme.get_default ().load_icon ("go-jump-symbolic", 16, Gtk.IconLookupFlags.GENERIC_FALLBACK);
-        } catch (Error err) {
-            stderr.printf ("Unable to load home icon: %s", err.message);
-        }
-    }
-
-    /**
-     * Call this function if the parent widgets has the focus, it will start
-     * computing the blink cursor, will enable cursor and selection drawing.
-     **/
-    public void show () {
-        focus = true;
-
-        if (timeout > 0)
-            Source.remove (timeout);
-
-        timeout = Timeout.add (700, () => {
-            blink = !blink;
-            need_draw ();
-
-            return true;
-        });
-    }
-
-    /**
-     * Delete the text selected.
-     **/
-    public void delete_selection () {
-        if (selected_start > 0 && selected_end > 0) {
-            int first = selected_start > selected_end ? selected_end : selected_start;
-            int second = selected_start > selected_end ? selected_start : selected_end;
-
-            text = text.slice (0, first) + text.slice (second, text.length);
-            reset_selection ();
-            cursor = first;
-        }
-    }
-
-    /**
-     * Insert some text at the cursor position.
-     *
-     * @param to_insert The text you want to insert.
-     **/
-    public void insert (string to_insert) {
-        if (to_insert != null && to_insert.length > 0) {
-            int first = selected_start > selected_end ? selected_end : selected_start;
-            int second = selected_start > selected_end ? selected_start : selected_end;
-
-            if (first != second && second > 0) {
-                text = text.slice (0, first) + to_insert + text.slice (second, text.length);
-                selected_start = -1;
-                selected_end = -1;
-                selection_start = 0;
-                selection_end = 0;
-                cursor = first + to_insert.length;
-            } else {
-                text = text.slice (0,cursor) + to_insert + text.slice (cursor, text.length);
-                cursor += to_insert.length;
-            }
-        }
-
-        need_completion ();
-    }
-
-    /**
-     * A callback from our im_context.
-     **/
-    private void commit (string character) {
-        insert (character);
-    }
-
-    public void key_press_event (Gdk.EventKey event) {
-        /* FIXME: I can't find the vapi to not use hardcoded key value. */
-        /* FIXME: we should use Gtk.BindingSet, but the vapi file seems buggy */
-
-        bool control_pressed = (event.state & Gdk.ModifierType.CONTROL_MASK) == 4;
-        bool shift_pressed = ! ((event.state & Gdk.ModifierType.SHIFT_MASK) == 0);
-
-        switch (event.keyval) {
-        case 0xff51: /* left */
-            if (cursor > 0 && !control_pressed && !shift_pressed) {
-                cursor --; /* No control pressed, the cursor is not at the begin */
-                reset_selection ();
-            } else if (cursor == 0 && control_pressed) {
-                left_full (); /* Control pressed, the cursor is at the begin */
-            } else if (control_pressed) {
-                cursor = 0;
-            } else if (cursor > 0 && shift_pressed) {
-                if (selected_start < 0) {
-                    selected_start = cursor;
-                }
-
-                if (selected_end < 0) {
-                    selected_end = cursor;
-                }
-
-                cursor--;
-                selected_start = cursor;
-                need_selection_update = true;
-            } else {
-                left ();
-            }
-
-            break;
-
-        case 0xff53: /* right */
-            if (cursor < text.length && !shift_pressed) {
-                cursor++;
-                reset_selection ();
-            } else if (cursor < text.length && shift_pressed) {
-                if (selected_start < 0) {
-                    selected_start = cursor;
-                }
-
-                if (selected_end < 0) {
-                    selected_end = cursor;
-                }
-
-                cursor++;
-                selected_start = cursor;
-                need_selection_update = true;
-            } else if (!shift_pressed) {
-                complete ();
-            }
-
-            break;
-
-        case 0xff0d: /* enter */
-            reset_selection ();
-            enter ();
-            break;
-
-        case 0xff08: /* backspace */
-            if (get_selection () != null) {
-                delete_selection ();
-                need_completion ();
-            } else if (cursor > 0) {
-                text = text.slice (0, cursor - 1) + text.slice (cursor, text.length);
-                cursor--;
-                need_completion ();
-            } else {
-                backspace ();
-            }
-
-            break;
-
-        case 0xffff: /* delete */
-            if (get_selection () == null && cursor < text.length && control_pressed) {
-                text = text.slice (0, cursor);
-            } else if (get_selection () == null && cursor < text.length) {
-                text = text.slice (0, cursor) + text.slice (cursor + 1, text.length);
-            } else if (get_selection () != null) {
-                delete_selection ();
-            }
-
-            need_completion ();
-            break;
-
-        case 0xff09: /* tab */
-            complete ();
-            break;
-
-        case 0xff54: /* down */
-            down ();
-            break;
-
-        case 0xff52: /* up */
-            up ();
-            break;
-
-        case 0xff1b: /* escape */
-            escape ();
-            break;
-
-        case 0xff50: /* Home */
-            cursor = 0;
-            break;
-
-        case 0xff57: /* End */
-            cursor = text.length;
-            break;
-
-        default:
-            im_context.filter_keypress (event);
-            break;
-        }
-
-        blink = true;
-        print ("%x\n", event.keyval);
-    }
-
-    public void complete () {
-        reset_selection ();
-
-        if (completion != "") {
-            text += completion + "/";
-            cursor += completion.length + 1;
-            completion = "";
-            completed ();
-        }
-    }
-
-    public string? get_selection () {
-        int first = selected_start > selected_end ? selected_end : selected_start;
-        int second = selected_start > selected_end ? selected_start : selected_end;
-
-        if (!(first < 0 || second < 0))
-            return text.slice (first,second);
-
-        return null;
-    }
-
-    public void key_release_event (Gdk.EventKey event) {
-        im_context.filter_keypress (event);
-    }
-
-    public void mouse_motion_event (Gdk.EventMotion event, double width) {
-        hover = false;
-
-        if (event.x < width && event.x > width - arrow_img.get_width ())
-            hover = true;
-
-        if (is_selecting)
-            selection_mouse_end = event.x > 0 ? event.x : 1;
-    }
-
-    public void mouse_press_event(Gdk.EventButton event, double width) {
-        reset_selection ();
-        blink = true;
-
-        if (event.x < width && event.x > width - arrow_img.get_width ()) {
-            enter ();
-        } else if (event.x >= 0) {
-            is_selecting = true;
-            selection_mouse_start = event.x;
-            selection_mouse_end = event.x;
-        } else if (event.x >= -20) {
-            is_selecting = true;
-            selection_mouse_start = -1;
-            selection_mouse_end = -1;
-        }
-        need_draw ();
-    }
-
-    public void mouse_release_event (Gdk.EventButton event) {
-        selection_mouse_end = event.x;
-        is_selecting = false;
-    }
-
-    /**
-     * Reset the current selection. This function won't ask for re-drawing,
-     * so, you will need to re-draw your entry by hand. It can be used after
-     * a #text set, to avoid weird things.
-     **/
-    public void reset_selection () {
-        selected_start = -1;
-        selected_end = -1;
-        selection_start = 0;
-        selection_end = 0;
-    }
-
-    private void update_selection (Cairo.Context cr, Gtk.Widget widget) {
-        double last_diff = double.MAX;
-        Pango.Layout layout = widget.create_pango_layout (text);
-
-        if (selection_mouse_start > 0) {
-            selected_start = -1;
-            selection_start = 0;
-            cursor = text.length;
-
-            for (int i = 0; i <= text.length; i++) {
-                layout.set_text (text.slice(0, i), -1);
-
-                if (Math.fabs (selection_mouse_start - get_width (layout)) < last_diff) {
-                    last_diff = Math.fabs (selection_mouse_start - get_width (layout));
-                    selection_start = get_width (layout);
-                    selected_start = i;
-                }
-            }
-
-            selection_mouse_start = -1;
-        }
-
-        if (selection_mouse_end > 0) {
-            last_diff = double.MAX;
-            selected_end = -1;
-            selection_end = 0;
-            cursor = text.length;
-
-            for (int i = 0; i <= text.length; i++) {
-                layout.set_text (text.slice (0, i), -1);
-
-                if (Math.fabs (selection_mouse_end - get_width (layout)) < last_diff) {
-                    last_diff = Math.fabs (selection_mouse_end - get_width (layout));
-                    selection_end = get_width (layout);
-                    selected_end = i;
-                    cursor = i;
-                }
-            }
-
-            selection_mouse_end = -1;
-        }
-    }
-
-    private void computetext_width (Pango.Layout pango) {
-        int text_width, text_height;
-        pango.get_size (out text_width, out text_height);
-        this.text_width = Pango.units_to_double (text_width);
-        this.text_height = Pango.units_to_double (text_height);
-    }
-
-    /**
-     * A utility function to get the width of a Pango.Layout. Maybe it could
-     * be moved to a less specific file/lib.
-     *
-     * @param pango a pango layout
-     * @return the width of the layout
-     **/
-    private double get_width (Pango.Layout pango) {
-        int text_width, text_height;
-        pango.get_size (out text_width, out text_height);
-        return Pango.units_to_double (text_width);
-    }
-
-    private void update_selection_key (Cairo.Context cr, Gtk.Widget widget) {
-        Pango.Layout layout = widget.create_pango_layout (text);
-        layout.set_text (text.slice (0, selected_end), -1);
-        selection_end = get_width (layout);
-        layout.set_text (text.slice (0, selected_start), -1);
-        selection_start = get_width (layout);
-        need_selection_update = false;
-    }
-
-    public void draw(Cairo.Context cr,
-                     double x, double height, double width,
-                     Gtk.Widget widget, Gtk.StyleContext button_context) {
-
-        update_selection (cr, widget);
-
-        if (need_selection_update)
-            update_selection_key (cr, widget);
-
-        cr.set_source_rgba (0, 0, 0, 0.8);
-
-        Pango.Layout layout = widget.create_pango_layout (text);
-        computetext_width (layout);
-        button_context.render_layout (cr, x, height / 2 - text_height / 2, layout);
-
-        layout.set_text (text.slice (0, cursor), -1);
-
-        if (blink && focus) {
-            cr.rectangle (x + get_width (layout), height / 6, 1, 4 * height / 6);
-            cr.fill ();
-        }
-
-        if (text != "") {
-                Gdk.cairo_set_source_pixbuf (cr,arrow_img,
-                                             x + width - arrow_img.get_width() - 10,
-                                             height/2 - arrow_img.get_height() / 2);
-
-            if (hover)
-                cr.paint ();
-            else
-                cr.paint_with_alpha (0.8);
-        }
-
-        /* draw completion */
-        cr.move_to (x + text_width, height / 2 - text_height / 2);
-        layout.set_text (completion, -1);
-
-#if VALA_0_14
-        Gdk.RGBA color = button_context.get_color (Gtk.StateFlags.NORMAL);
-#else
-        Gdk.RGBA color = Gdk.RGBA ();
-        button_context.get_color (Gtk.StateFlags.NORMAL, color);
-#endif
-        cr.set_source_rgba (color.red, color.green, color.blue, color.alpha - 0.3);
-        Pango.cairo_show_layout (cr, layout);
-
-        /* draw selection */
-        if (focus && selected_start >= 0 && selected_end >= 0) {
-            cr.rectangle (x + selection_start, height / 6, selection_end - selection_start, 4 * height / 6);
-#if VALA_0_14
-            color = button_context.get_background_color (Gtk.StateFlags.SELECTED);
-#else
-            button_context.get_background_color (Gtk.StateFlags.SELECTED, color);
-#endif
-            Gdk.cairo_set_source_rgba (cr, color);
-            cr.fill ();
-
-            layout.set_text (get_selection (), -1);
-
-#if VALA_0_14
-            color = button_context.get_color (Gtk.StateFlags.SELECTED);
-#else
-            button_context.get_color (Gtk.StateFlags.SELECTED, color);
-#endif
-            Gdk.cairo_set_source_rgba (cr, color);
-            cr.move_to (x + Math.fmin (selection_start, selection_end),
-                        height / 2 - text_height / 2);
-
-            Pango.cairo_show_layout (cr, layout);
-        }
-    }
-
-    public void reset () {
-        text = "";
-        cursor = 0;
-        completion = "";
-    }
-
-    public void hide () {
-        focus = false;
-        if (timeout > 0)
-            Source.remove (timeout);
-    }
-
-    ~BreadcrumbsEntry () {
-        hide ();
-    }
-}

=== modified file 'libwidgets/CMakeLists.txt'
--- libwidgets/CMakeLists.txt	2014-03-27 10:22:25 +0000
+++ libwidgets/CMakeLists.txt	2014-06-14 19:18:12 +0000
@@ -41,7 +41,6 @@
     LocationBar.vala
     PoofWindow.vala
     BreadcrumbsElements.vala
-    BreadcrumbsEntry.vala
 PACKAGES
     gtk+-3.0
     granite
@@ -66,5 +65,4 @@
     SOVERSION ${MARLINWIDGETS_SOVERSION})
 
 install (TARGETS ${PKGNAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/)
-target_link_libraries(${PKGNAME} ${DEPS_LIBRARIES})
-add_subdirectory(tests)
+target_link_libraries(${PKGNAME} ${DEPS_LIBRARIES})
\ No newline at end of file

=== modified file 'libwidgets/LocationBar.vala'
--- libwidgets/LocationBar.vala	2014-05-13 21:10:32 +0000
+++ libwidgets/LocationBar.vala	2014-06-14 19:18:12 +0000
@@ -34,27 +34,24 @@
     string? text_displayed;
 }
 
-public abstract class Marlin.View.Chrome.BasePathBar : Gtk.EventBox {
+public abstract class Marlin.View.Chrome.BasePathBar : Gtk.Entry {
 
     public string current_right_click_path;
     public string current_right_click_root;
-    //double right_click_root;
+    
+    protected string text_completion = "";
+    protected bool multiple_completions = false;
+    protected bool text_changed = false;
+    protected bool arrow_hovered = false;
+    protected bool ignore_focus_in = false;
+    protected bool ignore_change = false;
+    private Gdk.Pixbuf arrow_img;
 
     /* if we must display the BreadcrumbsElement which are in  newbreads. */
     bool view_old = false;
 
-    /* Used to decide if this button press event must be send to the
-     * integrated entry or not. */
-    double x_render_saved = 0;
-
-    /* if we have the focus or not
-     * FIXME: this should be replaced with some nice Gtk.Widget method. */
-    public new bool focus = false;
-
-    public Gtk.ActionGroup clipboard_actions;
-
     /* This list will contain all BreadcrumbsElement */
-    Gee.ArrayList<BreadcrumbsElement> elements;
+    protected Gee.ArrayList<BreadcrumbsElement> elements;
 
     /* This list will contain the BreadcrumbsElement which are animated */
     Gee.List<BreadcrumbsElement> newbreads;
@@ -67,19 +64,18 @@
 
     Gtk.StyleContext button_context;
     Gtk.StyleContext button_context_active;
-    public BreadcrumbsEntry entry;
 
     /**
      * When the user click on a breadcrumb, or when he enters a path by hand
      * in the integrated entry
      **/
-    public signal void activate_alternate (string path);
-    public signal void changed (string changed);
+    public signal void activate_alternate (File file);
+    public signal void path_changed (File file);
     public signal void need_completion ();
 
     List<IconDirectory?> icons;
 
-    string text = "";
+    string current_path = "";
 
     int selected = -1;
     int space_breads = 12;
@@ -87,7 +83,10 @@
     int y;
     string protocol;
 
+    public signal void completed ();
     public signal void escape ();
+    public signal void up ();
+    public signal void down ();
 
     private int timeout = -1;
 
@@ -96,17 +95,16 @@
 
     private Granite.Services.IconFactory icon_factory;
 
-
     construct {
-        add_events (Gdk.EventMask.BUTTON_PRESS_MASK
-                    | Gdk.EventMask.BUTTON_RELEASE_MASK
-                    | Gdk.EventMask.KEY_PRESS_MASK
-                    | Gdk.EventMask.KEY_RELEASE_MASK
-                    | Gdk.EventMask.POINTER_MOTION_MASK
-                    | Gdk.EventMask.LEAVE_NOTIFY_MASK);
-        init_clipboard ();
         icon_factory = Granite.Services.IconFactory.get_default ();
         icons = new List<IconDirectory?> ();
+        
+        /* Load arrow image */
+        try {
+            arrow_img = Gtk.IconTheme.get_default ().load_icon ("go-jump-symbolic", 16, Gtk.IconLookupFlags.GENERIC_FALLBACK);
+        } catch (Error err) {
+            stderr.printf ("Unable to load home icon: %s", err.message);
+        }
 
         button_context = get_style_context ();
         button_context.add_class ("button");
@@ -118,92 +116,26 @@
         Granite.Widgets.Utils.set_theming (this, ".noradius-button{border-radius:0px;}", null,
                                            Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
 
-        left_padding = 5;//border.left;
+        left_padding = border.left;
         right_padding = border.right;
 
-        set_can_focus (true);
-        set_visible_window (false);
-
         /* x padding */
         x = 0;
         /* y padding */
         y = 0;
 
         elements = new Gee.ArrayList<BreadcrumbsElement> ();
-
-        entry = new BreadcrumbsEntry ();
-
-        entry.enter.connect (on_entry_enter);
-
-        /* Let's connect the signals ;)
-         * FIXME: there could be a separate function for each signal */
-        entry.need_draw.connect (queue_draw);
-
-        entry.left.connect (() => {
-            if (elements.size > 0) {
-                var element = elements[elements.size - 1];
-                elements.remove (element);
-
-                if (element.display) {
-                    if (entry.text[0] != '/') {
-                        entry.text = element.text + "/" + entry.text;
-                        entry.cursor = element.text.length + 1;
-                    } else {
-                        entry.text = element.text + entry.text;
-                        entry.cursor = element.text.length;
-                    }
-                    entry.reset_selection ();
-                }
-            }
-        });
-
-        entry.left_full.connect (() => {
-            string tmp = entry.text;
-            string tmp_entry = "";
-
-            foreach (BreadcrumbsElement element in elements) {
-                if (element.display) {
-                    if (tmp_entry[0] != '/')
-                        tmp_entry += element.text + "/";
-                    else
-                        tmp_entry += element.text;
-                }
-            }
-
-            entry.text = tmp_entry + tmp;
-            elements.clear ();
-        });
-
-        entry.backspace.connect (() => {
-            if (elements.size > 0) {
-                string strloc = get_elements_path ();
-                File location = File.new_for_commandline_arg (strloc);
-                location = location.get_parent ();
-
-                if (location == null)
-                    location = File.new_for_commandline_arg (protocol);
-
-                changed (location.get_uri () + "/");
-                grab_focus ();
-            }
-        });
-
-        entry.escape.connect (() => {
-            escape ();
-        });
-
-        entry.need_completion.connect (() => {
-            need_completion ();
-        });
-
-        entry.paste.connect (() => {
-            var display = get_display ();
-            Gdk.Atom atom = Gdk.SELECTION_CLIPBOARD;
-            Gtk.Clipboard clipboard = Gtk.Clipboard.get_for_display (display, atom);
-            clipboard.request_text (request_text);
-        });
-
-        entry.hide ();
+        
+        secondary_icon_activatable = true;
+        secondary_icon_sensitive = true;
+        truncate_multiline = true;
+        activate.connect (on_activate);
+        icon_press.connect (on_activate);
+        motion_notify_event.connect (on_motion_notify);
+        focus_in_event.connect (on_focus_in);
+        focus_out_event.connect (on_focus_out);
+        grab_focus.connect_after (on_grab_focus);
+        changed.connect (on_change);
 
         /* Drag and drop */
         Gtk.TargetEntry target_uri_list = {"text/uri-list", 0, 0};
@@ -213,6 +145,170 @@
         drag_motion.connect (on_drag_motion);
         drag_data_received.connect (on_drag_data_received);
     }
+    
+    public override bool key_press_event (Gdk.EventKey event) {
+        switch (event.keyval) {
+            case Gdk.Key.KP_Tab:
+            case Gdk.Key.Tab:
+                complete ();
+                return true;
+
+            case Gdk.Key.KP_Down:
+            case Gdk.Key.Down:
+                down ();
+                return true;
+
+            case Gdk.Key.KP_Up:
+            case Gdk.Key.Up:
+                up ();
+                return true;
+                
+            case Gdk.Key.Escape:
+                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;
+
+        var el = get_element_from_coordinates ((int) event.x, (int) event.y);
+
+        if (el != null)
+            el.pressed = true;
+
+        queue_draw ();
+
+        if (timeout == -1 && event.button == 1) {
+            timeout = (int) Timeout.add (150, () => {
+                select_bread_from_coord (event);
+                timeout = -1;
+                return false;
+            });
+        }
+
+        if (event.button == 2) {
+            if (el != null) {
+                selected = elements.index_of (el);
+                var newpath = get_path_from_element (el);
+                activate_alternate (get_file_for_path (newpath));
+            }
+            
+            return true;
+        }
+
+        if (event.button == 3)
+            return select_bread_from_coord (event);
+
+        return true;
+    }
+
+    public override bool button_release_event (Gdk.EventButton event) {
+        reset_elements_states ();
+
+        if (timeout != -1) {
+            Source.remove ((uint) timeout);
+            timeout = -1;
+        }
+        
+        if (is_focus)
+            return base.button_release_event (event);
+
+        if (event.button == 1) {
+            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);
+                path_changed (get_file_for_path (newpath));
+            } else
+                grab_focus ();
+        }
+        
+        return base.button_release_event (event);
+    }
+    
+    void on_change () {
+        if (ignore_change) {
+            ignore_change = false;
+            return;
+        }
+        
+        set_entry_icon (true, (text.length > 0) ? "Navigate to: " + text : "");
+        text_completion = "";
+        need_completion ();
+    }
+    
+    bool on_motion_notify (Gdk.EventMotion event) {
+        int x = (int) event.x;
+        double x_render = 0;
+        double x_previous = -10;
+        set_tooltip_text ("");
+        
+        if (is_focus)
+            return base.motion_notify_event (event);
+
+        foreach (BreadcrumbsElement element in elements) {
+            if (element.display) {
+                x_render += element.real_width;
+                if (x <= x_render + 5 && x > x_previous + 5) {
+                    selected = elements.index_of (element);
+                    set_tooltip_text (_("Go to %s").printf (element.text));
+                    break;
+                }
+
+                x_previous = x_render;
+            }
+        }
+
+        if (event.x > 0 && event.x < x_render + 5)
+            set_entry_cursor (new Gdk.Cursor (Gdk.CursorType.ARROW));
+        else
+            set_entry_cursor (null);
+            
+        return base.motion_notify_event (event);
+    }
+
+    bool on_focus_out (Gdk.EventFocus event) {
+        if (is_focus) {
+            ignore_focus_in = true;
+            return base.focus_out_event (event);
+        }
+    
+        ignore_focus_in = false;
+        set_entry_icon (false);
+        set_entry_text ("");
+        
+        return base.focus_out_event (event);
+    }
+
+    bool on_focus_in (Gdk.EventFocus event) {
+        if (ignore_focus_in)
+            return base.focus_in_event (event);
+
+        set_entry_text (GLib.Uri.unescape_string (get_elements_path ()
+                .replace ("file:////", "/")
+                .replace ("file:///", "/")
+                .replace ("trash:///", "")
+                .replace ("network:///", "")));
+                
+        return base.focus_in_event (event);
+    }
+    
+    void on_grab_focus () {
+        select_region (0, 0);
+        set_position (-1);
+    }
+
+    void on_activate () {
+        path_changed (get_file_for_path (text + text_completion));
+        text_completion = "";
+    }
 
     void on_drag_begin (Gdk.DragContext drag_context) {
         critical ("Start drag...");
@@ -242,11 +338,11 @@
             var newpath = get_path_from_element (el);
             print ("Move to: %s\n", newpath);
             var target_file = GLib.File.new_for_uri (newpath);
-            on_file_droped (uris, target_file, real_action);
+            on_file_dropped (uris, target_file, real_action);
         }
     }
 
-    protected abstract void on_file_droped (List<GLib.File> uris, GLib.File target_file, Gdk.DragAction real_action);
+    protected abstract void on_file_dropped (List<GLib.File> uris, GLib.File target_file, Gdk.DragAction real_action);
 
     bool on_drag_motion (Gdk.DragContext context, int x, int y, uint time) {
         Gtk.drag_unhighlight (this);
@@ -265,6 +361,70 @@
 
         return false;
     }
+    
+    protected void add_icon (IconDirectory icon) {
+        if (icon.gicon != null)
+            icon.icon = icon_factory.load_symbolic_icon_from_gicon (button_context, icon.gicon, 16);
+        else
+            icon.icon = icon_factory.load_symbolic_icon (button_context, icon.icon_name, 16);
+
+        icons.append (icon);
+    }
+    
+    public void complete () {        
+        if (text_completion.length == 0)
+            return;
+
+        string path = text + text_completion;
+        
+        /* If there are multiple results, tab as far as we can, otherwise do the entire result */
+        if (!multiple_completions) {
+            set_entry_text (path + "/");
+            completed ();
+        } else
+            set_entry_text (path);
+    }
+    
+    public void reset_elements_states () {
+        foreach (BreadcrumbsElement element in elements)
+            element.pressed = false;
+
+        queue_draw ();
+    }
+    
+    public void set_entry_text (string text) {
+        ignore_change = true;
+        text_completion = "";
+        this.text = text;
+        set_position (-1);
+    }
+    
+    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 */
+        get_window ().get_children ().nth_data (13).set_cursor (cursor ?? new Gdk.Cursor (Gdk.CursorType.XTERM));
+    }
+    
+    public void set_entry_icon (bool active, string? tooltip = null) {
+        if (!active)
+            secondary_icon_pixbuf = null;
+        else {
+            secondary_icon_pixbuf = arrow_img;
+            secondary_icon_tooltip_text = tooltip;
+        }
+    }
+    
+    public double get_all_breadcrumbs_width (out int breadcrumbs_count) {
+        double total_width = 0.0;
+        breadcrumbs_count = 0;
+        foreach (BreadcrumbsElement element in elements) {
+            if (element.display) {
+                total_width += element.width;
+                element.max_width = -1;
+                breadcrumbs_count++;
+            }
+        }
+        return total_width;
+    }
 
     private BreadcrumbsElement? get_element_from_coordinates (int x, int y) {
         double x_render = 0;
@@ -295,39 +455,6 @@
         return newpath;
     }
 
-    protected void add_icon (IconDirectory icon) {
-        if (icon.gicon != null)
-            icon.icon = icon_factory.load_symbolic_icon_from_gicon (button_context, icon.gicon, 16);
-        else
-            icon.icon = icon_factory.load_symbolic_icon (button_context, icon.icon_name, 16);
-
-        icons.append (icon);
-    }
-
-    protected void init_clipboard () {
-        clipboard_actions = new Gtk.ActionGroup ("ClipboardActions");
-        clipboard_actions.add_actions (action_entries, this);
-    }
-
-    static const Gtk.ActionEntry[] action_entries = {
-        /* name, stock id */         { "Cut", Gtk.Stock.CUT,
-                                       /* label, accelerator */       null, null,
-                                       /* tooltip */                  N_("Cut the selected text to the clipboard"),
-                                       action_cut },
-        /* name, stock id */         { "Copy", Gtk.Stock.COPY,
-                                       /* label, accelerator */       null, null,
-                                       /* tooltip */                 N_("Copy the selected text to the clipboard"),
-                                       action_copy },
-        /* name, stock id */        { "Paste", Gtk.Stock.PASTE,
-                                      /* label, accelerator */      null, null,
-                                      /* tooltip */                 N_("Paste the text stored on the clipboard"),
-                                      action_paste },
-        /* name, stock id */        { "Paste Into Folder", Gtk.Stock.PASTE,
-                                      /* label, accelerator */      null, null,
-                                      /* tooltip */                 N_("Paste the text stored on the clipboard"),
-                                      action_paste }
-    };
-
     /**
      * Get the current path of the PathBar, based on the elements that it contains
      **/
@@ -337,37 +464,36 @@
 
         foreach (BreadcrumbsElement element in elements) {
             if (element.display)
-                strpath += element.text + "/"; /* sometimes, + "/" is useless
-                                             * but we are never careful enough */
-            /* FIXME make sure the comment never happen
-             * -> it seems to be necessary in all cases */
+                strpath += element.text + "/";
         }
 
         return strpath;
     }
-
-    private void action_paste (Gtk.Action action) {
-        var display = get_display ();
-        Gdk.Atom atom = Gdk.SELECTION_CLIPBOARD;
-        Gtk.Clipboard clipboard = Gtk.Clipboard.get_for_display (display, atom);
-        clipboard.request_text (request_text);
-    }
-
-    private void action_copy (Gtk.Action action) {
-        string? selection = entry.get_selection ();
-        if (selection != null) { /* else, it means that there is no selection */
-            var display = get_display ();
-            Gdk.Atom atom = Gdk.SELECTION_CLIPBOARD;
-            Gtk.Clipboard clipboard = Gtk.Clipboard.get_for_display (display, atom);
-            clipboard.set_text (entry.get_selection (), entry.get_selection ().length);
-        }
-    }
-
-    private void action_cut (Gtk.Action action) {
-        action_copy (action);
-        entry.delete_selection ();
-    }
-
+    
+    /**
+     * Gets a properly escaped GLib.File for the given path
+     **/
+    public File get_file_for_path (string path) {
+        string reserved_chars = (GLib.Uri.RESERVED_CHARS_GENERIC_DELIMITERS + GLib.Uri.RESERVED_CHARS_SUBCOMPONENT_DELIMITERS + " ").replace("#", "");
+        string newpath = GLib.Uri.unescape_string (path ?? "");
+
+        /* Format our path so its valid */
+        if (newpath == "")
+            newpath = "/";
+            
+        if (newpath[0] == '~')
+            newpath = newpath.replace("~", Environment.get_home_dir ());
+
+        if (!newpath.contains("://"))
+            newpath = Marlin.ROOT_FS_URI + newpath;
+        
+        newpath = newpath.replace("ssh:", "sftp:");
+        newpath = GLib.Uri.escape_string (newpath, reserved_chars, true);
+        
+        File file = File.new_for_commandline_arg (newpath);
+        return file;
+    }
+    
     /**
      * Select the breadcrumb to make a right click. This function check
      * where the user click, then, it loads a context menu with the others
@@ -377,7 +503,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) {
@@ -397,104 +523,12 @@
         }
 
         return false;
-    }
-
-    public override bool button_press_event (Gdk.EventButton event) {
-        foreach (BreadcrumbsElement element in elements)
-            element.pressed = false;
-
-        var el = get_element_from_coordinates ((int) event.x, (int) event.y);
-
-        if (el != null)
-            el.pressed = true;
-
-        queue_draw ();
-
-        if (timeout == -1 && event.button == 1) {
-            timeout = (int) Timeout.add (800, () => {
-                select_bread_from_coord (event);
-                timeout = -1;
-                return false;
-            });
-        }
-
-        if (event.button == 2) {
-            if (el != null) {
-                selected = elements.index_of (el);
-                var newpath = get_path_from_element (el);
-                activate_alternate (newpath);
-            }
-        }
-
-        if (event.button == 3)
-            return select_bread_from_coord(event);
-
-        if (focus) {
-            event.x -= x_render_saved;
-            entry.mouse_press_event(event, get_allocated_width() - x_render_saved);
-        }
-
-        return true;
-    }
-
-    public override bool button_release_event (Gdk.EventButton event) {
-        reset_elements_states ();
-
-        if (timeout != -1) {
-            Source.remove ((uint) timeout);
-            timeout = -1;
-        }
-
-        if (event.button == 1) {
-            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);
-                print ("%s\n\n\n", newpath);
-                changed (newpath);
-            } else {
-                grab_focus ();
-            }
-        }
-
-        if (focus) {
-            event.x -= x_render_saved;
-            entry.mouse_release_event(event);
-        }
-
-        return true;
-    }
-
-    private void on_entry_enter () {
-        text = get_elements_path ();
-
-        if (text != "")
-            changed (text + "/" + entry.text + entry.completion);
-        else
-            changed (entry.text + entry.completion);
-
-        //entry.reset();
-    }
-
-    public override bool key_press_event (Gdk.EventKey event) {
-        entry.key_press_event (event);
-        queue_draw ();
-        return true;
-    }
-
-    public override bool key_release_event (Gdk.EventKey event) {
-        entry.key_release_event (event);
-        queue_draw ();
-        return true;
-    }
+    }    
 
     public virtual string? update_breadcrumbs (string newpath, string breadpath) {
         string strloc;
 
-        debug ("Update breadcrumb text %s", newpath);
-
         if (Posix.strncmp (newpath, "./", 2) == 0) {
-            entry.reset ();
             return null;
         }
 
@@ -507,7 +541,6 @@
         }
 
         return strloc;
-
     }
 
     /**
@@ -517,19 +550,18 @@
      * be animated.
      **/
     public void change_breadcrumbs (string newpath) {
-        debug ("Change breadcrumbs to %s", newpath);
-        var explode_protocol = newpath.split ("://");
+        var explode_protocol = Uri.unescape_string (newpath).split ("://");
 
         if (explode_protocol.length > 1) {
             protocol = explode_protocol[0] + "://";
-            text = explode_protocol[1];
+            current_path = explode_protocol[1];
         } else {
-            text = newpath;
+            current_path = newpath;
             protocol = Marlin.ROOT_FS_URI;
         }
 
         selected = -1;
-        var breads = text.split ("/");
+        var breads = current_path.split ("/");
         var newelements = new Gee.ArrayList<BreadcrumbsElement> ();
         if (breads.length == 0 || breads[0] == "") {
             var element = new BreadcrumbsElement (protocol, left_padding, right_padding);
@@ -567,15 +599,6 @@
 
         int max_path = int.min (elements.size, newelements.size);
 
-        bool same = true;
-
-        for (int i = 0; i < max_path; i++) {
-            if (newelements[i].text != elements[i].text) {
-                same = false;
-                break;
-            }
-        }
-
         foreach (IconDirectory icon in icons) {
             if (icon.protocol && icon.path == protocol) {
                 newelements[0].set_icon(icon.icon);
@@ -637,7 +660,6 @@
 
         elements.clear ();
         elements = newelements;
-        entry.reset ();
     }
 
     uint anim = 0;
@@ -720,246 +742,76 @@
         });
     }
 
-/* disabled, waiting for deletion or fix the hardcoded stuff
- * or just draw elements by elements with widgets state flags */
-#if 0
-    private void draw_selection (Cairo.Context cr) {
-        /* If a dir is selected (= mouse hover)*/
-        if (selected != -1) {
-            int height = get_allocated_height();
-            /* FIXME: this block could be cleaned up, +7 and +5 are
-             * hardcoded. */
-            double x_hl = y + right_padding + left_padding;
-
-            if (selected > 0) {
-                foreach(BreadcrumbsElement element in elements) {
-                    if (element.display) {
-                        x_hl += element.real_width;
-                    }
-
-                    if (element == elements[selected - 1]) {
-                        break;
-                    }
-                }
-            }
-
-            x_hl += 7;
-            double first_stop = x_hl - 7 * (height / 2 - y)/(height / 2 - height / 3) + 5;
-            double text_width = (elements[selected].max_width > 0 ? elements[selected].max_width : elements[selected].text_width);
-
-            cr.move_to(first_stop,
-                       y + 1);
-            cr.line_to(x_hl + 3,
-                       height / 2);
-            cr.line_to(first_stop,
-                       height - y - 1);
-
-            x_hl += text_width;
-
-            double second_stop = x_hl - 7 * (height / 2 - y)/(height / 2 - height / 3) + 5;
-            cr.line_to(second_stop,
-                       height - y - 1);
-            cr.line_to(x_hl + 3,
-                       height / 2);
-            cr.line_to(second_stop,
-                       y + 1);
-            cr.close_path();
-#if VALA_0_14
-            Gdk.RGBA color = button_context.get_background_color(Gtk.StateFlags.SELECTED);
-#else
-            Gdk.RGBA color = Gdk.RGBA();
-            button_context.get_background_color(Gtk.StateFlags.SELECTED, color);
-#endif
-
-            Cairo.Pattern pat = new Cairo.Pattern.linear(first_stop, y, second_stop, y);
-            pat.add_color_stop_rgba(0.7, color.red, color.green, color.blue, 0);
-            pat.add_color_stop_rgba(1, color.red, color.green, color.blue, 0.6);
-
-            cr.set_source(pat);
-            cr.fill();
-        }
-    }
-#endif
-
-    public override bool motion_notify_event (Gdk.EventMotion event) {
-        int x = (int) event.x;
-        double x_render = 0;
-        double x_previous = -10;
-        selected = -1;
-        set_tooltip_text ("");
-
-        foreach (BreadcrumbsElement element in elements) {
-            if (element.display) {
-                x_render += element.real_width;
-                if (x <= x_render + 5 && x > x_previous + 5) {
-                    selected = elements.index_of (element);
-                    //TODO doesn't work
-                    set_tooltip_text (_("Go to %s").printf (element.text));
-                    break;
-                }
-
-                x_previous = x_render;
-            }
-        }
-
-        event.x -= x_render_saved;
-        entry.mouse_motion_event (event, get_allocated_width () - x_render_saved);
-
-        if (event.x > 0 && event.x + x_render_saved < get_allocated_width () - entry.arrow_img.get_width ())
-            get_window ().set_cursor (new Gdk.Cursor (Gdk.CursorType.XTERM));
-        else
-            get_window ().set_cursor (null);
-
-        return true;
-    }
-
-    public override bool leave_notify_event (Gdk.EventCrossing event) {
-        selected = -1;
-        entry.hover = false;
-        queue_draw ();
-        get_window ().set_cursor (null);
-        return false;
-    }
-
-    public override bool focus_out_event (Gdk.EventFocus event) {
-        focus = false;
-        //button_context = button_widget_context;
-        button_context.set_state (Gtk.StateFlags.NORMAL);
-        entry.hide ();
-        return true;
-    }
-
-    public override bool focus_in_event (Gdk.EventFocus event) {
-        entry.show ();
-        //button_context = entry_context;
-        //button_context.set_state (StateFlags.ACTIVE);
-        focus = true;
-        return true;
-    }
-
-    private void request_text (Gtk.Clipboard clip, string? text) {
-        if (text != null)
-            entry.insert (text.replace ("\n", ""));
-    }
-
-    public double get_all_breadcrumbs_width (out int breadcrumbs_count) {
-        double total_width = 0.0;
-        breadcrumbs_count = 0;
-        foreach (BreadcrumbsElement element in elements) {
-            if (element.display) {
-                total_width += element.width;
-                element.max_width = -1;
-                breadcrumbs_count++;
-            }
-        }
-        return total_width;
-    }
-
-    public void reset_elements_states () {
-        foreach (BreadcrumbsElement element in elements)
-            element.pressed = false;
-
-        queue_draw ();
-    }
-
     public override bool draw (Cairo.Context cr) {
         if (button_context_active == null) {
             button_context_active = new Gtk.StyleContext ();
             button_context_active.set_path(button_context.get_path ());
             button_context_active.set_state (Gtk.StateFlags.ACTIVE);
         }
-
-        //button_context.set_state (StateFlags.NORMAL);
-        //propagate_draw (get_child (), cr);
+        
+        base.draw (cr);
         double height = get_allocated_height ();
         double width = get_allocated_width ();
-        double margin = y;
-
-        /* Ensure there is an editable area to the right of the breadcrumbs */
-        double width_marged = width - 2*margin - MINIMUM_LOCATION_BAR_ENTRY_WIDTH;
-        double height_marged = height - 2*margin;
-        double x_render = margin;
-
-        /* Draw toolbar background */
-        button_context.render_background (cr, 0, margin, width, height_marged);
-
-        int breadcrumbs_displayed = 0;
-        double max_width = get_all_breadcrumbs_width (out breadcrumbs_displayed);
-
-        if (max_width > width_marged) { /* let's check if the breadcrumbs are bigger than the widget */
-            /* each element must not be bigger than the width/breadcrumbs count */
-            double max_element_width = width_marged/breadcrumbs_displayed;
-
+
+        if (!is_focus) {
+            double margin = y;
+
+            /* Ensure there is an editable area to the right of the breadcrumbs */
+            double width_marged = width - 2*margin - MINIMUM_LOCATION_BAR_ENTRY_WIDTH;
+            double height_marged = height - 2*margin;
+            double x_render = margin;
+            int breadcrumbs_displayed = 0;
+            double max_width = get_all_breadcrumbs_width (out breadcrumbs_displayed);
+
+            if (max_width > width_marged) { /* let's check if the breadcrumbs are bigger than the widget */
+                /* each element must not be bigger than the width/breadcrumbs count */
+                double max_element_width = width_marged/breadcrumbs_displayed;
+
+                foreach (BreadcrumbsElement element in elements) {
+                    if (element.display && element.width < max_element_width) {
+                        breadcrumbs_displayed --;
+                        max_element_width += (max_element_width - element.width)/breadcrumbs_displayed;
+                    }
+                }
+
+                foreach (BreadcrumbsElement element in elements)
+                    if (element.display && element.width > max_element_width)
+                        element.max_width = max_element_width - element.left_padding - element.right_padding - element.last_height/2;
+            }
+
+            cr.save ();
+            /* Really draw the elements */
             foreach (BreadcrumbsElement element in elements) {
-                if (element.display && element.width < max_element_width) {
-                    breadcrumbs_displayed --;
-                    max_element_width += (max_element_width - element.width)/breadcrumbs_displayed;
+                if (element.display) {
+                    x_render = element.draw (cr, x_render, margin, height_marged, button_context, this);
+                    /* save element x axis position */
+                    element.x = x_render - element.real_width;
                 }
             }
 
-            foreach (BreadcrumbsElement element in elements)
-                if (element.display && element.width > max_element_width)
-                    element.max_width = max_element_width - element.left_padding - element.right_padding - element.last_height/2;
-        }
-
-        cr.save ();
-        /* Really draw the elements */
-        foreach (BreadcrumbsElement element in elements) {
-            if (element.display) {
-                x_render = element.draw (cr, x_render, margin, height_marged, button_context, this);
-                /* save element x axis position */
-                element.x = x_render - element.real_width;
-            }
-        }
-
-        /* Draw the old breadcrumbs, only for the animations */
-        if (view_old)
-            foreach (BreadcrumbsElement element in newbreads)
-                if (element.display)
-                    x_render = element.draw(cr, x_render, margin, height_marged, button_context, this);
-
-        //draw_selection(cr);
-
-        x_render_saved = x_render + space_breads/2;
-
-        cr.restore ();
-        /* Draw frame: it must be done at the end to be on the background drawn by pressed breadcrumbs */
-
-        if (focus) {
-            cr.save ();
-            x_render -= height_marged/2 + 3;
-
-            cr.move_to (0, 0);
-            cr.line_to (0, y + height_marged + 3);
-            cr.line_to (x_render, y + height_marged + 3);
-            cr.line_to (x_render, y + height_marged);
-            cr.line_to (x_render + height_marged / 2, y + height_marged / 2);
-            cr.line_to (x_render, y);
-            cr.line_to (x_render, 0);
-            cr.close_path ();
-            cr.clip ();
-            button_context.render_frame (cr, 0, margin, width, height_marged);
-            cr.restore ();
-            cr.save ();
-
-            cr.move_to (x_render, get_allocated_height());
-            cr.line_to (x_render, y + height_marged);
-            cr.line_to (x_render + height_marged / 2, y + height_marged / 2);
-            cr.line_to (x_render, y);
-            cr.line_to (x_render, 0);
-            cr.line_to (get_allocated_width(), 0);
-            cr.line_to (get_allocated_width(), y + height_marged);
-            cr.close_path ();
-            cr.clip ();
-            button_context_active.render_background (cr, 0, margin, width, height_marged);
-            button_context_active.render_frame (cr, 0, margin, width, height_marged);
-            cr.restore ();
-            x_render += height_marged / 2 + 3;
+            /* Draw the old breadcrumbs, only for the animations */
+            if (view_old)
+                foreach (BreadcrumbsElement element in newbreads)
+                    if (element.display)
+                        x_render = element.draw(cr, x_render, margin, height_marged, button_context, this);
+                        
+            cr.restore ();
         } else {
-            button_context.render_frame (cr, 0, margin, width, height_marged);
+            if (text_completion != "") {
+                int layout_width, layout_height;
+                double text_width, text_height;
+                
+                cr.set_source_rgba (0, 0, 0, 0.4);
+                Pango.Layout layout = create_pango_layout (text);
+                layout.get_size (out layout_width, out layout_height);
+                text_width = Pango.units_to_double (layout_width);
+                text_height = Pango.units_to_double (layout_height);
+                cr.move_to (text_width + 4, text_height / 4);
+                layout.set_text (text_completion, -1);
+                Pango.cairo_show_layout (cr, layout);
+            }
         }
-
-        entry.draw (cr, x_render + space_breads / 2, height, width - x_render, this, button_context);
+        
         return true;
     }
 
@@ -977,4 +829,4 @@
         var file = File.new_for_commandline_arg (newpath);
         return file.get_parent () != null;
     }
-}
+}
\ No newline at end of file

=== removed directory 'libwidgets/tests'
=== removed file 'libwidgets/tests/CMakeLists.txt'
--- libwidgets/tests/CMakeLists.txt	2014-01-24 18:36:41 +0000
+++ libwidgets/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-include_directories(../../libcore/)
-find_package(Vala REQUIRED)
-include(ValaPrecompile)
-vala_precompile(VALA_C widgets-test
-    tests-pathbar.vala
-PACKAGES
-    gtk+-3.0
-    gee-0.8
-    posix
-    marlinwidgets
-OPTIONS
-    --thread
-    --vapidir=${CMAKE_BINARY_DIR}/libwidgets/
-    --vapidir=${CMAKE_BINARY_DIR}/libcore/
-)
-
-find_package(PkgConfig)
-pkg_check_modules(DEPS REQUIRED gtk+-3.0 gee-0.8)
-
-add_definitions(${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER})
-
-add_executable(widgets-test ${VALA_C})
-
-link_directories(${DEPS_LIBRARY_DIRS})
-target_link_libraries(widgets-test marlinwidgets ${DEPS_LIBRARIES})
-add_dependencies(widgets-test marlinwidgets)
-add_test_executable(widgets-test)
\ No newline at end of file

=== removed file 'libwidgets/tests/tests-pathbar.vala'
--- libwidgets/tests/tests-pathbar.vala	2014-03-27 10:39:12 +0000
+++ libwidgets/tests/tests-pathbar.vala	1970-01-01 00:00:00 +0000
@@ -1,213 +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; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-public class Breadcrumbs : Marlin.View.Chrome.BasePathBar {
-    public Breadcrumbs (Gtk.UIManager ui) {}
-    public override void load_right_click_menu (double x, double y) {}
-    protected override void on_file_droped (List<GLib.File> uris, GLib.File target_file, Gdk.DragAction real_action) {}
-}
-
-void add_pathbar_tests () {
-/* TODO: they are broken currently */
-    Test.add_func ("/marlin/pathbar/general", () => {
-        Test.log_set_fatal_handler (() => { return false; });
-        var breads = new Breadcrumbs (new Gtk.UIManager ());
-        var bread_entry = new Marlin.View.Chrome.BreadcrumbsEntry ();
-        assert (bread_entry is Marlin.View.Chrome.BreadcrumbsEntry);
-        assert (bread_entry.text == "");
-#if VALA_0_24
-        Gdk.Event e = new Gdk.Event (Gdk.EventType.KEY_PRESS);
-        Gdk.EventKey event = e.key;
-#else
-        Gdk.EventKey event = Gdk.EventKey ();
-#endif
-        event.window = breads.get_window ();
-        event.keyval = 0x061; /* a */
-        bread_entry.key_press_event (event);
-        assert (bread_entry.text == "a");
-        bread_entry.key_press_event (event);
-        assert (bread_entry.text == "aa");
-        assert (bread_entry.cursor == 2);
-
-        event.keyval = 0xff51; /* left */
-        bread_entry.key_press_event (event);
-        assert (bread_entry.cursor == 1);
-        bread_entry.key_press_event (event);
-        assert (bread_entry.cursor == 0);
-        bread_entry.key_press_event (event);
-        assert (bread_entry.cursor == 0);
-        event.keyval = 0xff53; /* right */
-        bread_entry.key_press_event (event);
-        assert (bread_entry.cursor == 1);
-
-        /* insertion in the middle */
-        event.keyval = 0x062; /* b */
-        bread_entry.key_press_event (event);
-        assert (bread_entry.text == "aba");
-        event.keyval = 0x063; /* c */
-        bread_entry.key_press_event (event);
-        assert (bread_entry.text == "abca");
-
-        /* insertion at the end */
-        assert (bread_entry.cursor == 3);
-        event.keyval = 0xff53; /* right */
-        bread_entry.key_press_event (event);
-        assert (bread_entry.cursor == 4);
-        event.keyval = 0x064; /* d */
-        bread_entry.key_press_event (event);
-        assert (bread_entry.text == "abcad");
-
-        /* backspace */
-        event.keyval = 0xff08; /* backspace */
-        bread_entry.key_press_event (event);
-        assert (bread_entry.text == "abca");
-        event.keyval = 0xff51; /* left */
-        bread_entry.key_press_event (event);
-        event.keyval = 0xff08; /* backspace */
-        bread_entry.key_press_event (event);
-        assert (bread_entry.text == "aba");
-        event.keyval = 0xff53; /* right */
-        bread_entry.key_press_event (event);
-        event.keyval = 0x063; /* c */
-        bread_entry.key_press_event (event);
-        assert (bread_entry.text == "abac");
-        event.keyval = 0xff51; /* left */
-        bread_entry.key_press_event (event);
-
-        /* selection */
-        event.state = Gdk.ModifierType.SHIFT_MASK;
-        event.keyval = 0xff51; /* left */
-        bread_entry.key_press_event (event);
-        assert (bread_entry.get_selection () == "a");
-        bread_entry.key_press_event (event);
-        assert (bread_entry.get_selection () == "ba");
-        bread_entry.key_press_event (event);
-        assert (bread_entry.get_selection () == "aba");
-        bread_entry.key_press_event (event);
-        assert (bread_entry.get_selection () == "aba");
-        event.keyval = 0xff53; /* right */
-        bread_entry.key_press_event (event);
-        assert (bread_entry.get_selection () == "ba");
-        bread_entry.key_press_event (event);
-        assert (bread_entry.get_selection () == "a");
-        bread_entry.key_press_event (event);
-        assert (bread_entry.get_selection () == "");
-        bread_entry.key_press_event (event);
-        assert (bread_entry.get_selection () == "c");
-        event.keyval = 0xff51; /* left */
-        bread_entry.key_press_event (event);
-        assert (bread_entry.get_selection () == "");
-    });
-
-    Test.add_func ("/marlin/pathbar/start-selection", () => {
-        Test.log_set_fatal_handler (() => { return false; });
-        var breads = new Breadcrumbs (new Gtk.UIManager ());
-        var bread_entry = new Marlin.View.Chrome.BreadcrumbsEntry ();
-        assert (bread_entry is Marlin.View.Chrome.BreadcrumbsEntry);
-        assert (bread_entry.text == "");
-        bread_entry.text = "abdcefghij/";
-        bread_entry.cursor = ("abdcefghij/").length;
-#if VALA_0_24
-        Gdk.Event e = new Gdk.Event (Gdk.EventType.KEY_PRESS);
-        Gdk.EventKey event = e.key;
-#else
-        Gdk.EventKey event = Gdk.EventKey ();
-#endif
-        event.state = Gdk.ModifierType.SHIFT_MASK;
-        event.window = breads.get_window ();
-        event.keyval = 0xff51; /* left */
-        bread_entry.key_press_event (event);
-        assert (bread_entry.get_selection () == "/");
-    });
-
-    Test.add_func ("/marlin/pathbar/backspace-without-text", () => {
-        Test.log_set_fatal_handler (() => { return false; });
-        var breads = new Breadcrumbs (new Gtk.UIManager ());
-        var bread_entry = new Marlin.View.Chrome.BreadcrumbsEntry ();
-        assert (bread_entry is Marlin.View.Chrome.BreadcrumbsEntry);
-        assert (bread_entry.text == "");
-#if VALA_0_24
-        Gdk.Event e = new Gdk.Event (Gdk.EventType.KEY_PRESS);
-        Gdk.EventKey event = e.key;
-#else
-        Gdk.EventKey event = Gdk.EventKey ();
-#endif
-        event.window = breads.get_window ();
-        event.keyval = 0xff08; /* backspace */
-        bread_entry.key_press_event (event);
-        assert (bread_entry.get_selection () == null);
-    });
-
-    Test.add_func ("/marlin/pathbar/backspace-keypress", () => {
-        Test.log_set_fatal_handler (() => { return false; });
-        var breads = new Breadcrumbs (new Gtk.UIManager());
-        Marlin.View.Chrome.BreadcrumbsEntry bread_entry = breads.entry;
-        assert (bread_entry is Marlin.View.Chrome.BreadcrumbsEntry);
-        assert (bread_entry.text == "");
-#if VALA_0_24
-        Gdk.Event e = new Gdk.Event (Gdk.EventType.KEY_PRESS);
-        Gdk.EventKey event = e.key;
-#else
-        Gdk.EventKey event = Gdk.EventKey ();
-#endif
-        event.window = breads.get_window ();
-        event.keyval = 0xff08; /* backspace */
-        breads.key_press_event (event);
-        assert (bread_entry.get_selection () == null);
-
-        event.keyval = 0x061; /* a */
-        breads.change_breadcrumbs ("");
-        breads.change_breadcrumbs ("/");
-    });
-
-    Test.add_func ("/marlin/pathbar/go-to-trash", () => {
-        Test.log_set_fatal_handler (() => { return false; });
-        var breads = new Breadcrumbs (new Gtk.UIManager ());
-        breads.change_breadcrumbs ("trash:///");
-        breads.change_breadcrumbs ("/home/there");
-    });
-
-    Test.add_func ("/marlin/pathbar/non-file-system-location", () => {
-        Test.log_set_fatal_handler (() => { return false; });
-        var breads = new Breadcrumbs (new Gtk.UIManager ());
-        breads.change_breadcrumbs ("trash://");
-        breads.change_breadcrumbs ("trash://dir/folder/");
-        assert (breads.get_elements_path () == "trash://dir/folder/");
-        breads.change_breadcrumbs ("ftp://[e-mail]/dir/folder/");
-        assert (breads.get_elements_path () == "ftp://[e-mail]/dir/folder/");
-    });
-
-}
-
-void main (string[] args) {
-    Gtk.init (ref args);
-    Test.init (ref args);
-    //Preferences.settings = new GLib.Settings("org.gnome.marlin.preferences");
-
-    add_pathbar_tests ();
-
-    Idle.add (() => {
-        Test.run ();
-        Gtk.main_quit ();
-        return false;
-        }
-    );
-    Gtk.main ();
-}

=== modified file 'src/View/Chrome/TopMenu.vala'
--- src/View/Chrome/TopMenu.vala	2014-04-25 00:31:37 +0000
+++ src/View/Chrome/TopMenu.vala	2014-06-14 19:18:12 +0000
@@ -62,18 +62,15 @@
                     win.current_tab.slot.view_box.grab_focus ();
             });
 
-            location_bar.activate.connect (() => {
-                File file = File.new_for_commandline_arg (GLib.Uri.escape_string (
-                    location_bar.path, 
-                    (GLib.Uri.RESERVED_CHARS_GENERIC_DELIMITERS + GLib.Uri.RESERVED_CHARS_SUBCOMPONENT_DELIMITERS).replace("#", ""), 
-                    false));
+            location_bar.activate.connect ((file) => {
                 win.current_tab.path_changed (file);
             });
 
-            location_bar.activate_alternate.connect ((a) => {
-                win.add_tab (File.new_for_commandline_arg (a));
+            location_bar.activate_alternate.connect ((file) => {
+                win.add_tab (file);
             });
 
+            
             location_bar.show_all ();
             view_switcher.margin_right = 20;
             pack_start (location_bar);
@@ -81,4 +78,4 @@
             show ();
         }
     }
-}
+}
\ No newline at end of file

=== modified file 'src/View/LocationBar.vala'
--- src/View/LocationBar.vala	2014-05-13 21:10:32 +0000
+++ src/View/LocationBar.vala	2014-06-14 19:18:12 +0000
@@ -27,10 +27,10 @@
         private string _path;
         public new string path {
             set {
-                var new_path = value;
+                var new_path = GLib.Uri.unescape_string (value);
                 _path = new_path;
-                if (!bread.focus && !win.freeze_view_changes) {
-                    bread.entry.reset ();
+                if (!bread.is_focus && !win.freeze_view_changes) {
+                    bread.text = "";
                     bread.change_breadcrumbs (new_path);
                 }
             }
@@ -41,8 +41,8 @@
 
         Marlin.View.Window win;
 
-        public new signal void activate ();
-        public signal void activate_alternate (string path);
+        public new signal void activate (GLib.File file);
+        public signal void activate_alternate (GLib.File file);
         public signal void escape ();
 
         public override void get_preferred_width (out int minimum_width, out int natural_width) {
@@ -55,8 +55,8 @@
             bread = new Breadcrumbs (ui, win);
             bread.escape.connect (() => { escape(); });
 
-            bread.changed.connect (on_bread_changed);
-            bread.activate_alternate.connect ((a) => { activate_alternate(a); });
+            bread.path_changed.connect (on_path_changed);
+            bread.activate_alternate.connect ((file) => { activate_alternate(file); });
 
             margin_top = 4;
             margin_bottom = 4;
@@ -65,7 +65,7 @@
             pack_start (bread, true, true, 0);
         }
 
-        private void on_bread_changed (string changed) {
+        private void on_path_changed (File file) {
             if (win.freeze_view_changes)
                 return;
 
@@ -75,14 +75,7 @@
             else
                 win.current_tab.slot.view_box.grab_focus ();
 
-            //_path = changed;
-            path = changed;
-            activate();
-
-            /* This prevents that the location bar is left in a weird state
-             * when going from a non-existent folder to another one underneath. */
-            bread.entry.reset ();
-            bread.change_breadcrumbs (changed);
+            activate(file);
         }
     }
 
@@ -98,7 +91,7 @@
 
         /* Used for the context menu we show when there is a right click */
         GOF.Directory.Async files_menu = null;
-
+        
         bool autocompleted = false;
 
         Marlin.View.Window win;
@@ -190,35 +183,45 @@
             IconDirectory icon = {"/", Marlin.ICON_FILESYSTEM_SYMBOLIC, false, null, null, null, false, null};
             icon.exploded = {"/"};
             add_icon (icon);
+            
+            up.connect (() => {
+                File file = get_file_for_path (text);
+                File parent = file.get_parent ();
+                
+                if (parent != null && file.get_uri () != parent.get_uri ())
+                    change_breadcrumbs (parent.get_uri ());
+                    
+                win.current_tab.up ();
+                grab_focus ();
+            });
 
-            entry.down.connect (() => {
-                /* focus back the view */
+            down.connect (() => {
+                // focus back the view 
                 if (win.current_tab.content_shown)
                     win.current_tab.content.grab_focus ();
                 else
                     win.current_tab.slot.view_box.grab_focus ();
             });
 
-            entry.completed.connect (() => {
-                string path = get_elements_path ();
-                update_breadcrumbs (entry.text, path);
+            completed.connect (() => {
+                string path = "";
+                string newpath = update_breadcrumbs (get_file_for_path (text).get_uri (), path);
+                
+                foreach (BreadcrumbsElement element in elements) {
+                    if (!element.hidden)
+                        path += element.text + "/";
+                }
+            
+                if (path != newpath)
+                    change_breadcrumbs (newpath);
+                
                 grab_focus ();
             });
-
-            menu = new Gtk.Menu ();
-            menu.show_all ();
-
+            
             need_completion.connect (on_need_completion);
-        }
-
-        protected void merge_in_clipboard_actions () {
-            ui.insert_action_group (clipboard_actions, 0);
-            ui.ensure_update ();
-        }
-
-        protected void merge_out_clipboard_actions () {
-            ui.remove_action_group (clipboard_actions);
-            ui.ensure_update ();
+
+            menu = new Gtk.Menu ();
+            menu.show_all ();
         }
 
         /**
@@ -230,56 +233,59 @@
          *
          **/
         private void on_file_loaded(GOF.File file) {
-            if(file.is_folder () && file.get_display_name ().length > to_search.length) {
-                if (file.get_display_name ().ascii_ncasecmp (to_search, to_search.length) == 0) {
+            string file_display_name = GLib.Uri.unescape_string (file.get_display_name ());
+            if(file.is_folder () && file_display_name.length > to_search.length) {
+                if (file_display_name.ascii_ncasecmp (to_search, to_search.length) == 0) {
                     if (!autocompleted) {
-                        entry.completion = file.get_display_name ().slice (to_search.length, file.get_display_name ().length);
+                        text_completion = file_display_name.slice (to_search.length, file_display_name.length);
                         autocompleted = true;
                     } else {
-                        string file_complet = file.get_display_name ().slice (to_search.length, file.get_display_name ().length);
+                        string file_complet = file_display_name.slice (to_search.length, file_display_name.length);
                         string to_add = "";
-                        for (int i = 0; i < (entry.completion.length > file_complet.length ? file_complet.length : entry.completion.length); i++) {
-                            if (entry.completion[i] == file_complet[i])
-                                to_add += entry.completion[i].to_string ();
+                        for (int i = 0; i < (text_completion.length > file_complet.length ? file_complet.length : text_completion.length); i++) {
+                            if (text_completion[i] == file_complet[i])
+                                to_add += text_completion[i].to_string ();
                             else
                                 break;
                         }
-                        entry.completion = to_add;
+                        text_completion = to_add;
+                        multiple_completions = true;
                     }
+                    
                     /* autocompletion is case insensitive so we have to change the first completed
                      * parts: the entry.text.
                      */
-                    string str = entry.text.slice (0, entry.text.length - to_search.length);
-                    if (str == null)
-                        str = "";
-                    entry.text = str + file.get_display_name ().slice (0, to_search.length);
+                    string str = text.slice (0, text.length - to_search.length);
+                    if (str != null && !multiple_completions) {
+                        text = str + file.get_display_name ().slice (0, to_search.length);
+                        set_position (-1);
+                    }
                 }
             }
         }
 
         public void on_need_completion () {
-            to_search = "";
-            string path = get_elements_path ();
-            string[] stext = entry.text.split ("/");
-            int stext_len = stext.length;
-            if (stext_len > 0)
-                to_search = stext[stext.length -1];
+            File file = get_file_for_path (text);
+            to_search = file.get_basename ();
 
-            entry.completion = "";
             autocompleted = false;
-
-            path += entry.text;
-            message ("path %s to_search %s", path, to_search);
-            if (to_search != "")
-                path = Marlin.Utils.get_parent (path);
-
-            if (path != null && path.length > 0) {
-                var directory = File.new_for_uri (path);
-                files = GOF.Directory.Async.from_gfile (directory);
-                if (files.file.exists) {
+            multiple_completions = false;
+            
+            if (to_search != "" && file.has_parent (null))
+                file = file.get_parent ();
+            else
+                return;
+
+            var directory = file;
+            var files_cache = files;
+            
+            files = GOF.Directory.Async.from_gfile (directory);
+            if (files.file.exists) {
+                /* Verify that we got a new instance of files so we do not double up events */
+                if (files_cache != files)
                     files.file_loaded.connect (on_file_loaded);
-                    files.load ();
-                }
+                
+                files.load ();
             }
         }
 
@@ -363,7 +369,7 @@
             file.launch (win.get_screen (), app);
         }
 
-        protected override void on_file_droped (List<GLib.File> uris, GLib.File target_file, Gdk.DragAction real_action) {
+        protected override void on_file_dropped (List<GLib.File> uris, GLib.File target_file, Gdk.DragAction real_action) {
             Marlin.FileOperations.copy_move(uris, null, target_file, real_action);
         }
 
@@ -376,18 +382,6 @@
             return strloc;
         }
 
-        public override bool focus_out_event (Gdk.EventFocus event) {
-            base.focus_out_event (event);
-            merge_out_clipboard_actions ();
-            return true;
-        }
-
-        public override bool focus_in_event (Gdk.EventFocus event) {
-            base.focus_in_event (event);
-            merge_in_clipboard_actions ();
-            return true;
-        }
-
         private void get_menu_position (Gtk.Menu menu, out int x, out int y, out bool push_in) {
             x = (int) menu_x_root;
             y = (int) menu_y_root;
@@ -414,4 +408,4 @@
                         Gtk.get_current_event_time ());
         }
     }
-}
+}
\ No newline at end of file

=== modified file 'src/View/ViewContainer.vala'
--- src/View/ViewContainer.vala	2014-04-30 09:13:59 +0000
+++ src/View/ViewContainer.vala	2014-06-14 19:18:12 +0000
@@ -75,8 +75,7 @@
 
             path_changed.connect ((myfile) => {
                 /* location didn't change, do nothing */
-                if (slot != null && myfile != null && slot.directory.file.exists
-                    && slot.location.equal (myfile))
+                if (slot != null && myfile != null && slot.directory.file.exists && slot.location.equal (myfile))
                     return;
 
                 change_view(view_mode, myfile);
@@ -322,7 +321,7 @@
                               // You see if I would just use back(n) the reference to n would be passed
                               // in the clusure, restulting in a value of n which would always be n=1. So
                               // by introducting a new variable I can bypass this anoyance.
-                var item = new Gtk.MenuItem.with_label (path);
+                var item = new Gtk.MenuItem.with_label (GLib.Uri.unescape_string (path));
                 item.activate.connect (() => { back(cn); });
                 back_menu.insert (item, -1);
             }
@@ -338,7 +337,7 @@
             var n = 1;
             foreach (var path in list) {
                 int cn = n++; // For explenation look up
-                var item = new Gtk.MenuItem.with_label (path);
+                var item = new Gtk.MenuItem.with_label (GLib.Uri.unescape_string (path));
                 item.activate.connect (() => forward (cn));
                 forward_menu.insert (item, -1);
             }
@@ -353,4 +352,4 @@
         }
 
     }
-}
+}
\ No newline at end of file

=== modified file 'src/View/Window.vala'
--- src/View/Window.vala	2014-06-06 18:51:14 +0000
+++ src/View/Window.vala	2014-06-14 19:18:12 +0000
@@ -243,6 +243,12 @@
             /*/
             /* Connect and abstract signals to local ones
             /*/
+            key_press_event.connect ((event) => {
+                if (top_menu.location_bar.bread.is_focus)
+                    return top_menu.location_bar.bread.key_press_event (event);
+                
+                return false;
+            });
 
             window_state_event.connect ((event) => {
                 if ((bool) event.changed_mask & Gdk.WindowState.MAXIMIZED) {
@@ -861,4 +867,4 @@
 
         };
     }
-}
+}
\ No newline at end of file