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

Merge pull request #53594 from Calinou/editor-import-dock-add-dirty-marker 

Add a "dirty" marker to the editor import dock for unsaved changes
This commit is contained in:
Rémi Verschelde 2021-10-09 13:32:30 +02:00 committed by GitHub
parent e8c89b2b91 ba30f40c47
commit b22664e160
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
editor/import_dock.cpp
View File

@ -130,6 +130,7 @@ void ImportDock::set_edit_path(const String &p_path) {
_add_keep_import_option(importer_name);
import->set_disabled(false);
_set_dirty(false);
import_as->set_disabled(false);
preset->set_disabled(false);
@ -280,6 +281,7 @@ void ImportDock::set_edit_multiple_paths(const Vector<String> &p_paths) {
params->paths = p_paths;
import->set_disabled(false);
_set_dirty(false);
import_as->set_disabled(false);
preset->set_disabled(false);
@ -533,6 +535,8 @@ void ImportDock::_reimport() {
EditorFileSystem::get_singleton()->reimport_files(params->paths);
EditorFileSystem::get_singleton()->emit_signal(SNAME("filesystem_changed")); //it changed, so force emitting the signal
_set_dirty(false);
}
void ImportDock::_notification(int p_what) {
@ -548,6 +552,24 @@ void ImportDock::_notification(int p_what) {
}
}
void ImportDock::_property_edited(const StringName &p_prop) {
_set_dirty(true);
}
void ImportDock::_set_dirty(bool p_dirty) {
if (p_dirty) {
// Add a dirty marker to notify the user that they should reimport the selected resource to see changes.
import->set_text(TTR("Reimport") + " (*)");
import->add_theme_color_override("font_color", get_theme_color(SNAME("warning_color"), SNAME("Editor")));
import->set_tooltip(TTR("You have pending changes that haven't been applied yet. Click Reimport to apply changes made to the import options.\nSelecting another resource in the FileSystem dock without clicking Reimport first will discard changes made in the Import dock."));
} else {
// Remove the dirty marker on the Reimport button.
import->set_text(TTR("Reimport"));
import->remove_theme_color_override("font_color");
import->set_tooltip("");
}
}
void ImportDock::_property_toggled(const StringName &p_prop, bool p_checked) {
if (p_checked) {
params->checked.insert(p_prop);
@ -588,6 +610,7 @@ ImportDock::ImportDock() {
import_opts = memnew(EditorInspector);
add_child(import_opts);
import_opts->set_v_size_flags(SIZE_EXPAND_FILL);
import_opts->connect("property_edited", callable_mp(this, &ImportDock::_property_edited));
import_opts->connect("property_toggled", callable_mp(this, &ImportDock::_property_toggled));
hb = memnew(HBoxContainer);

2
editor/import_dock.h
View File

@ -68,7 +68,9 @@ class ImportDock : public VBoxContainer {
void _update_preset_menu();
void _add_keep_import_option(const String &p_importer_name);
void _property_edited(const StringName &p_prop);
void _property_toggled(const StringName &p_prop, bool p_checked);
void _set_dirty(bool p_dirty);
void _reimport_attempt();
void _reimport_and_restart();
void _reimport();