Merge lp:~donadigo/scratch/open-dir-sidebar into lp:~elementary-apps/scratch/scratch

[Adam Bieńkowski]

* Passing directory will now open it in the sidebar

This branch fixes bug #1570661: "Open directory in sidebar if passed a directory".

If given a directory, Scratch will no longer throw an error, instead it will pass the file through the new "request_open_folder" signal to inform plugins that a directory was opened.

I still don't feel really confident about this solution, and if there should be other changes in the code to perhaps improve handling other directories / arguments etc. Please feel free to ping me on Slack or tell me in a review.

[Jeremy Wootten (jeremywootten)]

Will this work or conflict with lp:~matzipan/scratch/folder-manager-improvement?

[Adam Bieńkowski (donadigo)]

jeremywootten: I don't think so, it completely removes the filemanager plugin so it will conflict. I guess this branch shouldn't be merged then, and we should just wait until the other one gets merged so this one can get updated.

Unmerged revisions

1821. By Adam Bieńkowski on 2017-02-16

Opening directory will now open it in the sidebar

=== modified file 'plugins/filemanager/FileManagerPlugin.vala'
--- plugins/filemanager/FileManagerPlugin.vala	2016-09-03 11:50:58 +0000
+++ plugins/filemanager/FileManagerPlugin.vala	2017-02-16 13:41:47 +0000
@@ -37,6 +37,7 @@
         public void activate () {
             plugins = (Scratch.Services.Interface) object;
             plugins.hook_notebook_sidebar.connect (on_hook_sidebar);
+            plugins.request_open_folder.connect (on_request_open_folder);
         }
 
         public void deactivate () {
@@ -103,6 +104,10 @@
 
             notebook.append_page (box, new Gtk.Label (_("File Manager")));
         }
+
+        void on_request_open_folder (File file) {
+            view.open_folder (new FileManager.File (file.get_path ()));
+        }        
     }
 }
 

=== modified file 'src/MainWindow.vala'
--- src/MainWindow.vala	2017-01-06 17:11:40 +0000
+++ src/MainWindow.vala	2017-02-16 13:41:47 +0000
@@ -506,6 +506,10 @@
             }
         }
 
+        public void open_folder (File file) {
+            plugins.plugin_iface.request_open_folder (file);
+        }
+
         // Return true if there are no documents
         public bool is_empty () {
             return split_view.is_empty ();

=== modified file 'src/Scratch.vala'
--- src/Scratch.vala	2016-12-13 02:06:39 +0000
+++ src/Scratch.vala	2017-02-16 13:41:47 +0000
@@ -194,12 +194,16 @@
                             case FileType.SYMBOLIC_LINK:
                                 files += file;
                                 break;
+                            case FileType.DIRECTORY:
+                                var window = get_last_window ();
+                                if (window != null) {
+                                    window.open_folder (file);
+                                }
+
+                                break;                                
                             case FileType.MOUNTABLE:
                                 reason = _("It is a mountable location.");
                                 break;
-                            case FileType.DIRECTORY:
-                                reason = _("It is a directory.");
-                                break;
                             case FileType.SPECIAL:
                                 reason = _("It is a \"special\" file such as a socket,\n fifo, block device, or character device.");
                                 break;

=== modified file 'src/Services/PluginManager.vala'
--- src/Services/PluginManager.vala	2014-04-13 16:12:53 +0000
+++ src/Services/PluginManager.vala	2017-02-16 13:41:47 +0000
@@ -36,6 +36,8 @@
         public signal void hook_document (Scratch.Services.Document doc);
         public signal void hook_preferences_dialog (Scratch.Dialogs.Preferences dialog);
         
+        public signal void request_open_folder (File file);
+        
         public Scratch.TemplateManager template_manager { private set; get; }
         
         public Interface (PluginsManager manager) {