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

Merge pull request #20242 from akien-mga/export-preset-reload 

Export: Properly reload preset when opening dialog
This commit is contained in:
Max Hilbrunner 2018-07-18 16:20:57 +02:00 committed by GitHub
parent e064eea940 13239cd4cc
commit ce53876a44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/editor_node.cpp
View File

@ -1856,10 +1856,6 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
} break; } break;
case SETTINGS_EXPORT_PREFERENCES: {
//project_export_settings->popup_centered_ratio();
} break;
case FILE_IMPORT_SUBSCENE: { case FILE_IMPORT_SUBSCENE: {
if (!editor_data.get_edited_scene_root()) { if (!editor_data.get_edited_scene_root()) {

1
editor/editor_node.h
View File

@ -164,7 +164,6 @@ private:
SETTINGS_UPDATE_ALWAYS, SETTINGS_UPDATE_ALWAYS,
SETTINGS_UPDATE_CHANGES, SETTINGS_UPDATE_CHANGES,
SETTINGS_UPDATE_SPINNER_HIDE, SETTINGS_UPDATE_SPINNER_HIDE,
SETTINGS_EXPORT_PREFERENCES,
SETTINGS_PREFERENCES, SETTINGS_PREFERENCES,
SETTINGS_LAYOUT_SAVE, SETTINGS_LAYOUT_SAVE,
SETTINGS_LAYOUT_DELETE, SETTINGS_LAYOUT_DELETE,

3
editor/export_template_manager.cpp
View File

@ -123,7 +123,6 @@ void ExportTemplateManager::_update_template_list() {
void ExportTemplateManager::_download_template(const String &p_version) { void ExportTemplateManager::_download_template(const String &p_version) {
print_line("download " + p_version);
while (template_list->get_child_count()) { while (template_list->get_child_count()) {
memdelete(template_list->get_child(0)); memdelete(template_list->get_child(0));
} }
@ -352,7 +351,6 @@ void ExportTemplateManager::_http_download_mirror_completed(int p_status, int p_
bool mirrors_found = false; bool mirrors_found = false;
Dictionary d = r; Dictionary d = r;
print_line(r);
if (d.has("mirrors")) { if (d.has("mirrors")) {
Array mirrors = d["mirrors"]; Array mirrors = d["mirrors"];
for (int i = 0; i < mirrors.size(); i++) { for (int i = 0; i < mirrors.size(); i++) {
@ -507,7 +505,6 @@ void ExportTemplateManager::_notification(int p_what) {
if (p_what == NOTIFICATION_VISIBILITY_CHANGED) { if (p_what == NOTIFICATION_VISIBILITY_CHANGED) {
if (!is_visible_in_tree()) { if (!is_visible_in_tree()) {
print_line("closed");
set_process(false); set_process(false);
} }
} }

7
editor/project_export.cpp
View File

@ -76,6 +76,9 @@ void ProjectExportDialog::popup_export() {
} }
_update_presets(); _update_presets();
if (presets->get_current() >= 0) {
_edit_preset(presets->get_current()); // triggers rescan for templates if newly installed
}
// Restore valid window bounds or pop up at default size. // Restore valid window bounds or pop up at default size.
if (EditorSettings::get_singleton()->has_setting("interface/dialogs/export_bounds")) { if (EditorSettings::get_singleton()->has_setting("interface/dialogs/export_bounds")) {
@ -154,7 +157,6 @@ void ProjectExportDialog::_update_presets() {
if (current_idx != -1) { if (current_idx != -1) {
presets->select(current_idx); presets->select(current_idx);
//_edit_preset(current_idx);
} }
updating = false; updating = false;
@ -167,6 +169,7 @@ void ProjectExportDialog::_edit_preset(int p_index) {
name->set_editable(false); name->set_editable(false);
runnable->set_disabled(true); runnable->set_disabled(true);
parameters->edit(NULL); parameters->edit(NULL);
presets->unselect_all();
delete_preset->set_disabled(true); delete_preset->set_disabled(true);
sections->hide(); sections->hide();
patches->clear(); patches->clear();
@ -438,11 +441,9 @@ void ProjectExportDialog::_delete_preset() {
void ProjectExportDialog::_delete_preset_confirm() { void ProjectExportDialog::_delete_preset_confirm() {
int idx = presets->get_current(); int idx = presets->get_current();
parameters->edit(NULL); //to avoid crash
_edit_preset(-1); _edit_preset(-1);
EditorExport::get_singleton()->remove_export_preset(idx); EditorExport::get_singleton()->remove_export_preset(idx);
_update_presets(); _update_presets();
_edit_preset(presets->get_current());
} }
Variant ProjectExportDialog::get_drag_data_fw(const Point2 &p_point, Control *p_from) { Variant ProjectExportDialog::get_drag_data_fw(const Point2 &p_point, Control *p_from) {

2
scene/gui/item_list.cpp
View File

@ -285,7 +285,7 @@ void ItemList::unselect_all() {
items[i].selected = false; items[i].selected = false;
} }
current = -1;
update(); update();
} }