Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-01-26 11:51:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9559 from Noshyaar/pr-2

Browse Source 
ScriptCreateDialog: Fix regressions from #9536
This commit is contained in:
Thomas Herzog 2017-07-10 22:59:02 +02:00 committed by GitHub
commit 93dcfe1246
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
editor/script_create_dialog.cpp
View File

@ -58,7 +58,6 @@ void ScriptCreateDialog::config(const String &p_base_name, const String &p_base_
file_path->set_text(""); file_path->set_text("");
} }
_lang_changed(current_language); _lang_changed(current_language);
_template_changed(template_menu->get_selected());
_parent_name_changed(parent_name->get_text()); _parent_name_changed(parent_name->get_text());
_class_name_changed(""); _class_name_changed("");
_path_changed(file_path->get_text()); _path_changed(file_path->get_text());
@ -246,25 +245,31 @@ void ScriptCreateDialog::_lang_changed(int l) {
bool use_templates = language->is_using_templates(); bool use_templates = language->is_using_templates();
template_menu->set_disabled(!use_templates); template_menu->set_disabled(!use_templates);
template_menu->clear();
if (use_templates) { if (use_templates) {
template_list = EditorSettings::get_singleton()->get_script_templates(language->get_extension()); template_list = EditorSettings::get_singleton()->get_script_templates(language->get_extension());
String last_lang = EditorSettings::get_singleton()->get_project_metadata("script_setup", "last_selected_language", ""); String last_lang = EditorSettings::get_singleton()->get_project_metadata("script_setup", "last_selected_language", "");
String last_template = EditorSettings::get_singleton()->get_project_metadata("script_setup", "last_selected_template", ""); String last_template = EditorSettings::get_singleton()->get_project_metadata("script_setup", "last_selected_template", "");
template_menu->clear();
template_menu->add_item(TTR("Default")); template_menu->add_item(TTR("Default"));
for (int i = 0; i < template_list.size(); i++) { for (int i = 0; i < template_list.size(); i++) {
String s = template_list[i].capitalize(); String s = template_list[i].capitalize();
template_menu->add_item(s); template_menu->add_item(s);
if (language_menu->get_item_text(l) == last_lang && last_template == s) { if (language_menu->get_item_text(language_menu->get_selected()) == last_lang && last_template == s) {
template_menu->select(i + 1); template_menu->select(i + 1);
} }
} }
_template_changed(template_menu->get_selected()); } else {
EditorSettings::get_singleton()->set_project_metadata("script_setup", "last_selected_language", language_menu->get_item_text(l));
template_menu->add_item(TTR("N/A"));
script_template = "";
} }
_template_changed(template_menu->get_selected());
EditorSettings::get_singleton()->set_project_metadata("script_setup", "last_selected_language", language_menu->get_item_text(language_menu->get_selected()));
_update_dialog(); _update_dialog();
} }