Merge lp:~matzipan/scratch/use-rename-event into lp:~elementary-apps/scratch/scratch

[Zisu Andrei]

This branch is WIP.

Currently, if you rename a file in the sidebar, when you perform the action, the selected file cursor jumps to a different file. This is because the sidebar doesn't use the rename GIO event, but instead deletes and creates the row everytime this happens.

However, using the rename event doesn't fully work, because Granite.SourceList doesn't have a way to trigger re-sorting of the elements. It only sorts an element when it is first added.

Thus, I am pushing this now as it is, in the hopes that I will address this issue in my sidebar-widget branch in granite. Then it can be merged into scratch.

Unmerged revisions

1780. By Zisu Andrei on 2016-11-30

Use rename monitor event instead of create/remove

1779. By Zisu Andrei on 2016-11-30

Simplify file/folder validity check. Move common construct/rename/trash code into superclass. GObject constructor for File

1778. By Zisu Andrei on 2016-11-30

Merge filemanager into folder-manager

=== modified file 'plugins/CMakeLists.txt'
--- plugins/CMakeLists.txt	2016-09-03 10:30:53 +0000
+++ plugins/CMakeLists.txt	2016-11-30 23:31:32 +0000
@@ -6,8 +6,7 @@
 )
 
 add_subdirectory (contractor)
-add_subdirectory (pastebin)
-add_subdirectory (filemanager)
+add_subdirectory (pastebin) 
 add_subdirectory (folder-manager)
 add_subdirectory (terminal)
 add_subdirectory (browser-preview)
 
=== removed directory 'plugins/filemanager'
=== removed file 'plugins/filemanager/CMakeLists.txt'
--- plugins/filemanager/CMakeLists.txt	2016-09-03 10:30:53 +0000
+++ plugins/filemanager/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-add_definitions(${NORMAL_CFLAGS})
-link_directories(${NORMAL_LINK_DIRS})
-
-set (PLUGIN_NAME "filemanager")
-
-vala_precompile(VALA_C ${PLUGIN_NAME}
-    FileManagerPlugin.vala
-    File.vala
-    Settings.vala
-    FileView.vala
-PACKAGES
-    gtk+-3.0
-    gee-0.8
-    granite
-    scratchcore
-    libpeas-1.0
-    gtksourceview-3.0
-    ${ZEITGEIST_DEPS}
-OPTIONS
-    ${DEFAULT_PLUGIN_OPTIONS}
-)
-
-add_library(${PLUGIN_NAME} MODULE ${VALA_C})
-add_dependencies(${PLUGIN_NAME} ${LIBNAME})
-
-install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINDIR}/${PLUGIN_NAME})
-install(FILES ${PLUGIN_NAME}.plugin DESTINATION ${PLUGINDIR}/${PLUGIN_NAME})
-
-message("-- File Manager plugin will be compiled")
 
=== removed file 'plugins/filemanager/File.vala'
--- plugins/filemanager/File.vala	2013-07-16 15:56:38 +0000
+++ plugins/filemanager/File.vala	1970-01-01 00:00:00 +0000
@@ -1,207 +0,0 @@
-// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
-/***
-  BEGIN LICENSE
-
-  Copyright (C) 2013 Julien Spautz <[e-mail]>
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License version 3, as published
-  by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY, 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.  If not, see <http://www.gnu.org/licenses/>
-
-  END LICENSE
-***/
-
-namespace Scratch.Plugins.FileManager {
-
-    /**
-     * Class for easily dealing with files.
-     */
-    internal class File : GLib.Object {
-
-        public GLib.File file;
-        private GLib.FileInfo info;
-        
-        private enum Type {
-            VALID_FILE,
-            VALID_FOLDER,
-            UNKNOWN,
-            INVALID
-        }
-
-        public File (string path) {
-            file = GLib.File.new_for_path (path);
-
-            info = new FileInfo ();
-            try {
-                info = file.query_info (
-                    GLib.FileAttribute.STANDARD_CONTENT_TYPE + "," +
-                    GLib.FileAttribute.STANDARD_IS_BACKUP + "," +
-                    GLib.FileAttribute.STANDARD_IS_HIDDEN + "," +
-                    GLib.FileAttribute.STANDARD_DISPLAY_NAME + "," +
-                    GLib.FileAttribute.STANDARD_TYPE,
-                    FileQueryInfoFlags.NONE);
-            } catch (GLib.Error error) {
-                info = null;
-                warning (error.message);
-            }
-        }
-
-        // returns the path the file
-        string _path = null;
-        public string path {
-            get { return _path != null ? _path : _path = file.get_path (); }
-        }
-
-        // returns the basename of the file
-        string _name = null;
-        public string name {
-            get { return _name != null ? _name : _name = info.get_display_name (); }
-        }
-
-        // returns the icon of the file's content type
-        GLib.Icon _icon = null;
-        public GLib.Icon icon {
-            get {
-                if (_icon != null)
-                    return _icon;
-                //var content_type = info.get_attribute_string (FileAttribute.STANDARD_FAST_CONTENT_TYPE);
-                var content_type = info.get_content_type ();
-                return _icon = GLib.ContentType.get_icon (content_type);
-            }
-        }
-
-        // checks if file exists
-        public bool exists {
-            get { return file.query_exists (); }
-        }
-
-        Type _type = Type.UNKNOWN;
-        // checks if we're dealing with a non-hidden, non-backup directory
-        public bool is_valid_directory {
-            get {
-                if (_type == Type.VALID_FILE)
-                    return false;
-                if (_type == Type.VALID_FOLDER)
-                    return true;
-                if (_type == Type.INVALID)
-                    return false;
-
-                if (info.get_file_type () != FileType.DIRECTORY ||
-                    info.get_is_hidden () || info.get_is_backup ()) {
-                    return false;
-                }
-
-                bool has_valid_children = false;
-
-                foreach (var child in children) {
-                    if (child.is_valid_textfile) {
-                        _type = Type.VALID_FOLDER;
-                        return has_valid_children = true;
-                    }
-                }
-
-                foreach (var child in children) {
-                    if (child.is_valid_directory) {
-                        has_valid_children = true;
-                        _type = Type.VALID_FOLDER;
-                    return has_valid_children = true;
-                    }
-                }
-
-                return false;
-            }
-        }
-
-        // checks if we're dealing with a textfile
-        public bool is_valid_textfile {
-            get {
-                if (_type == Type.VALID_FILE)
-                    return true;
-                if (_type == Type.VALID_FOLDER)
-                    return false;
-                if (_type == Type.INVALID)
-                    return false;
-
-                if (info.get_file_type () == FileType.REGULAR) {
-                    //var content_type = info.get_attribute_string (FileAttribute.STANDARD_FAST_CONTENT_TYPE);
-                    var content_type = info.get_content_type ();
-                    if (ContentType.is_a (content_type, "text/*") &&
-                        !info.get_is_backup () &&
-                        !info.get_is_hidden ()) {
-                        _type = Type.VALID_FILE;
-                        return true;
-                    }
-                }
-
-                return false;
-            }
-        }
-
-        // returns a list of all children of a directory
-        GLib.List <File> _children = null;
-        public GLib.List <File> children {
-            get {
-                if (_children != null)
-                    return _children;
-
-                var parent = GLib.File.new_for_path (file.get_path ());
-                try {
-                    var enumerator = parent.enumerate_children (
-                        GLib.FileAttribute.STANDARD_NAME,
-                        FileQueryInfoFlags.NONE
-                    );
-
-                    var file_info = new FileInfo ();
-                    while ((file_info = enumerator.next_file ()) != null) {
-                        var child = parent.get_child (file_info.get_name ());
-                        _children.append (new File (child.get_path ()));
-                    }
-                } catch (GLib.Error error) {
-                    warning (error.message);
-                }
-
-                return _children;
-            }
-        }
-
-        public void rename (string name) {
-            try {
-                file.set_display_name (name);
-            } catch (GLib.Error error) {
-                warning (error.message);
-            }
-        }
-
-        /*public void trash () {
-            try {
-                file.trash ();
-            } catch (GLib.Error error) {
-                warning (error.message);
-            }
-        }*/
-
-        public void reset_cache () {
-            _name = null;
-            _path = null;
-            _icon = null;
-            _children = null;
-            _type = Type.UNKNOWN;
-        }
-
-        public static int compare (File a, File b) {
-            if (a.is_valid_directory && b.is_valid_textfile)
-                return -1;
-            if (a.is_valid_textfile && b.is_valid_directory)
-                return 1;
-            return strcmp (a.path.collate_key_for_filename (),
-                           b.path.collate_key_for_filename ());
-        }
-    }
-}
 
=== removed file 'plugins/filemanager/FileManagerPlugin.vala'
--- plugins/filemanager/FileManagerPlugin.vala	2016-09-03 11:50:58 +0000
+++ plugins/filemanager/FileManagerPlugin.vala	1970-01-01 00:00:00 +0000
@@ -1,113 +0,0 @@
-// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
-/***
-  BEGIN LICENSE
-
-  Copyright (C) 2013 Julien Spautz <[e-mail]>
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License version 3, as published
-  by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY, 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.  If not, see <http://www.gnu.org/licenses/>
-
-  END LICENSE
-***/
-
-public const string NAME = _("Folder Manager");
-public const string DESCRIPTION = _("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;
-
-        public Object object { owned get; construct; }
-
-        public FileManagerPlugin () {
-            message ("Starting File Manager Plugin");
-        }
-
-        public void activate () {
-            plugins = (Scratch.Services.Interface) object;
-            plugins.hook_notebook_sidebar.connect (on_hook_sidebar);
-        }
-
-        public void deactivate () {
-            if (box != null)
-                box.destroy();
-        }
-
-        public void update_state () {
-            
-        }
-
-        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 ();
-
-            view.select.connect ((a) => {
-                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";
-            parent.clicked.connect (() => {
-                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")));
-        }
-    }
-}
-
-[ModuleInit]
-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));
-}
 
=== removed file 'plugins/filemanager/FileView.vala'
--- plugins/filemanager/FileView.vala	2016-09-03 11:50:58 +0000
+++ plugins/filemanager/FileView.vala	1970-01-01 00:00:00 +0000
@@ -1,297 +0,0 @@
-// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
-/***
-  BEGIN LICENSE
-
-  Copyright (C) 2013 Julien Spautz <[e-mail]>
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License version 3, as published
-  by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY, 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.  If not, see <http://www.gnu.org/licenses/>
-
-  END LICENSE
-***/
-
-namespace Scratch.Plugins.FileManager {
-    Settings settings;
-
-    /**
-     * SourceList that displays folders and their contents.
-     */
-    internal class FileView : Granite.Widgets.SourceList {
-        public FolderItem? folder = null;
-        public signal void select (string file);
-        public FileView () {
-            this.width_request = 180;
-
-            this.item_selected.connect ((item) => {
-                select ((item as FileItem).path);
-            });
-
-            this.root.child_removed.connect (() => {
-                this.selected = null;
-            });
-
-            settings = new Settings ();
-            restore_settings ();
-        }
-
-        public void open_parent () {
-            GLib.File parent = this.folder.file.file.get_parent ();
-            this.root.remove (this.folder);
-            open_folder (new File (parent.get_path ()));
-        } 
-        
-        public void open_folder (File folder, bool expand = true) {
-            if (is_open (folder)) {
-                warning ("Folder '%s' is already open.", folder.path);
-                return;
-            } else if (!folder.is_valid_directory) {
-                warning ("Cannot open invalid directory.");
-                return;
-            }
-
-            // Clean the SourceList before start adding something
-            if (this.folder != null) {
-                this.root.remove (this.folder);
-            }
-
-            this.folder = new FolderItem (folder, this);
-            this.root.add (this.folder);
-
-            this.folder.expanded = expand;
-            write_settings ();
-        }
-        
-        public void add_file () {
-            string path = folder.file.file.get_path () + _("/New File");
-            var file = GLib.File.new_for_path (path);
-            int n = 1;
-            while (file.query_exists ()) {
-                file = GLib.File.new_for_path (path + n.to_string ());
-                n++;
-            }
-
-            try {
-                file.create (FileCreateFlags.NONE);
-            } catch (Error e) {
-                warning (e.message);
-            }
-
-            var item = new FileItem (new File (file.get_path ()));
-            this.folder.add (item);
-        }
-
-        public void remove_file () {
-            if (this.selected is FileItem) {
-                var file = GLib.File.new_for_path (((FileItem)selected).file.file.get_path ());
-                try {
-                    file.delete ();
-                    this.root.remove (selected);
-                } catch (Error e) {
-                    warning (e.message);
-                }
-            }
-
-            this.selected = null;
-        }
-
-        private bool is_open (File folder) {
-            foreach (var child in root.children) {
-                if (folder.path == (child as Item).path) {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        private void write_settings () {
-            settings.opened_folder = this.folder.file.file.get_path ();
-        }
-
-        private void restore_settings () {
-            var folder = new File (settings.opened_folder);
-            if (settings.opened_folder == "" || settings.opened_folder == null || !folder.is_valid_directory) {
-                settings.opened_folder = GLib.Environment.get_home_dir ();
-            }
-
-            open_folder (new File (settings.opened_folder));
-        }
-    }
-
-    /**
-     * Common abstract class for normal and expandable items.
-     */
-    internal class Item : Granite.Widgets.SourceList.ExpandableItem, Granite.Widgets.SourceListSortable {
-        public File file { get; construct; }
-        public string path { get { return file.path; } }
-
-        public int compare (Granite.Widgets.SourceList.Item a, Granite.Widgets.SourceList.Item b) {
-            if (a is FolderItem && b is FileItem) {
-                return -1;
-            } else if (a is FileItem && b is FolderItem) {
-                return 1;
-            }
-
-            return File.compare ((a as Item).file, (b as Item).file);
-        }
-
-        public bool allow_dnd_sorting () {
-            return false;
-        }
-    }
-
-    /**
-     * Normal item in the source list, represents a textfile.
-     * TODO Remove, Rename
-     */
-    internal class FileItem : Item {
-        //Gtk.Menu menu;
-        //Gtk.MenuItem item_trash;
-        public FileItem (File file) requires (file.is_valid_textfile) {
-            Object (file: file);
-
-            this.selectable = true;
-            this.editable = true;
-            this.name = file.name;
-            this.icon = file.icon;
-        }
-
-        public void rename (string new_name) {
-            string new_uri = file.file.get_parent ().get_uri () + "/" + new_name;
-            debug (new_uri);
-            file.rename (new_name);
-        }
-
-        /*public override Gtk.Menu? get_context_menu () {
-            menu = new Gtk.Menu ();
-            item_trash = new Gtk.MenuItem.with_label (_("Move to Trash"));
-            menu.append (item_trash);
-            item_trash.activate.connect (() => { file.trash (); });
-            menu.show_all ();
-            return menu;
-        }*/
-    }
-
-    /**
-     * Expandable item in the source list, represents a folder.
-     * Monitored for changes inside the directory.
-     * TODO remove, rename, create new file
-     */
-    internal class FolderItem : Item {
-        public signal void folder_open (GLib.File folder);
-        public FileView view { get; construct; }
-
-        private GLib.FileMonitor monitor;
-        private bool children_loaded = false;
-
-        //Gtk.Menu menu;
-        //Gtk.MenuItem item_trash;
-        //Gtk.MenuItem item_create;
-
-        public FolderItem (File file, FileView view) requires (file.is_valid_directory) {
-            Object (file: file, view: view);
-
-            this.editable = false;
-            this.selectable = false;
-            this.name = file.name;
-            this.icon = file.icon;
-
-            this.add (new Granite.Widgets.SourceList.Item ("")); // dummy
-            this.toggled.connect (() => {
-                if (this.expanded && this.n_children <= 1) {
-                    this.clear ();
-                    this.add_children ();
-                    children_loaded = true;
-                }
-            });
-
-            try {
-                monitor = file.file.monitor_directory (GLib.FileMonitorFlags.NONE);
-                monitor.changed.connect ((s,d,e) => { on_changed (s,d,e); });
-            } catch (GLib.Error e) {
-                warning (e.message);
-            }
-        }
-
-        public override Gtk.Menu? get_context_menu () {
-            if (this == this.view.root.children.to_array ()[0]) {
-                return null;
-            }
-
-            var menu = new Gtk.Menu ();
-            var item = new Gtk.MenuItem.with_label (_("Open"));
-            item.activate.connect (() => { this.folder_open (this.file.file); });
-            menu.append (item);
-            menu.show_all ();
-            return menu;
-        }
-
-        internal void add_children () {
-            foreach (var child in file.children) {
-                if (child.is_valid_directory) {
-                    var item = new FolderItem (child, view);
-                    item.folder_open.connect (() => {
-                        this.view.open_folder (child);
-                    });
-
-                    add (item);
-                } else if (child.is_valid_textfile) {
-                    var item = new FileItem (child);
-                    add (item);
-                    item.edited.connect (item.rename);
-                }
-            }
-        }
-
-        private void on_changed (GLib.File source, GLib.File? dest, GLib.FileMonitorEvent event) {
-            if (!children_loaded) {
-                this.file.reset_cache ();
-                return;
-            }
-
-            switch (event) {
-                case GLib.FileMonitorEvent.DELETED:
-                    var children_tmp = new Gee.ArrayList<Granite.Widgets.SourceList.Item> ();
-                    children_tmp.add_all (children);
-                    foreach (var item in children_tmp) {
-                        if ((item as Item).path == source.get_path ()) {
-                            remove (item);
-                        }
-                    }
-
-                    break;
-                case GLib.FileMonitorEvent.CREATED:
-                    if (source.query_exists () == false) {
-                        return;
-                    }
-
-                    var file = new File (source.get_path ());
-                    var exists = false;
-                    foreach (var item in children) {
-                        if ((item as Item).path == file.path) {
-                            exists = true;
-                        }
-                    }
-
-                    if (!exists) {
-                        if (file.is_valid_textfile) {
-                            this.add (new FileItem (file));
-                        } else if (file.is_valid_directory) {
-                            this.add (new FolderItem (file, view));
-                        }
-                    }
-
-                    break;
-            }
-        }
-    }
-
-}
 
=== removed file 'plugins/filemanager/Settings.vala'
--- plugins/filemanager/Settings.vala	2013-07-16 15:56:38 +0000
+++ plugins/filemanager/Settings.vala	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
-/***
-  BEGIN LICENSE
-
-  Copyright (C) 2013 Julien Spautz <[e-mail]>
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License version 3, as published
-  by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY, 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.  If not, see <http://www.gnu.org/licenses/>
-
-  END LICENSE
-***/
-
-namespace Scratch.Plugins.FileManager {
-
-    /**
-     * Class for interacting with gsettings.
-     */
-    internal class Settings : Granite.Services.Settings {
-
-        private const string SCHEMA = "org.pantheon.scratch.plugins.file-manager";
-
-        public string opened_folder { get; set; }
-
-        public Settings () {
-            base (SCHEMA);
-        }
-    }
-}
 
=== removed file 'plugins/filemanager/filemanager.plugin'
--- plugins/filemanager/filemanager.plugin	2013-07-16 15:56:38 +0000
+++ plugins/filemanager/filemanager.plugin	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-[Plugin]
-Module=filemanager
-Loader=C
-IAge=2
-Name=File Manager
-Description=Browse files and directories
-Icon=system-file-manager
-Authors=Mario Guerriero
-Copyright=Copyright © 2013 Scratch Developers
-Website=http://launchpad.net/scratch
 
=== modified file 'plugins/folder-manager/CMakeLists.txt'
--- plugins/folder-manager/CMakeLists.txt	2016-09-03 10:30:53 +0000
+++ plugins/folder-manager/CMakeLists.txt	2016-11-30 23:31:32 +0000
@@ -8,6 +8,8 @@
     File.vala
     Settings.vala
     FileView.vala
+    FileItem.vala
+    FolderItem.vala
 PACKAGES
     gtk+-3.0
     gee-0.8
 
=== modified file 'plugins/folder-manager/File.vala'
--- plugins/folder-manager/File.vala	2013-06-02 13:07:08 +0000
+++ plugins/folder-manager/File.vala	2016-11-30 23:31:32 +0000
@@ -1,77 +1,66 @@
 // -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
-/***
-  BEGIN LICENSE
-
-  Copyright (C) 2013 Julien Spautz <[e-mail]>
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License version 3, as published
-  by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY, 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.  If not, see <http://www.gnu.org/licenses/>
-
-  END LICENSE
-***/
+/*-
+ * Copyright (c) 2016 elementary LLC. (https://elementary.io)
+ *
+ * This program 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 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program 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.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Julien Spautz <[e-mail]>, Andrei-Costin Zisu <[e-mail]>
+ */
 
 namespace Scratch.Plugins.FolderManager {
 
     /**
      * Class for easily dealing with files.
      */
-    internal class File : GLib.Object {
+    public class File : GLib.Object {
 
-        public GLib.File file;
+        public GLib.File file { get; private set; }
         private GLib.FileInfo info;
 
-        private enum Type {
-            VALID_FILE,
-            VALID_FOLDER,
-            UNKNOWN,
-            INVALID
-        }
-
         public File (string path) {
-            file = GLib.File.new_for_path (path);
-
-            info = new FileInfo ();
-            try {
-                info = file.query_info (
-                    GLib.FileAttribute.STANDARD_CONTENT_TYPE + "," +
-                    GLib.FileAttribute.STANDARD_IS_BACKUP + "," +
-                    GLib.FileAttribute.STANDARD_IS_HIDDEN + "," +
-                    GLib.FileAttribute.STANDARD_DISPLAY_NAME + "," +
-                    GLib.FileAttribute.STANDARD_TYPE,
-                    FileQueryInfoFlags.NONE);
-            } catch (GLib.Error error) {
-                info = null;
-                warning (error.message);
-            }
+            Object (path: path);
         }
 
         // returns the path the file
-        string _path = null;
+        private string _path;
         public string path {
-            get { return _path != null ? _path : _path = file.get_path (); }
+            get { 
+                _path = file.get_path ();
+                return _path; 
+            }
+            set construct {
+                load_file_for_path (value);
+            }
         }
 
         // returns the basename of the file
-        string _name = null;
+        private string _name;
         public string name {
-            get { return _name != null ? _name : _name = info.get_display_name (); }
+            get { 
+                _name = info.get_display_name ();
+                return _name; 
+            }
         }
 
         // returns the icon of the file's content type
         GLib.Icon _icon = null;
         public GLib.Icon icon {
             get {
-                if (_icon != null)
+                if (_icon != null) {
                     return _icon;
-                //var content_type = info.get_attribute_string (FileAttribute.STANDARD_FAST_CONTENT_TYPE);
+                }
+
                 var content_type = info.get_content_type ();
                 return _icon = GLib.ContentType.get_icon (content_type);
             }
@@ -82,37 +71,15 @@
             get { return file.query_exists (); }
         }
 
-        Type _type = Type.UNKNOWN;
         // checks if we're dealing with a non-hidden, non-backup directory
         public bool is_valid_directory {
-            get {
-                if (_type == Type.VALID_FILE)
+            get {        
+                if (info.get_is_hidden () || info.get_is_backup ()) {
                     return false;
-                if (_type == Type.VALID_FOLDER)
+                }
+
+                if (info.get_file_type () == FileType.DIRECTORY) {
                     return true;
-                if (_type == Type.INVALID)
-                    return false;
-
-                if (info.get_file_type () != FileType.DIRECTORY ||
-                    info.get_is_hidden () || info.get_is_backup ()) {
-                    return false;
-                }
-
-                bool has_valid_children = false;
-
-                foreach (var child in children) {
-                    if (child.is_valid_textfile) {
-                        _type = Type.VALID_FOLDER;
-                        return has_valid_children = true;
-                    }
-                }
-
-                foreach (var child in children) {
-                    if (child.is_valid_directory) {
-                        has_valid_children = true;
-                        _type = Type.VALID_FOLDER;
-                    return has_valid_children = true;
-                    }
                 }
 
                 return false;
@@ -122,22 +89,13 @@
         // checks if we're dealing with a textfile
         public bool is_valid_textfile {
             get {
-                if (_type == Type.VALID_FILE)
+                if (info.get_is_hidden () || info.get_is_backup ()) {
+                    return false;
+                }
+
+                if (info.get_file_type () == FileType.REGULAR && 
+                    ContentType.is_a (info.get_content_type (), "text/*")) {
                     return true;
-                if (_type == Type.VALID_FOLDER)
-                    return false;
-                if (_type == Type.INVALID)
-                    return false;
-
-                if (info.get_file_type () == FileType.REGULAR) {
-                    //var content_type = info.get_attribute_string (FileAttribute.STANDARD_FAST_CONTENT_TYPE);
-                    var content_type = info.get_content_type ();
-                    if (ContentType.is_a (content_type, "text/*") &&
-                        !info.get_is_backup () &&
-                        !info.get_is_hidden ()) {
-                        _type = Type.VALID_FILE;
-                        return true;
-                    }
                 }
 
                 return false;
@@ -148,8 +106,9 @@
         GLib.List <File> _children = null;
         public GLib.List <File> children {
             get {
-                if (_children != null)
+                if (_children != null) {
                     return _children;
+                }
 
                 var parent = GLib.File.new_for_path (file.get_path ());
                 try {
@@ -171,9 +130,27 @@
             }
         }
 
-        /*public void rename (string name) {
-            try {
-                file.set_display_name (name);
+        private void load_file_for_path (string path) {
+            file = GLib.File.new_for_path (path);
+
+            info = new FileInfo ();
+            try {
+                info = file.query_info (
+                    GLib.FileAttribute.STANDARD_CONTENT_TYPE + "," +
+                    GLib.FileAttribute.STANDARD_IS_BACKUP + "," +
+                    GLib.FileAttribute.STANDARD_IS_HIDDEN + "," +
+                    GLib.FileAttribute.STANDARD_DISPLAY_NAME + "," +
+                    GLib.FileAttribute.STANDARD_TYPE,
+                    FileQueryInfoFlags.NONE);
+            } catch (GLib.Error error) {
+                info = null;
+                warning (error.message);
+            }
+        }
+
+        public void rename (string name) {
+            try {
+                file.set_display_name (name);    
             } catch (GLib.Error error) {
                 warning (error.message);
             }
@@ -185,21 +162,22 @@
             } catch (GLib.Error error) {
                 warning (error.message);
             }
-        }*/
+        }
 
-        public void reset_cache () {
-            _name = null;
-            _path = null;
+        private void reset_cache () {
             _icon = null;
             _children = null;
-            _type = Type.UNKNOWN;
         }
 
         public static int compare (File a, File b) {
-            if (a.is_valid_directory && b.is_valid_textfile)
+            if (a.is_valid_directory && b.is_valid_textfile) {
                 return -1;
-            if (a.is_valid_textfile && b.is_valid_directory)
+            }
+
+            if (a.is_valid_textfile && b.is_valid_directory) {
                 return 1;
+            }
+
             return strcmp (a.path.collate_key_for_filename (),
                            b.path.collate_key_for_filename ());
         }
 
=== added file 'plugins/folder-manager/FileItem.vala'
--- plugins/folder-manager/FileItem.vala	1970-01-01 00:00:00 +0000
+++ plugins/folder-manager/FileItem.vala	2016-11-30 23:31:32 +0000
@@ -0,0 +1,39 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2016 elementary LLC. (https://elementary.io)
+ *
+ * This program 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 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program 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.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Corentin Noël <[e-mail]>, Andrei-Costin Zisu <[e-mail]>
+ */
+
+public class Scratch.Plugins.FolderManager.FileItem : Item {
+    public FileItem (Scratch.Plugins.FolderManager.File file, Scratch.Plugins.FolderManager.FileView view) requires (file.is_valid_textfile) {
+        Object (file: file, view: view);
+    }
+
+    public override Gtk.Menu? get_context_menu () {
+        var menu = new Gtk.Menu ();
+        var rename_item = new Gtk.MenuItem.with_label (_("Rename"));
+        rename_item.activate.connect (() => view.start_editing_item (this));
+        menu.append (rename_item);
+
+        var delete_item = new Gtk.MenuItem.with_label (_("Move to Trash"));
+        delete_item.activate.connect (() => do_remove ());
+        menu.append (delete_item);
+
+        menu.show_all ();
+        return menu;
+    }
+}
 
=== modified file 'plugins/folder-manager/FileView.vala'
--- plugins/folder-manager/FileView.vala	2015-09-16 01:11:55 +0000
+++ plugins/folder-manager/FileView.vala	2016-11-30 23:31:32 +0000
@@ -1,22 +1,22 @@
 // -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
-/***
-  BEGIN LICENSE
-
-  Copyright (C) 2013 Julien Spautz <[e-mail]>
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License version 3, as published
-  by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY, 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.  If not, see <http://www.gnu.org/licenses/>
-
-  END LICENSE
-***/
+/*-
+ * Copyright (c) 2016 elementary LLC. (https://elementary.io)
+ *
+ * This program 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 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program 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.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Julien Spautz <[e-mail]>, Andrei-Costin Zisu <[e-mail]>
+ */
 
 namespace Scratch.Plugins.FolderManager {
     Settings settings;
@@ -24,25 +24,31 @@
     /**
      * SourceList that displays folders and their contents.
      */
-    internal class FileView : Granite.Widgets.SourceList {
-
-        public signal void select (string file);
-
+    public class FileView : Granite.Widgets.SourceList {
+        public signal void select (GLib.File file);
+        public signal void welcome_visible (bool visible);
         public FileView () {
-            this.width_request = 180;
-            this.item_selected.connect ((item) => {
-                select ((item as FileItem).path);
+            width_request = 180;
+
+            item_selected.connect ((item) => {
+                if (item is FileItem) {
+                    select ((item as FileItem).file.file);
+                }
+            });
+
+            root.child_removed.connect (() => {
+                this.selected = null;
+                if (root.n_children == 0) {
+                    welcome_visible (true);
+                }
+
+                write_settings ();
             });
 
             settings = new Settings ();
         }
 
-        public void restore_saved_state () {
-            foreach (var path in settings.opened_folders)
-                add_folder (new File (path), false);
-        }
-
-        public void open_folder (File folder) {
+        public void open_folder (File folder, bool expand = true) {
             if (is_open (folder)) {
                 warning ("Folder '%s' is already open.", folder.path);
                 return;
@@ -51,64 +57,81 @@
                 return;
             }
 
-            add_folder (folder, true);
+            var folder_item = new FolderItem (folder, this);
+            root.add (folder_item);
+            welcome_visible (false);
+
+            folder_item.expanded = expand;
             write_settings ();
         }
 
-        private void add_folder (File folder, bool expand) {
-            if (is_open (folder)) {
-                warning ("Folder '%s' is already open.", folder.path);
-                return;
-            } else if (!folder.is_valid_directory) {
-                warning ("Cannot open invalid directory.");
-                return;
+        public void restore_settings () {
+            foreach (var folder_path in settings.opened_folders) {
+                if (folder_path == null) {
+                    continue;
+                }
+
+                var folder = new File (folder_path);
+                if (folder.is_valid_directory) {
+                    open_folder (folder);
+                }
             }
-
-            var folder_root = new MainFolderItem (folder);
-            this.root.add (folder_root);
-
-            folder_root.expanded = expand;
-            folder_root.closed.connect (() => {
-                root.remove (folder_root);
-                write_settings ();
-            });
         }
 
         private bool is_open (File folder) {
-            foreach (var child in root.children)
-                if (folder.path == (child as Item).path)
+            foreach (var child in root.children) {
+                if (folder.path == (child as Item).path) {
                     return true;
+                }
+            }
+
             return false;
         }
 
         private void write_settings () {
-            string[] to_save = {};
-
-            foreach (var main_folder in root.children) {
-                var saved = false;
-
-                foreach (var saved_folder in to_save) {
-                    if ((main_folder as Item).path == saved_folder) {
-                        saved = true;
-                        break;
-                    }
-                }
-
-                if (!saved) {
-                    to_save += (main_folder as Item).path;
+            string[] paths = {};
+            foreach (var child in this.root.children) {
+                if (child is FolderItem) {
+                    paths += ((FolderItem) child).path;
                 }
             }
 
-            settings.opened_folders = to_save;
+            settings.opened_folders = paths;
         }
     }
 
     /**
-     * Common abstract class for file and filder items.
+     * Common abstract class for normal and expandable items.
      */
-    internal class Item: Granite.Widgets.SourceList.ExpandableItem, Granite.Widgets.SourceListSortable {
+    public class Item : Granite.Widgets.SourceList.ExpandableItem, Granite.Widgets.SourceListSortable {
         public File file { get; construct; }
-        public string path { get { return file.path; } }
+        public Scratch.Plugins.FolderManager.FileView view { get; construct; }
+        public string path { 
+            get { return file.path; } 
+            set { file.path = value; }
+        }
+
+        construct {
+            selectable = true;
+            editable = true;
+            update_item ();
+
+            edited.connect (rename);
+            file.notify["path"].connect(update_item);
+        }
+
+        protected void update_item () {
+            name = file.name;
+            icon = file.icon;
+        }
+
+        protected void rename (string new_name) {
+            file.rename (new_name);
+        }
+        
+        protected void do_remove () {
+            file.trash ();
+        }
 
         public int compare (Granite.Widgets.SourceList.Item a, Granite.Widgets.SourceList.Item b) {
             if (a is FolderItem && b is FileItem) {
@@ -120,193 +143,8 @@
             return File.compare ((a as Item).file, (b as Item).file);
         }
 
-        public bool allow_dnd_sorting () { 
+        public bool allow_dnd_sorting () {
             return false;
         }
     }
-
-    /**
-     * Normal item in the source list, represents a textfile.
-     * TODO Remove, Rename
-     */
-    internal class FileItem : Item {
-
-        //Gtk.Menu menu;
-        //Gtk.MenuItem item_trash;
-
-        public FileItem (File file) requires (file.is_valid_textfile) {
-            Object (file: file);
-
-            this.selectable = true;
-            //this.editable = true;
-            this.name = file.name;
-            this.icon = file.icon;
-        }
-
-        /*public void rename (string new_name) {
-            file.rename (new_name);
-        }*/
-
-        /*public override Gtk.Menu? get_context_menu () {
-            menu = new Gtk.Menu ();
-            item_trash = new Gtk.MenuItem.with_label (_("Move to Trash"));
-            menu.append (item_trash);
-            item_trash.activate.connect (() => { file.trash (); });
-            menu.show_all ();
-            return menu;
-        }*/
-    }
-
-    /**
-     * Expandable item in the source list, represents a folder.
-     * Monitored for changes inside the directory.
-     * TODO remove, rename, create new file
-     */
-    internal class FolderItem : Item {
-
-        //Gtk.Menu menu;
-        //Gtk.MenuItem item_trash;
-        //Gtk.MenuItem item_create;
-
-        private GLib.FileMonitor monitor;
-        private bool children_loaded = false;
-
-        public FolderItem (File file) requires (file.is_valid_directory) {
-            Object (file: file);
-
-            this.editable = false;
-            this.selectable = false;
-            this.name = file.name;
-            this.icon = file.icon;
-
-            this.add (new Granite.Widgets.SourceList.Item ("")); // dummy
-            this.toggled.connect (() => {
-                if (this.expanded && this.n_children <= 1) {
-                    this.clear ();
-                    this.add_children ();
-                    children_loaded = true;
-                }
-            });
-
-            try {
-                monitor = file.file.monitor_directory (GLib.FileMonitorFlags.NONE);
-                monitor.changed.connect ((s,d,e) => { on_changed (s,d,e); });
-            } catch (GLib.Error e) {
-                warning (e.message);
-            }
-        }
-
-        /*public override Gtk.Menu? get_context_menu () {
-            menu = new Gtk.Menu ();
-            item_trash = new Gtk.MenuItem.with_label (_("Move to Trash"));
-            item_create = new Gtk.MenuItem.with_label (_("Create new File"));
-            menu.append (item_trash);
-            menu.append (item_create);
-            item_trash.activate.connect (() => { file.trash (); });
-            item_create.activate.connect (() => {
-                var new_file = GLib.File.new_for_path (file.path + "/new File");
-
-                try {
-		            FileOutputStream os = new_file.create (FileCreateFlags.NONE);
-	            } catch (Error e) {
-		            warning ("Error: %s\n", e.message);
-	            }
-            });
-            menu.show_all ();
-            return menu;
-        }*/
-
-        internal void add_children () {
-            foreach (var child in file.children) {
-                if (child.is_valid_directory) {
-                    var item = new FolderItem (child);
-                    add (item);
-                } else if (child.is_valid_textfile) {
-                    var item = new FileItem (child);
-                    add (item);
-                    //item.edited.connect (item.rename);
-                }
-            }
-        }
-
-        private void on_changed (GLib.File source, GLib.File? dest, GLib.FileMonitorEvent event) {
-
-            if (!children_loaded) {
-                this.file.reset_cache ();
-                return;
-            }
-
-            switch (event) {
-                case GLib.FileMonitorEvent.DELETED:
-                    var children_tmp = new Gee.ArrayList<Granite.Widgets.SourceList.Item> ();
-                    children_tmp.add_all (children);
-                    foreach (var item in children_tmp) {
-                        if ((item as Item).path == source.get_path ()) {
-                            remove (item);
-                        }
-                    }
-
-                    break;
-                case GLib.FileMonitorEvent.CREATED:
-                    if (source.query_exists () == false) {
-                        return;
-                    }
-
-                    var file = new File (source.get_path ());
-                    var exists = false;
-                    foreach (var item in children) {
-                        if ((item as Item).path == file.path) {
-                            exists = true;
-                            break;
-                        }
-                    }
-
-                    if (!exists) {
-                        if (file.is_valid_textfile) {
-                            this.add (new FileItem (file));
-                        } else if (file.is_valid_directory) {
-                            this.add (new FolderItem (file));
-                        }
-                    }
-
-                    break;
-            }
-        }
-    }
-
-    /**
-     * Special root folder.
-     * TODO rename, create new file
-     */
-    internal class MainFolderItem : FolderItem {
-        public signal void closed ();
-
-        Gtk.Menu menu;
-        Gtk.MenuItem item_close;
-        //Gtk.MenuItem item_create;
-
-        public MainFolderItem (File file) requires (file.is_valid_directory) {
-            base (file);
-        }
-
-        public override Gtk.Menu? get_context_menu () {
-            menu = new Gtk.Menu ();
-            item_close = new Gtk.MenuItem.with_label (_("Close Folder"));
-            //item_create = new Gtk.MenuItem.with_label (_("Create new File"));
-            menu.append (item_close);
-            //menu.append (item_create);
-            item_close.activate.connect (() => { closed (); });
-            /*item_create.activate.connect (() => {
-                var new_file = GLib.File.new_for_path (file.path + "/new File");
-
-                try {
-                    FileOutputStream os = new_file.create (FileCreateFlags.NONE);
-                } catch (Error e) {
-                    warning ("Error: %s\n", e.message);
-                }
-            });*/
-            menu.show_all ();
-            return menu;
-        }
-    }
 }
 
=== added file 'plugins/folder-manager/FolderItem.vala'
--- plugins/folder-manager/FolderItem.vala	1970-01-01 00:00:00 +0000
+++ plugins/folder-manager/FolderItem.vala	2016-11-30 23:31:32 +0000
@@ -0,0 +1,196 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2016 elementary LLC. (https://elementary.io)
+ *
+ * This program 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 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program 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.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Corentin Noël <[e-mail]>, Andrei-Costin Zisu <[e-mail]>
+ */
+
+public class Scratch.Plugins.FolderManager.FolderItem : Item {
+    public signal void folder_open (GLib.File folder);
+
+    private GLib.FileMonitor monitor;
+    private bool children_loaded = false;
+
+    public FolderItem (Scratch.Plugins.FolderManager.File file, Scratch.Plugins.FolderManager.FileView view) requires (file.is_valid_directory) {
+        Object (file: file, view: view);
+    }
+
+    construct {
+        if (file.children.length () > 0) {
+            add (new Granite.Widgets.SourceList.Item ("")); // dummy
+        }
+
+        toggled.connect (() => {
+            if (expanded && n_children <= 1) {
+                clear ();
+                add_children ();
+                children_loaded = true;
+            }
+        });
+        
+        try {
+            monitor = file.file.monitor_directory (GLib.FileMonitorFlags.WATCH_MOVES);
+            monitor.changed.connect (on_changed);
+        } catch (GLib.Error e) {
+            warning (e.message);
+        }
+    }
+
+    public override Gtk.Menu? get_context_menu () {
+        var menu = new Gtk.Menu ();
+        if (parent == view.root) {
+            var item = new Gtk.MenuItem.with_label (_("Close Folder"));
+            item.activate.connect (() => {
+                monitor.cancel ();
+                parent.remove (this);
+            });
+            menu.append (item);
+        } else {
+            var item = new Gtk.MenuItem.with_label (_("Open"));
+            item.activate.connect (() => folder_open (file.file));
+            menu.append (item);
+        }
+
+        var rename_item = new Gtk.MenuItem.with_label (_("Rename"));
+        rename_item.activate.connect (() => view.start_editing_item (this));
+        menu.append (rename_item);
+
+        var new_file_item = new Gtk.MenuItem.with_label (_("Add file"));
+        new_file_item.activate.connect (() => add_file ());
+        menu.append (new_file_item);
+
+        var new_folder_item = new Gtk.MenuItem.with_label (_("Add folder"));
+        new_folder_item.activate.connect(() => add_folder ());
+        menu.append (new_folder_item);
+
+        var delete_item = new Gtk.MenuItem.with_label (_("Move to Trash"));
+        delete_item.activate.connect (() => do_remove ());
+        menu.append (delete_item);
+
+        menu.show_all ();
+        return menu;
+    }
+
+    internal void add_children () {
+        foreach (var child in file.children) {
+            if (child.is_valid_directory) {
+                var item = new FolderItem (child, view);
+                item.folder_open.connect (() => {
+                    view.open_folder (child);
+                });
+
+                add (item);
+            } else if (child.is_valid_textfile) {
+                var item = new FileItem (child, view);
+                add (item);
+            }
+        }
+    }
+
+    private void on_changed (GLib.File source, GLib.File? dest, GLib.FileMonitorEvent event) {
+        if (!children_loaded) {
+            return;
+        }
+
+        switch (event) {
+            case GLib.FileMonitorEvent.RENAMED:
+                    foreach (var child in children) {
+                        var item = child as Item;
+                        if (item.path == source.get_path ()) {
+                            item.path = dest.get_path ();
+                            break;
+                        }
+                    }
+                break;
+            case GLib.FileMonitorEvent.DELETED:
+                var children_tmp = new Gee.ArrayList<Granite.Widgets.SourceList.Item> ();
+                children_tmp.add_all (children);
+                foreach (var item in children_tmp) {
+                    if ((item as Item).path == source.get_path ()) {
+                        remove (item);
+                    }
+                }
+
+                break;
+            case GLib.FileMonitorEvent.CREATED:
+                if (source.query_exists () == false) {
+                    return;
+                }
+
+                var file = new File (source.get_path ());
+                var exists = false;
+                foreach (var item in children) {
+                    if ((item as Item).path == file.path) {
+                        exists = true;
+                    }
+                }
+
+                if (!exists) {
+                    if (file.is_valid_textfile) {
+                        add (new FileItem (file, view));
+                    } else if (file.is_valid_directory) {
+                        add (new FolderItem (file, view));
+                    }
+                }
+
+                break;
+        }
+    }
+
+    private void add_folder () {
+        var child = file.file.get_child (_("New Folder"));
+
+        var n = 1;
+        while (child.query_exists ()) {
+            child = file.file.get_child (_("New Folder (%d)").printf (n));
+            n++;
+        }
+
+        try {
+            child.make_directory ();
+
+            if (children_loaded) {
+                var item = new FolderItem (new File (child.get_path ()), view);
+                add (item);
+                view.start_editing_item (item);
+            }
+        } catch (Error e) {
+            warning (e.message);
+        }
+    }
+
+    private void add_file () {
+        var child = file.file.get_child (_("New File"));
+
+        var n = 1;
+        while (child.query_exists ()) {
+            child = file.file.get_child (_("New File (%d)").printf (n));
+            n++;
+        }
+
+        try {
+            child.create (FileCreateFlags.NONE);
+
+            if (children_loaded) {
+                var item = new FileItem (new File (child.get_path ()), view);
+                add (item);
+                view.start_editing_item (item);
+            }
+        } catch (Error e) {
+            warning (e.message);
+        }
+    }
+}   
 
=== modified file 'plugins/folder-manager/FolderManagerPlugin.vala'
--- plugins/folder-manager/FolderManagerPlugin.vala	2015-12-01 11:37:53 +0000
+++ plugins/folder-manager/FolderManagerPlugin.vala	2016-11-30 23:31:32 +0000
@@ -23,13 +23,10 @@
 
 namespace Scratch.Plugins {
     public class FolderManagerPlugin : Peas.ExtensionBase, Peas.Activatable {
-
+        public Scratch.Services.Interface plugins;
+        Gtk.Button button;
         FolderManager.FileView view;
-        Gtk.ToolButton tool_button;
-
-        int index = 0;
-
-        Scratch.Services.Interface plugins;
+
         public Object object { owned get; construct; }
 
         public FolderManagerPlugin () {
@@ -43,74 +40,71 @@
         }
 
         public void deactivate () {
-            if (view != null)
+            if (view != null) {
                 view.destroy();
-            if (tool_button != null) {
-                //(tool_button.parent as Scratch.Widgets.Toolbar).open_button.visible = true;
-                tool_button.destroy ();
+                view = null;
+            }
+
+            if (button != null) {
+                button.destroy();
+                button = null;
             }
         }
 
         public void update_state () {
+            
         }
 
         void on_hook_sidebar (Gtk.Notebook notebook) {
-            if (view != null)
+            if (view != null) {
                 return;
+            }
 
+            // File View
             view = new FolderManager.FileView ();
-
-            view.select.connect ((a) => {
-                var file = GLib.File.new_for_path (a);
-                plugins.open_file (file);
-            });
-
-            view.root.child_added.connect (() => {
-                if (view.get_n_visible_children (view.root) == 0) {
-                    index = notebook.append_page (view, new Gtk.Label (_("Folders")));
+            view.select.connect ((file) => plugins.open_file (file));
+            view.welcome_visible.connect ((visible) => {
+                if (visible) {
+                    view.parent.remove (view);
+                } else if (view.parent == null) {
+                    view.show_all ();
+                    var icon = new Gtk.Image.from_icon_name ("folder-symbolic", Gtk.IconSize.MENU);
+                    icon.tooltip_text = _("File Manager");
+                    notebook.append_page (view  , icon);
                 }
             });
 
-            view.root.child_removed.connect (() => {
-                if (view.get_n_visible_children (view.root) == 1)
-                    notebook.remove_page (index);
-            });
-
-            view.restore_saved_state ();
+            view.restore_settings ();
         }
 
         void on_hook_toolbar (Gtk.HeaderBar toolbar) {
-            if (tool_button != null)
+            if (button != null) {
                 return;
-
-            //(toolbar as Scratch.Widgets.Toolbar).open_button.visible = false;
-            var icon = new Gtk.Image.from_icon_name ("folder-saved-search", Gtk.IconSize.LARGE_TOOLBAR);
-            tool_button = new Gtk.ToolButton (icon, _("Open a folder"));
-            tool_button.tooltip_text = _("Open a folder");
-            tool_button.clicked.connect (() => {
-                Gtk.Window window = plugins.manager.window;
-                Gtk.FileChooserDialog chooser = new Gtk.FileChooserDialog (
-                    "Select a folder.", window, Gtk.FileChooserAction.SELECT_FOLDER,
-                    _("_Cancel"), Gtk.ResponseType.CANCEL,
-                    _("_Open"), Gtk.ResponseType.ACCEPT);
-                chooser.select_multiple = true;
-
-                if (chooser.run () == Gtk.ResponseType.ACCEPT) {
-                    SList<string> uris = chooser.get_uris ();
-                    foreach (unowned string uri in uris) {
-                        var folder = new FolderManager.File (uri.replace ("file:///", "/"));
-                        view.open_folder (folder); // emit signal
-                    }
-                }
-
-                chooser.close ();
-            });
-
-            icon.show ();
-            tool_button.show ();
-
-            toolbar.pack_start (tool_button);
-            //toolbar.insert (tool_button, 1);
+            }
+
+            button = new Gtk.Button.from_icon_name ("folder-saved-search", Gtk.IconSize.LARGE_TOOLBAR);
+            button.tooltip_text = _("Open a folder");
+            button.clicked.connect (() => open_dialog ());
+            button.show_all ();
+            toolbar.pack_start (button);
+        }
+        
+        private void open_dialog () {
+            Gtk.Window window = plugins.manager.window;
+            Gtk.FileChooserDialog chooser = new Gtk.FileChooserDialog (
+                "Select a folder.", window, Gtk.FileChooserAction.SELECT_FOLDER,
+                _("_Cancel"), Gtk.ResponseType.CANCEL,
+                _("_Open"), Gtk.ResponseType.ACCEPT);
+            chooser.select_multiple = true;
+
+            if (chooser.run () == Gtk.ResponseType.ACCEPT) {
+                chooser.get_files ().foreach ((file) => {
+                    var folder = new Scratch.Plugins.FolderManager.File (file.get_path ());
+                    view.open_folder (folder);
+                });
+            }
+
+            chooser.close ();
         }
     }
 }
 
=== modified file 'plugins/folder-manager/folder-manager.plugin'
--- plugins/folder-manager/folder-manager.plugin	2013-06-08 15:17:42 +0000
+++ plugins/folder-manager/folder-manager.plugin	2016-11-30 23:31:32 +0000
@@ -3,8 +3,8 @@
 Loader=C
 IAge=2
 Name=Folder Manager
-Description=Basic folder manager with file browsing
-Icon=folder-saved-search
-Authors=Julien Spautz <[e-mail]>
-Copyright=Copyright © 2013 Scratch Developers
+Description=Browse files and directories
+Icon=system-file-manager
+Authors=Mario Guerriero, Julien Spautz, Corentin Noël, Andrei Zisu
+Copyright=Copyright © 2016 elementary LLC
 Website=http://launchpad.net/scratch
 
=== modified file 'schemas/CMakeLists.txt'
--- schemas/CMakeLists.txt	2015-09-10 00:54:45 +0000
+++ schemas/CMakeLists.txt	2016-11-30 23:31:32 +0000
@@ -1,6 +1,5 @@
 include(GSettings)
 add_schema("org.pantheon.scratch.gschema.xml")
 add_schema("org.pantheon.scratch.plugins.folder-manager.gschema.xml")
-add_schema("org.pantheon.scratch.plugins.file-manager.gschema.xml")
 add_schema("org.pantheon.scratch.plugins.terminal.gschema.xml")
 add_schema("org.pantheon.scratch.plugins.spell.gschema.xml")
 
=== removed file 'schemas/org.pantheon.scratch.plugins.file-manager.gschema.xml'
--- schemas/org.pantheon.scratch.plugins.file-manager.gschema.xml	2013-07-16 15:56:38 +0000
+++ schemas/org.pantheon.scratch.plugins.file-manager.gschema.xml	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schemalist>
-    <schema path="/org/pantheon/scratch/plugins/file-manager/" id="org.pantheon.scratch.plugins.file-manager" gettext-domain="scratch">
-        <key name="opened-folder" type="s">
-            <default>''</default>
-            <summary>Opened folder.</summary>
-            <description>Opened folder that should be restored in startup.</description>
-        </key>
-    </schema>
-</schemalist>