maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #12889 from sersoong/2.1-test

Browse source 
2.1-Add gdscript multiple template and 'template' OptionButton in Script_Create_Dialog.cpp
This commit is contained in:
Rémi Verschelde 2017-11-14 08:13:19 +01:00 committed by GitHub
parent ff69d1fff2 875fd90467
commit fbb0732a36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 52 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/script_language.h
View file

@ -176,6 +176,9 @@ public:
virtual void get_comment_delimiters(List<String> *p_delimiters) const = 0;
virtual void get_string_delimiters(List<String> *p_delimiters) const = 0;
virtual String get_template(const String &p_class_name, const String &p_base_class_name) const = 0;
virtual String get_empty_template(const String &p_class_name, const String &p_base_class_name) const = 0;
virtual String get_nocomment_template(const String &p_class_name, const String &p_base_class_name) const = 0;
virtual bool validate(const String &p_script, int &r_line_error, int &r_col_error, String &r_test_error, const String &p_path = "", List<String> *r_functions = NULL) const = 0;
virtual Script *create_script() const = 0;
virtual bool has_named_classes() const = 0;

27
editor/script_create_dialog.cpp
View file

@ -123,7 +123,17 @@ void ScriptCreateDialog::_create_new() {
if (class_name->is_editable())
cname = class_name->get_text();
String text = ScriptServer::get_language(language_menu->get_selected())->get_template(cname, parent_name->get_text());
String text;
if (template_select==0) {
text = ScriptServer::get_language(language_menu->get_selected())->get_template(cname, parent_name->get_text());
} else if (template_select==1) {
text = ScriptServer::get_language(language_menu->get_selected())->get_empty_template(cname, parent_name->get_text());
} else if (template_select == 2) {
text = ScriptServer::get_language(language_menu->get_selected())->get_nocomment_template(cname, parent_name->get_text());
} else {
text = ScriptServer::get_language(language_menu->get_selected())->get_template(cname, parent_name->get_text());
}
Script *script = ScriptServer::get_language(language_menu->get_selected())->create_script();
script->set_source_code(text);
if (cname != "")
@ -209,6 +219,11 @@ void ScriptCreateDialog::_lang_changed(int l) {
_class_name_changed(class_name->get_text());
}
void ScriptCreateDialog::_template_changed(int p_template) {
template_select = p_template;
}
void ScriptCreateDialog::_built_in_pressed() {
if (internal->is_pressed()) {
@ -330,6 +345,7 @@ void ScriptCreateDialog::_bind_methods() {
ObjectTypeDB::bind_method("_class_name_changed", &ScriptCreateDialog::_class_name_changed);
ObjectTypeDB::bind_method("_lang_changed", &ScriptCreateDialog::_lang_changed);
ObjectTypeDB::bind_method("_template_changed", &ScriptCreateDialog::_template_changed);
ObjectTypeDB::bind_method("_built_in_pressed", &ScriptCreateDialog::_built_in_pressed);
ObjectTypeDB::bind_method("_browse_path", &ScriptCreateDialog::_browse_path);
ObjectTypeDB::bind_method("_file_selected", &ScriptCreateDialog::_file_selected);
@ -370,6 +386,15 @@ ScriptCreateDialog::ScriptCreateDialog() {
language_menu->select(0);
language_menu->connect("item_selected", this, "_lang_changed");
template_menu = memnew(OptionButton);
vb->add_margin_child(TTR("Template"), template_menu);
template_menu->add_item(TTR("Default"));
template_menu->add_item(TTR("Empty GD File"));
template_menu->add_item(TTR("No Comment GD File"));
template_menu->select(0);
template_menu->connect("item_selected", this, "_template_changed");
//parent_name->set_text();
vb2 = memnew(VBoxContainer);

3
editor/script_create_dialog.h
View file

@ -44,6 +44,7 @@ class ScriptCreateDialog : public ConfirmationDialog {
Label *path_error_label;
LineEdit *parent_name;
OptionButton *language_menu;
OptionButton *template_menu;
LineEdit *file_path;
EditorFileDialog *file_browse;
CheckButton *internal;
@ -52,9 +53,11 @@ class ScriptCreateDialog : public ConfirmationDialog {
bool path_valid;
bool create_new;
String initial_bp;
int template_select;
void _path_changed(const String &p_path = String());
void _lang_changed(int l = 0);
void _template_changed(int l = 0);
void _built_in_pressed();
bool _validate(const String &p_strin);
void _class_name_changed(const String &p_name);

18
modules/gdscript/gd_editor.cpp
View file

@ -58,6 +58,24 @@ String GDScriptLanguage::get_template(const String &p_class_name, const String &
return _template.replace("%BASE%", p_base_class_name);
}
String GDScriptLanguage::get_empty_template(const String &p_class_name, const String &p_base_class_name) const {
String _template = String() +
"extends %BASE%\n\n";
return _template.replace("%BASE%", p_base_class_name);
}
String GDScriptLanguage::get_nocomment_template(const String &p_class_name, const String &p_base_class_name) const {
String _template = String() +
"extends %BASE%\n\n" +
"func _ready():\n" +
"\tpass\n";
return _template.replace("%BASE%", p_base_class_name);
}
bool GDScriptLanguage::validate(const String &p_script, int &r_line_error, int &r_col_error, String &r_test_error, const String &p_path, List<String> *r_functions) const {
GDParser parser;

2
modules/gdscript/gd_script.h
View file

@ -356,6 +356,8 @@ public:
virtual void get_comment_delimiters(List<String> *p_delimiters) const;
virtual void get_string_delimiters(List<String> *p_delimiters) const;
virtual String get_template(const String &p_class_name, const String &p_base_class_name) const;
virtual String get_empty_template(const String &p_class_name, const String &p_base_class_name) const;
virtual String get_nocomment_template(const String &p_class_name, const String &p_base_class_name) const;
virtual bool validate(const String &p_script, int &r_line_error, int &r_col_error, String &r_test_error, const String &p_path = "", List<String> *r_functions = NULL) const;
virtual Script *create_script() const;
virtual bool has_named_classes() const;