diff options
| author | Max Hilbrunner <mhilbrunner@users.noreply.github.com> | 2018-07-05 00:30:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-05 00:30:06 +0200 |
| commit | 4f39d330cf1c6434988fffa5b01428d86d1e3d4c (patch) | |
| tree | d20c8a83bfbd5e678fa4e368f04c35bf0db02566 /editor/filesystem_dock.h | |
| parent | dc2d8d4dee22ca870dffb7a7a4508dabb18a9988 (diff) | |
| parent | 8ae652bd592c519373d8423a6e337b99940643e3 (diff) | |
Merge pull request #19245 from swarnimarun/overwrite_fix
Fix overwrite of file/folder of same name without warning
Diffstat (limited to 'editor/filesystem_dock.h')
| -rw-r--r-- | editor/filesystem_dock.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/editor/filesystem_dock.h b/editor/filesystem_dock.h index 53f77b64f9..96b81fd229 100644 --- a/editor/filesystem_dock.h +++ b/editor/filesystem_dock.h @@ -129,6 +129,7 @@ private: LineEdit *duplicate_dialog_text; ConfirmationDialog *make_dir_dialog; LineEdit *make_dir_dialog_text; + ConfirmationDialog *overwrite_dialog; ScriptCreateDialog *make_script_dialog_text; class FileOrFolder { @@ -146,6 +147,7 @@ private: FileOrFolder to_rename; FileOrFolder to_duplicate; Vector<FileOrFolder> to_move; + String to_move_path; Vector<String> history; int history_pos; @@ -191,7 +193,9 @@ private: void _make_dir_confirm(); void _rename_operation_confirm(); void _duplicate_operation_confirm(); - void _move_operation_confirm(const String &p_to_path); + void _move_with_overwrite(); + bool _check_existing(); + void _move_operation_confirm(const String &p_to_path, bool overwrite = false); void _file_option(int p_option); void _folder_option(int p_option); |