summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
Diffstat (limited to 'editor')
-rw-r--r--editor/editor_file_system.cpp48
-rw-r--r--editor/project_manager.cpp42
-rw-r--r--editor/project_settings.cpp3
3 files changed, 27 insertions, 66 deletions
diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp
index 3fb2923696..2612a2af16 100644
--- a/editor/editor_file_system.cpp
+++ b/editor/editor_file_system.cpp
@@ -487,22 +487,6 @@ bool EditorFileSystem::_check_missing_imported_files(const String &p_path) {
return true;
}
-static bool _find_project(const String &p_path) {
- DirAccess *dir_access = DirAccess::create_for_path(p_path);
- bool ret = false;
- while (true) {
- bool is_dir;
- String file = dir_access->get_next(&is_dir);
- if (file == "")
- break;
- if (file.ends_with(".godot")) {
- ret = true;
- }
- }
- memdelete(dir_access);
- return ret;
-}
-
void EditorFileSystem::_scan_new_dir(EditorFileSystemDirectory *p_dir, DirAccess *da, const ScanProgress &p_progress) {
List<String> dirs;
@@ -525,9 +509,8 @@ void EditorFileSystem::_scan_new_dir(EditorFileSystemDirectory *p_dir, DirAccess
if (f.begins_with(".")) //ignore hidden and . / ..
continue;
- if (_find_project(cd.plus_file(f))) {
+ if (FileAccess::exists(cd.plus_file(f).plus_file("godot.cfg"))) // skip if another project inside this
continue;
- }
dirs.push_back(f);
@@ -693,35 +676,34 @@ void EditorFileSystem::_scan_fs_changes(EditorFileSystemDirectory *p_dir, const
while (true) {
bool isdir;
- String file = da->get_next(&isdir);
- if (file == "")
+ String f = da->get_next(&isdir);
+ if (f == "")
break;
if (isdir) {
- if (file.begins_with(".")) //ignore hidden and . / ..
+ if (f.begins_with(".")) //ignore hidden and . / ..
continue;
- int idx = p_dir->find_dir_index(file);
+ int idx = p_dir->find_dir_index(f);
if (idx == -1) {
- if (_find_project(cd.plus_file(file))) {
+ if (FileAccess::exists(cd.plus_file(f).plus_file("godot.cfg"))) // skip if another project inside this
continue;
- }
EditorFileSystemDirectory *efd = memnew(EditorFileSystemDirectory);
efd->parent = p_dir;
- efd->name = file;
+ efd->name = f;
DirAccess *d = DirAccess::create(DirAccess::ACCESS_RESOURCES);
- d->change_dir(cd.plus_file(file));
+ d->change_dir(cd.plus_file(f));
_scan_new_dir(efd, d, p_progress.get_sub(1, 1));
memdelete(d);
ItemAction ia;
ia.action = ItemAction::ACTION_DIR_ADD;
ia.dir = p_dir;
- ia.file = file;
+ ia.file = f;
ia.new_dir = efd;
scan_actions.push_back(ia);
} else {
@@ -729,16 +711,16 @@ void EditorFileSystem::_scan_fs_changes(EditorFileSystemDirectory *p_dir, const
}
} else {
- String ext = file.get_extension().to_lower();
+ String ext = f.get_extension().to_lower();
if (!valid_extensions.has(ext))
continue; //invalid
- int idx = p_dir->find_file_index(file);
+ int idx = p_dir->find_file_index(f);
if (idx == -1) {
//never seen this file, add actition to add it
EditorFileSystemDirectory::FileInfo *fi = memnew(EditorFileSystemDirectory::FileInfo);
- fi->file = file;
+ fi->file = f;
String path = cd.plus_file(fi->file);
fi->modified_time = FileAccess::get_modified_time(path);
@@ -749,7 +731,7 @@ void EditorFileSystem::_scan_fs_changes(EditorFileSystemDirectory *p_dir, const
ItemAction ia;
ia.action = ItemAction::ACTION_FILE_ADD;
ia.dir = p_dir;
- ia.file = file;
+ ia.file = f;
ia.new_file = fi;
scan_actions.push_back(ia);
}
@@ -757,14 +739,14 @@ void EditorFileSystem::_scan_fs_changes(EditorFileSystemDirectory *p_dir, const
if (import_extensions.has(ext)) {
//if it can be imported, and it was added, it needs to be reimported
print_line("REIMPORT: file was not found before, reimport");
- print_line("at dir: " + p_dir->get_path() + " file: " + file);
+ print_line("at dir: " + p_dir->get_path() + " file: " + f);
for (int i = 0; i < p_dir->files.size(); i++) {
print_line(itos(i) + ": " + p_dir->files[i]->file);
}
ItemAction ia;
ia.action = ItemAction::ACTION_FILE_REIMPORT;
ia.dir = p_dir;
- ia.file = file;
+ ia.file = f;
scan_actions.push_back(ia);
}
diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp
index 1a4a36fa18..f2c04fe785 100644
--- a/editor/project_manager.cpp
+++ b/editor/project_manager.cpp
@@ -50,19 +50,6 @@
#include "scene/gui/tool_button.h"
#include "version.h"
-static String _find_project_file(DirAccess *p_da) {
- p_da->list_dir_begin();
- while (true) {
- String f = p_da->get_next();
- if (f == "")
- break;
- if (f.get_extension() == "godot")
- return p_da->get_current_dir() + "/" + f;
- }
- p_da->list_dir_end();
- return "";
-}
-
class NewProjectDialog : public ConfirmationDialog {
GDCLASS(NewProjectDialog, ConfirmationDialog);
@@ -105,18 +92,18 @@ private:
if (mode != MODE_IMPORT) {
- if (_find_project_file(d) != "") {
+ if (d->file_exists("godot.cfg")) {
- error->set_text(TTR("Invalid project path, *.godot must not exist."));
+ error->set_text(TTR("Invalid project path, godot.cfg must not exist."));
memdelete(d);
return "";
}
} else {
- if (valid_path != "" && _find_project_file(d) == "") {
+ if (valid_path != "" && !d->file_exists("godot.cfg")) {
- error->set_text(TTR("Invalid project path, *.godot must exist."));
+ error->set_text(TTR("Invalid project path, godot.cfg must exist."));
memdelete(d);
return "";
}
@@ -149,7 +136,7 @@ private:
String p = p_path;
if (mode == MODE_IMPORT) {
- if (p.get_extension() == "godot") {
+ if (p.ends_with("godot.cfg")) {
p = p.get_base_dir();
}
@@ -175,7 +162,7 @@ private:
fdialog->set_mode(FileDialog::MODE_OPEN_FILE);
fdialog->clear_filters();
- fdialog->add_filter("*.godot ; " _MKSTR(VERSION_NAME) " Project");
+ fdialog->add_filter("godot.cfg ; " _MKSTR(VERSION_NAME) " Project");
} else {
fdialog->set_mode(FileDialog::MODE_OPEN_DIR);
}
@@ -199,9 +186,9 @@ private:
} else {
if (mode == MODE_NEW) {
- FileAccess *f = FileAccess::open(dir.plus_file("/" + project_name->get_text().replace(" ", "_") + ".godot"), FileAccess::WRITE);
+ FileAccess *f = FileAccess::open(dir.plus_file("/godot.cfg"), FileAccess::WRITE);
if (!f) {
- error->set_text(TTR("Couldn't create *.godot project file in project path."));
+ error->set_text(TTR("Couldn't create godot.cfg in project path."));
} else {
f->store_line("; Engine configuration file.");
@@ -754,17 +741,10 @@ void ProjectManager::_load_recent_projects() {
continue;
String project = _name.get_slice("/", 1);
- DirAccess *dir_access = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
- if (dir_access->change_dir(path) != OK) {
- EditorSettings::get_singleton()->erase(_name);
- continue;
- }
- String conf = _find_project_file(dir_access);
- memdelete(dir_access);
+ String conf = path.plus_file("godot.cfg");
bool favorite = (_name.begins_with("favorite_projects/")) ? true : false;
uint64_t last_modified = 0;
-
if (FileAccess::exists(conf)) {
last_modified = FileAccess::get_modified_time(conf);
@@ -1026,7 +1006,7 @@ void ProjectManager::_scan_dir(DirAccess *da, float pos, float total, List<Strin
while (n != String()) {
if (da->current_is_dir() && !n.begins_with(".")) {
subdirs.push_front(n);
- } else if (n.get_extension() == "godot") {
+ } else if (n == "godot.cfg") {
r_projects->push_back(da->get_current_dir());
}
n = da->get_next();
@@ -1137,7 +1117,7 @@ void ProjectManager::_files_dropped(PoolStringArray p_files, int p_screen) {
dir->list_dir_begin();
String file = dir->get_next();
while (confirm && file != String()) {
- if (!dir->current_is_dir() && file.get_extension() == "godot") {
+ if (!dir->current_is_dir() && file.ends_with("godot.cfg")) {
confirm = false;
}
file = dir->get_next();
diff --git a/editor/project_settings.cpp b/editor/project_settings.cpp
index 7d9ee91f35..858b9403a7 100644
--- a/editor/project_settings.cpp
+++ b/editor/project_settings.cpp
@@ -1168,8 +1168,7 @@ void ProjectSettings::_bind_methods() {
ProjectSettings::ProjectSettings(EditorData *p_data) {
singleton = this;
- String project_file = "(" + GlobalConfig::get_singleton()->get_project_file_name() + ")";
- set_title(TTR("Project Settings " + project_file));
+ set_title(TTR("Project Settings (godot.cfg)"));
set_resizable(true);
undo_redo = &p_data->get_undo_redo();
data = p_data;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 04:45:40 +0000