1 files changed, 463 insertions, 559 deletions

diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp
index bce0e9148..fe1f984f3 100644
--- a/editor/filesystem_dock.cpp
+++ b/editor/filesystem_dock.cpp
@@ -28,101 +28,97 @@
 /*************************************************************************/
 #include "filesystem_dock.h"
 
-#include "os/dir_access.h"
-#include "os/file_access.h"
+#include "editor_node.h"
+#include "editor_settings.h"
 #include "global_config.h"
 #include "io/resource_loader.h"
+#include "os/dir_access.h"
+#include "os/file_access.h"
 #include "os/os.h"
-#include "editor_node.h"
-#include "editor_settings.h"
 #include "scene/main/viewport.h"
 
-bool FileSystemDock::_create_tree(TreeItem *p_parent,EditorFileSystemDirectory *p_dir) {
+bool FileSystemDock::_create_tree(TreeItem *p_parent, EditorFileSystemDirectory *p_dir) {
 
 	TreeItem *item = tree->create_item(p_parent);
-	String dname=p_dir->get_name();
-	if (dname=="")
-		dname="res://";
+	String dname = p_dir->get_name();
+	if (dname == "")
+		dname = "res://";
 	else {
 		// collapse every tree item but the root folder
 		item->set_collapsed(true);
 	}
 
-	item->set_text(0,dname);
-	item->set_icon(0,get_icon("Folder","EditorIcons"));
-	item->set_selectable(0,true);
+	item->set_text(0, dname);
+	item->set_icon(0, get_icon("Folder", "EditorIcons"));
+	item->set_selectable(0, true);
 	String lpath = p_dir->get_path();
-	if (lpath!="res://" && lpath.ends_with("/")) {
-		lpath=lpath.substr(0,lpath.length()-1);
+	if (lpath != "res://" && lpath.ends_with("/")) {
+		lpath = lpath.substr(0, lpath.length() - 1);
 	}
-	item->set_metadata(0,lpath);
-	if (lpath==path) {
+	item->set_metadata(0, lpath);
+	if (lpath == path) {
 		item->select(0);
 	}
 
-	for(int i=0;i<p_dir->get_subdir_count();i++)
-		_create_tree(item,p_dir->get_subdir(i));
+	for (int i = 0; i < p_dir->get_subdir_count(); i++)
+		_create_tree(item, p_dir->get_subdir(i));
 
 	return true;
 }
 
-
 void FileSystemDock::_update_tree() {
 
 	tree->clear();
-	updating_tree=true;
+	updating_tree = true;
 	TreeItem *root = tree->create_item();
 	TreeItem *favorites = tree->create_item(root);
-	favorites->set_icon(0, get_icon("Favorites","EditorIcons") );
-	favorites->set_text(0,TTR("Favorites:"));
-	favorites->set_selectable(0,false);
-	Vector<String> faves = 	EditorSettings::get_singleton()->get_favorite_dirs();
-	for(int i=0;i<faves.size();i++) {
+	favorites->set_icon(0, get_icon("Favorites", "EditorIcons"));
+	favorites->set_text(0, TTR("Favorites:"));
+	favorites->set_selectable(0, false);
+	Vector<String> faves = EditorSettings::get_singleton()->get_favorite_dirs();
+	for (int i = 0; i < faves.size(); i++) {
 		if (!faves[i].begins_with("res://"))
 			continue;
 
 		TreeItem *ti = tree->create_item(favorites);
 		String fv = faves[i];
-		if (fv=="res://")
-			ti->set_text(0,"/");
+		if (fv == "res://")
+			ti->set_text(0, "/");
 		else
-			ti->set_text(0,faves[i].get_file());
-		ti->set_icon(0,get_icon("Folder","EditorIcons"));
-		ti->set_selectable(0,true);
-		ti->set_metadata(0,faves[i]);
+			ti->set_text(0, faves[i].get_file());
+		ti->set_icon(0, get_icon("Folder", "EditorIcons"));
+		ti->set_selectable(0, true);
+		ti->set_metadata(0, faves[i]);
 	}
 
-	_create_tree(root,EditorFileSystem::get_singleton()->get_filesystem());
-	updating_tree=false;
-
+	_create_tree(root, EditorFileSystem::get_singleton()->get_filesystem());
+	updating_tree = false;
 }
 
-
 void FileSystemDock::_notification(int p_what) {
 
-	switch(p_what) {
+	switch (p_what) {
 
 		case NOTIFICATION_RESIZED: {
 
+			bool new_mode = get_size().height < get_viewport_rect().size.height * 3 / 4;
 
-			bool new_mode = get_size().height < get_viewport_rect().size.height*3/4;
-
-			if (new_mode != split_mode ) {
+			if (new_mode != split_mode) {
 
-				split_mode=new_mode;
+				split_mode = new_mode;
 
 				//print_line("SPLIT MODE? "+itos(split_mode));
 				if (split_mode) {
 
 					file_list_vb->hide();
-					tree->set_custom_minimum_size(Size2(0,0));
+					tree->set_custom_minimum_size(Size2(0, 0));
 					tree->set_v_size_flags(SIZE_EXPAND_FILL);
 					button_back->show();
 				} else {
 
 					tree->show();
 					file_list_vb->show();
-					tree->set_custom_minimum_size(Size2(0,200)*EDSCALE);
+					tree->set_custom_minimum_size(Size2(0, 200) * EDSCALE);
 					tree->set_v_size_flags(SIZE_FILL);
 					button_back->hide();
 					if (!EditorFileSystem::get_singleton()->is_scanning()) {
@@ -131,42 +127,40 @@ void FileSystemDock::_notification(int p_what) {
 				}
 			}
 
-
 		} break;
 		case NOTIFICATION_ENTER_TREE: {
 
 			if (initialized)
 				return;
-			initialized=true;
+			initialized = true;
 
-			EditorFileSystem::get_singleton()->connect("filesystem_changed",this,"_fs_changed");
-			EditorResourcePreview::get_singleton()->connect("preview_invalidated",this,"_preview_invalidated");
+			EditorFileSystem::get_singleton()->connect("filesystem_changed", this, "_fs_changed");
+			EditorResourcePreview::get_singleton()->connect("preview_invalidated", this, "_preview_invalidated");
 
-			button_reload->set_icon( get_icon("Reload","EditorIcons"));
-			button_favorite->set_icon( get_icon("Favorites","EditorIcons"));
+			button_reload->set_icon(get_icon("Reload", "EditorIcons"));
+			button_favorite->set_icon(get_icon("Favorites", "EditorIcons"));
 			//button_instance->set_icon( get_icon("Add","EditorIcons"));
 			//button_open->set_icon( get_icon("Folder","EditorIcons"));
-			button_back->set_icon( get_icon("Filesystem","EditorIcons"));
+			button_back->set_icon(get_icon("Filesystem", "EditorIcons"));
 			if (display_mode == DISPLAY_THUMBNAILS) {
-				button_display_mode->set_icon(get_icon("FileList","EditorIcons"));
+				button_display_mode->set_icon(get_icon("FileList", "EditorIcons"));
 			} else {
-				button_display_mode->set_icon(get_icon("FileThumbnail","EditorIcons"));
+				button_display_mode->set_icon(get_icon("FileThumbnail", "EditorIcons"));
 			}
-			button_display_mode->connect("pressed",this,"_change_file_display");
+			button_display_mode->connect("pressed", this, "_change_file_display");
 			//file_options->set_icon( get_icon("Tools","EditorIcons"));
-			files->connect("item_activated",this,"_select_file");
-			button_hist_next->connect("pressed",this,"_fw_history");
-			button_hist_prev->connect("pressed",this,"_bw_history");
-			search_icon->set_texture( get_icon("Zoom","EditorIcons"));
-
-			button_hist_next->set_icon( get_icon("Forward","EditorIcons"));
-			button_hist_prev->set_icon( get_icon("Back","EditorIcons"));
-			file_options->connect("id_pressed",this,"_file_option");
-			folder_options->connect("id_pressed",this,"_folder_option");
+			files->connect("item_activated", this, "_select_file");
+			button_hist_next->connect("pressed", this, "_fw_history");
+			button_hist_prev->connect("pressed", this, "_bw_history");
+			search_icon->set_texture(get_icon("Zoom", "EditorIcons"));
 
+			button_hist_next->set_icon(get_icon("Forward", "EditorIcons"));
+			button_hist_prev->set_icon(get_icon("Back", "EditorIcons"));
+			file_options->connect("id_pressed", this, "_file_option");
+			folder_options->connect("id_pressed", this, "_folder_option");
 
-			button_back->connect("pressed",this,"_go_to_tree",varray(),CONNECT_DEFERRED);
-			current_path->connect("text_entered",this,"_go_to_dir");
+			button_back->connect("pressed", this, "_go_to_tree", varray(), CONNECT_DEFERRED);
+			current_path->connect("text_entered", this, "_go_to_dir");
 			_update_tree(); //maybe it finished already
 
 			if (EditorFileSystem::get_singleton()->is_scanning()) {
@@ -176,7 +170,7 @@ void FileSystemDock::_notification(int p_what) {
 		} break;
 		case NOTIFICATION_PROCESS: {
 			if (EditorFileSystem::get_singleton()->is_scanning()) {
-				scanning_progress->set_value(EditorFileSystem::get_singleton()->get_scanning_progress()*100);
+				scanning_progress->set_value(EditorFileSystem::get_singleton()->get_scanning_progress() * 100);
 			}
 		} break;
 		case NOTIFICATION_EXIT_TREE: {
@@ -185,16 +179,15 @@ void FileSystemDock::_notification(int p_what) {
 		case NOTIFICATION_DRAG_BEGIN: {
 
 			Dictionary dd = get_viewport()->gui_get_drag_data();
-			if (tree->is_visible_in_tree() && dd.has("type") ) {
-				if  ( (String(dd["type"])=="files") || (String(dd["type"])=="files_and_dirs") || (String(dd["type"])=="resource")) {
+			if (tree->is_visible_in_tree() && dd.has("type")) {
+				if ((String(dd["type"]) == "files") || (String(dd["type"]) == "files_and_dirs") || (String(dd["type"]) == "resource")) {
 					tree->set_drop_mode_flags(Tree::DROP_MODE_ON_ITEM);
 				}
-				if  ( (String(dd["type"])=="favorite") ) {
+				if ((String(dd["type"]) == "favorite")) {
 					tree->set_drop_mode_flags(Tree::DROP_MODE_INBETWEEN);
 				}
 			}
 
-
 		} break;
 		case NOTIFICATION_DRAG_END: {
 
@@ -212,65 +205,57 @@ void FileSystemDock::_notification(int p_what) {
 			}
 		} break;
 	}
-
 }
 
-
-
-
 void FileSystemDock::_dir_selected() {
 
 	TreeItem *ti = tree->get_selected();
 	if (!ti)
 		return;
 	String dir = ti->get_metadata(0);
-	bool found=false;
+	bool found = false;
 	Vector<String> favorites = EditorSettings::get_singleton()->get_favorite_dirs();
-	for(int i=0;i<favorites.size();i++) {
+	for (int i = 0; i < favorites.size(); i++) {
 
-		if (favorites[i]==dir) {
-			found=true;
+		if (favorites[i] == dir) {
+			found = true;
 			break;
 		}
 	}
 
-
 	button_favorite->set_pressed(found);
 
 	if (!split_mode) {
 		_open_pressed(); //go directly to dir
 	}
-
 }
 
-
 void FileSystemDock::_favorites_pressed() {
 
 	TreeItem *sel = tree->get_selected();
 	if (!sel)
-		return ;
+		return;
 	String dir = sel->get_metadata(0);
 
 	int idx = -1;
 	Vector<String> favorites = EditorSettings::get_singleton()->get_favorite_dirs();
-	for(int i=0;i<favorites.size();i++) {
+	for (int i = 0; i < favorites.size(); i++) {
 
-		if (favorites[i]==dir) {
-			idx=i;
+		if (favorites[i] == dir) {
+			idx = i;
 			break;
 		}
 	}
 
-	if (button_favorite->is_pressed() && idx==-1) {
+	if (button_favorite->is_pressed() && idx == -1) {
 		favorites.push_back(dir);
 		EditorSettings::get_singleton()->set_favorite_dirs(favorites);
 		_update_tree();
-	} else if (!button_favorite->is_pressed() && idx!=-1) {
+	} else if (!button_favorite->is_pressed() && idx != -1) {
 		favorites.remove(idx);
 		EditorSettings::get_singleton()->set_favorite_dirs(favorites);
 		_update_tree();
 	}
-
 }
 
 String FileSystemDock::get_selected_path() const {
@@ -279,7 +264,7 @@ String FileSystemDock::get_selected_path() const {
 	if (!sel)
 		return "";
 	String path = sel->get_metadata(0);
-	return "res://"+path;
+	return "res://" + path;
 }
 
 String FileSystemDock::get_current_path() const {
@@ -287,22 +272,22 @@ String FileSystemDock::get_current_path() const {
 	return path;
 }
 
-void FileSystemDock::navigate_to_path(const String& p_path) {
+void FileSystemDock::navigate_to_path(const String &p_path) {
 	// If the path is a file, do not only go to the directory in the tree, also select the file in the file list.
-	String dir_path="";
-	String file_name="";
-	DirAccess* dirAccess=DirAccess::open("res://");
+	String dir_path = "";
+	String file_name = "";
+	DirAccess *dirAccess = DirAccess::open("res://");
 	if (dirAccess->file_exists(p_path)) {
-		dir_path=p_path.get_base_dir();
-		file_name=p_path.get_file();
+		dir_path = p_path.get_base_dir();
+		file_name = p_path.get_file();
 	} else if (dirAccess->dir_exists(p_path)) {
-		dir_path=p_path;
+		dir_path = p_path;
 	} else {
 		ERR_EXPLAIN(TTR("Cannot navigate to '" + p_path + "' as it has not been found in the file system!"));
 		ERR_FAIL();
 	}
 
-	path=dir_path;
+	path = dir_path;
 	_update_tree();
 	tree->ensure_cursor_is_visible();
 
@@ -310,9 +295,9 @@ void FileSystemDock::navigate_to_path(const String& p_path) {
 		_open_pressed(); // Seems to be the only way to get into the file view. This also pushes to history.
 
 		// Focus the given file.
-		for (int i=0; i<files->get_item_count(); i++) {
+		for (int i = 0; i < files->get_item_count(); i++) {
 			if (files->get_item_text(i) == file_name) {
-				files->select(i,true);
+				files->select(i, true);
 				files->ensure_current_is_visible();
 				break;
 			}
@@ -320,42 +305,40 @@ void FileSystemDock::navigate_to_path(const String& p_path) {
 	}
 }
 
-void FileSystemDock::_thumbnail_done(const String& p_path,const Ref<Texture>& p_preview, const Variant& p_udata) {
+void FileSystemDock::_thumbnail_done(const String &p_path, const Ref<Texture> &p_preview, const Variant &p_udata) {
 
-	bool valid=false;
+	bool valid = false;
 
 	if (search_box->is_visible()) {
-		valid=true;
+		valid = true;
 	} else {
-		valid=(path==p_path.get_base_dir());
+		valid = (path == p_path.get_base_dir());
 	}
 
 	if (p_preview.is_valid() && valid) {
 
-		Array uarr=p_udata;
-		int idx=uarr[0];
-		String file=uarr[1];
-		if (idx>=files->get_item_count())
+		Array uarr = p_udata;
+		int idx = uarr[0];
+		String file = uarr[1];
+		if (idx >= files->get_item_count())
 			return;
-		if (files->get_item_text(idx)!=file)
+		if (files->get_item_text(idx) != file)
 			return;
 		String fpath = files->get_item_metadata(idx);
-		if (fpath!=p_path)
+		if (fpath != p_path)
 			return;
-		files->set_item_icon(idx,p_preview);
-
+		files->set_item_icon(idx, p_preview);
 	}
-
 }
 
 void FileSystemDock::_change_file_display() {
 
 	if (button_display_mode->is_pressed()) {
 		display_mode = DISPLAY_LIST;
-		button_display_mode->set_icon( get_icon("FileThumbnail","EditorIcons"));
+		button_display_mode->set_icon(get_icon("FileThumbnail", "EditorIcons"));
 	} else {
 		display_mode = DISPLAY_THUMBNAILS;
-		button_display_mode->set_icon( get_icon("FileList","EditorIcons"));
+		button_display_mode->set_icon(get_icon("FileList", "EditorIcons"));
 	}
 
 	EditorSettings::get_singleton()->set("docks/filesystem/display_mode", display_mode);
@@ -363,32 +346,30 @@ void FileSystemDock::_change_file_display() {
 	_update_files(true);
 }
 
-void FileSystemDock::_search(EditorFileSystemDirectory *p_path,List<FileInfo>* matches,int p_max_items) {
+void FileSystemDock::_search(EditorFileSystemDirectory *p_path, List<FileInfo> *matches, int p_max_items) {
 
-	if (matches->size()>p_max_items)
+	if (matches->size() > p_max_items)
 		return;
 
-	for(int i=0;i<p_path->get_subdir_count();i++) {
-		_search(p_path->get_subdir(i),matches,p_max_items);
-
+	for (int i = 0; i < p_path->get_subdir_count(); i++) {
+		_search(p_path->get_subdir(i), matches, p_max_items);
 	}
 
 	String match = search_box->get_text();
 
-	for(int i=0;i<p_path->get_file_count();i++) {
+	for (int i = 0; i < p_path->get_file_count(); i++) {
 		String file = p_path->get_file(i);
 
-		if (file.find(match)!=-1) {
+		if (file.find(match) != -1) {
 
 			FileInfo fi;
-			fi.name=file;
-			fi.type=p_path->get_file_type(i);
-			fi.path=p_path->get_file_path(i);			
-			fi.import_status=0;
-
+			fi.name = file;
+			fi.type = p_path->get_file_type(i);
+			fi.path = p_path->get_file_path(i);
+			fi.import_status = 0;
 
 			matches->push_back(fi);
-			if (matches->size()>p_max_items)
+			if (matches->size() > p_max_items)
 				return;
 		}
 	}
@@ -400,7 +381,7 @@ void FileSystemDock::_update_files(bool p_keep_selection) {
 
 	if (p_keep_selection) {
 
-		for(int i=0;i<files->get_item_count();i++) {
+		for (int i = 0; i < files->get_item_count(); i++) {
 
 			if (files->is_selected(i))
 				cselection.insert(files->get_item_text(i));
@@ -411,48 +392,47 @@ void FileSystemDock::_update_files(bool p_keep_selection) {
 
 	current_path->set_text(path);
 
-
 	EditorFileSystemDirectory *efd = EditorFileSystem::get_singleton()->get_filesystem_path(path);
 	if (!efd)
 		return;
 
 	int thumbnail_size = EditorSettings::get_singleton()->get("docks/filesystem/thumbnail_size");
-	thumbnail_size*=EDSCALE;
+	thumbnail_size *= EDSCALE;
 	Ref<Texture> folder_thumbnail;
 	Ref<Texture> file_thumbnail;
 
 	bool use_thumbnails = (display_mode == DISPLAY_THUMBNAILS);
-	bool use_folders = search_box->get_text().length()==0 && split_mode;
+	bool use_folders = search_box->get_text().length() == 0 && split_mode;
 
 	if (use_thumbnails) { //thumbnails
 
 		files->set_max_columns(0);
 		files->set_icon_mode(ItemList::ICON_MODE_TOP);
-		files->set_fixed_column_width(thumbnail_size*3/2);
+		files->set_fixed_column_width(thumbnail_size * 3 / 2);
 		files->set_max_text_lines(2);
-		files->set_fixed_icon_size(Size2(thumbnail_size,thumbnail_size));
+		files->set_fixed_icon_size(Size2(thumbnail_size, thumbnail_size));
 
-		if (!has_icon("ResizedFolder","EditorIcons")) {
-			Ref<ImageTexture> folder = get_icon("FolderBig","EditorIcons");
+		if (!has_icon("ResizedFolder", "EditorIcons")) {
+			Ref<ImageTexture> folder = get_icon("FolderBig", "EditorIcons");
 			Image img = folder->get_data();
-			img.resize(thumbnail_size,thumbnail_size);
-			Ref<ImageTexture> resized_folder = Ref<ImageTexture>( memnew( ImageTexture));
-			resized_folder->create_from_image(img,0);
-			Theme::get_default()->set_icon("ResizedFolder","EditorIcons",resized_folder);
+			img.resize(thumbnail_size, thumbnail_size);
+			Ref<ImageTexture> resized_folder = Ref<ImageTexture>(memnew(ImageTexture));
+			resized_folder->create_from_image(img, 0);
+			Theme::get_default()->set_icon("ResizedFolder", "EditorIcons", resized_folder);
 		}
 
-		folder_thumbnail = get_icon("ResizedFolder","EditorIcons");
+		folder_thumbnail = get_icon("ResizedFolder", "EditorIcons");
 
-		if (!has_icon("ResizedFile","EditorIcons")) {
-			Ref<ImageTexture> file = get_icon("FileBig","EditorIcons");
+		if (!has_icon("ResizedFile", "EditorIcons")) {
+			Ref<ImageTexture> file = get_icon("FileBig", "EditorIcons");
 			Image img = file->get_data();
-			img.resize(thumbnail_size,thumbnail_size);
-			Ref<ImageTexture> resized_file = Ref<ImageTexture>( memnew( ImageTexture));
-			resized_file->create_from_image(img,0);
-			Theme::get_default()->set_icon("ResizedFile","EditorIcons",resized_file);
+			img.resize(thumbnail_size, thumbnail_size);
+			Ref<ImageTexture> resized_file = Ref<ImageTexture>(memnew(ImageTexture));
+			resized_file->create_from_image(img, 0);
+			Theme::get_default()->set_icon("ResizedFile", "EditorIcons", resized_file);
 		}
 
-		file_thumbnail = get_icon("ResizedFile","EditorIcons");
+		file_thumbnail = get_icon("ResizedFile", "EditorIcons");
 
 	} else {
 
@@ -461,137 +441,124 @@ void FileSystemDock::_update_files(bool p_keep_selection) {
 		files->set_max_text_lines(1);
 		files->set_fixed_column_width(0);
 		files->set_fixed_icon_size(Size2());
-
 	}
 
 	if (use_folders) {
 
-		if (path!="res://") {
+		if (path != "res://") {
 
 			if (use_thumbnails) {
-				files->add_item("..",folder_thumbnail,true);
+				files->add_item("..", folder_thumbnail, true);
 			} else {
-				files->add_item("..",get_icon("folder","FileDialog"),true);
+				files->add_item("..", get_icon("folder", "FileDialog"), true);
 			}
 
 			String bd = path.get_base_dir();
-			if (bd!="res://" && !bd.ends_with("/"))
-				bd+="/";
+			if (bd != "res://" && !bd.ends_with("/"))
+				bd += "/";
 
-			files->set_item_metadata(files->get_item_count()-1,bd);
+			files->set_item_metadata(files->get_item_count() - 1, bd);
 		}
 
-		for(int i=0;i<efd->get_subdir_count();i++) {
-
-			String dname=efd->get_subdir(i)->get_name();
+		for (int i = 0; i < efd->get_subdir_count(); i++) {
 
+			String dname = efd->get_subdir(i)->get_name();
 
 			if (use_thumbnails) {
-				files->add_item(dname,folder_thumbnail,true);
+				files->add_item(dname, folder_thumbnail, true);
 			} else {
-				files->add_item(dname,get_icon("folder","FileDialog"),true);
+				files->add_item(dname, get_icon("folder", "FileDialog"), true);
 			}
 
-			files->set_item_metadata(files->get_item_count()-1,path.plus_file(dname)+"/");
+			files->set_item_metadata(files->get_item_count() - 1, path.plus_file(dname) + "/");
 
 			if (cselection.has(dname))
-				files->select(files->get_item_count()-1,false);
+				files->select(files->get_item_count() - 1, false);
 		}
 	}
 
-
 	List<FileInfo> filelist;
 
 	if (search_box->get_text().length()) {
 
-		if (search_box->get_text().length()>1) {
-			_search(EditorFileSystem::get_singleton()->get_filesystem(),&filelist,128);
+		if (search_box->get_text().length() > 1) {
+			_search(EditorFileSystem::get_singleton()->get_filesystem(), &filelist, 128);
 		}
 
 		filelist.sort();
 	} else {
 
-		for(int i=0;i<efd->get_file_count();i++) {
+		for (int i = 0; i < efd->get_file_count(); i++) {
 
 			FileInfo fi;
-			fi.name=efd->get_file(i);
-			fi.path=path.plus_file(fi.name);
-			fi.type=efd->get_file_type(i);
-			fi.import_status=0;
-
-
+			fi.name = efd->get_file(i);
+			fi.path = path.plus_file(fi.name);
+			fi.type = efd->get_file_type(i);
+			fi.import_status = 0;
 
 			filelist.push_back(fi);
 		}
 	}
 
-	StringName ei="EditorIcons"; //make it faster..
-	StringName oi="Object";
-
+	StringName ei = "EditorIcons"; //make it faster..
+	StringName oi = "Object";
 
-	for(List<FileInfo>::Element *E=filelist.front();E;E=E->next()) {
-		String fname=E->get().name;
+	for (List<FileInfo>::Element *E = filelist.front(); E; E = E->next()) {
+		String fname = E->get().name;
 		String fp = E->get().path;
 		StringName type = E->get().type;
 
 		Ref<Texture> type_icon;
 
-		String tooltip=fname;
+		String tooltip = fname;
 
-		if (E->get().import_status==0) {
+		if (E->get().import_status == 0) {
 
-			if (has_icon(type,ei)) {
-				type_icon=get_icon(type,ei);
+			if (has_icon(type, ei)) {
+				type_icon = get_icon(type, ei);
 			} else {
-				type_icon=get_icon(oi,ei);
+				type_icon = get_icon(oi, ei);
 			}
-		} else if (E->get().import_status==1) {
-			type_icon=get_icon("DependencyOk","EditorIcons");
-		} else if (E->get().import_status==2) {
-			type_icon=get_icon("DependencyChanged","EditorIcons");
-			tooltip+"\nStatus: Needs Re-Import";
-		} else if (E->get().import_status==3) {
-			type_icon=get_icon("ImportFail","EditorIcons");
-			tooltip+"\nStatus: Missing Dependencies";
+		} else if (E->get().import_status == 1) {
+			type_icon = get_icon("DependencyOk", "EditorIcons");
+		} else if (E->get().import_status == 2) {
+			type_icon = get_icon("DependencyChanged", "EditorIcons");
+			tooltip + "\nStatus: Needs Re-Import";
+		} else if (E->get().import_status == 3) {
+			type_icon = get_icon("ImportFail", "EditorIcons");
+			tooltip + "\nStatus: Missing Dependencies";
 		}
 
 		if (E->get().sources.size()) {
-			for(int i=0;i<E->get().sources.size();i++) {
-				tooltip+="\nSource: "+E->get().sources[i];
+			for (int i = 0; i < E->get().sources.size(); i++) {
+				tooltip += "\nSource: " + E->get().sources[i];
 			}
 		}
 
-
-
 		if (use_thumbnails) {
-			files->add_item(fname,file_thumbnail,true);
-			files->set_item_metadata(files->get_item_count()-1,fp);
-			files->set_item_tag_icon(files->get_item_count()-1,type_icon);
+			files->add_item(fname, file_thumbnail, true);
+			files->set_item_metadata(files->get_item_count() - 1, fp);
+			files->set_item_tag_icon(files->get_item_count() - 1, type_icon);
 			Array udata;
 			udata.resize(2);
-			udata[0]=files->get_item_count()-1;
-			udata[1]=fname;
-			EditorResourcePreview::get_singleton()->queue_resource_preview(fp,this,"_thumbnail_done",udata);
+			udata[0] = files->get_item_count() - 1;
+			udata[1] = fname;
+			EditorResourcePreview::get_singleton()->queue_resource_preview(fp, this, "_thumbnail_done", udata);
 		} else {
-			files->add_item(fname,type_icon,true);
-			files->set_item_metadata(files->get_item_count()-1,fp);
-
+			files->add_item(fname, type_icon, true);
+			files->set_item_metadata(files->get_item_count() - 1, fp);
 		}
 
 		if (cselection.has(fname))
-			files->select(files->get_item_count()-1,false);
-
-		files->set_item_tooltip(files->get_item_count()-1,tooltip);
-
+			files->select(files->get_item_count() - 1, false);
 
+		files->set_item_tooltip(files->get_item_count() - 1, tooltip);
 	}
-
-
 }
 
 void FileSystemDock::_select_file(int p_idx) {
 
-	files->select(p_idx,true);
+	files->select(p_idx, true);
 	_file_option(FILE_OPEN);
 }
 
@@ -607,33 +574,30 @@ void FileSystemDock::_go_to_tree() {
 	//file_options->hide();
 }
 
-void FileSystemDock::_go_to_dir(const String& p_dir){
+void FileSystemDock::_go_to_dir(const String &p_dir) {
 
 	DirAccess *da = DirAccess::create(DirAccess::ACCESS_RESOURCES);
-	if (da->change_dir(p_dir)==OK) {
-		path=da->get_current_dir();
+	if (da->change_dir(p_dir) == OK) {
+		path = da->get_current_dir();
 		_update_files(false);
 	}
 	current_path->set_text(path);
 	memdelete(da);
-
-
 }
 
-void FileSystemDock::_preview_invalidated(const String& p_path) {
-
-	if (p_path.get_base_dir()==path && search_box->get_text()==String() && file_list_vb->is_visible_in_tree()) {
+void FileSystemDock::_preview_invalidated(const String &p_path) {
 
+	if (p_path.get_base_dir() == path && search_box->get_text() == String() && file_list_vb->is_visible_in_tree()) {
 
-		for(int i=0;i<files->get_item_count();i++) {
+		for (int i = 0; i < files->get_item_count(); i++) {
 
-			if (files->get_item_metadata(i)==p_path) {
+			if (files->get_item_metadata(i) == p_path) {
 				//re-request preview
 				Array udata;
 				udata.resize(2);
-				udata[0]=i;
-				udata[1]=files->get_item_text(i);
-				EditorResourcePreview::get_singleton()->queue_resource_preview(p_path,this,"_thumbnail_done",udata);
+				udata[0] = i;
+				udata[1] = files->get_item_text(i);
+				EditorResourcePreview::get_singleton()->queue_resource_preview(p_path, this, "_thumbnail_done", udata);
 				break;
 			}
 		}
@@ -642,15 +606,14 @@ void FileSystemDock::_preview_invalidated(const String& p_path) {
 
 void FileSystemDock::_fs_changed() {
 
-	button_hist_prev->set_disabled(history_pos==0);
-	button_hist_next->set_disabled(history_pos+1==history.size());
+	button_hist_prev->set_disabled(history_pos == 0);
+	button_hist_next->set_disabled(history_pos + 1 == history.size());
 	scanning_vb->hide();
 	split_box->show();
 
 	if (tree->is_visible()) {
 		button_favorite->show();
 		_update_tree();
-
 	}
 
 	if (file_list_vb->is_visible()) {
@@ -669,25 +632,23 @@ void FileSystemDock::_set_scanning_mode() {
 	scanning_vb->show();
 	set_process(true);
 	if (EditorFileSystem::get_singleton()->is_scanning()) {
-		scanning_progress->set_value(EditorFileSystem::get_singleton()->get_scanning_progress()*100);
+		scanning_progress->set_value(EditorFileSystem::get_singleton()->get_scanning_progress() * 100);
 	} else {
 		scanning_progress->set_value(0);
 	}
-
 }
 
 void FileSystemDock::_fw_history() {
 
-	if (history_pos<history.size()-1)
+	if (history_pos < history.size() - 1)
 		history_pos++;
 
-	path=history[history_pos];
+	path = history[history_pos];
 
 	if (tree->is_visible()) {
 		_update_tree();
 		tree->grab_focus();
 		tree->ensure_cursor_is_visible();
-
 	}
 
 	if (file_list_vb->is_visible()) {
@@ -695,18 +656,16 @@ void FileSystemDock::_fw_history() {
 		current_path->set_text(path);
 	}
 
-	button_hist_prev->set_disabled(history_pos==0);
-	button_hist_next->set_disabled(history_pos+1==history.size());
-
+	button_hist_prev->set_disabled(history_pos == 0);
+	button_hist_next->set_disabled(history_pos + 1 == history.size());
 }
 
 void FileSystemDock::_bw_history() {
 
-	if (history_pos>0)
+	if (history_pos > 0)
 		history_pos--;
 
-	path=history[history_pos];
-
+	path = history[history_pos];
 
 	if (tree->is_visible()) {
 		_update_tree();
@@ -719,44 +678,40 @@ void FileSystemDock::_bw_history() {
 		current_path->set_text(path);
 	}
 
-	button_hist_prev->set_disabled(history_pos==0);
-	button_hist_next->set_disabled(history_pos+1==history.size());
-
+	button_hist_prev->set_disabled(history_pos == 0);
+	button_hist_next->set_disabled(history_pos + 1 == history.size());
 }
 
 void FileSystemDock::_push_to_history() {
 
-	history.resize(history_pos+1);
-	if (history[history_pos]!=path) {
+	history.resize(history_pos + 1);
+	if (history[history_pos] != path) {
 		history.push_back(path);
 		history_pos++;
 	}
 
-	button_hist_prev->set_disabled(history_pos==0);
-	button_hist_next->set_disabled(history_pos+1==history.size());
-
+	button_hist_prev->set_disabled(history_pos == 0);
+	button_hist_next->set_disabled(history_pos + 1 == history.size());
 }
 
+void FileSystemDock::_find_inside_move_files(EditorFileSystemDirectory *efsd, Vector<String> &files) {
 
-void FileSystemDock::_find_inside_move_files(EditorFileSystemDirectory *efsd,Vector<String>& files) {
-
-	for(int i=0;i<efsd->get_subdir_count();i++) {
-		_find_inside_move_files(efsd->get_subdir(i),files);
+	for (int i = 0; i < efsd->get_subdir_count(); i++) {
+		_find_inside_move_files(efsd->get_subdir(i), files);
 	}
-	for(int i=0;i<efsd->get_file_count();i++) {
+	for (int i = 0; i < efsd->get_file_count(); i++) {
 		files.push_back(efsd->get_file_path(i));
 	}
-
 }
 
-void FileSystemDock::_find_remaps(EditorFileSystemDirectory *efsd,Map<String,String> &renames,List<String>& to_remaps) {
+void FileSystemDock::_find_remaps(EditorFileSystemDirectory *efsd, Map<String, String> &renames, List<String> &to_remaps) {
 
-	for(int i=0;i<efsd->get_subdir_count();i++) {
-		_find_remaps(efsd->get_subdir(i),renames,to_remaps);
+	for (int i = 0; i < efsd->get_subdir_count(); i++) {
+		_find_remaps(efsd->get_subdir(i), renames, to_remaps);
 	}
-	for(int i=0;i<efsd->get_file_count();i++) {
-		Vector<String> deps=efsd->get_file_deps(i);
-		for(int j=0;j<deps.size();j++) {
+	for (int i = 0; i < efsd->get_file_count(); i++) {
+		Vector<String> deps = efsd->get_file_deps(i);
+		for (int j = 0; j < deps.size(); j++) {
 			if (renames.has(deps[j])) {
 				to_remaps.push_back(efsd->get_file_path(i));
 				break;
@@ -765,10 +720,9 @@ void FileSystemDock::_find_remaps(EditorFileSystemDirectory *efsd,Map<String,Str
 	}
 }
 
+void FileSystemDock::_rename_operation(const String &p_to_path) {
 
-void FileSystemDock::_rename_operation(const String& p_to_path) {
-
-	if (move_files[0]==p_to_path) {
+	if (move_files[0] == p_to_path) {
 		EditorNode::get_singleton()->show_warning(TTR("Same source and destination files, doing nothing."));
 		return;
 	}
@@ -777,33 +731,33 @@ void FileSystemDock::_rename_operation(const String& p_to_path) {
 		return;
 	}
 
-	Map<String,String> renames;
-	renames[move_files[0]]=p_to_path;
+	Map<String, String> renames;
+	renames[move_files[0]] = p_to_path;
 
 	List<String> remap;
 
-	_find_remaps(EditorFileSystem::get_singleton()->get_filesystem(),renames,remap);
-	print_line("found files to remap: "+itos(remap.size()));
+	_find_remaps(EditorFileSystem::get_singleton()->get_filesystem(), renames, remap);
+	print_line("found files to remap: " + itos(remap.size()));
 
 	//perform remaps
-	for(List<String>::Element *E=remap.front();E;E=E->next()) {
+	for (List<String>::Element *E = remap.front(); E; E = E->next()) {
 
-		Error err = ResourceLoader::rename_dependencies(E->get(),renames);
-		print_line("remapping: "+E->get());
+		Error err = ResourceLoader::rename_dependencies(E->get(), renames);
+		print_line("remapping: " + E->get());
 
-		if (err!=OK) {
-			EditorNode::get_singleton()->add_io_error("Can't rename deps for:\n"+E->get()+"\n");
+		if (err != OK) {
+			EditorNode::get_singleton()->add_io_error("Can't rename deps for:\n" + E->get() + "\n");
 		}
 	}
 
 	//finally, perform moves
 
-	DirAccess *da=DirAccess::create(DirAccess::ACCESS_RESOURCES);
+	DirAccess *da = DirAccess::create(DirAccess::ACCESS_RESOURCES);
 
-	Error err = da->rename(move_files[0],p_to_path);
-	print_line("moving file "+move_files[0]+" to "+p_to_path);
-	if (err!=OK) {
-		EditorNode::get_singleton()->add_io_error("Error moving file:\n"+move_files[0]+"\n");
+	Error err = da->rename(move_files[0], p_to_path);
+	print_line("moving file " + move_files[0] + " to " + p_to_path);
+	if (err != OK) {
+		EditorNode::get_singleton()->add_io_error("Error moving file:\n" + move_files[0] + "\n");
 	}
 
 	//rescan everything
@@ -812,10 +766,9 @@ void FileSystemDock::_rename_operation(const String& p_to_path) {
 	_rescan();
 }
 
+void FileSystemDock::_move_operation(const String &p_to_path) {
 
-void FileSystemDock::_move_operation(const String& p_to_path) {
-
-	if (p_to_path==path) {
+	if (p_to_path == path) {
 		EditorNode::get_singleton()->show_warning(TTR("Same source and destination paths, doing nothing."));
 		return;
 	}
@@ -824,78 +777,78 @@ void FileSystemDock::_move_operation(const String& p_to_path) {
 
 	Vector<String> inside_files;
 
-	for(int i=0;i<move_dirs.size();i++) {
+	for (int i = 0; i < move_dirs.size(); i++) {
 		if (p_to_path.begins_with(move_dirs[i])) {
 			EditorNode::get_singleton()->show_warning(TTR("Can't move directories to within themselves."));
 			return;
 		}
 
-		EditorFileSystemDirectory *efsd=EditorFileSystem::get_singleton()->get_filesystem_path(move_dirs[i]);
+		EditorFileSystemDirectory *efsd = EditorFileSystem::get_singleton()->get_filesystem_path(move_dirs[i]);
 		if (!efsd)
 			continue;
-		_find_inside_move_files(efsd,inside_files);
+		_find_inside_move_files(efsd, inside_files);
 	}
 
 	//make list of remaps
-	Map<String,String> renames;
-	String repfrom=path=="res://"?path:String(path+"/");
-	String repto=p_to_path=="res://"?p_to_path:String(p_to_path+"/");
+	Map<String, String> renames;
+	String repfrom = path == "res://" ? path : String(path + "/");
+	String repto = p_to_path == "res://" ? p_to_path : String(p_to_path + "/");
 
-	for(int i=0;i<move_files.size();i++) {
-		renames[move_files[i]]=move_files[i].replace_first(repfrom,repto);
-		print_line("move file "+move_files[i]+" -> "+renames[move_files[i]]);
+	for (int i = 0; i < move_files.size(); i++) {
+		renames[move_files[i]] = move_files[i].replace_first(repfrom, repto);
+		print_line("move file " + move_files[i] + " -> " + renames[move_files[i]]);
 	}
-	for(int i=0;i<inside_files.size();i++) {
-		renames[inside_files[i]]=inside_files[i].replace_first(repfrom,repto);
-		print_line("inside file "+inside_files[i]+" -> "+renames[inside_files[i]]);
+	for (int i = 0; i < inside_files.size(); i++) {
+		renames[inside_files[i]] = inside_files[i].replace_first(repfrom, repto);
+		print_line("inside file " + inside_files[i] + " -> " + renames[inside_files[i]]);
 	}
 
 	//make list of files that will be run the remapping
 	List<String> remap;
 
-	_find_remaps(EditorFileSystem::get_singleton()->get_filesystem(),renames,remap);
-	print_line("found files to remap: "+itos(remap.size()));
+	_find_remaps(EditorFileSystem::get_singleton()->get_filesystem(), renames, remap);
+	print_line("found files to remap: " + itos(remap.size()));
 
 	//perform remaps
-	for(List<String>::Element *E=remap.front();E;E=E->next()) {
+	for (List<String>::Element *E = remap.front(); E; E = E->next()) {
 
-		Error err = ResourceLoader::rename_dependencies(E->get(),renames);
-		print_line("remapping: "+E->get());
+		Error err = ResourceLoader::rename_dependencies(E->get(), renames);
+		print_line("remapping: " + E->get());
 
-		if (err!=OK) {
-			EditorNode::get_singleton()->add_io_error("Can't rename deps for:\n"+E->get()+"\n");
+		if (err != OK) {
+			EditorNode::get_singleton()->add_io_error("Can't rename deps for:\n" + E->get() + "\n");
 		}
 	}
 
 	//finally, perform moves
 
-	DirAccess *da=DirAccess::create(DirAccess::ACCESS_RESOURCES);
+	DirAccess *da = DirAccess::create(DirAccess::ACCESS_RESOURCES);
 
-	for(int i=0;i<move_files.size();i++) {
+	for (int i = 0; i < move_files.size(); i++) {
 
-		String to = move_files[i].replace_first(repfrom,repto);
-		Error err = da->rename(move_files[i],to);
-		print_line("moving file "+move_files[i]+" to "+to);
-		if (err!=OK) {
-			EditorNode::get_singleton()->add_io_error("Error moving file:\n"+move_files[i]+"\n");
+		String to = move_files[i].replace_first(repfrom, repto);
+		Error err = da->rename(move_files[i], to);
+		print_line("moving file " + move_files[i] + " to " + to);
+		if (err != OK) {
+			EditorNode::get_singleton()->add_io_error("Error moving file:\n" + move_files[i] + "\n");
 		}
 	}
 
-	for(int i=0;i<move_dirs.size();i++) {
+	for (int i = 0; i < move_dirs.size(); i++) {
 
 		String mdir = move_dirs[i];
-		if (mdir=="res://")
+		if (mdir == "res://")
 			continue;
 
 		if (mdir.ends_with("/")) {
-			mdir=mdir.substr(0,mdir.length()-1);
+			mdir = mdir.substr(0, mdir.length() - 1);
 		}
 
 		String to = p_to_path.plus_file(mdir.get_file());
-		Error err = da->rename(mdir,to);
-		print_line("moving dir "+mdir+" to "+to);
-		if (err!=OK) {
-			EditorNode::get_singleton()->add_io_error("Error moving dir:\n"+move_dirs[i]+"\n");
+		Error err = da->rename(mdir, to);
+		print_line("moving dir " + mdir + " to " + to);
+		if (err != OK) {
+			EditorNode::get_singleton()->add_io_error("Error moving dir:\n" + move_dirs[i] + "\n");
 		}
 	}
 
@@ -903,48 +856,44 @@ void FileSystemDock::_move_operation(const String& p_to_path) {
 	//rescan everything
 	print_line("call rescan!");
 	_rescan();
-
 }
 
 void FileSystemDock::_file_option(int p_option) {
 
-	switch(p_option) {
-
+	switch (p_option) {
 
 		case FILE_SHOW_IN_EXPLORER:
 		case FILE_OPEN: {
-			int idx=-1;
-			for(int i=0;i<files->get_item_count();i++) {
+			int idx = -1;
+			for (int i = 0; i < files->get_item_count(); i++) {
 				if (files->is_selected(i)) {
-					idx=i;
+					idx = i;
 					break;
 				}
 			}
 
-			if (idx<0)
+			if (idx < 0)
 				return;
 
-
-
 			String path = files->get_item_metadata(idx);
 			if (p_option == FILE_SHOW_IN_EXPLORER) {
 				String dir = GlobalConfig::get_singleton()->globalize_path(path);
 				dir = dir.substr(0, dir.find_last("/"));
-				OS::get_singleton()->shell_open(String("file://")+dir);
+				OS::get_singleton()->shell_open(String("file://") + dir);
 				return;
 			}
 
 			if (path.ends_with("/")) {
-				if (path!="res://") {
-					path=path.substr(0,path.length()-1);
+				if (path != "res://") {
+					path = path.substr(0, path.length() - 1);
 				}
-				this->path=path;
+				this->path = path;
 				_update_files(false);
 				current_path->set_text(path);
 				_push_to_history();
 			} else {
 
-				if (ResourceLoader::get_resource_type(path)=="PackedScene") {
+				if (ResourceLoader::get_resource_type(path) == "PackedScene") {
 
 					editor->open_request(path);
 				} else {
@@ -957,11 +906,11 @@ void FileSystemDock::_file_option(int p_option) {
 
 			Vector<String> paths;
 
-			for (int i = 0; i<files->get_item_count(); i++) {
+			for (int i = 0; i < files->get_item_count(); i++) {
 				if (!files->is_selected(i))
 					continue;
-				String path =files->get_item_metadata(i);
-				if (EditorFileSystem::get_singleton()->get_file_type(path)=="PackedScene") {
+				String path = files->get_item_metadata(i);
+				if (EditorFileSystem::get_singleton()->get_file_type(path) == "PackedScene") {
 					paths.push_back(path);
 				}
 			}
@@ -973,7 +922,7 @@ void FileSystemDock::_file_option(int p_option) {
 		case FILE_DEPENDENCIES: {
 
 			int idx = files->get_current();
-			if (idx<0 || idx>=files->get_item_count())
+			if (idx < 0 || idx >= files->get_item_count())
 				break;
 			String path = files->get_item_metadata(idx);
 			deps_editor->edit(path);
@@ -981,7 +930,7 @@ void FileSystemDock::_file_option(int p_option) {
 		case FILE_OWNERS: {
 
 			int idx = files->get_current();
-			if (idx<0 || idx>=files->get_item_count())
+			if (idx < 0 || idx >= files->get_item_count())
 				break;
 			String path = files->get_item_metadata(idx);
 			owners_editor->show(path);
@@ -991,53 +940,49 @@ void FileSystemDock::_file_option(int p_option) {
 			move_dirs.clear();
 			move_files.clear();
 
-			for(int i=0;i<files->get_item_count();i++) {
+			for (int i = 0; i < files->get_item_count(); i++) {
 
 				String path = files->get_item_metadata(i);
 				if (!files->is_selected(i))
 					continue;
 
-				 if (files->get_item_text(i)=="..") {
-					 EditorNode::get_singleton()->show_warning(TTR("Can't operate on '..'"));
-					 return;
-				 }
+				if (files->get_item_text(i) == "..") {
+					EditorNode::get_singleton()->show_warning(TTR("Can't operate on '..'"));
+					return;
+				}
 
 				if (path.ends_with("/")) {
-					move_dirs.push_back(path.substr(0,path.length()-1));
+					move_dirs.push_back(path.substr(0, path.length() - 1));
 				} else {
 					move_files.push_back(path);
 				}
 			}
 
-
-			if (move_dirs.empty() && move_files.size()==1) {
+			if (move_dirs.empty() && move_files.size() == 1) {
 
 				rename_dialog->clear_filters();
-				rename_dialog->add_filter("*."+move_files[0].get_extension());
+				rename_dialog->add_filter("*." + move_files[0].get_extension());
 				rename_dialog->set_mode(EditorFileDialog::MODE_SAVE_FILE);
 				rename_dialog->set_current_path(move_files[0]);
 				rename_dialog->popup_centered_ratio();
-				rename_dialog->set_title(TTR("Pick New Name and Location For:")+" "+move_files[0].get_file());
-
+				rename_dialog->set_title(TTR("Pick New Name and Location For:") + " " + move_files[0].get_file());
 
 			} else {
 				//just move
 				move_dialog->popup_centered_ratio();
 			}
 
-
 		} break;
 		case FILE_REMOVE: {
 
 			Vector<String> torem;
 
-			for(int i=0;i<files->get_item_count();i++) {
+			for (int i = 0; i < files->get_item_count(); i++) {
 
 				String path = files->get_item_metadata(i);
 				if (path.ends_with("/") || !files->is_selected(i))
 					continue;
 				torem.push_back(path);
-
 			}
 
 			if (torem.empty()) {
@@ -1055,9 +1000,8 @@ void FileSystemDock::_file_option(int p_option) {
 		} break;
 		case FILE_REIMPORT: {
 
-
 			Vector<String> reimport;
-			for(int i=0;i<files->get_item_count();i++) {
+			for (int i = 0; i < files->get_item_count(); i++) {
 
 				if (!files->is_selected(i))
 					continue;
@@ -1066,8 +1010,8 @@ void FileSystemDock::_file_option(int p_option) {
 				reimport.push_back(path);
 			}
 
-			ERR_FAIL_COND(reimport.size()==0);
-/*
+			ERR_FAIL_COND(reimport.size() == 0);
+			/*
 			Ref<ResourceImportMetadata> rimd = ResourceLoader::load_import_metadata(reimport[0]);
 			ERR_FAIL_COND(!rimd.is_valid());
 			String editor=rimd->get_editor();
@@ -1091,7 +1035,7 @@ void FileSystemDock::_file_option(int p_option) {
 		case FILE_COPY_PATH:
 
 			int idx = files->get_current();
-			if (idx<0 || idx>=files->get_item_count())
+			if (idx < 0 || idx >= files->get_item_count())
 				break;
 			String path = files->get_item_metadata(idx);
 			OS::get_singleton()->set_clipboard(path);
@@ -1103,18 +1047,18 @@ void FileSystemDock::_folder_option(int p_option) {
 	TreeItem *item = tree->get_selected();
 	TreeItem *child = item->get_children();
 
-	switch(p_option) {
-		
+	switch (p_option) {
+
 		case FOLDER_EXPAND_ALL:
 			item->set_collapsed(false);
-			while(child) {
+			while (child) {
 				child->set_collapsed(false);
 				child = child->get_next();
 			}
 			break;
 
 		case FOLDER_COLLAPSE_ALL:
-			while(child) {
+			while (child) {
 				child->set_collapsed(true);
 				child = child->get_next();
 			}
@@ -1122,8 +1066,7 @@ void FileSystemDock::_folder_option(int p_option) {
 	}
 }
 
-void FileSystemDock::_open_pressed(){
-
+void FileSystemDock::_open_pressed() {
 
 	TreeItem *sel = tree->get_selected();
 	if (!sel) {
@@ -1149,22 +1092,20 @@ void FileSystemDock::_open_pressed(){
 	_push_to_history();
 
 	//emit_signal("open",path);
-
 }
 
-void FileSystemDock::_dir_rmb_pressed(const Vector2& p_pos) {
+void FileSystemDock::_dir_rmb_pressed(const Vector2 &p_pos) {
 	folder_options->clear();
-	folder_options->set_size(Size2(1,1));
+	folder_options->set_size(Size2(1, 1));
 
-	folder_options->add_item(TTR("Expand all"),FOLDER_EXPAND_ALL);
-	folder_options->add_item(TTR("Collapse all"),FOLDER_COLLAPSE_ALL);
+	folder_options->add_item(TTR("Expand all"), FOLDER_EXPAND_ALL);
+	folder_options->add_item(TTR("Collapse all"), FOLDER_COLLAPSE_ALL);
 
 	folder_options->set_pos(files->get_global_pos() + p_pos);
 	folder_options->popup();
 }
 
-
-void FileSystemDock::_search_changed(const String& p_text) {
+void FileSystemDock::_search_changed(const String &p_text) {
 
 	if (!search_box->is_visible_in_tree())
 		return; //wtf
@@ -1176,14 +1117,12 @@ void FileSystemDock::_rescan() {
 
 	_set_scanning_mode();
 	EditorFileSystem::get_singleton()->scan();
-
 }
 
-void FileSystemDock::fix_dependencies(const String& p_for_file) {
+void FileSystemDock::fix_dependencies(const String &p_for_file) {
 	deps_editor->edit(p_for_file);
 }
 
-
 void FileSystemDock::focus_on_filter() {
 
 	if (!search_box->is_visible_in_tree()) {
@@ -1205,39 +1144,37 @@ void FileSystemDock::set_display_mode(int p_mode) {
 	_change_file_display();
 }
 
+Variant FileSystemDock::get_drag_data_fw(const Point2 &p_point, Control *p_from) {
 
-Variant FileSystemDock::get_drag_data_fw(const Point2& p_point,Control* p_from) {
-
-	if (p_from==tree) {
+	if (p_from == tree) {
 
 		TreeItem *selected = tree->get_selected();
 		if (!selected)
 			return Variant();
 
 		String path = selected->get_metadata(0);
-		if (path==String())
+		if (path == String())
 			return Variant();
 		if (!path.ends_with("/"))
-			path=path+"/";
+			path = path + "/";
 		Vector<String> paths;
 		paths.push_back(path);
-		Dictionary d = EditorNode::get_singleton()->drag_files(paths,p_from);
+		Dictionary d = EditorNode::get_singleton()->drag_files(paths, p_from);
 
-		if (selected->get_parent() && tree->get_root()->get_children()==selected->get_parent()) {
+		if (selected->get_parent() && tree->get_root()->get_children() == selected->get_parent()) {
 			//a favorite.. treat as such
-			d["type"]="favorite";
+			d["type"] = "favorite";
 		}
 
 		return d;
-
 	}
 
-	if (p_from==files) {
+	if (p_from == files) {
 
 		List<int> seldirs;
 		List<int> selfiles;
 
-		for (int i = 0; i<files->get_item_count(); i++) {
+		for (int i = 0; i < files->get_item_count(); i++) {
 			if (files->is_selected(i)) {
 				String path = files->get_item_metadata(i);
 				if (path.ends_with("/"))
@@ -1261,35 +1198,34 @@ Variant FileSystemDock::get_drag_data_fw(const Point2& p_point,Control* p_from)
 			}
 		}*/
 
-		if (selfiles.size()>0 && seldirs.size()==0) {
+		if (selfiles.size() > 0 && seldirs.size() == 0) {
 			Vector<String> fnames;
-			for(List<int>::Element *E=selfiles.front();E;E=E->next()) {
+			for (List<int>::Element *E = selfiles.front(); E; E = E->next()) {
 				fnames.push_back(files->get_item_metadata(E->get()));
 			}
-			return EditorNode::get_singleton()->drag_files(fnames,p_from);
+			return EditorNode::get_singleton()->drag_files(fnames, p_from);
 		}
 
-		if (selfiles.size()>0 || seldirs.size()>0) {
+		if (selfiles.size() > 0 || seldirs.size() > 0) {
 			Vector<String> fnames;
-			for(List<int>::Element *E=selfiles.front();E;E=E->next()) {
+			for (List<int>::Element *E = selfiles.front(); E; E = E->next()) {
 				fnames.push_back(files->get_item_metadata(E->get()));
 			}
-			for(List<int>::Element *E=seldirs.front();E;E=E->next()) {
+			for (List<int>::Element *E = seldirs.front(); E; E = E->next()) {
 				fnames.push_back(files->get_item_metadata(E->get()));
 			}
-			return EditorNode::get_singleton()->drag_files_and_dirs(fnames,p_from);
+			return EditorNode::get_singleton()->drag_files_and_dirs(fnames, p_from);
 		}
-
 	}
 
 	return Variant();
 }
 
-bool FileSystemDock::can_drop_data_fw(const Point2& p_point,const Variant& p_data,Control* p_from) const{
+bool FileSystemDock::can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const {
 
 	Dictionary drag_data = p_data;
 
-	if (drag_data.has("type") && String(drag_data["type"])=="favorite") {
+	if (drag_data.has("type") && String(drag_data["type"]) == "favorite") {
 
 		//moving favorite around
 		TreeItem *ti = tree->get_item_at_pos(p_point);
@@ -1298,34 +1234,32 @@ bool FileSystemDock::can_drop_data_fw(const Point2& p_point,const Variant& p_dat
 
 		int what = tree->get_drop_section_at_pos(p_point);
 
-		if (ti==tree->get_root()->get_children()) {
-			return (what==1); //the parent, first fav
+		if (ti == tree->get_root()->get_children()) {
+			return (what == 1); //the parent, first fav
 		}
-		if (ti->get_parent() && tree->get_root()->get_children()==ti->get_parent()) {
+		if (ti->get_parent() && tree->get_root()->get_children() == ti->get_parent()) {
 			return true; // a favorite
 		}
 
-		if (ti==tree->get_root()->get_children()->get_next()) {
-			return (what==-1); //the tree, last fav
+		if (ti == tree->get_root()->get_children()->get_next()) {
+			return (what == -1); //the tree, last fav
 		}
 
 		return false;
-
 	}
 
-
-	if (drag_data.has("type") && String(drag_data["type"])=="resource") {
+	if (drag_data.has("type") && String(drag_data["type"]) == "resource") {
 		return true;
 	}
 
-	if (drag_data.has("type") && ( String(drag_data["type"])=="files" || String(drag_data["type"])=="files_and_dirs")) {
+	if (drag_data.has("type") && (String(drag_data["type"]) == "files" || String(drag_data["type"]) == "files_and_dirs")) {
 
 		Vector<String> fnames = drag_data["files"];
 
-		if (p_from==files) {
+		if (p_from == files) {
 
 			int at_pos = files->get_item_at_pos(p_point);
-			if (at_pos!=-1) {
+			if (at_pos != -1) {
 
 				String dir = files->get_item_metadata(at_pos);
 				if (dir.ends_with("/"))
@@ -1333,31 +1267,30 @@ bool FileSystemDock::can_drop_data_fw(const Point2& p_point,const Variant& p_dat
 			}
 		}
 
-		if (p_from==tree) {
+		if (p_from == tree) {
 
 			TreeItem *ti = tree->get_item_at_pos(p_point);
 			if (!ti)
 				return false;
 			String path = ti->get_metadata(0);
 
-			if (path==String())
+			if (path == String())
 				return false;
 
 			return true;
 		}
-
 	}
 
 	return false;
 }
 
-void FileSystemDock::drop_data_fw(const Point2& p_point,const Variant& p_data,Control* p_from){
+void FileSystemDock::drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) {
 
-	if (!can_drop_data_fw(p_point,p_data,p_from))
+	if (!can_drop_data_fw(p_point, p_data, p_from))
 		return;
 	Dictionary drag_data = p_data;
 
-	if (drag_data.has("type") && String(drag_data["type"])=="favorite") {
+	if (drag_data.has("type") && String(drag_data["type"]) == "favorite") {
 
 		//moving favorite around
 		TreeItem *ti = tree->get_item_at_pos(p_point);
@@ -1366,131 +1299,126 @@ void FileSystemDock::drop_data_fw(const Point2& p_point,const Variant& p_data,Co
 
 		Vector<String> files = drag_data["files"];
 
-		ERR_FAIL_COND(files.size()!=1);
+		ERR_FAIL_COND(files.size() != 1);
 
 		String swap = files[0];
-		if (swap!="res://" && swap.ends_with("/")) {
-			swap=swap.substr(0,swap.length()-1);
+		if (swap != "res://" && swap.ends_with("/")) {
+			swap = swap.substr(0, swap.length() - 1);
 		}
 
 		int what = tree->get_drop_section_at_pos(p_point);
 
-		TreeItem *swap_item=NULL;
+		TreeItem *swap_item = NULL;
 
-		if (ti==tree->get_root()->get_children()) {
-			swap_item=tree->get_root()->get_children()->get_children();
+		if (ti == tree->get_root()->get_children()) {
+			swap_item = tree->get_root()->get_children()->get_children();
 
-		} else if (ti->get_parent() && tree->get_root()->get_children()==ti->get_parent()) {
-			if (what==-1) {
-				swap_item=ti;
+		} else if (ti->get_parent() && tree->get_root()->get_children() == ti->get_parent()) {
+			if (what == -1) {
+				swap_item = ti;
 			} else {
-				swap_item=ti->get_next();
+				swap_item = ti->get_next();
 			}
 		}
 
 		String swap_with;
 
 		if (swap_item) {
-			swap_with=swap_item->get_metadata(0);
-			if (swap_with!="res://" && swap_with.ends_with("/")) {
-				swap_with=swap_with.substr(0,swap_with.length()-1);
+			swap_with = swap_item->get_metadata(0);
+			if (swap_with != "res://" && swap_with.ends_with("/")) {
+				swap_with = swap_with.substr(0, swap_with.length() - 1);
 			}
 		}
 
-		if (swap==swap_with)
+		if (swap == swap_with)
 			return;
 
 		Vector<String> dirs = EditorSettings::get_singleton()->get_favorite_dirs();
 
-		ERR_FAIL_COND(dirs.find(swap)==-1);
-		ERR_FAIL_COND(swap_with!=String() && dirs.find(swap_with)==-1);
+		ERR_FAIL_COND(dirs.find(swap) == -1);
+		ERR_FAIL_COND(swap_with != String() && dirs.find(swap_with) == -1);
 
 		dirs.erase(swap);
 
-		if (swap_with==String()) {
+		if (swap_with == String()) {
 			dirs.push_back(swap);
 		} else {
 			int idx = dirs.find(swap_with);
-			dirs.insert(idx,swap);
+			dirs.insert(idx, swap);
 		}
 
 		EditorSettings::get_singleton()->set_favorite_dirs(dirs);
 		_update_tree();
 		return;
-
 	}
 
-	if (drag_data.has("type") && String(drag_data["type"])=="resource") {
+	if (drag_data.has("type") && String(drag_data["type"]) == "resource") {
 		Ref<Resource> res = drag_data["resource"];
 
 		if (!res.is_valid()) {
 			return;
 		}
 
-
-		if (p_from==tree) {
+		if (p_from == tree) {
 
 			TreeItem *ti = tree->get_item_at_pos(p_point);
 			if (!ti)
 				return;
 			String path = ti->get_metadata(0);
 
-			if (path==String())
+			if (path == String())
 				return;
 
-			EditorNode::get_singleton()->save_resource_as(res,path);
+			EditorNode::get_singleton()->save_resource_as(res, path);
 			return;
-
 		}
 
-		if (p_from==files) {
-			String save_path=path;
+		if (p_from == files) {
+			String save_path = path;
 
 			int at_pos = files->get_item_at_pos(p_point);
-			if (at_pos!=-1) {
+			if (at_pos != -1) {
 				String to_dir = files->get_item_metadata(at_pos);
 				if (to_dir.ends_with("/")) {
-					save_path=to_dir;
-					if (save_path!="res://")
-						save_path=save_path.substr(0,save_path.length()-1);
+					save_path = to_dir;
+					if (save_path != "res://")
+						save_path = save_path.substr(0, save_path.length() - 1);
 				}
-
 			}
 
-			EditorNode::get_singleton()->save_resource_as(res,save_path);
+			EditorNode::get_singleton()->save_resource_as(res, save_path);
 			return;
 		}
 	}
 
-	if (drag_data.has("type") && ( String(drag_data["type"])=="files" || String(drag_data["type"])=="files_and_dirs")) {
+	if (drag_data.has("type") && (String(drag_data["type"]) == "files" || String(drag_data["type"]) == "files_and_dirs")) {
 
-		if (p_from==files || p_from==tree) {
+		if (p_from == files || p_from == tree) {
 
 			String to_dir;
 
-			if (p_from==files) {
+			if (p_from == files) {
 
 				int at_pos = files->get_item_at_pos(p_point);
-				ERR_FAIL_COND(at_pos==-1);
+				ERR_FAIL_COND(at_pos == -1);
 				to_dir = files->get_item_metadata(at_pos);
-			}  else {
+			} else {
 				TreeItem *ti = tree->get_item_at_pos(p_point);
 				if (!ti)
 					return;
 				to_dir = ti->get_metadata(0);
-				ERR_FAIL_COND(to_dir==String());
-
+				ERR_FAIL_COND(to_dir == String());
 			}
 
-			if (to_dir!="res://" && to_dir.ends_with("/")) {
-				to_dir=to_dir.substr(0,to_dir.length()-1);
+			if (to_dir != "res://" && to_dir.ends_with("/")) {
+				to_dir = to_dir.substr(0, to_dir.length() - 1);
 			}
 
 			Vector<String> fnames = drag_data["files"];
 			move_files.clear();
 			move_dirs.clear();
 
-			for(int i=0;i<fnames.size();i++) {
+			for (int i = 0; i < fnames.size(); i++) {
 				if (fnames[i].ends_with("/"))
 					move_dirs.push_back(fnames[i]);
 				else
@@ -1500,27 +1428,26 @@ void FileSystemDock::drop_data_fw(const Point2& p_point,const Variant& p_data,Co
 			_move_operation(to_dir);
 		}
 	}
-
 }
 
-void FileSystemDock::_files_list_rmb_select(int p_item,const Vector2& p_pos) {
+void FileSystemDock::_files_list_rmb_select(int p_item, const Vector2 &p_pos) {
 
 	Vector<String> filenames;
 
-	bool all_scenes=true;
-	bool all_can_reimport=true;
+	bool all_scenes = true;
+	bool all_can_reimport = true;
 	Set<String> types;
 
-	for(int i=0;i<files->get_item_count();i++) {
+	for (int i = 0; i < files->get_item_count(); i++) {
 
 		if (!files->is_selected(i))
 			continue;
 
 		String path = files->get_item_metadata(i);
 
-		if (files->get_item_text(i)=="..") {
+		if (files->get_item_text(i) == "..") {
 			// no operate on ..
-			 return;
+			return;
 		}
 
 		if (path.ends_with("/")) {
@@ -1528,63 +1455,58 @@ void FileSystemDock::_files_list_rmb_select(int p_item,const Vector2& p_pos) {
 			return;
 		}
 
-
-		EditorFileSystemDirectory *efsd=NULL;
+		EditorFileSystemDirectory *efsd = NULL;
 		int pos;
 
-		efsd = EditorFileSystem::get_singleton()->find_file(path,&pos);
+		efsd = EditorFileSystem::get_singleton()->find_file(path, &pos);
 
 		if (efsd) {
 
-
 		} else {
-			all_can_reimport=false;
-
+			all_can_reimport = false;
 		}
 
 		filenames.push_back(path);
-		if (EditorFileSystem::get_singleton()->get_file_type(path)!="PackedScene")
-			all_scenes=false;
+		if (EditorFileSystem::get_singleton()->get_file_type(path) != "PackedScene")
+			all_scenes = false;
 	}
 
-
-	if (filenames.size()==0)
+	if (filenames.size() == 0)
 		return;
 
 	file_options->clear();
-	file_options->set_size(Size2(1,1));
+	file_options->set_size(Size2(1, 1));
 
-	file_options->add_item(TTR("Open"),FILE_OPEN);
+	file_options->add_item(TTR("Open"), FILE_OPEN);
 	if (all_scenes) {
-		file_options->add_item(TTR("Instance"),FILE_INSTANCE);
+		file_options->add_item(TTR("Instance"), FILE_INSTANCE);
 	}
 
 	file_options->add_separator();
 
-	if (filenames.size()==1) {
-		file_options->add_item(TTR("Edit Dependencies.."),FILE_DEPENDENCIES);
-		file_options->add_item(TTR("View Owners.."),FILE_OWNERS);
+	if (filenames.size() == 1) {
+		file_options->add_item(TTR("Edit Dependencies.."), FILE_DEPENDENCIES);
+		file_options->add_item(TTR("View Owners.."), FILE_OWNERS);
 		file_options->add_separator();
 	}
 
-	if (filenames.size()==1) {
+	if (filenames.size() == 1) {
 		file_options->add_item(TTR("Copy Path"), FILE_COPY_PATH);
-		file_options->add_item(TTR("Rename or Move.."),FILE_MOVE);
+		file_options->add_item(TTR("Rename or Move.."), FILE_MOVE);
 	} else {
-		file_options->add_item(TTR("Move To.."),FILE_MOVE);
+		file_options->add_item(TTR("Move To.."), FILE_MOVE);
 	}
 
-
-	file_options->add_item(TTR("Delete"),FILE_REMOVE);
+	file_options->add_item(TTR("Delete"), FILE_REMOVE);
 
 	//file_options->add_item(TTR("Info"),FILE_INFO);
 
 	file_options->add_separator();
-	file_options->add_item(TTR("Show In File Manager"),FILE_SHOW_IN_EXPLORER);
+	file_options->add_item(TTR("Show In File Manager"), FILE_SHOW_IN_EXPLORER);
 
-	if (all_can_reimport && types.size()==1) { //all can reimport and are of the same type
+	if (all_can_reimport && types.size() == 1) { //all can reimport and are of the same type
 
-/*
+		/*
 		bool valid=true;
 		Ref<EditorImportPlugin> rimp = EditorImportExport::get_singleton()->get_import_plugin_by_name(types.front()->get());
 		if (rimp.is_valid()) {
@@ -1605,24 +1527,21 @@ void FileSystemDock::_files_list_rmb_select(int p_item,const Vector2& p_pos) {
 
 	file_options->set_pos(files->get_global_pos() + p_pos);
 	file_options->popup();
-
 }
 
-void FileSystemDock::select_file(const String& p_file) {
+void FileSystemDock::select_file(const String &p_file) {
 
 	_go_to_dir(p_file.get_base_dir());
-	for(int i=0;i<files->get_item_count();i++) {
-		if (files->get_item_metadata(i)==p_file) {
+	for (int i = 0; i < files->get_item_count(); i++) {
+		if (files->get_item_metadata(i) == p_file) {
 			files->select(i);
 			files->ensure_current_is_visible();
 			break;
 		}
 	}
-
 }
 
-void FileSystemDock::_file_multi_selected(int p_index,bool p_selected) {
-
+void FileSystemDock::_file_multi_selected(int p_index, bool p_selected) {
 
 	_file_selected();
 }
@@ -1633,27 +1552,27 @@ void FileSystemDock::_file_selected() {
 	Vector<String> imports;
 	String import_type;
 
-	for(int i=0;i<files->get_item_count();i++) {
+	for (int i = 0; i < files->get_item_count(); i++) {
 		if (!files->is_selected(i))
 			continue;
 
 		String p = files->get_item_metadata(i);
-		if (!FileAccess::exists(p+".import")) {
+		if (!FileAccess::exists(p + ".import")) {
 			imports.clear();
 			break;
 		}
 		Ref<ConfigFile> cf;
 		cf.instance();
-		Error err = cf->load(p+".import");
-		if (err!=OK) {
+		Error err = cf->load(p + ".import");
+		if (err != OK) {
 			imports.clear();
 			break;
 		}
 
-		String type = cf->get_value("remap","type");
-		if (import_type=="") {
-			import_type=type;
-		} else if (import_type!=type) {
+		String type = cf->get_value("remap", "type");
+		if (import_type == "") {
+			import_type = type;
+		} else if (import_type != type) {
 			//all should be the same type
 			imports.clear();
 			break;
@@ -1661,27 +1580,25 @@ void FileSystemDock::_file_selected() {
 		imports.push_back(p);
 	}
 
-
-	if (imports.size()==0) {
+	if (imports.size() == 0) {
 		EditorNode::get_singleton()->get_import_dock()->clear();
-	} else if (imports.size()==1) {
+	} else if (imports.size() == 1) {
 		EditorNode::get_singleton()->get_import_dock()->set_edit_path(imports[0]);
 	} else {
 		EditorNode::get_singleton()->get_import_dock()->set_edit_multiple_paths(imports);
 	}
 }
 
-
 void FileSystemDock::_bind_methods() {
 
-	ClassDB::bind_method(D_METHOD("_update_tree"),&FileSystemDock::_update_tree);
-	ClassDB::bind_method(D_METHOD("_rescan"),&FileSystemDock::_rescan);
-	ClassDB::bind_method(D_METHOD("_favorites_pressed"),&FileSystemDock::_favorites_pressed);
+	ClassDB::bind_method(D_METHOD("_update_tree"), &FileSystemDock::_update_tree);
+	ClassDB::bind_method(D_METHOD("_rescan"), &FileSystemDock::_rescan);
+	ClassDB::bind_method(D_METHOD("_favorites_pressed"), &FileSystemDock::_favorites_pressed);
 	//ClassDB::bind_method(D_METHOD("_instance_pressed"),&ScenesDock::_instance_pressed);
-	ClassDB::bind_method(D_METHOD("_open_pressed"),&FileSystemDock::_open_pressed);
-	ClassDB::bind_method(D_METHOD("_dir_rmb_pressed"),&FileSystemDock::_dir_rmb_pressed);
+	ClassDB::bind_method(D_METHOD("_open_pressed"), &FileSystemDock::_open_pressed);
+	ClassDB::bind_method(D_METHOD("_dir_rmb_pressed"), &FileSystemDock::_dir_rmb_pressed);
 
-	ClassDB::bind_method(D_METHOD("_thumbnail_done"),&FileSystemDock::_thumbnail_done);
+	ClassDB::bind_method(D_METHOD("_thumbnail_done"), &FileSystemDock::_thumbnail_done);
 	ClassDB::bind_method(D_METHOD("_select_file"), &FileSystemDock::_select_file);
 	ClassDB::bind_method(D_METHOD("_go_to_tree"), &FileSystemDock::_go_to_tree);
 	ClassDB::bind_method(D_METHOD("_go_to_dir"), &FileSystemDock::_go_to_dir);
@@ -1700,46 +1617,42 @@ void FileSystemDock::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_drag_data_fw"), &FileSystemDock::get_drag_data_fw);
 	ClassDB::bind_method(D_METHOD("can_drop_data_fw"), &FileSystemDock::can_drop_data_fw);
 	ClassDB::bind_method(D_METHOD("drop_data_fw"), &FileSystemDock::drop_data_fw);
-	ClassDB::bind_method(D_METHOD("_files_list_rmb_select"),&FileSystemDock::_files_list_rmb_select);
-
-	ClassDB::bind_method(D_METHOD("_preview_invalidated"),&FileSystemDock::_preview_invalidated);
-	ClassDB::bind_method(D_METHOD("_file_selected"),&FileSystemDock::_file_selected);
-	ClassDB::bind_method(D_METHOD("_file_multi_selected"),&FileSystemDock::_file_multi_selected);
+	ClassDB::bind_method(D_METHOD("_files_list_rmb_select"), &FileSystemDock::_files_list_rmb_select);
 
+	ClassDB::bind_method(D_METHOD("_preview_invalidated"), &FileSystemDock::_preview_invalidated);
+	ClassDB::bind_method(D_METHOD("_file_selected"), &FileSystemDock::_file_selected);
+	ClassDB::bind_method(D_METHOD("_file_multi_selected"), &FileSystemDock::_file_multi_selected);
 
 	ADD_SIGNAL(MethodInfo("instance", PropertyInfo(Variant::POOL_STRING_ARRAY, "files")));
 	ADD_SIGNAL(MethodInfo("open"));
-
 }
 
 FileSystemDock::FileSystemDock(EditorNode *p_editor) {
 
-	editor=p_editor;
-
+	editor = p_editor;
 
-	HBoxContainer *toolbar_hbc = memnew( HBoxContainer );
+	HBoxContainer *toolbar_hbc = memnew(HBoxContainer);
 	add_child(toolbar_hbc);
 
-	button_hist_prev = memnew( ToolButton );
+	button_hist_prev = memnew(ToolButton);
 	toolbar_hbc->add_child(button_hist_prev);
 	button_hist_prev->set_disabled(true);
 	button_hist_prev->set_tooltip(TTR("Previous Directory"));
 
-	button_hist_next = memnew( ToolButton );
+	button_hist_next = memnew(ToolButton);
 	toolbar_hbc->add_child(button_hist_next);
 	button_hist_next->set_disabled(true);
 	button_hist_prev->set_focus_mode(FOCUS_NONE);
 	button_hist_next->set_focus_mode(FOCUS_NONE);
 	button_hist_next->set_tooltip(TTR("Next Directory"));
 
-	current_path=memnew( LineEdit );
+	current_path = memnew(LineEdit);
 	current_path->set_h_size_flags(SIZE_EXPAND_FILL);
 	toolbar_hbc->add_child(current_path);
 
-
-	button_reload = memnew( Button );
+	button_reload = memnew(Button);
 	button_reload->set_flat(true);
-	button_reload->connect("pressed",this,"_rescan");
+	button_reload->connect("pressed", this, "_rescan");
 	toolbar_hbc->add_child(button_reload);
 	button_reload->set_focus_mode(FOCUS_NONE);
 	button_reload->set_tooltip(TTR("Re-Scan Filesystem"));
@@ -1747,11 +1660,10 @@ FileSystemDock::FileSystemDock(EditorNode *p_editor) {
 
 	//toolbar_hbc->add_spacer();
 
-
-	button_favorite = memnew( Button );
+	button_favorite = memnew(Button);
 	button_favorite->set_flat(true);
 	button_favorite->set_toggle_mode(true);
-	button_favorite->connect("pressed",this,"_favorites_pressed");
+	button_favorite->connect("pressed", this, "_favorites_pressed");
 	toolbar_hbc->add_child(button_favorite);
 	button_favorite->set_tooltip(TTR("Toggle folder status as Favorite"));
 
@@ -1759,9 +1671,7 @@ FileSystemDock::FileSystemDock(EditorNode *p_editor) {
 
 	//Control *spacer = memnew( Control);
 
-
-
-/*
+	/*
 	button_open = memnew( Button );
 	button_open->set_flat(true);
 	button_open->connect("pressed",this,"_open_pressed");
@@ -1780,112 +1690,106 @@ FileSystemDock::FileSystemDock(EditorNode *p_editor) {
 	button_instance->set_tooltip(TTR("Instance the selected scene(s) as child of the selected node."));
 
 */
-	file_options = memnew( PopupMenu );
+	file_options = memnew(PopupMenu);
 	add_child(file_options);
 
-	folder_options = memnew ( PopupMenu );
+	folder_options = memnew(PopupMenu);
 	add_child(folder_options);
 
-	split_box = memnew( VSplitContainer );
+	split_box = memnew(VSplitContainer);
 	add_child(split_box);
 	split_box->set_v_size_flags(SIZE_EXPAND_FILL);
 
-	tree = memnew( Tree );
+	tree = memnew(Tree);
 
 	tree->set_hide_root(true);
 	split_box->add_child(tree);
 	tree->set_drag_forwarding(this);
 	tree->set_allow_rmb_select(true);
 
-
 	//tree->set_v_size_flags(SIZE_EXPAND_FILL);
-	tree->connect("item_edited",this,"_favorite_toggled");
-	tree->connect("item_activated",this,"_open_pressed");
-	tree->connect("cell_selected",this,"_dir_selected");
-	tree->connect("item_rmb_selected",this,"_dir_rmb_pressed");
+	tree->connect("item_edited", this, "_favorite_toggled");
+	tree->connect("item_activated", this, "_open_pressed");
+	tree->connect("cell_selected", this, "_dir_selected");
+	tree->connect("item_rmb_selected", this, "_dir_rmb_pressed");
 
-	files = memnew( ItemList );
+	files = memnew(ItemList);
 	files->set_v_size_flags(SIZE_EXPAND_FILL);
 	files->set_select_mode(ItemList::SELECT_MULTI);
 	files->set_drag_forwarding(this);
-	files->connect("item_rmb_selected",this,"_files_list_rmb_select");
-	files->connect("item_selected",this,"_file_selected");
-	files->connect("multi_selected",this,"_file_multi_selected");
+	files->connect("item_rmb_selected", this, "_files_list_rmb_select");
+	files->connect("item_selected", this, "_file_selected");
+	files->connect("multi_selected", this, "_file_multi_selected");
 	files->set_allow_rmb_select(true);
 
-	file_list_vb = memnew( VBoxContainer );
+	file_list_vb = memnew(VBoxContainer);
 	split_box->add_child(file_list_vb);
 	file_list_vb->set_v_size_flags(SIZE_EXPAND_FILL);
 
-	path_hb = memnew( HBoxContainer );
+	path_hb = memnew(HBoxContainer);
 	file_list_vb->add_child(path_hb);
 
-	button_back  = memnew( ToolButton );
+	button_back = memnew(ToolButton);
 	path_hb->add_child(button_back);
 	button_back->hide();
 
-	search_box = memnew( LineEdit );
+	search_box = memnew(LineEdit);
 	search_box->set_h_size_flags(SIZE_EXPAND_FILL);
 	path_hb->add_child(search_box);
-	search_box->connect("text_changed",this,"_search_changed");
+	search_box->connect("text_changed", this, "_search_changed");
 
-	search_icon = memnew( TextureRect );
+	search_icon = memnew(TextureRect);
 	search_icon->set_stretch_mode(TextureRect::STRETCH_KEEP_CENTERED);
 	path_hb->add_child(search_icon);
 
-	button_display_mode = memnew( ToolButton );
+	button_display_mode = memnew(ToolButton);
 	path_hb->add_child(button_display_mode);
 	button_display_mode->set_toggle_mode(true);
 
 	file_list_vb->add_child(files);
 
-
-	scanning_vb = memnew( VBoxContainer );
-	Label *slabel = memnew( Label );
+	scanning_vb = memnew(VBoxContainer);
+	Label *slabel = memnew(Label);
 	slabel->set_text("Scanning Files,\nPlease Wait..");
 	slabel->set_align(Label::ALIGN_CENTER);
 	scanning_vb->add_child(slabel);
-	scanning_progress = memnew( ProgressBar );
+	scanning_progress = memnew(ProgressBar);
 	scanning_vb->add_child(scanning_progress);
 	add_child(scanning_vb);
 	scanning_vb->hide();
 
-
-
-	deps_editor = memnew( DependencyEditor );
+	deps_editor = memnew(DependencyEditor);
 	add_child(deps_editor);
 
-	owners_editor = memnew( DependencyEditorOwners);
+	owners_editor = memnew(DependencyEditorOwners);
 	add_child(owners_editor);
 
-	remove_dialog = memnew( DependencyRemoveDialog);
+	remove_dialog = memnew(DependencyRemoveDialog);
 	add_child(remove_dialog);
 
-	move_dialog = memnew( EditorDirDialog );
+	move_dialog = memnew(EditorDirDialog);
 	add_child(move_dialog);
-	move_dialog->connect("dir_selected",this,"_move_operation");
+	move_dialog->connect("dir_selected", this, "_move_operation");
 	move_dialog->get_ok()->set_text(TTR("Move"));
 
-	rename_dialog = memnew( EditorFileDialog );
+	rename_dialog = memnew(EditorFileDialog);
 	rename_dialog->set_mode(EditorFileDialog::MODE_SAVE_FILE);
-	rename_dialog->connect("file_selected",this,"_rename_operation");
+	rename_dialog->connect("file_selected", this, "_rename_operation");
 	add_child(rename_dialog);
 
-	updating_tree=false;
-	initialized=false;
+	updating_tree = false;
+	initialized = false;
 
 	history.push_back("res://");
-	history_pos=0;
+	history_pos = 0;
 
-	split_mode=false;
+	split_mode = false;
 	display_mode = DISPLAY_THUMBNAILS;
 
-	path="res://";
-
+	path = "res://";
 
-	add_constant_override("separation",3);
+	add_constant_override("separation", 3);
 }
 
 FileSystemDock::~FileSystemDock() {
-
 }