godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32381 from YeldhamDev/script_dialog_cleanup 

Cleanup the "Attach Node Script" dialog
This commit is contained in:
Rémi Verschelde 2019-09-27 08:17:07 +02:00 committed by GitHub
parent fd0ad20122 3333d447c0
commit daf4a9f9be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
editor/script_create_dialog.cpp
View File

@ -602,7 +602,7 @@ void ScriptCreateDialog::_path_entered(const String &p_path) {
void ScriptCreateDialog::_msg_script_valid(bool valid, const String &p_msg) { void ScriptCreateDialog::_msg_script_valid(bool valid, const String &p_msg) {
error_label->set_text(TTR(p_msg)); error_label->set_text("- " + TTR(p_msg));
if (valid) { if (valid) {
error_label->add_color_override("font_color", get_color("success_color", "Editor")); error_label->add_color_override("font_color", get_color("success_color", "Editor"));
} else { } else {
@ -612,7 +612,7 @@ void ScriptCreateDialog::_msg_script_valid(bool valid, const String &p_msg) {
void ScriptCreateDialog::_msg_path_valid(bool valid, const String &p_msg) { void ScriptCreateDialog::_msg_path_valid(bool valid, const String &p_msg) {
path_error_label->set_text(TTR(p_msg)); path_error_label->set_text("- " + TTR(p_msg));
if (valid) { if (valid) {
path_error_label->add_color_override("font_color", get_color("success_color", "Editor")); path_error_label->add_color_override("font_color", get_color("success_color", "Editor"));
} else { } else {
@ -744,25 +744,11 @@ ScriptCreateDialog::ScriptCreateDialog() {
VBoxContainer *vb = memnew(VBoxContainer); VBoxContainer *vb = memnew(VBoxContainer);
HBoxContainer *hb = memnew(HBoxContainer);
Label *l = memnew(Label);
l->set_text(" - ");
hb->add_child(l);
error_label = memnew(Label); error_label = memnew(Label);
error_label->set_text(TTR("Error!")); vb->add_child(error_label);
error_label->set_align(Label::ALIGN_LEFT);
hb->add_child(error_label);
vb->add_child(hb);
hb = memnew(HBoxContainer);
l = memnew(Label);
l->set_text(" - ");
hb->add_child(l);
path_error_label = memnew(Label); path_error_label = memnew(Label);
path_error_label->set_text(TTR("Error!")); vb->add_child(path_error_label);
path_error_label->set_align(Label::ALIGN_LEFT);
hb->add_child(path_error_label);
vb->add_child(hb);
status_panel = memnew(PanelContainer); status_panel = memnew(PanelContainer);
status_panel->set_h_size_flags(Control::SIZE_FILL); status_panel->set_h_size_flags(Control::SIZE_FILL);
@ -777,7 +763,7 @@ ScriptCreateDialog::ScriptCreateDialog() {
vb->add_child(gc); vb->add_child(gc);
vb->add_child(spacing); vb->add_child(spacing);
vb->add_child(status_panel); vb->add_child(status_panel);
hb = memnew(HBoxContainer); HBoxContainer *hb = memnew(HBoxContainer);
hb->add_child(vb); hb->add_child(vb);
add_child(hb); add_child(hb);
@ -787,9 +773,7 @@ ScriptCreateDialog::ScriptCreateDialog() {
language_menu = memnew(OptionButton); language_menu = memnew(OptionButton);
language_menu->set_custom_minimum_size(Size2(250, 0) * EDSCALE); language_menu->set_custom_minimum_size(Size2(250, 0) * EDSCALE);
language_menu->set_h_size_flags(SIZE_EXPAND_FILL); language_menu->set_h_size_flags(SIZE_EXPAND_FILL);
l = memnew(Label(TTR("Language"))); gc->add_child(memnew(Label(TTR("Language:"))));
l->set_align(Label::ALIGN_RIGHT);
gc->add_child(l);
gc->add_child(language_menu); gc->add_child(language_menu);
default_language = 0; default_language = 0;
@ -825,9 +809,7 @@ ScriptCreateDialog::ScriptCreateDialog() {
parent_browse_button->set_flat(true); parent_browse_button->set_flat(true);
parent_browse_button->connect("pressed", this, "_browse_path", varray(true, false)); parent_browse_button->connect("pressed", this, "_browse_path", varray(true, false));
hb->add_child(parent_browse_button); hb->add_child(parent_browse_button);
l = memnew(Label(TTR("Inherits"))); gc->add_child(memnew(Label(TTR("Inherits:"))));
l->set_align(Label::ALIGN_RIGHT);
gc->add_child(l);
gc->add_child(hb); gc->add_child(hb);
is_browsing_parent = false; is_browsing_parent = false;
@ -836,17 +818,13 @@ ScriptCreateDialog::ScriptCreateDialog() {
class_name = memnew(LineEdit); class_name = memnew(LineEdit);
class_name->connect("text_changed", this, "_class_name_changed"); class_name->connect("text_changed", this, "_class_name_changed");
class_name->set_h_size_flags(SIZE_EXPAND_FILL); class_name->set_h_size_flags(SIZE_EXPAND_FILL);
l = memnew(Label(TTR("Class Name"))); gc->add_child(memnew(Label(TTR("Class Name:"))));
l->set_align(Label::ALIGN_RIGHT);
gc->add_child(l);
gc->add_child(class_name); gc->add_child(class_name);
/* Templates */ /* Templates */
template_menu = memnew(OptionButton); template_menu = memnew(OptionButton);
l = memnew(Label(TTR("Template"))); gc->add_child(memnew(Label(TTR("Template:"))));
l->set_align(Label::ALIGN_RIGHT);
gc->add_child(l);
gc->add_child(template_menu); gc->add_child(template_menu);
template_menu->connect("item_selected", this, "_template_changed"); template_menu->connect("item_selected", this, "_template_changed");
@ -855,8 +833,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"))); internal_label = memnew(Label(TTR("Built-in Script:")));
internal_label->set_align(Label::ALIGN_RIGHT);
gc->add_child(internal_label); gc->add_child(internal_label);
gc->add_child(internal); gc->add_child(internal);
@ -873,9 +850,7 @@ ScriptCreateDialog::ScriptCreateDialog() {
path_button->set_flat(true); path_button->set_flat(true);
path_button->connect("pressed", this, "_browse_path", varray(false, true)); path_button->connect("pressed", this, "_browse_path", varray(false, true));
hb->add_child(path_button); hb->add_child(path_button);
l = memnew(Label(TTR("Path"))); gc->add_child(memnew(Label(TTR("Path:"))));
l->set_align(Label::ALIGN_RIGHT);
gc->add_child(l);
gc->add_child(hb); gc->add_child(hb);
/* Dialog Setup */ /* Dialog Setup */