From 4cd69e91fc096668e2000a06f6fc9ee673516cec Mon Sep 17 00:00:00 2001 From: Benjamin Date: Sat, 26 May 2018 20:19:38 +0200 Subject: [PATCH] Update resource file project settings on rename --- core/project_settings.cpp | 4 ++++ core/project_settings.h | 1 + editor/filesystem_dock.cpp | 17 +++++++++++++++++ editor/filesystem_dock.h | 1 + 4 files changed, 23 insertions(+) diff --git a/core/project_settings.cpp b/core/project_settings.cpp index a7bfc8895b7..7f9f4b638a4 100644 --- a/core/project_settings.cpp +++ b/core/project_settings.cpp @@ -870,6 +870,10 @@ void ProjectSettings::set_custom_property_info(const String &p_prop, const Prope custom_prop_info[p_prop].name = p_prop; } +const Map &ProjectSettings::get_custom_property_info() const { + return custom_prop_info; +} + void ProjectSettings::set_disable_feature_overrides(bool p_disable) { disable_feature_overrides = p_disable; diff --git a/core/project_settings.h b/core/project_settings.h index b01e7855aa8..66f3ed954e2 100644 --- a/core/project_settings.h +++ b/core/project_settings.h @@ -137,6 +137,7 @@ public: Error save_custom(const String &p_path = "", const CustomMap &p_custom = CustomMap(), const Vector &p_custom_features = Vector(), bool p_merge_with_current = true); Error save(); void set_custom_property_info(const String &p_prop, const PropertyInfo &p_info); + const Map &get_custom_property_info() const; Vector get_optimizer_presets() const; diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp index e15c876893f..6de52c61761 100644 --- a/editor/filesystem_dock.cpp +++ b/editor/filesystem_dock.cpp @@ -920,6 +920,21 @@ void FileSystemDock::_update_dependencies_after_move(const Map & } } +void FileSystemDock::_update_project_settings_after_move(const Map &p_renames) const { + + // Find all project settings of type FILE and replace them if needed + const Map prop_info = ProjectSettings::get_singleton()->get_custom_property_info(); + for (const Map::Element *E = prop_info.front(); E; E = E->next()) { + if (E->get().hint == PROPERTY_HINT_FILE) { + String old_path = GLOBAL_GET(E->key()); + if (p_renames.has(old_path)) { + ProjectSettings::get_singleton()->set_setting(E->key(), p_renames[old_path]); + } + }; + } + ProjectSettings::get_singleton()->save(); +} + void FileSystemDock::_update_favorite_dirs_list_after_move(const Map &p_renames) const { Vector favorite_dirs = EditorSettings::get_singleton()->get_favorite_dirs(); @@ -1002,6 +1017,7 @@ void FileSystemDock::_rename_operation_confirm() { _try_move_item(to_rename, new_path, file_renames, folder_renames); _update_dependencies_after_move(file_renames); _update_resource_paths_after_move(file_renames); + _update_project_settings_after_move(file_renames); _update_favorite_dirs_list_after_move(folder_renames); //Rescan everything @@ -1061,6 +1077,7 @@ void FileSystemDock::_move_operation_confirm(const String &p_to_path) { if (is_moved) { _update_dependencies_after_move(file_renames); _update_resource_paths_after_move(file_renames); + _update_project_settings_after_move(file_renames); _update_favorite_dirs_list_after_move(folder_renames); print_line("call rescan!"); diff --git a/editor/filesystem_dock.h b/editor/filesystem_dock.h index e59d4c96e18..7b57af4e863 100644 --- a/editor/filesystem_dock.h +++ b/editor/filesystem_dock.h @@ -186,6 +186,7 @@ private: void _update_dependencies_after_move(const Map &p_renames) const; void _update_resource_paths_after_move(const Map &p_renames) const; void _update_favorite_dirs_list_after_move(const Map &p_renames) const; + void _update_project_settings_after_move(const Map &p_renames) const; void _make_dir_confirm(); void _rename_operation_confirm();