Merge lp:~gero-bare/scratch/fix-bug-1633916 into lp:~elementary-apps/scratch/scratch

[Gero.Bare]

This might be an overkill but I'm not aware of a better solution.

On doc closes check if the document is currently selected and de select it from the file view.

I keep track of the documents in order to disconnect the signals when opportune.

[lp:~gero-bare/scratch/fix-bug-1633916]

1772. By Gero.Bare on 2016-10-24

Fix formatting error.

[Zisu Andrei (matzipan)]

I confirm your branch fixes the issue and does not introduce any regressions.

However, there's a tiny comment inline.

review: Needs Fixing

[Zisu Andrei (matzipan)]

Actually, I think I spotted a bug: what happens if the user has 2 tabs open for the same file (right click on the tab and click "duplicate"). When one of them is closed, the item is deselected and no deselection occurs for the second one.

review: Needs Fixing

[lp:~gero-bare/scratch/fix-bug-1633916]

1773. By Gero.Bare on 2016-11-12

Now theflemanger selects atomatically the document currently opened in the editor.
Fixed some style issues.

1774. By Gero.Bare on 2016-11-12

Fix a little screw up. It should compile now.

[Zisu Andrei (matzipan)]

Hey Gero,

Great progress, but I found a little bug.

How to test:
Open a file (say file a)
Then click the settings icon in the top right and click "Add View".
Now press ctrl+o and open a different file (say file b)
Then press ctrl+o and open the same file as the one you opened in your first step (say file a).

You will have two views, one with two tabs, a and b, and one with a single tab, a.

In the view with two tabs. Close "a". This will leave you with a view with "a", and one with "b".

Press the "a" tab. Your selection won't happen.

Also, there's some comments inline.

Let's get this merged!

review: Needs Fixing

[lp:~gero-bare/scratch/fix-bug-1633916]

1775. By Gero.Bare on 2016-11-18

Don't reopen documents unnecessarily.

[Gero.Bare (gero-bare)]

document.focus () => doesn't focus a shit. Sorry my language but there's only so much I can do it here.

Besides that, I think this works.

[Zisu Andrei (matzipan)]

Can anybody reject this branch? I'm working on an improvement here: https://code.launchpad.net/~matzipan/scratch/select-file-in-sidebar/+merge/313838

Unmerged revisions

1775. By Gero.Bare on 2016-11-18

Don't reopen documents unnecessarily.

1774. By Gero.Bare on 2016-11-12

Fix a little screw up. It should compile now.

1773. By Gero.Bare on 2016-11-12

Now theflemanger selects atomatically the document currently opened in the editor.
Fixed some style issues.

1772. By Gero.Bare on 2016-10-24

Fix formatting error.

1771. By Gero.Bare on 2016-10-24

On document close, check if the file is currently selected and deselect it.

=== modified file 'plugins/filemanager/FileManagerPlugin.vala'
--- plugins/filemanager/FileManagerPlugin.vala	2016-09-03 11:50:58 +0000
+++ plugins/filemanager/FileManagerPlugin.vala	2016-11-18 21:54:58 +0000
@@ -27,6 +27,7 @@
         
         Gtk.Box box;
         FileManager.FileView view;
+        private Gee.TreeSet <Scratch.Services.Document> docs;
 
         public Object object { owned get; construct; }
 
@@ -37,11 +38,21 @@
         public void activate () {
             plugins = (Scratch.Services.Interface) object;
             plugins.hook_notebook_sidebar.connect (on_hook_sidebar);
+
+            docs = new Gee.TreeSet <Scratch.Services.Document> ();
+            plugins.hook_document.connect (on_hook_document);
         }
 
         public void deactivate () {
             if (box != null)
                 box.destroy();
+
+            foreach (var doc in docs) {
+                docs.remove (doc);
+                doc.doc_closed.disconnect (on_doc_closed);
+            }
+
+            plugins.hook_document.disconnect (on_hook_document);
         }
 
         public void update_state () {
@@ -57,8 +68,14 @@
             // File View
             view = new FileManager.FileView ();
 
-            view.select.connect ((a) => {
-                var file = GLib.File.new_for_path (a);
+            view.select.connect ((path) => {
+                foreach (var document in docs) {
+                    if (document.file.get_path () == path) {
+                        document.focus ();
+                        return;
+                    }
+                }
+                var file = GLib.File.new_for_path (path);
                 plugins.open_file (file);
             });
 
@@ -103,6 +120,20 @@
 
             notebook.append_page (box, new Gtk.Label (_("File Manager")));
         }
+
+        void on_hook_document (Scratch.Services.Document doc) {
+            if (!docs.contains (doc)) {
+                docs.add (doc);
+                doc.doc_closed.connect (on_doc_closed);
+            }
+
+            view.select_item_from_path (doc.file.get_path ());
+        }
+
+        void on_doc_closed (Scratch.Services.Document doc) {
+            docs.remove (doc);
+            view.deselect_file_path (doc.file.get_path ());
+        }
     }
 }
 

=== modified file 'plugins/filemanager/FileView.vala'
--- plugins/filemanager/FileView.vala	2016-09-03 11:50:58 +0000
+++ plugins/filemanager/FileView.vala	2016-11-18 21:54:58 +0000
@@ -102,6 +102,40 @@
             this.selected = null;
         }
 
+        public void deselect_file_path (string path) {
+            if (selected != null) {
+                if ((selected as FileItem).file.file.get_path () == path) {
+                    selected = null;
+                }
+            }
+        }
+
+        public void select_item_from_path (string path) {
+            debug ("Select filepath %s", path);
+            if (selected == null || (selected as FileItem).path != path) {
+                var file = new File (path);
+                if (file.is_valid_directory) {
+                    return;
+                }
+
+                var parent_folder = new File(file.file.get_parent ().get_path ());
+                open_folder (parent_folder);
+
+                if (this.folder == null) {
+                    debug ("Failed to open %s", parent_folder.file.get_path ());
+                    return;
+                }
+
+                foreach (var item in this.folder.children) {
+                    if ((item as Item).path == path) {
+                        selected = (item as Item);
+                        break;
+                    }
+                }
+                debug ("Failed to open filepath %s", path);
+            }
+        }
+
         private bool is_open (File folder) {
             foreach (var child in root.children) {
                 if (folder.path == (child as Item).path) {