Re-add create/load script button and context menu

- create from f51b202566e9b2a9deb3eb4836f6e00fb30e8500
- load from 41329f9750379b3c2e506d1e9ed7f6195c812920

editor/property_editor.cpp

@@ -194,6 +194,12 @@ void CustomPropertyEditor::_menu_option(int p_which) {
 						}
 					}
 				} break;
+				case OBJ_MENU_NEW_SCRIPT: {
+
+					if (owner->cast_to<Node>())
+						EditorNode::get_singleton()->get_scene_tree_dock()->open_script_dialog(owner->cast_to<Node>());
+
+				} break;
 				default: {
 
 					ERR_FAIL_COND(inheritors_array.empty());
@@ -212,6 +218,7 @@ void CustomPropertyEditor::_menu_option(int p_which) {
 			}
 
 		} break;
+
 		default: {}
 	}
 }
@@ -647,7 +654,10 @@ bool CustomPropertyEditor::edit(Object *p_owner, const String &p_name, Variant::
 			menu->clear();
 			menu->set_size(Size2(1, 1));
 
-			if (hint_text != "") {
+			if (p_name=="script/script" && hint_text=="Script" && owner->cast_to<Node>()) {
+				menu->add_icon_item(get_icon("Script","EditorIcons"),TTR("New Script"),OBJ_MENU_NEW_SCRIPT);
+				menu->add_separator();
+			} else if (hint_text!="") {
 				int idx = 0;
 
 				for (int i = 0; i < hint_text.get_slice_count(","); i++) {

editor/property_editor.h

@@ -63,6 +63,7 @@ class CustomPropertyEditor : public Popup {
 		OBJ_MENU_COPY = 4,
 		OBJ_MENU_PASTE = 5,
 		OBJ_MENU_REIMPORT = 6,
+		OBJ_MENU_NEW_SCRIPT=7,
 		TYPE_BASE_ID = 100
 
 	};

editor/scene_tree_dock.cpp

@@ -58,7 +58,9 @@ void SceneTreeDock::_unhandled_key_input(InputEvent p_event) {
 	} else if (ED_IS_SHORTCUT("scene_tree/duplicate", p_event)) {
 		_tool_selected(TOOL_DUPLICATE);
 	} else if (ED_IS_SHORTCUT("scene_tree/add_script", p_event)) {
-		_tool_selected(TOOL_SCRIPT);
+		_tool_selected(TOOL_CREATE_SCRIPT);
+	} else if (ED_IS_SHORTCUT("scene_tree/load_script", p_event)) {
+ 		_tool_selected(TOOL_LOAD_SCRIPT);
 	} else if (ED_IS_SHORTCUT("scene_tree/move_up", p_event)) {
 		_tool_selected(TOOL_MOVE_UP);
 	} else if (ED_IS_SHORTCUT("scene_tree/move_down", p_event)) {
@@ -228,6 +230,23 @@ void SceneTreeDock::_replace_with_branch_scene(const String &p_file, Node *base)
 	scene_tree->set_selected(instanced_scene);
 }
 
+void SceneTreeDock::_file_selected(String p_file) {
+	RES p_script = ResourceLoader::load(p_file, "Script");
+	if (p_script.is_null()) {
+		accept->get_ok()->set_text(TTR("Ugh"));
+			accept->set_text(vformat(TTR("Error loading script from %s"), p_file));
+		accept->popup_centered_minsize();
+		return;
+	}
+
+	Node *selected = scene_tree->get_selected();
+	if (!selected)
+		return;
+	selected->set_script(p_script.get_ref_ptr());
+	editor->push_item(p_script.operator->());
+	file_dialog->hide();
+}
+
 bool SceneTreeDock::_cyclical_dependency_exists(const String &p_target_scene_path, Node *p_desired_node) {
 	int childCount = p_desired_node->get_child_count();
 
@@ -328,7 +347,22 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 			//groups_editor->set_current(current);
 			//groups_editor->popup_centered_ratio();
 		} break;
-		case TOOL_SCRIPT: {
+		case TOOL_LOAD_SCRIPT: {
+			Node *selected = scene_tree->get_selected();
+			if (!selected)
+				break;
+
+			file_dialog->set_mode(EditorFileDialog::MODE_OPEN_FILE);
+
+			List<String> extensions;
+			ResourceLoader::get_recognized_extensions_for_type("Script", &extensions);
+			file_dialog->clear_filters();
+			for (List<String>::Element *E = extensions.front(); E; E = E->next())
+				file_dialog->add_filter("*." + E->get() + " ; " + E->get().to_upper());
+
+			file_dialog->popup_centered_ratio();
+		} break;
+		case TOOL_CREATE_SCRIPT: {
 
 			Node *selected = scene_tree->get_selected();
 			if (!selected)
@@ -676,6 +710,7 @@ void SceneTreeDock::_notification(int p_what) {
 			button_add->set_icon(get_icon("Add", "EditorIcons"));
 			button_instance->set_icon(get_icon("Instance", "EditorIcons"));
 			button_create_script->set_icon(get_icon("Script", "EditorIcons"));
+			button_load_script->set_icon(get_icon("Script", "EditorIcons"));
 
 			filter_icon->set_texture(get_icon("Zoom", "EditorIcons"));
 
@@ -1248,8 +1283,10 @@ void SceneTreeDock::_selection_changed() {
 
 	if (selection_size==1 && EditorNode::get_singleton()->get_editor_selection()->get_selection().front()->key()->get_script().is_null()) {
 		button_create_script->show();
+		button_load_script->show();
 	} else {
 		button_create_script->hide();
+		button_load_script->hide();
 	}
 
 	//tool_buttons[TOOL_MULTI_EDIT]->set_disabled(EditorNode::get_singleton()->get_editor_selection()->get_selection().size()<2);
@@ -1671,7 +1708,8 @@ void SceneTreeDock::_tree_rmb(const Vector2 &p_menu_pos) {
 		//menu->add_icon_item(get_icon("Groups","EditorIcons"),TTR("Edit Groups"),TOOL_GROUP);
 		//menu->add_icon_item(get_icon("Connect","EditorIcons"),TTR("Edit Connections"),TOOL_CONNECT);
 		menu->add_separator();
-		menu->add_icon_shortcut(get_icon("Script", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/add_script"), TOOL_SCRIPT);
+		menu->add_icon_shortcut(get_icon("Script", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/add_script"), TOOL_CREATE_SCRIPT);
+		menu->add_icon_shortcut(get_icon("Script", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/load_script"), TOOL_LOAD_SCRIPT);
 		menu->add_separator();
 	}
 
@@ -1710,6 +1748,12 @@ void SceneTreeDock::set_filter(const String &p_filter) {
 	scene_tree->set_filter(p_filter);
 }
 
+void SceneTreeDock::open_script_dialog(Node* p_for_node) {
+
+	scene_tree->set_selected(p_for_node,false);
+	_tool_selected(TOOL_CREATE_SCRIPT);
+}
+
 void SceneTreeDock::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("_tool_selected"), &SceneTreeDock::_tool_selected, DEFVAL(false));
@@ -1733,6 +1777,7 @@ void SceneTreeDock::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("_script_dropped"), &SceneTreeDock::_script_dropped);
 	ObjectTypeDB::bind_method(_MD("_tree_rmb"), &SceneTreeDock::_tree_rmb);
 	ObjectTypeDB::bind_method(_MD("_filter_changed"), &SceneTreeDock::_filter_changed);
+	ObjectTypeDB::bind_method(_MD("_file_selected"), &SceneTreeDock::_file_selected);
 
 	ObjectTypeDB::bind_method(_MD("instance"), &SceneTreeDock::instance);
 }
@@ -1754,6 +1799,7 @@ SceneTreeDock::SceneTreeDock(EditorNode *p_editor, Node *p_scene_root, EditorSel
 	ED_SHORTCUT("scene_tree/instance_scene", TTR("Instance Child Scene"));
 	ED_SHORTCUT("scene_tree/change_node_type", TTR("Change Type"));
 	ED_SHORTCUT("scene_tree/add_script", TTR("Add Script"));
+	ED_SHORTCUT("scene_tree/load_script", TTR("Load Script"));
 	ED_SHORTCUT("scene_tree/move_up", TTR("Move Up"), KEY_MASK_CMD | KEY_UP);
 	ED_SHORTCUT("scene_tree/move_down", TTR("Move Down"), KEY_MASK_CMD | KEY_DOWN);
 	ED_SHORTCUT("scene_tree/duplicate", TTR("Duplicate"), KEY_MASK_CMD | KEY_D);
@@ -1788,12 +1834,19 @@ SceneTreeDock::SceneTreeDock(EditorNode *p_editor, Node *p_scene_root, EditorSel
 	filter->connect("text_changed", this, "_filter_changed");
 
 	tb = memnew(ToolButton);
-	tb->connect("pressed", this, "_tool_selected", make_binds(TOOL_SCRIPT, false));
+	tb->connect("pressed", this, "_tool_selected", make_binds(TOOL_CREATE_SCRIPT, false));
 	tb->set_tooltip(TTR("Create a new script for the selected node."));
 	tb->set_shortcut(ED_GET_SHORTCUT("scene_tree/add_script"));
 	filter_hbc->add_child(tb);
 	button_create_script=tb;
 
+	tb = memnew(ToolButton);
+	tb->connect("pressed", this, "_tool_selected", make_binds(TOOL_LOAD_SCRIPT, false));
+	tb->set_tooltip(TTR("Load a script for the selected node."));
+	tb->set_shortcut(ED_GET_SHORTCUT("scene_tree/load_script"));
+	filter_hbc->add_child(tb);
+	button_load_script = tb;
+
 	scene_tree = memnew(SceneTreeEditor(false, true, true));
 	vbc->add_child(scene_tree);
 	scene_tree->set_v_size_flags(SIZE_EXPAND | SIZE_FILL);
@@ -1816,6 +1869,11 @@ SceneTreeDock::SceneTreeDock(EditorNode *p_editor, Node *p_scene_root, EditorSel
 	add_child(create_dialog);
 	create_dialog->connect("create", this, "_create");
 
+	file_dialog = memnew(EditorFileDialog);
+	add_child(file_dialog);
+	file_dialog->hide();
+	file_dialog->connect("file_selected", this, "_file_selected");
+
 	//groups_editor = memnew( GroupsEditor );
 	//add_child(groups_editor);
 	//groups_editor->set_undo_redo(&editor_data->get_undo_redo());

editor/scene_tree_dock.h

@@ -58,7 +58,8 @@ class SceneTreeDock : public VBoxContainer {
 		TOOL_REPLACE,
 		TOOL_CONNECT,
 		TOOL_GROUP,
-		TOOL_SCRIPT,
+		TOOL_CREATE_SCRIPT,
+		TOOL_LOAD_SCRIPT,
 		TOOL_MOVE_UP,
 		TOOL_MOVE_DOWN,
 		TOOL_DUPLICATE,
@@ -73,10 +74,12 @@ class SceneTreeDock : public VBoxContainer {
 
 	int current_option;
 	CreateDialog *create_dialog;
+	EditorFileDialog *file_dialog;
 
 	ToolButton *button_add;
 	ToolButton *button_instance;
 	ToolButton *button_create_script;
+	ToolButton *button_load_script;
 
 	SceneTreeEditor *scene_tree;
 
@@ -151,6 +154,8 @@ class SceneTreeDock : public VBoxContainer {
 	void _perform_instance_scenes(const Vector<String> &p_files, Node *parent, int p_pos);
 	void _replace_with_branch_scene(const String &p_file, Node *base);
 
+	void _file_selected(String p_file);
+
 protected:
 	void _notification(int p_what);
 	static void _bind_methods();
@@ -169,6 +174,7 @@ public:
 	SceneTreeEditor *get_tree_editor() { return scene_tree; }
 	EditorData *get_editor_data() { return editor_data; }
 
+	void open_script_dialog(Node* p_for_node);
 	SceneTreeDock(EditorNode *p_editor, Node *p_scene_root, EditorSelection *p_editor_selection, EditorData &p_editor_data);
 };