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

Merge pull request #9742 from quinnyo/project-manager-new-config 

updated project manager to use new project.godot values
This commit is contained in:
Rémi Verschelde 2017-07-22 13:40:15 +02:00 committed by GitHub
parent c4918ca76b 5c62304b78
commit 8cf8be6a8d
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
editor/project_manager.cpp
View File

@ -202,10 +202,10 @@ private:
f->store_line("\n");
f->store_line("[application]");
f->store_line("\n");
f->store_line("name=\"" + project_name->get_text() + "\"");
f->store_line("icon=\"res://icon.png\"");
f->store_line("config/name=\"" + project_name->get_text() + "\"");
f->store_line("config/icon=\"res://icon.png\"");
f->store_line("[rendering]");
f->store_line("viewport/default_environment=\"res://default_env.tres\"");
f->store_line("environment/default_environment=\"res://default_env.tres\"");
memdelete(f);
ResourceSaver::save(dir.plus_file("/icon.png"), get_icon("DefaultProjectIcon", "EditorIcons"));
@ -811,16 +811,16 @@ void ProjectManager::_load_recent_projects() {
String project_name = TTR("Unnamed Project");
if (cf->has_section_key("application", "name")) {
project_name = static_cast<String>(cf->get_value("application", "name")).xml_unescape();
if (cf->has_section_key("application", "config/name")) {
project_name = static_cast<String>(cf->get_value("application", "config/name")).xml_unescape();
}
if (filter_option == ProjectListFilter::FILTER_NAME && search_term != "" && project_name.findn(search_term) == -1)
continue;
Ref<Texture> icon;
if (cf->has_section_key("application", "icon")) {
String appicon = cf->get_value("application", "icon");
if (cf->has_section_key("application", "config/icon")) {
String appicon = cf->get_value("application", "config/icon");
if (appicon != "") {
Ref<Image> img;
img.instance();
@ -840,8 +840,8 @@ void ProjectManager::_load_recent_projects() {
}
String main_scene;
if (cf->has_section_key("application", "main_scene")) {
main_scene = cf->get_value("application", "main_scene");
if (cf->has_section_key("application", "run/main_scene")) {
main_scene = cf->get_value("application", "run/main_scene");
}
selected_list_copy.erase(project);