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

Merge pull request #34578 from timothyqiu/var-rename

Browse source 
Fixes variable naming in FileSystemDock
This commit is contained in:
Rémi Verschelde 2019-12-30 17:11:42 +01:00 committed by GitHub
commit ea3262ee9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
editor/filesystem_dock.cpp
View file

@ -1750,8 +1750,8 @@ void FileSystemDock::_file_option(int p_option, const Vector<String> &p_selected
if (!fpath.ends_with("/")) { if (!fpath.ends_with("/")) {
fpath = fpath.get_base_dir(); fpath = fpath.get_base_dir();
} }
make_script_dialog_text->config("Node", fpath.plus_file("new_script.gd"), false); make_script_dialog->config("Node", fpath.plus_file("new_script.gd"), false);
make_script_dialog_text->popup_centered(Size2(300, 300) * EDSCALE); make_script_dialog->popup_centered(Size2(300, 300) * EDSCALE);
} break; } break;
case FILE_COPY_PATH: { case FILE_COPY_PATH: {
@ -2686,9 +2686,9 @@ FileSystemDock::FileSystemDock(EditorNode *p_editor) {
make_scene_dialog->register_text_enter(make_scene_dialog_text); make_scene_dialog->register_text_enter(make_scene_dialog_text);
make_scene_dialog->connect("confirmed", this, "_make_scene_confirm"); make_scene_dialog->connect("confirmed", this, "_make_scene_confirm");
make_script_dialog_text = memnew(ScriptCreateDialog); make_script_dialog = memnew(ScriptCreateDialog);
make_script_dialog_text->set_title(TTR("Create Script")); make_script_dialog->set_title(TTR("Create Script"));
add_child(make_script_dialog_text); add_child(make_script_dialog);
new_resource_dialog = memnew(CreateDialog); new_resource_dialog = memnew(CreateDialog);
add_child(new_resource_dialog); add_child(new_resource_dialog);

2
editor/filesystem_dock.h
View file

@ -140,7 +140,7 @@ private:
ConfirmationDialog *make_scene_dialog; ConfirmationDialog *make_scene_dialog;
LineEdit *make_scene_dialog_text; LineEdit *make_scene_dialog_text;
ConfirmationDialog *overwrite_dialog; ConfirmationDialog *overwrite_dialog;
ScriptCreateDialog *make_script_dialog_text; ScriptCreateDialog *make_script_dialog;
CreateDialog *new_resource_dialog; CreateDialog *new_resource_dialog;
bool always_show_folders; bool always_show_folders;