Merge pull request #99787 from KoBeWi/nonempt_dialog

Fix non-empty project folder confirmation dialog
This commit is contained in:
Rémi Verschelde 2024-11-29 22:02:50 +01:00
commit 537c05bb71
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 9 additions and 6 deletions

View File

@ -488,12 +488,14 @@ void ProjectDialog::ok_pressed() {
// Before we create a project, check that the target folder is empty.
// If not, we need to ask the user if they're sure they want to do this.
if (!is_folder_empty) {
ConfirmationDialog *cd = memnew(ConfirmationDialog);
cd->set_title(TTR("Warning: This folder is not empty"));
cd->set_text(TTR("You are about to create a Godot project in a non-empty folder.\nThe entire contents of this folder will be imported as project resources!\n\nAre you sure you wish to continue?"));
cd->get_ok_button()->connect(SceneStringName(pressed), callable_mp(this, &ProjectDialog::_nonempty_confirmation_ok_pressed));
get_parent()->add_child(cd);
cd->popup_centered();
if (!nonempty_confirmation) {
nonempty_confirmation = memnew(ConfirmationDialog);
nonempty_confirmation->set_title(TTR("Warning: This folder is not empty"));
nonempty_confirmation->set_text(TTR("You are about to create a Godot project in a non-empty folder.\nThe entire contents of this folder will be imported as project resources!\n\nAre you sure you wish to continue?"));
nonempty_confirmation->get_ok_button()->connect(SceneStringName(pressed), callable_mp(this, &ProjectDialog::_nonempty_confirmation_ok_pressed));
add_child(nonempty_confirmation);
}
nonempty_confirmation->popup_centered();
return;
}

View File

@ -65,6 +65,7 @@ private:
Mode mode = MODE_NEW;
bool is_folder_empty = true;
ConfirmationDialog *nonempty_confirmation = nullptr;
CheckButton *create_dir = nullptr;
Button *project_browse = nullptr;