asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ability to add Resource from FileSystem Dock

Browse source
This commit is contained in:
steincodes 2018-07-22 21:23:40 +05:30
parent 89e1b302b5
commit a1dee44e21
2 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
editor/filesystem_dock.cpp
View file

@ -1319,6 +1319,9 @@ void FileSystemDock::_file_option(int p_option) {
String fpath = files->get_item_metadata(idx); String fpath = files->get_item_metadata(idx);
OS::get_singleton()->set_clipboard(fpath); OS::get_singleton()->set_clipboard(fpath);
} break; } break;
case FILE_NEW_RESOURCE: {
new_resource_dialog->popup_create(true);
} break;
} }
} }
@ -1393,6 +1396,21 @@ void FileSystemDock::_folder_option(int p_option) {
} }
} }
void FileSystemDock::_resource_created() const {
Object *c = new_resource_dialog->instance_selected();
ERR_FAIL_COND(!c);
Resource *r = Object::cast_to<Resource>(c);
ERR_FAIL_COND(!r);
REF res(r);
editor->push_item(c);
RES current_res = RES(r);
editor->save_resource_as(current_res);
}
void FileSystemDock::_go_to_file_list() { void FileSystemDock::_go_to_file_list() {
if (low_height_mode) { if (low_height_mode) {
@ -1738,6 +1756,7 @@ void FileSystemDock::_files_list_rmb_select(int p_item, const Vector2 &p_pos) {
file_options->add_item(TTR("New Folder..."), FILE_NEW_FOLDER); file_options->add_item(TTR("New Folder..."), FILE_NEW_FOLDER);
file_options->add_item(TTR("New Script..."), FILE_NEW_SCRIPT); file_options->add_item(TTR("New Script..."), FILE_NEW_SCRIPT);
file_options->add_item(TTR("New Resource..."), FILE_NEW_RESOURCE);
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);
file_options->set_position(files->get_global_position() + p_pos); file_options->set_position(files->get_global_position() + p_pos);
@ -1750,6 +1769,7 @@ void FileSystemDock::_rmb_pressed(const Vector2 &p_pos) {
file_options->add_item(TTR("New Folder..."), FILE_NEW_FOLDER); file_options->add_item(TTR("New Folder..."), FILE_NEW_FOLDER);
file_options->add_item(TTR("New Script..."), FILE_NEW_SCRIPT); file_options->add_item(TTR("New Script..."), FILE_NEW_SCRIPT);
file_options->add_item(TTR("New Resource..."), FILE_NEW_RESOURCE);
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);
file_options->set_position(files->get_global_position() + p_pos); file_options->set_position(files->get_global_position() + p_pos);
file_options->popup(); file_options->popup();
@ -1862,6 +1882,7 @@ void FileSystemDock::_bind_methods() {
ClassDB::bind_method(D_METHOD("_file_option"), &FileSystemDock::_file_option); ClassDB::bind_method(D_METHOD("_file_option"), &FileSystemDock::_file_option);
ClassDB::bind_method(D_METHOD("_folder_option"), &FileSystemDock::_folder_option); ClassDB::bind_method(D_METHOD("_folder_option"), &FileSystemDock::_folder_option);
ClassDB::bind_method(D_METHOD("_make_dir_confirm"), &FileSystemDock::_make_dir_confirm); ClassDB::bind_method(D_METHOD("_make_dir_confirm"), &FileSystemDock::_make_dir_confirm);
ClassDB::bind_method(D_METHOD("_resource_created"), &FileSystemDock::_resource_created);
ClassDB::bind_method(D_METHOD("_move_operation_confirm", "to_path", "overwrite"), &FileSystemDock::_move_operation_confirm, DEFVAL(false)); ClassDB::bind_method(D_METHOD("_move_operation_confirm", "to_path", "overwrite"), &FileSystemDock::_move_operation_confirm, DEFVAL(false));
ClassDB::bind_method(D_METHOD("_move_with_overwrite"), &FileSystemDock::_move_with_overwrite); ClassDB::bind_method(D_METHOD("_move_with_overwrite"), &FileSystemDock::_move_with_overwrite);
ClassDB::bind_method(D_METHOD("_rename_operation_confirm"), &FileSystemDock::_rename_operation_confirm); ClassDB::bind_method(D_METHOD("_rename_operation_confirm"), &FileSystemDock::_rename_operation_confirm);
@ -2087,6 +2108,11 @@ FileSystemDock::FileSystemDock(EditorNode *p_editor) {
make_script_dialog_text->set_title(TTR("Create Script")); make_script_dialog_text->set_title(TTR("Create Script"));
add_child(make_script_dialog_text); add_child(make_script_dialog_text);
new_resource_dialog = memnew(CreateDialog);
add_child(new_resource_dialog);
new_resource_dialog->set_base_type("Resource");
new_resource_dialog->connect("create", this, "_resource_created");
updating_tree = false; updating_tree = false;
initialized = false; initialized = false;
import_dock_needs_update = false; import_dock_needs_update = false;

7
editor/filesystem_dock.h
View file

@ -47,6 +47,8 @@
#include "os/dir_access.h" #include "os/dir_access.h"
#include "os/thread.h" #include "os/thread.h"
#include "create_dialog.h"
#include "dependency_editor.h" #include "dependency_editor.h"
#include "editor_dir_dialog.h" #include "editor_dir_dialog.h"
#include "editor_file_system.h" #include "editor_file_system.h"
@ -78,7 +80,8 @@ private:
FILE_NEW_FOLDER, FILE_NEW_FOLDER,
FILE_NEW_SCRIPT, FILE_NEW_SCRIPT,
FILE_SHOW_IN_EXPLORER, FILE_SHOW_IN_EXPLORER,
FILE_COPY_PATH FILE_COPY_PATH,
FILE_NEW_RESOURCE
}; };
enum FolderMenu { enum FolderMenu {
@ -131,6 +134,7 @@ private:
LineEdit *make_dir_dialog_text; LineEdit *make_dir_dialog_text;
ConfirmationDialog *overwrite_dialog; ConfirmationDialog *overwrite_dialog;
ScriptCreateDialog *make_script_dialog_text; ScriptCreateDialog *make_script_dialog_text;
CreateDialog *new_resource_dialog;
class FileOrFolder { class FileOrFolder {
public: public:
@ -191,6 +195,7 @@ private:
void _update_favorite_dirs_list_after_move(const Map<String, String> &p_renames) const; void _update_favorite_dirs_list_after_move(const Map<String, String> &p_renames) const;
void _update_project_settings_after_move(const Map<String, String> &p_renames) const; void _update_project_settings_after_move(const Map<String, String> &p_renames) const;
void _resource_created() const;
void _make_dir_confirm(); void _make_dir_confirm();
void _rename_operation_confirm(); void _rename_operation_confirm();
void _duplicate_operation_confirm(); void _duplicate_operation_confirm();