summaryrefslogtreecommitdiffstats
path: root/editor/filesystem_dock.h
diff options
context:
space:
mode:
authorsteincodes <swarnimarun11@gmail.com>2018-05-29 18:03:11 +0530
committersteincodes <swarnimarun11@gmail.com>2018-06-12 21:54:43 +0530
commit8ae652bd592c519373d8423a6e337b99940643e3 (patch)
tree62c91ef6a6c69c93c207937b82fbdacc546acccf /editor/filesystem_dock.h
parent46bab3abc71156cd2da95312368f2c72abe7b151 (diff)
downloadredot-engine-8ae652bd592c519373d8423a6e337b99940643e3.tar.gz
Fix for overwriting files and folders on move
Diffstat (limited to 'editor/filesystem_dock.h')
-rw-r--r--editor/filesystem_dock.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/editor/filesystem_dock.h b/editor/filesystem_dock.h
index e59d4c96e1..dc84b53679 100644
--- a/editor/filesystem_dock.h
+++ b/editor/filesystem_dock.h
@@ -128,6 +128,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 {
@@ -145,6 +146,7 @@ private:
FileOrFolder to_rename;
FileOrFolder to_duplicate;
Vector<FileOrFolder> to_move;
+ String to_move_path;
Vector<String> history;
int history_pos;
@@ -190,7 +192,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);