Merge lp:~junrrein/pantheon-files/fix-903920 into lp:~elementary-apps/pantheon-files/trunk

[Julián Unrrein]

Show an "Open in New Tab" menu item when right clicking a breadcrumb. Fixes bug #903920.

[David Gomes (davidgomes)]

Fix that coding style. Only spaces. Mixing tabs and spaces is awful.

review: Needs Fixing

[lp:~junrrein/pantheon-files/fix-903920]

1074. By Julián Unrrein on 2013-01-12

Minor modification to a variable name.
Remove some debug output that wasn't meant to stay.

[Julián Unrrein (junrrein)]

What do you mean? To use 4 spaces instead of a tab?

[Julián Unrrein (junrrein)]

This is my first code contribution ever. Feel free to give me any indications.

[lp:~junrrein/pantheon-files/fix-903920]

1075. By Julián Unrrein on 2013-01-12

Replace tabs with spaces.

[David Gomes (davidgomes)]

Indeed, 4 spaces instead of tabs. That's how we indent our code.

[David Gomes (davidgomes)]

menuitem_newtab.activate.connect ( () => {
↓
menuitem_newtab.activate.connect (() => {

Other than that, teh code looks fine. Fix that, I'll test it and if it works, I'll merge it.

[lp:~junrrein/pantheon-files/fix-903920]

1076. By Julián Unrrein on 2013-01-12

Clean the code a bit. Fix the coding style.

[Julián Unrrein (junrrein)]

Notice that this time I also modified the code a bit.

[Cody Garver (codygarver)]

review: Approve

=== modified file 'libwidgets/LocationBar.vala'
--- libwidgets/LocationBar.vala	2012-11-25 04:12:30 +0000
+++ libwidgets/LocationBar.vala	2013-01-12 22:28:21 +0000
@@ -39,6 +39,7 @@
 
 public abstract class Marlin.View.Chrome.BasePathBar : EventBox
 {
+    public string current_right_click_path;
     public string current_right_click_root;
     //double right_click_root;
 
@@ -391,6 +392,7 @@
         var el = get_element_from_coordinates ((int) event.x, (int) event.y);
         if (el != null) {
             var newpath = get_path_from_element (el);
+            current_right_click_path = newpath;
             current_right_click_root = Marlin.Utils.get_parent(newpath);
             double menu_x_root;
             if (el.x - space_breads < 0)

=== modified file 'src/View/LocationBar.vala'
--- src/View/LocationBar.vala	2012-06-11 09:25:17 +0000
+++ src/View/LocationBar.vala	2013-01-12 22:28:21 +0000
@@ -282,6 +282,15 @@
         
         private void on_files_loaded_menu()
         {
+            // First the "Open in new tab" menuitem is added to the menu.
+            var menuitem_newtab = new Gtk.MenuItem.with_label (_("Open in New Tab"));
+            menu.append (menuitem_newtab);
+            menuitem_newtab.activate.connect (() => {
+                win.add_tab (File.new_for_uri (current_right_click_path));
+            });
+            
+            menu.append (new Gtk.SeparatorMenuItem ());
+            
             unowned List<GOF.File>? sorted_dirs = files_menu.get_sorted_dirs ();
             foreach (var gof in sorted_dirs) {
                 var menuitem = new Gtk.MenuItem.with_label(gof.get_display_name ());