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

Rework Create Folder

Browse Source
This commit is contained in:
kobewi 2024-08-08 00:01:33 +02:00
parent 4bef4d9808
commit 6af1ae4230
2 changed files with 31 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
editor/project_manager/project_dialog.cpp
View File

@ -90,7 +90,7 @@ void ProjectDialog::_validate_path() {
Ref<DirAccess> d = DirAccess::create(DirAccess::ACCESS_FILESYSTEM); Ref<DirAccess> d = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
String path = project_path->get_text().simplify_path(); String path = project_path->get_text().simplify_path();
String target_path = path; String target_path = _get_target_path();
InputType target_path_input_type = PROJECT_PATH; InputType target_path_input_type = PROJECT_PATH;
if (mode == MODE_IMPORT) { if (mode == MODE_IMPORT) {
@ -108,7 +108,6 @@ void ProjectDialog::_validate_path() {
} }
if (!zip_path.is_empty()) { if (!zip_path.is_empty()) {
target_path = install_path->get_text().simplify_path();
target_path_input_type = INSTALL_PATH; target_path_input_type = INSTALL_PATH;
create_dir->show(); create_dir->show();
@ -240,22 +239,16 @@ void ProjectDialog::_validate_path() {
} }
String ProjectDialog::_get_target_path() { String ProjectDialog::_get_target_path() {
String path;
if (mode == MODE_NEW || mode == MODE_INSTALL) { if (mode == MODE_NEW || mode == MODE_INSTALL) {
return project_path->get_text(); path = project_path->get_text();
} else if (mode == MODE_IMPORT) { } else if (mode == MODE_IMPORT) {
return install_path->get_text(); path = install_path->get_text();
} else {
ERR_FAIL_V("");
} }
} if (project_name_suffix->is_visible() || install_name_suffix->is_visible()) {
void ProjectDialog::_set_target_path(const String &p_text) { path = path.path_join(auto_dir);
if (mode == MODE_NEW || mode == MODE_INSTALL) {
project_path->set_text(p_text);
} else if (mode == MODE_IMPORT) {
install_path->set_text(p_text);
} else {
ERR_FAIL();
} }
return path;
} }
void ProjectDialog::_update_target_auto_dir() { void ProjectDialog::_update_target_auto_dir() {
@ -289,61 +282,34 @@ void ProjectDialog::_update_target_auto_dir() {
break; break;
} }
new_auto_dir = OS::get_singleton()->get_safe_dir_name(new_auto_dir); new_auto_dir = OS::get_singleton()->get_safe_dir_name(new_auto_dir);
if (create_dir->is_pressed()) {
String target_path = _get_target_path();
if (target_path.get_file() == auto_dir) {
// Update target dir name to new project name / ZIP name.
target_path = target_path.get_base_dir().path_join(new_auto_dir);
}
_set_target_path(target_path);
}
auto_dir = new_auto_dir; auto_dir = new_auto_dir;
_create_dir_toggled(create_dir->is_pressed());
} }
void ProjectDialog::_create_dir_toggled(bool p_pressed) { void ProjectDialog::_create_dir_toggled(bool p_pressed) {
String target_path = _get_target_path(); if (p_pressed) {
project_name_suffix->set_text("/" + auto_dir);
if (create_dir->is_pressed()) { install_name_suffix->set_text("/" + auto_dir);
// (Re-)append target dir name.
if (last_custom_target_dir.is_empty()) {
target_path = target_path.path_join(auto_dir);
} else {
target_path = target_path.path_join(last_custom_target_dir);
}
} else {
// Strip any trailing slash.
target_path = target_path.rstrip("/\\");
// Save and remove target dir name.
if (target_path.get_file() == auto_dir) {
last_custom_target_dir = "";
} else {
last_custom_target_dir = target_path.get_file();
}
target_path = target_path.get_base_dir();
} }
project_name_suffix->set_visible(p_pressed && mode == MODE_NEW);
_set_target_path(target_path); install_name_suffix->set_visible(p_pressed && mode == MODE_IMPORT);
_validate_path(); _validate_path();
} }
void ProjectDialog::_project_name_changed() { void ProjectDialog::_project_name_changed() {
if (mode == MODE_NEW || mode == MODE_INSTALL) { if (mode == MODE_NEW || mode == MODE_INSTALL) {
_update_target_auto_dir(); _update_target_auto_dir();
} else {
_validate_path();
} }
_validate_path();
} }
void ProjectDialog::_project_path_changed() { void ProjectDialog::_project_path_changed() {
if (mode == MODE_IMPORT) { if (mode == MODE_IMPORT) {
_update_target_auto_dir(); _update_target_auto_dir();
} else {
_validate_path();
} }
_validate_path();
} }
void ProjectDialog::_install_path_changed() { void ProjectDialog::_install_path_changed() {
@ -397,13 +363,7 @@ void ProjectDialog::_browse_install_path() {
void ProjectDialog::_project_path_selected(const String &p_path) { void ProjectDialog::_project_path_selected(const String &p_path) {
show_dialog(false); show_dialog(false);
if (create_dir->is_pressed() && (mode == MODE_NEW || mode == MODE_INSTALL)) { project_path->set_text(p_path);
// Replace parent directory, but keep target dir name.
project_path->set_text(p_path.path_join(project_path->get_text().get_file()));
} else {
project_path->set_text(p_path);
}
_project_path_changed(); _project_path_changed();
if (install_path->is_visible_in_tree()) { if (install_path->is_visible_in_tree()) {
@ -417,13 +377,7 @@ void ProjectDialog::_project_path_selected(const String &p_path) {
void ProjectDialog::_install_path_selected(const String &p_path) { void ProjectDialog::_install_path_selected(const String &p_path) {
ERR_FAIL_COND_MSG(mode != MODE_IMPORT, "Install path is only used for MODE_IMPORT."); ERR_FAIL_COND_MSG(mode != MODE_IMPORT, "Install path is only used for MODE_IMPORT.");
if (create_dir->is_pressed()) { install_path->set_text(p_path);
// Replace parent directory, but keep target dir name.
install_path->set_text(p_path.path_join(install_path->get_text().get_file()));
} else {
install_path->set_text(p_path);
}
_install_path_changed(); _install_path_changed();
get_ok_button()->grab_focus(); get_ok_button()->grab_focus();
@ -482,7 +436,7 @@ void ProjectDialog::ok_pressed() {
return; return;
} }
String path = project_path->get_text(); String path = _get_target_path();
if (mode == MODE_NEW) { if (mode == MODE_NEW) {
if (create_dir->is_pressed()) { if (create_dir->is_pressed()) {
@ -546,7 +500,6 @@ void ProjectDialog::ok_pressed() {
break; break;
} }
path = install_path->get_text().simplify_path();
[[fallthrough]]; [[fallthrough]];
} }
case MODE_INSTALL: { case MODE_INSTALL: {
@ -777,19 +730,12 @@ void ProjectDialog::show_dialog(bool p_reset_name) {
callable_mp((Control *)project_path, &Control::grab_focus).call_deferred(); callable_mp((Control *)project_path, &Control::grab_focus).call_deferred();
} }
auto_dir = "";
last_custom_target_dir = "";
_update_target_auto_dir(); _update_target_auto_dir();
if (create_dir->is_pressed()) {
// Append `auto_dir` to target path.
_create_dir_toggled(true);
}
} }
_validate_path(); _validate_path();
popup_centered(Size2(500, 0) * EDSCALE); popup_centered(Size2(800, 0) * EDSCALE);
} }
void ProjectDialog::_notification(int p_what) { void ProjectDialog::_notification(int p_what) {
@ -871,6 +817,14 @@ ProjectDialog::ProjectDialog() {
install_path->set_structured_text_bidi_override(TextServer::STRUCTURED_TEXT_FILE); install_path->set_structured_text_bidi_override(TextServer::STRUCTURED_TEXT_FILE);
iphb->add_child(install_path); iphb->add_child(install_path);
project_name_suffix = memnew(Label);
project_name_suffix->hide();
pphb->add_child(project_name_suffix);
install_name_suffix = memnew(Label);
install_name_suffix->hide();
iphb->add_child(install_name_suffix);
// status icon // status icon
project_status_rect = memnew(TextureRect); project_status_rect = memnew(TextureRect);
project_status_rect->set_stretch_mode(TextureRect::STRETCH_KEEP_CENTERED); project_status_rect->set_stretch_mode(TextureRect::STRETCH_KEEP_CENTERED);

6
editor/project_manager/project_dialog.h
View File

@ -79,6 +79,8 @@ private:
Ref<ButtonGroup> renderer_button_group; Ref<ButtonGroup> renderer_button_group;
Label *msg = nullptr; Label *msg = nullptr;
Label *project_name_suffix = nullptr;
Label *install_name_suffix = nullptr;
LineEdit *project_name = nullptr; LineEdit *project_name = nullptr;
LineEdit *project_path = nullptr; LineEdit *project_path = nullptr;
LineEdit *install_path = nullptr; LineEdit *install_path = nullptr;
@ -100,16 +102,12 @@ private:
// Project path for MODE_NEW and MODE_INSTALL. Install path for MODE_IMPORT. // Project path for MODE_NEW and MODE_INSTALL. Install path for MODE_IMPORT.
// Install path is only visible when importing a ZIP. // Install path is only visible when importing a ZIP.
String _get_target_path(); String _get_target_path();
void _set_target_path(const String &p_text);
// Calculated from project name / ZIP name. // Calculated from project name / ZIP name.
String auto_dir; String auto_dir;
// Updates `auto_dir`. If the target path dir name is equal to `auto_dir` (the default state), the target path is also updated. // Updates `auto_dir`. If the target path dir name is equal to `auto_dir` (the default state), the target path is also updated.
void _update_target_auto_dir(); void _update_target_auto_dir();
// While `create_dir` is disabled, stores the last target path dir name, or an empty string if equal to `auto_dir`.
String last_custom_target_dir;
void _create_dir_toggled(bool p_pressed); void _create_dir_toggled(bool p_pressed);
void _project_name_changed(); void _project_name_changed();