godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-03 16:55:53 +00:00
Code Releases Wiki Activity

add confirmation dialogue to filesystem dock

Browse Source
This commit is contained in:
Nubels
2025-07-27 10:27:46 +02:00
parent 0dd9178269
commit 3d764e57c9
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
editor/docks/filesystem_dock.cpp
View File

@@ -1878,6 +1878,10 @@ void FileSystemDock::_duplicate_operation_confirm(const String &p_path) {
_try_duplicate_item(to_duplicate, p_path); _try_duplicate_item(to_duplicate, p_path);
} }
void FileSystemDock::_move_confirm() {
_move_operation_confirm(confirm_move_to_dir, confirm_to_copy);
}
void FileSystemDock::_overwrite_dialog_action(bool p_overwrite) { void FileSystemDock::_overwrite_dialog_action(bool p_overwrite) {
overwrite_dialog->hide(); overwrite_dialog->hide();
_move_operation_confirm(to_move_path, to_move_or_copy, p_overwrite ? OVERWRITE_REPLACE : OVERWRITE_RENAME); _move_operation_confirm(to_move_path, to_move_or_copy, p_overwrite ? OVERWRITE_REPLACE : OVERWRITE_RENAME);
@@ -3116,11 +3120,19 @@ void FileSystemDock::drop_data_fw(const Point2 &p_point, const Variant &p_data,
} }
} }
if (!to_move.is_empty()) { if (!to_move.is_empty()) {
String move_confirm_text;
confirm_move_to_dir = to_dir;
if (Input::get_singleton()->is_key_pressed(Key::CMD_OR_CTRL)) { if (Input::get_singleton()->is_key_pressed(Key::CMD_OR_CTRL)) {
_move_operation_confirm(to_dir, true); move_confirm_text = vformat(TTR("Copy %d selected item(s) to \"%s\"?"), to_move.size(), target_dir);
confirm_to_copy = true;
} else { } else {
_move_operation_confirm(to_dir); move_confirm_text = vformat(TTR("Move %d selected item(s) to \"%s\"?"), to_move.size(), target_dir);
confirm_to_copy = false;
} }
move_confirm_dialog->set_text(move_confirm_text);
move_confirm_dialog->popup_centered();
} }
} else if (favorite) { } else if (favorite) {
// Add the files from favorites. // Add the files from favorites.
@@ -4393,6 +4405,10 @@ FileSystemDock::FileSystemDock() {
conversion_dialog->set_ok_button_text(TTRC("Convert")); conversion_dialog->set_ok_button_text(TTRC("Convert"));
conversion_dialog->connect(SceneStringName(confirmed), callable_mp(this, &FileSystemDock::_convert_dialog_action)); conversion_dialog->connect(SceneStringName(confirmed), callable_mp(this, &FileSystemDock::_convert_dialog_action));
move_confirm_dialog = memnew(ConfirmationDialog);
add_child(move_confirm_dialog);
move_confirm_dialog->connect(SceneStringName(confirmed), callable_mp(this, &FileSystemDock::_move_confirm));
uncollapsed_paths_before_search = Vector<String>(); uncollapsed_paths_before_search = Vector<String>();
tree_update_id = 0; tree_update_id = 0;

5
editor/docks/filesystem_dock.h
View File

@@ -196,12 +196,16 @@ private:
Label *overwrite_dialog_file_list = nullptr; Label *overwrite_dialog_file_list = nullptr;
ConfirmationDialog *conversion_dialog = nullptr; ConfirmationDialog *conversion_dialog = nullptr;
ConfirmationDialog *move_confirm_dialog = nullptr;
SceneCreateDialog *make_scene_dialog = nullptr; SceneCreateDialog *make_scene_dialog = nullptr;
ScriptCreateDialog *make_script_dialog = nullptr; ScriptCreateDialog *make_script_dialog = nullptr;
ShaderCreateDialog *make_shader_dialog = nullptr; ShaderCreateDialog *make_shader_dialog = nullptr;
CreateDialog *new_resource_dialog = nullptr; CreateDialog *new_resource_dialog = nullptr;
String confirm_move_to_dir;
bool confirm_to_copy = false;
bool always_show_folders = false; bool always_show_folders = false;
int thumbnail_size_setting = 0; int thumbnail_size_setting = 0;
@@ -299,6 +303,7 @@ private:
void _make_scene_confirm(); void _make_scene_confirm();
void _rename_operation_confirm(); void _rename_operation_confirm();
void _duplicate_operation_confirm(const String &p_path); void _duplicate_operation_confirm(const String &p_path);
void _move_confirm();
void _overwrite_dialog_action(bool p_overwrite); void _overwrite_dialog_action(bool p_overwrite);
void _convert_dialog_action(); void _convert_dialog_action();
Vector<String> _check_existing(); Vector<String> _check_existing();