godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-30 16:26:50 +00:00
Code Releases Wiki Activity

Add the ability to remove project contents from the remove project dialog

Browse Source
This commit is contained in:
Lightning_A
2021-03-20 12:31:49 -06:00
parent 2274d4eebc
commit 93f944b070
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
editor/project_manager.cpp
View File

@@ -1038,7 +1038,7 @@ public:
int get_project_count() const; int get_project_count() const;
void select_project(int p_index); void select_project(int p_index);
void select_first_visible_project(); void select_first_visible_project();
void erase_selected_projects(); void erase_selected_projects(bool p_delete_project_contents);
Vector<Item> get_selected_projects() const; Vector<Item> get_selected_projects() const;
const Set<String> &get_selected_project_keys() const; const Set<String> &get_selected_project_keys() const;
void ensure_project_visible(int p_index); void ensure_project_visible(int p_index);
@@ -1693,7 +1693,7 @@ void ProjectList::toggle_select(int p_index) {
item.control->update(); item.control->update();
} }
void ProjectList::erase_selected_projects() { void ProjectList::erase_selected_projects(bool p_delete_project_contents) {
if (_selected_project_keys.size() == 0) { if (_selected_project_keys.size() == 0) {
return; return;
} }
@@ -1704,6 +1704,10 @@ void ProjectList::erase_selected_projects() {
EditorSettings::get_singleton()->erase("projects/" + item.project_key); EditorSettings::get_singleton()->erase("projects/" + item.project_key);
EditorSettings::get_singleton()->erase("favorite_projects/" + item.project_key); EditorSettings::get_singleton()->erase("favorite_projects/" + item.project_key);
if (p_delete_project_contents) {
OS::get_singleton()->move_to_trash(item.path);
}
memdelete(item.control); memdelete(item.control);
_projects.remove(i); _projects.remove(i);
--i; --i;
@@ -2222,7 +2226,7 @@ void ProjectManager::_rename_project() {
} }
void ProjectManager::_erase_project_confirm() { void ProjectManager::_erase_project_confirm() {
_project_list->erase_selected_projects(); _project_list->erase_selected_projects(delete_project_contents->is_pressed());
_update_project_buttons(); _update_project_buttons();
} }
@@ -2240,12 +2244,13 @@ void ProjectManager::_erase_project() {
String confirm_message; String confirm_message;
if (selected_list.size() >= 2) { if (selected_list.size() >= 2) {
confirm_message = vformat(TTR("Remove %d projects from the list?\nThe project folders' contents won't be modified."), selected_list.size()); confirm_message = vformat(TTR("Remove %d projects from the list?"), selected_list.size());
} else { } else {
confirm_message = TTR("Remove this project from the list?\nThe project folder's contents won't be modified."); confirm_message = TTR("Remove this project from the list?");
} }
erase_ask->set_text(confirm_message); erase_ask_label->set_text(confirm_message);
delete_project_contents->set_pressed(false);
erase_ask->popup_centered(); erase_ask->popup_centered();
} }
@@ -2656,6 +2661,16 @@ ProjectManager::ProjectManager() {
erase_ask->get_ok_button()->connect("pressed", callable_mp(this, &ProjectManager::_erase_project_confirm)); erase_ask->get_ok_button()->connect("pressed", callable_mp(this, &ProjectManager::_erase_project_confirm));
add_child(erase_ask); add_child(erase_ask);
VBoxContainer *erase_ask_vb = memnew(VBoxContainer);
erase_ask->add_child(erase_ask_vb);
erase_ask_label = memnew(Label);
erase_ask_vb->add_child(erase_ask_label);
delete_project_contents = memnew(CheckBox);
delete_project_contents->set_text(TTR("Also delete project contents (no undo!)"));
erase_ask_vb->add_child(delete_project_contents);
multi_open_ask = memnew(ConfirmationDialog); multi_open_ask = memnew(ConfirmationDialog);
multi_open_ask->get_ok_button()->set_text(TTR("Edit")); multi_open_ask->get_ok_button()->set_text(TTR("Edit"));
multi_open_ask->get_ok_button()->connect("pressed", callable_mp(this, &ProjectManager::_open_selected_projects)); multi_open_ask->get_ok_button()->connect("pressed", callable_mp(this, &ProjectManager::_open_selected_projects));

4
editor/project_manager.h
View File

@@ -67,7 +67,11 @@ class ProjectManager : public Control {
FileDialog *scan_dir; FileDialog *scan_dir;
ConfirmationDialog *language_restart_ask; ConfirmationDialog *language_restart_ask;
ConfirmationDialog *erase_ask; ConfirmationDialog *erase_ask;
Label *erase_ask_label;
CheckBox *delete_project_contents;
ConfirmationDialog *erase_missing_ask; ConfirmationDialog *erase_missing_ask;
ConfirmationDialog *multi_open_ask; ConfirmationDialog *multi_open_ask;
ConfirmationDialog *multi_run_ask; ConfirmationDialog *multi_run_ask;