Browse Source

Centralizing file operation defaults

Source commit: 054a2452723ca6716ca99b86253cbfc1270c5213
Martin Prikryl 5 năm trước cách đây
mục cha
commit
3dbd7b44a0

+ 2 - 3
source/packages/filemng/DirView.pas

@@ -539,7 +539,7 @@ begin
     end;
   end;
 
-  FileOperator.Flags := [foAllowUndo, foNoConfirmMkDir];
+  FileOperator.Flags := FileOperatorDefaultFlags;
   if RenameOnCollision then
   begin
     FileOperator.Flags := FileOperator.Flags + [foRenameOnCollision];
@@ -833,7 +833,6 @@ begin
   FNotRelative := False;
 
   FFileOperator := TFileOperator.Create(Self);
-  FFileOperator.Flags := [foAllowUndo, foNoConfirmMkDir];
   FDirOK := True;
   FPath := '';
 
@@ -2851,7 +2850,7 @@ begin
 
   with FFileOperator do
   begin
-    Flags := [foAllowUndo, foNoConfirmation];
+    Flags := FileOperatorDefaultFlags + [foNoConfirmation];
     Operation := foRename;
     OperandFrom.Clear;
     OperandTo.Clear;

+ 1 - 2
source/packages/filemng/DriveView.pas

@@ -478,7 +478,6 @@ begin
   end;
 
   FFileOperator := TFileOperator.Create(Self);
-  FFileOperator.Flags := [foAllowUndo, foNoConfirmMkDir];
 
   FShowVolLabel := True;
   FChangeFlag := False;
@@ -835,7 +834,7 @@ begin
 
     with FFileOperator do
     begin
-      Flags := [foAllowUndo, foNoConfirmation];
+      Flags := FileOperatorDefaultFlags + [foNoConfirmation];
       Operation := foRename;
       OperandFrom.Clear;
       OperandTo.Clear;

+ 5 - 1
source/packages/filemng/FileOperator.pas

@@ -175,6 +175,9 @@ Type
     Property WantMappingHandle :Boolean  Read GetWantMappingHandle Write SetWantMappingHandle Stored false;
   end;
 
+const
+  FileOperatorDefaultFlags = [foAllowUndo, foNoConfirmMkDir];
+
 procedure Register;
 
 resourcestring
@@ -296,7 +299,8 @@ begin
  fLastFrom := TStringList.Create;
  fLastTo   := TStringList.Create;
  fCanUndo  := False;
- FData.fFlags := FOF_ALLOWUNDO OR FOF_NOCONFIRMMKDIR;
+ FData.fFlags := 0;
+ Flags := FileOperatorDefaultFlags;
 end; {Create}