godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-13 13:31:48 +00:00
Code Releases Wiki Activity

VCS: Add a stern confirmation dialog before discarding all changes

Browse Source
This commit is contained in:
Twarit Waikar
2022-12-21 03:21:33 +05:30
parent f318d60e06
commit d18ed2c18a
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
editor/plugins/version_control_editor_plugin.cpp
View File

@@ -67,6 +67,7 @@ void VersionControlEditorPlugin::_bind_methods() {
ClassDB::bind_method(D_METHOD("_ssh_private_key_selected"), &VersionControlEditorPlugin::_ssh_private_key_selected); ClassDB::bind_method(D_METHOD("_ssh_private_key_selected"), &VersionControlEditorPlugin::_ssh_private_key_selected);
ClassDB::bind_method(D_METHOD("_commit_message_gui_input"), &VersionControlEditorPlugin::_commit_message_gui_input); ClassDB::bind_method(D_METHOD("_commit_message_gui_input"), &VersionControlEditorPlugin::_commit_message_gui_input);
ClassDB::bind_method(D_METHOD("_cell_button_pressed"), &VersionControlEditorPlugin::_cell_button_pressed); ClassDB::bind_method(D_METHOD("_cell_button_pressed"), &VersionControlEditorPlugin::_cell_button_pressed);
ClassDB::bind_method(D_METHOD("_confirm_discard_all"), &VersionControlEditorPlugin::_confirm_discard_all);
ClassDB::bind_method(D_METHOD("_discard_all"), &VersionControlEditorPlugin::_discard_all); ClassDB::bind_method(D_METHOD("_discard_all"), &VersionControlEditorPlugin::_discard_all);
ClassDB::bind_method(D_METHOD("_create_branch"), &VersionControlEditorPlugin::_create_branch); ClassDB::bind_method(D_METHOD("_create_branch"), &VersionControlEditorPlugin::_create_branch);
ClassDB::bind_method(D_METHOD("_create_remote"), &VersionControlEditorPlugin::_create_remote); ClassDB::bind_method(D_METHOD("_create_remote"), &VersionControlEditorPlugin::_create_remote);
@@ -435,6 +436,10 @@ void VersionControlEditorPlugin::_discard_file(String p_file_path, EditorVCSInte
EditorFileSystem::get_singleton()->update_file(p_file_path); EditorFileSystem::get_singleton()->update_file(p_file_path);
} }
void VersionControlEditorPlugin::_confirm_discard_all() {
discard_all_confirm->popup_centered();
}
void VersionControlEditorPlugin::_discard_all() { void VersionControlEditorPlugin::_discard_all() {
TreeItem *file_entry = unstaged_files->get_root()->get_first_child(); TreeItem *file_entry = unstaged_files->get_root()->get_first_child();
while (file_entry) { while (file_entry) {
@@ -1240,10 +1245,21 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
refresh_button->connect(SNAME("pressed"), callable_mp(this, &VersionControlEditorPlugin::_refresh_remote_list)); refresh_button->connect(SNAME("pressed"), callable_mp(this, &VersionControlEditorPlugin::_refresh_remote_list));
unstage_title->add_child(refresh_button); unstage_title->add_child(refresh_button);
discard_all_confirm = memnew(AcceptDialog);
discard_all_confirm->set_title(TTR("Discard all changes"));
discard_all_confirm->set_min_size(Size2i(400, 50));
discard_all_confirm->set_text(TTR("This operation is IRREVERSIBLE. Your changes will be deleted FOREVER."));
discard_all_confirm->set_hide_on_ok(true);
discard_all_confirm->set_ok_button_text(TTR("Permanentally delete my changes"));
discard_all_confirm->add_cancel_button();
version_commit_dock->add_child(discard_all_confirm);
discard_all_confirm->get_ok_button()->connect(SNAME("pressed"), callable_mp(this, &VersionControlEditorPlugin::_discard_all));
discard_all_button = memnew(Button); discard_all_button = memnew(Button);
discard_all_button->set_tooltip_text(TTR("Discard all changes")); discard_all_button->set_tooltip_text(TTR("Discard all changes"));
discard_all_button->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Close"), SNAME("EditorIcons"))); discard_all_button->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Close"), SNAME("EditorIcons")));
discard_all_button->connect(SNAME("pressed"), callable_mp(this, &VersionControlEditorPlugin::_discard_all)); discard_all_button->connect(SNAME("pressed"), callable_mp(this, &VersionControlEditorPlugin::_confirm_discard_all));
discard_all_button->set_flat(true); discard_all_button->set_flat(true);
unstage_title->add_child(discard_all_button); unstage_title->add_child(discard_all_button);

3
editor/plugins/version_control_editor_plugin.h
View File

@@ -86,6 +86,8 @@ private:
FileDialog *set_up_ssh_private_key_file_dialog = nullptr; FileDialog *set_up_ssh_private_key_file_dialog = nullptr;
Label *set_up_warning_text = nullptr; Label *set_up_warning_text = nullptr;
AcceptDialog *discard_all_confirm = nullptr;
OptionButton *commit_list_size_button = nullptr; OptionButton *commit_list_size_button = nullptr;
AcceptDialog *branch_create_confirm = nullptr; AcceptDialog *branch_create_confirm = nullptr;
@@ -157,6 +159,7 @@ private:
void _force_push(); void _force_push();
void _fetch(); void _fetch();
void _commit(); void _commit();
void _confirm_discard_all();
void _discard_all(); void _discard_all();
void _refresh_stage_area(); void _refresh_stage_area();
void _refresh_branch_list(); void _refresh_branch_list();