Merge lp:~artem-anufrij/scratch/Bugfix-1200522 into lp:~elementary-apps/scratch/scratch

[Artem Anufrij]

'save as' opens automatically location highlighted in the File Browser plugin

[Danielle Foré (danrabbit)]

This doesn't seem to work as expected. I'm still getting the folder Scratch was launched from in the Save dialog regardless of the expanded folders or selected file in the file manager plugin

review: Needs Fixing

[Artem Anufrij (artem-anufrij)]

@Dan:
Have you tested it with file manager, or folder manager? File manager works fine....

[Danielle Foré (danrabbit)]

File manager. I tried running from the directory and installed.

[lp:~artem-anufrij/scratch/Bugfix-1200522]

1402. By artem-anufrij on 2014-11-01

commit

[Artem Anufrij (artem-anufrij)]

Mysterious.

I pushed once again the code...

This is the workflow on my system:

https://launchpadlibrarian.net/188886936/Screencast%202014-11-01%2022%3A20%3A38.mp4

[Artem Anufrij (artem-anufrij)]

Dan, could you try again?

[Artem Anufrij (artem-anufrij)]

Please review

review: Needs Resubmitting

[Artem Anufrij (artem-anufrij)]

review: Approve

[Artem Anufrij (artem-anufrij)]

review: Approve

Unmerged revisions

1402. By artem-anufrij on 2014-11-01

commit

1401. By artem-anufrij on 2014-10-30

'save as' opens automatically location highlighted in the File Browser plugin

=== modified file 'plugins/filemanager/FileManagerPlugin.vala'
--- plugins/filemanager/FileManagerPlugin.vala	2014-04-13 16:15:35 +0000
+++ plugins/filemanager/FileManagerPlugin.vala	2014-11-01 21:23:31 +0000
@@ -22,10 +22,10 @@
 public const string DESCRIPTION = N_("Basic folder manager with file browsing");
 
 namespace Scratch.Plugins {
-    
+
     public class FileManagerPlugin : Peas.ExtensionBase, Peas.Activatable {
         public Scratch.Services.Interface plugins;
-        
+
         Gtk.Box box;
         FileManager.FileView view;
 
@@ -51,9 +51,9 @@
         void on_hook_sidebar (Gtk.Notebook notebook) {
             if (view != null)
                 return;
-            
+
             box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
-            
+
             // File View
             view = new FileManager.FileView ();
 
@@ -61,12 +61,12 @@
                 var file = GLib.File.new_for_path (a);
                 plugins.open_file (file);
             });
-            
+
             // Toolbar
             var toolbar = new Gtk.Toolbar ();
             toolbar.set_icon_size (Gtk.IconSize.SMALL_TOOLBAR);
             toolbar.get_style_context ().add_class ("inline-toolbar");
-                        
+
             var parent = new Gtk.ToolButton (null, null);
             parent.tooltip_text = _("Go to parent");
             parent.icon_name = "go-up-symbolic";
@@ -74,33 +74,33 @@
                 view.open_parent ();
                 parent.sensitive = !(view.folder.file.file.get_path () == "/");
             });
-            
+
             var spacer = new Gtk.ToolItem ();
             spacer.set_expand (true);
-            
+
             var add = new Gtk.ToolButton (null, null);
             add.tooltip_text = _("Add file");
             add.icon_name = "list-add-symbolic";
             add.clicked.connect (() => {
                 view.add_file ();
             });
-            
+
             var remove = new Gtk.ToolButton (null, null);
             remove.tooltip_text = _("Remove file");
             remove.icon_name = "edit-delete-symbolic";
             remove.clicked.connect (() => {
                 view.remove_file ();
             });
-            
+
             toolbar.insert (parent, -1);
             toolbar.insert (spacer, -1);
             toolbar.insert (add, -1);
             toolbar.insert (remove, -1);
-            
+
             box.pack_start (view, true, true, 0);
             box.pack_start (toolbar, false, false, 0);
             box.show_all ();
-            
+
             notebook.append_page (box, new Gtk.Label (_("File Manager")));
 
         }
@@ -111,4 +111,4 @@
 public void peas_register_types (GLib.TypeModule module) {
   var objmodule = module as Peas.ObjectModule;
   objmodule.register_extension_type (typeof (Peas.Activatable), typeof (Scratch.Plugins.FileManagerPlugin));
-}
+}
\ No newline at end of file

=== modified file 'plugins/filemanager/FileView.vala'
--- plugins/filemanager/FileView.vala	2014-07-21 03:36:57 +0000
+++ plugins/filemanager/FileView.vala	2014-11-01 21:23:31 +0000
@@ -35,7 +35,13 @@
             this.width_request = 180;
 
             this.item_selected.connect ((item) => {
-                select ((item as FileItem).path);
+                if (item is FileItem) {
+                    select ((item as FileItem).path);
+                    Utils.last_path = (item as FileItem).file.file.get_parent ().get_uri ();
+                } else if (item is FolderItem) {
+                    Utils.last_path = (item as FolderItem).file.file.get_uri ();
+                }
+
             });
             this.root.child_removed.connect (() => {
                 this.selected = null;
@@ -73,7 +79,7 @@
                 warning ("Cannot open invalid directory.");
                 return;
             }
-            
+
             // Clean the SourceList before start adding something
             if (this.folder != null)
                 this.root.remove (this.folder);
@@ -251,7 +257,7 @@
                     view: view);
 
             this.editable = false;
-            this.selectable = false;
+            this.selectable = true;
             this.name = file.name;
             this.icon = IconLoader.get_default ().get_rendered_icon (file.icon);
 
@@ -263,6 +269,10 @@
                     children_loaded = true;
                 }
             });
+
+            this.activated.connect (() => {
+                this.expanded = !this.expanded;
+            });
             
             try {
                 monitor = file.file.monitor_directory (GLib.FileMonitorFlags.NONE);

=== modified file 'plugins/terminal/terminal.vala'
--- plugins/terminal/terminal.vala	2014-08-07 00:33:31 +0000
+++ plugins/terminal/terminal.vala	2014-11-01 21:23:31 +0000
@@ -167,4 +167,4 @@
     var objmodule = module as Peas.ObjectModule;
     objmodule.register_extension_type (typeof (Peas.Activatable),
                                      typeof (Scratch.Plugins.Terminal));
-}
+}
\ No newline at end of file