Browse Source

Make small changes to the script dialog

Michael Alexsander Silva Dias 6 years ago
parent
commit
73d95f1006
1 changed files with 11 additions and 32 deletions
  1. 11 32
      editor/script_create_dialog.cpp

+ 11 - 32
editor/script_create_dialog.cpp

@@ -657,32 +657,17 @@ ScriptCreateDialog::ScriptCreateDialog() {
 	status_panel->add_style_override("panel", EditorNode::get_singleton()->get_gui_base()->get_stylebox("bg", "Tree"));
 	status_panel->add_style_override("panel", EditorNode::get_singleton()->get_gui_base()->get_stylebox("bg", "Tree"));
 	status_panel->add_child(vb);
 	status_panel->add_child(vb);
 
 
-	/* Margins */
-
-	Control *empty_h = memnew(Control);
-	empty_h->set_name("empty_h"); //duplicate() doesn't like nodes without a name
-	empty_h->set_h_size_flags(Control::SIZE_EXPAND_FILL);
-	empty_h->set_v_size_flags(Control::SIZE_EXPAND_FILL);
-	empty_h->set_custom_minimum_size(Size2(0, 10 * EDSCALE));
-	Control *empty_v = memnew(Control);
-	empty_v->set_name("empty_v");
-	empty_v->set_h_size_flags(Control::SIZE_EXPAND_FILL);
-	empty_v->set_v_size_flags(Control::SIZE_EXPAND_FILL);
-	empty_v->set_custom_minimum_size(Size2(10, 0 * EDSCALE));
+	/* Spacing */
+
+	Control *spacing = memnew(Control);
+	spacing->set_custom_minimum_size(Size2(0, 10 * EDSCALE));
 
 
 	vb = memnew(VBoxContainer);
 	vb = memnew(VBoxContainer);
-	vb->add_child(empty_h->duplicate());
 	vb->add_child(gc);
 	vb->add_child(gc);
-	vb->add_child(empty_h->duplicate());
+	vb->add_child(spacing);
 	vb->add_child(status_panel);
 	vb->add_child(status_panel);
-	vb->add_child(empty_h->duplicate());
 	hb = memnew(HBoxContainer);
 	hb = memnew(HBoxContainer);
-	hb->add_child(empty_v->duplicate());
 	hb->add_child(vb);
 	hb->add_child(vb);
-	hb->add_child(empty_v->duplicate());
-
-	memdelete(empty_h);
-	memdelete(empty_v);
 
 
 	add_child(hb);
 	add_child(hb);
 
 
@@ -691,8 +676,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);
-	l->set_text(TTR("Language"));
+	l = memnew(Label(TTR("Language")));
 	l->set_align(Label::ALIGN_RIGHT);
 	l->set_align(Label::ALIGN_RIGHT);
 	gc->add_child(l);
 	gc->add_child(l);
 	gc->add_child(language_menu);
 	gc->add_child(language_menu);
@@ -741,8 +725,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);
-	l->set_text(TTR("Inherits"));
+	l = memnew(Label(TTR("Inherits")));
 	l->set_align(Label::ALIGN_RIGHT);
 	l->set_align(Label::ALIGN_RIGHT);
 	gc->add_child(l);
 	gc->add_child(l);
 	gc->add_child(hb);
 	gc->add_child(hb);
@@ -753,8 +736,7 @@ 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);
-	l->set_text(TTR("Class Name"));
+	l = memnew(Label(TTR("Class Name")));
 	l->set_align(Label::ALIGN_RIGHT);
 	l->set_align(Label::ALIGN_RIGHT);
 	gc->add_child(l);
 	gc->add_child(l);
 	gc->add_child(class_name);
 	gc->add_child(class_name);
@@ -762,8 +744,7 @@ ScriptCreateDialog::ScriptCreateDialog() {
 	/* Templates */
 	/* Templates */
 
 
 	template_menu = memnew(OptionButton);
 	template_menu = memnew(OptionButton);
-	l = memnew(Label);
-	l->set_text(TTR("Template"));
+	l = memnew(Label(TTR("Template")));
 	l->set_align(Label::ALIGN_RIGHT);
 	l->set_align(Label::ALIGN_RIGHT);
 	gc->add_child(l);
 	gc->add_child(l);
 	gc->add_child(template_menu);
 	gc->add_child(template_menu);
@@ -775,8 +756,7 @@ ScriptCreateDialog::ScriptCreateDialog() {
 	internal->connect("pressed", this, "_built_in_pressed");
 	internal->connect("pressed", this, "_built_in_pressed");
 	hb = memnew(HBoxContainer);
 	hb = memnew(HBoxContainer);
 	hb->add_child(internal);
 	hb->add_child(internal);
-	l = memnew(Label);
-	l->set_text(TTR("Built-in Script"));
+	l = memnew(Label(TTR("Built-in Script")));
 	l->set_align(Label::ALIGN_RIGHT);
 	l->set_align(Label::ALIGN_RIGHT);
 	gc->add_child(l);
 	gc->add_child(l);
 	gc->add_child(hb);
 	gc->add_child(hb);
@@ -794,8 +774,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);
-	l->set_text(TTR("Path"));
+	l = memnew(Label(TTR("Path")));
 	l->set_align(Label::ALIGN_RIGHT);
 	l->set_align(Label::ALIGN_RIGHT);
 	gc->add_child(l);
 	gc->add_child(l);
 	gc->add_child(hb);
 	gc->add_child(hb);