Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #109356 from KoBeWi/advanced_presets

Browse source 
Move advanced toggle state out of export presets
This commit is contained in:
Thaddeus Crews 2025-10-23 15:33:52 -05:00
commit 79c3bf447a
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
4 changed files with 8 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
editor/export/editor_export.cpp
View file

@ -49,7 +49,6 @@ void EditorExport::_save() {
config->set_value(section, "name", preset->get_name());
config->set_value(section, "platform", preset->get_platform()->get_name());
config->set_value(section, "runnable", preset->is_runnable());
config->set_value(section, "advanced_options", preset->are_advanced_options_enabled());
config->set_value(section, "dedicated_server", preset->is_dedicated_server());
config->set_value(section, "custom_features", preset->get_custom_features());
@ -264,7 +263,6 @@ void EditorExport::load_config() {
}
preset->set_name(config->get_value(section, "name"));
preset->set_advanced_options_enabled(config->get_value(section, "advanced_options", false));
preset->set_runnable(config->get_value(section, "runnable"));
preset->set_dedicated_server(config->get_value(section, "dedicated_server", false));

12
editor/export/editor_export_preset.cpp
View file

@ -31,6 +31,7 @@
#include "editor_export.h"
#include "core/config/project_settings.h"
#include "editor/settings/editor_settings.h"
bool EditorExportPreset::_set(const StringName &p_name, const Variant &p_value) {
values[p_name] = p_value;
@ -316,17 +317,8 @@ bool EditorExportPreset::is_runnable() const {
return runnable;
}
void EditorExportPreset::set_advanced_options_enabled(bool p_enabled) {
if (advanced_options_enabled == p_enabled) {
return;
}
advanced_options_enabled = p_enabled;
EditorExport::singleton->save_presets();
notify_property_list_changed();
}
bool EditorExportPreset::are_advanced_options_enabled() const {
return advanced_options_enabled;
return EDITOR_GET("_export_preset_advanced_mode");
}
void EditorExportPreset::set_dedicated_server(bool p_enable) {

2
editor/export/editor_export_preset.h
View file

@ -70,7 +70,6 @@ private:
HashSet<String> selected_files;
HashMap<String, FileExportMode> customized_files;
bool runnable = false;
bool advanced_options_enabled = false;
bool dedicated_server = false;
Vector<String> patches;
@ -133,7 +132,6 @@ public:
void set_runnable(bool p_enable);
bool is_runnable() const;
void set_advanced_options_enabled(bool p_enabled);
bool are_advanced_options_enabled() const;
void set_dedicated_server(bool p_enable);

11
editor/export/project_export.cpp
View file

@ -286,7 +286,6 @@ void ProjectExportDialog::_edit_preset(int p_index) {
export_path->setup(extension_vector, false, true, false);
export_path->update_property();
advanced_options->set_disabled(false);
advanced_options->set_pressed(current->are_advanced_options_enabled());
runnable->set_disabled(false);
runnable->set_pressed(current->is_runnable());
if (parameters->get_edited_object() != current.ptr()) {
@ -494,11 +493,13 @@ void ProjectExportDialog::_advanced_options_pressed() {
if (updating) {
return;
}
EditorSettings::get_singleton()->set_setting("_export_preset_advanced_mode", advanced_options->is_pressed());
EditorSettings::get_singleton()->save();
Ref<EditorExportPreset> current = get_current_preset();
ERR_FAIL_COND(current.is_null());
current->set_advanced_options_enabled(advanced_options->is_pressed());
if (current.is_valid()) {
current->notify_property_list_changed();
}
_update_presets();
}
@ -715,7 +716,6 @@ void ProjectExportDialog::_duplicate_preset() {
if (make_runnable) {
preset->set_runnable(make_runnable);
}
preset->set_advanced_options_enabled(current->are_advanced_options_enabled());
preset->set_dedicated_server(current->is_dedicated_server());
preset->set_export_filter(current->get_export_filter());
preset->set_include_filter(current->get_include_filter());
@ -1513,6 +1513,7 @@ ProjectExportDialog::ProjectExportDialog() {
advanced_options = memnew(CheckButton);
advanced_options->set_text(TTR("Advanced Options"));
advanced_options->set_tooltip_text(TTR("If checked, the advanced options will be shown."));
advanced_options->set_pressed(EDITOR_GET("_export_preset_advanced_mode"));
advanced_options->connect(SceneStringName(pressed), callable_mp(this, &ProjectExportDialog::_advanced_options_pressed));
HBoxContainer *preset_configs_container = memnew(HBoxContainer);