summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--editor/editor_autoload_settings.cpp50
-rw-r--r--editor/editor_autoload_settings.h6
-rw-r--r--editor/project_settings_editor.cpp2
-rw-r--r--modules/mono/editor/code_completion.cpp2
4 files changed, 30 insertions, 30 deletions
diff --git a/editor/editor_autoload_settings.cpp b/editor/editor_autoload_settings.cpp
index 281d614ea9..829948d3cb 100644
--- a/editor/editor_autoload_settings.cpp
+++ b/editor/editor_autoload_settings.cpp
@@ -52,7 +52,7 @@ void EditorAutoloadSettings::_notification(int p_what) {
file_dialog->add_filter("*." + E);
}
- for (const AutoLoadInfo &info : autoload_cache) {
+ for (const AutoloadInfo &info : autoload_cache) {
if (info.node && info.in_editor) {
get_tree()->get_root()->call_deferred(SNAME("add_child"), info.node);
}
@@ -122,7 +122,7 @@ bool EditorAutoloadSettings::_autoload_name_is_valid(const String &p_name, Strin
for (const String &E : keywords) {
if (E == p_name) {
if (r_error) {
- *r_error = TTR("Invalid name.") + " " + TTR("Keyword cannot be used as an AutoLoad name.");
+ *r_error = TTR("Invalid name.") + " " + TTR("Keyword cannot be used as an Autoload name.");
}
return false;
@@ -227,7 +227,7 @@ void EditorAutoloadSettings::_autoload_edited() {
path = "*" + path;
}
- undo_redo->create_action(TTR("Toggle AutoLoad Globals"));
+ undo_redo->create_action(TTR("Toggle Autoload Globals"));
undo_redo->add_do_property(ProjectSettings::get_singleton(), base, path);
undo_redo->add_undo_property(ProjectSettings::get_singleton(), base, ProjectSettings::get_singleton()->get(base));
@@ -378,13 +378,13 @@ Node *EditorAutoloadSettings::_create_autoload(const String &p_path) {
Object *obj = ClassDB::instantiate(ibt);
- ERR_FAIL_COND_V_MSG(!obj, nullptr, "Cannot instance script for AutoLoad, expected 'Node' inheritance, got: " + String(ibt) + ".");
+ ERR_FAIL_COND_V_MSG(!obj, nullptr, "Cannot instance script for Autoload, expected 'Node' inheritance, got: " + String(ibt) + ".");
n = Object::cast_to<Node>(obj);
n->set_script(script);
}
- ERR_FAIL_COND_V_MSG(!n, nullptr, "Path in AutoLoad not a node or script: " + p_path + ".");
+ ERR_FAIL_COND_V_MSG(!n, nullptr, "Path in Autoload not a node or script: " + p_path + ".");
return n;
}
@@ -396,10 +396,10 @@ void EditorAutoloadSettings::update_autoload() {
updating_autoload = true;
- Map<String, AutoLoadInfo> to_remove;
- List<AutoLoadInfo *> to_add;
+ Map<String, AutoloadInfo> to_remove;
+ List<AutoloadInfo *> to_add;
- for (const AutoLoadInfo &info : autoload_cache) {
+ for (const AutoloadInfo &info : autoload_cache) {
to_remove.insert(info.name, info);
}
@@ -423,7 +423,7 @@ void EditorAutoloadSettings::update_autoload() {
continue;
}
- AutoLoadInfo info;
+ AutoloadInfo info;
info.is_singleton = path.begins_with("*");
if (info.is_singleton) {
@@ -436,7 +436,7 @@ void EditorAutoloadSettings::update_autoload() {
bool need_to_add = true;
if (to_remove.has(name)) {
- AutoLoadInfo &old_info = to_remove[name];
+ AutoloadInfo &old_info = to_remove[name];
if (old_info.path == info.path) {
// Still the same resource, check status
info.node = old_info.node;
@@ -478,8 +478,8 @@ void EditorAutoloadSettings::update_autoload() {
}
// Remove deleted/changed autoloads
- for (KeyValue<String, AutoLoadInfo> &E : to_remove) {
- AutoLoadInfo &info = E.value;
+ for (KeyValue<String, AutoloadInfo> &E : to_remove) {
+ AutoloadInfo &info = E.value;
if (info.is_singleton) {
for (int i = 0; i < ScriptServer::get_language_count(); i++) {
ScriptServer::get_language(i)->remove_named_global_constant(info.name);
@@ -500,7 +500,7 @@ void EditorAutoloadSettings::update_autoload() {
// Load new/changed autoloads
List<Node *> nodes_to_add;
- for (AutoLoadInfo *info : to_add) {
+ for (AutoloadInfo *info : to_add) {
info->node = _create_autoload(info->path);
ERR_CONTINUE(!info->node);
@@ -632,8 +632,8 @@ void EditorAutoloadSettings::drop_data_fw(const Point2 &p_point, const Variant &
int order = ProjectSettings::get_singleton()->get_order("autoload/" + name);
- AutoLoadInfo aux;
- List<AutoLoadInfo>::Element *E = nullptr;
+ AutoloadInfo aux;
+ List<AutoloadInfo>::Element *E = nullptr;
if (!move_to_back) {
aux.order = order;
@@ -649,7 +649,7 @@ void EditorAutoloadSettings::drop_data_fw(const Point2 &p_point, const Variant &
for (int i = 0; i < autoloads.size(); i++) {
aux.order = ProjectSettings::get_singleton()->get_order("autoload/" + autoloads[i]);
- List<AutoLoadInfo>::Element *I = autoload_cache.find(aux);
+ List<AutoloadInfo>::Element *I = autoload_cache.find(aux);
if (move_to_back) {
autoload_cache.move_to_back(I);
@@ -664,7 +664,7 @@ void EditorAutoloadSettings::drop_data_fw(const Point2 &p_point, const Variant &
int i = 0;
- for (const AutoLoadInfo &F : autoload_cache) {
+ for (const AutoloadInfo &F : autoload_cache) {
orders.write[i++] = F.order;
}
@@ -676,7 +676,7 @@ void EditorAutoloadSettings::drop_data_fw(const Point2 &p_point, const Variant &
i = 0;
- for (const AutoLoadInfo &F : autoload_cache) {
+ for (const AutoloadInfo &F : autoload_cache) {
undo_redo->add_do_method(ProjectSettings::get_singleton(), "set_order", "autoload/" + F.name, orders[i++]);
undo_redo->add_undo_method(ProjectSettings::get_singleton(), "set_order", "autoload/" + F.name, F.order);
}
@@ -697,18 +697,18 @@ bool EditorAutoloadSettings::autoload_add(const String &p_name, const String &p_
String error;
if (!_autoload_name_is_valid(name, &error)) {
- EditorNode::get_singleton()->show_warning(TTR("Can't add AutoLoad:") + "\n" + error);
+ EditorNode::get_singleton()->show_warning(TTR("Can't add Autoload:") + "\n" + error);
return false;
}
const String &path = p_path;
if (!FileAccess::exists(path)) {
- EditorNode::get_singleton()->show_warning(TTR("Can't add AutoLoad:") + "\n" + vformat(TTR("%s is an invalid path. File does not exist."), path));
+ EditorNode::get_singleton()->show_warning(TTR("Can't add Autoload:") + "\n" + vformat(TTR("%s is an invalid path. File does not exist."), path));
return false;
}
if (!path.begins_with("res://")) {
- EditorNode::get_singleton()->show_warning(TTR("Can't add AutoLoad:") + "\n" + vformat(TTR("%s is an invalid path. Not in resource path (res://)."), path));
+ EditorNode::get_singleton()->show_warning(TTR("Can't add Autoload:") + "\n" + vformat(TTR("%s is an invalid path. Not in resource path (res://)."), path));
return false;
}
@@ -716,7 +716,7 @@ bool EditorAutoloadSettings::autoload_add(const String &p_name, const String &p_
UndoRedo *undo_redo = EditorNode::get_undo_redo();
- undo_redo->create_action(TTR("Add AutoLoad"));
+ undo_redo->create_action(TTR("Add Autoload"));
// Singleton autoloads are represented with a leading "*" in their path.
undo_redo->add_do_property(ProjectSettings::get_singleton(), name, "*" + path);
@@ -791,7 +791,7 @@ EditorAutoloadSettings::EditorAutoloadSettings() {
continue;
}
- AutoLoadInfo info;
+ AutoloadInfo info;
info.is_singleton = path.begins_with("*");
if (info.is_singleton) {
@@ -812,7 +812,7 @@ EditorAutoloadSettings::EditorAutoloadSettings() {
autoload_cache.push_back(info);
}
- for (AutoLoadInfo &info : autoload_cache) {
+ for (AutoloadInfo &info : autoload_cache) {
info.node = _create_autoload(info.path);
if (info.node) {
@@ -921,7 +921,7 @@ EditorAutoloadSettings::EditorAutoloadSettings() {
}
EditorAutoloadSettings::~EditorAutoloadSettings() {
- for (const AutoLoadInfo &info : autoload_cache) {
+ for (const AutoloadInfo &info : autoload_cache) {
if (info.node && !info.in_editor) {
memdelete(info.node);
}
diff --git a/editor/editor_autoload_settings.h b/editor/editor_autoload_settings.h
index 135ff48a0c..044eea4245 100644
--- a/editor/editor_autoload_settings.h
+++ b/editor/editor_autoload_settings.h
@@ -49,7 +49,7 @@ class EditorAutoloadSettings : public VBoxContainer {
String autoload_changed;
- struct AutoLoadInfo {
+ struct AutoloadInfo {
String name;
String path;
bool is_singleton = false;
@@ -57,12 +57,12 @@ class EditorAutoloadSettings : public VBoxContainer {
int order = 0;
Node *node = nullptr;
- bool operator==(const AutoLoadInfo &p_info) const {
+ bool operator==(const AutoloadInfo &p_info) const {
return order == p_info.order;
}
};
- List<AutoLoadInfo> autoload_cache;
+ List<AutoloadInfo> autoload_cache;
bool updating_autoload;
int number_of_autoloads;
diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp
index 7059509e72..c4019bc22d 100644
--- a/editor/project_settings_editor.cpp
+++ b/editor/project_settings_editor.cpp
@@ -663,7 +663,7 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) {
tab_container->add_child(localization_editor);
autoload_settings = memnew(EditorAutoloadSettings);
- autoload_settings->set_name(TTR("AutoLoad"));
+ autoload_settings->set_name(TTR("Autoload"));
autoload_settings->connect("autoload_changed", callable_mp(this, &ProjectSettingsEditor::queue_save));
tab_container->add_child(autoload_settings);
diff --git a/modules/mono/editor/code_completion.cpp b/modules/mono/editor/code_completion.cpp
index 095fd831a3..3a41b3f6f5 100644
--- a/modules/mono/editor/code_completion.cpp
+++ b/modules/mono/editor/code_completion.cpp
@@ -120,7 +120,7 @@ PackedStringArray get_code_completion(CompletionKind p_kind, const String &p_scr
} break;
case CompletionKind::NODE_PATHS: {
{
- // AutoLoads
+ // Autoloads.
OrderedHashMap<StringName, ProjectSettings::AutoloadInfo> autoloads = ProjectSettings::get_singleton()->get_autoload_list();
for (OrderedHashMap<StringName, ProjectSettings::AutoloadInfo>::Element E = autoloads.front(); E; E = E.next()) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 19:42:09 +0000