godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-16 14:00:40 +00:00
Code Releases Wiki Activity

Minor fixes for ScriptCreateDialog

Browse Source
This commit is contained in:
Michael Alexsander
2020-01-08 01:15:05 -03:00
parent 83fe471c3b
commit f9d11120f7
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editor/filesystem_dock.cpp
View File

@@ -1761,7 +1761,7 @@ void FileSystemDock::_file_option(int p_option, const Vector<String> &p_selected
fpath = fpath.get_base_dir(); fpath = fpath.get_base_dir();
} }
make_script_dialog->config("Node", fpath.plus_file("new_script.gd"), false); make_script_dialog->config("Node", fpath.plus_file("new_script.gd"), false);
make_script_dialog->popup_centered(Size2(300, 300) * EDSCALE); make_script_dialog->popup_centered();
} break; } break;
case FILE_COPY_PATH: { case FILE_COPY_PATH: {

4
editor/plugins/script_editor_plugin.cpp
View File

@@ -1004,8 +1004,8 @@ void ScriptEditor::_menu_option(int p_option) {
ScriptEditorBase *current = _get_current_editor(); ScriptEditorBase *current = _get_current_editor();
switch (p_option) { switch (p_option) {
case FILE_NEW: { case FILE_NEW: {
script_create_dialog->config("Node", "new_script"); script_create_dialog->config("Node", "new_script", false);
script_create_dialog->popup_centered(Size2(300, 300) * EDSCALE); script_create_dialog->popup_centered();
} break; } break;
case FILE_NEW_TEXTFILE: { case FILE_NEW_TEXTFILE: {
file_dialog->set_mode(EditorFileDialog::MODE_SAVE_FILE); file_dialog->set_mode(EditorFileDialog::MODE_SAVE_FILE);

13
editor/script_create_dialog.cpp
View File

@@ -678,6 +678,11 @@ void ScriptCreateDialog::_update_dialog() {
} }
} }
if (!_can_be_built_in()) {
internal->set_pressed(false);
}
internal->set_disabled(!_can_be_built_in());
/* Is Script created or loaded from existing file */ /* Is Script created or loaded from existing file */
if (is_built_in) { if (is_built_in) {
@@ -685,8 +690,6 @@ void ScriptCreateDialog::_update_dialog() {
parent_name->set_editable(true); parent_name->set_editable(true);
parent_search_button->set_disabled(false); parent_search_button->set_disabled(false);
parent_browse_button->set_disabled(!can_inherit_from_file); parent_browse_button->set_disabled(!can_inherit_from_file);
internal->set_visible(_can_be_built_in());
internal_label->set_visible(_can_be_built_in());
_msg_path_valid(true, TTR("Built-in script (into scene file).")); _msg_path_valid(true, TTR("Built-in script (into scene file)."));
} else if (is_new_script_created) { } else if (is_new_script_created) {
// New Script Created // New Script Created
@@ -694,8 +697,6 @@ void ScriptCreateDialog::_update_dialog() {
parent_name->set_editable(true); parent_name->set_editable(true);
parent_search_button->set_disabled(false); parent_search_button->set_disabled(false);
parent_browse_button->set_disabled(!can_inherit_from_file); parent_browse_button->set_disabled(!can_inherit_from_file);
internal->set_visible(_can_be_built_in());
internal_label->set_visible(_can_be_built_in());
if (is_path_valid) { if (is_path_valid) {
_msg_path_valid(true, TTR("Will create a new script file.")); _msg_path_valid(true, TTR("Will create a new script file."));
} }
@@ -705,7 +706,6 @@ void ScriptCreateDialog::_update_dialog() {
parent_name->set_editable(false); parent_name->set_editable(false);
parent_search_button->set_disabled(true); parent_search_button->set_disabled(true);
parent_browse_button->set_disabled(true); parent_browse_button->set_disabled(true);
internal->set_disabled(!_can_be_built_in());
if (is_path_valid) { if (is_path_valid) {
_msg_path_valid(true, TTR("Will load an existing script file.")); _msg_path_valid(true, TTR("Will load an existing script file."));
} }
@@ -834,8 +834,7 @@ ScriptCreateDialog::ScriptCreateDialog() {
internal = memnew(CheckBox); internal = memnew(CheckBox);
internal->set_text(TTR("On")); internal->set_text(TTR("On"));
internal->connect("pressed", this, "_built_in_pressed"); internal->connect("pressed", this, "_built_in_pressed");
internal_label = memnew(Label(TTR("Built-in Script:"))); gc->add_child(memnew(Label(TTR("Built-in Script:"))));
gc->add_child(internal_label);
gc->add_child(internal); gc->add_child(internal);
/* Path */ /* Path */

1
editor/script_create_dialog.h
View File

@@ -58,7 +58,6 @@ class ScriptCreateDialog : public ConfirmationDialog {
Button *path_button; Button *path_button;
EditorFileDialog *file_browse; EditorFileDialog *file_browse;
CheckBox *internal; CheckBox *internal;
Label *internal_label;
VBoxContainer *path_vb; VBoxContainer *path_vb;
AcceptDialog *alert; AcceptDialog *alert;
CreateDialog *select_class; CreateDialog *select_class;