fix: some remaining issues in the new file-open/save dialogs

ansgarbecker · ansgarbecker · commit 34e3f32a07bc · 2025-11-29T14:17:14.000+01:00
* add missing support for ofFileMustExist, by default enabled in TExtFileOpenDialog * store and restore previously selected path * support single FileName when MultiSelect is true * avoid setting unwanted tree path when caller provides an empty FileName or InitialDir * set different default form caption for open + save mode (todo: include lclstrconsts translation files in packages) Refs #2268
diff --git a/source/extfiledialog.lfm b/source/extfiledialog.lfm
@@ -37,6 +37,7 @@ object frmExtFileDialog: TfrmExtFileDialog
       BorderSpacing.Right = 10
       TabOrder = 0
       Text = 'editFilename'
+      OnEditingDone = editFilenameEditingDone
     end
     object lblFilename: TLabel
       AnchorSideLeft.Control = pnlBottom
@@ -222,7 +223,7 @@ object frmExtFileDialog: TfrmExtFileDialog
   end
   object IdleTimerTreeNodeScrolltoview: TIdleTimer
     AutoEnabled = True
-    Interval = 100
+    Interval = 200
     OnTimer = IdleTimerTreeNodeScrolltoviewTimer
     Left = 32
     Top = 64
diff --git a/source/extfiledialog.pas b/source/extfiledialog.pas
@@ -31,6 +31,7 @@   TfrmExtFileDialog = class(TExtForm)
     procedure comboEncodingChange(Sender: TObject);
     procedure comboFileTypeChange(Sender: TObject);
     procedure comboLineBreaksChange(Sender: TObject);
+    procedure editFilenameEditingDone(Sender: TObject);
     procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
@@ -74,7 +75,6 @@   TfrmExtFileDialog = class(TExtForm)
     procedure AddFileType(FileMask, DisplayName: String);
     property FileName: String read GetFileName write SetFileName;
     property InitialDir: String read FInitialDir write SetInitialDir;
-    class var PreviousDir: String;
     property DefaultExt: String read FDefaultExt write FDefaultExt;
     property Options: TOpenOptions read FOptions write FOptions;
     property Files: TStringList read FFiles;
@@ -83,13 +83,15 @@   TfrmExtFileDialog = class(TExtForm)
 
   // File-open-dialog with encoding selector
   TExtFileOpenDialog = class(TfrmExtFileDialog)
+    procedure FormCreate(Sender: TObject); overload;
     procedure FormShow(Sender: TObject); overload;
     public
       property Encodings: TStringList read FEncodings write FEncodings;
       property EncodingIndex: Integer read FEncodingIndex write FEncodingIndex;
   end;
 
   TExtFileSaveDialog = class(TfrmExtFileDialog)
+    procedure FormCreate(Sender: TObject); overload;
     procedure FormShow(Sender: TObject); overload;
     public
       property LineBreakIndex: TLineBreaks read FLineBreakIndex write FLineBreakIndex;
@@ -131,7 +133,7 @@ procedure TfrmExtFileDialog.FormCreate(Sender: TObject);
 
 procedure TfrmExtFileDialog.FormDestroy(Sender: TObject);
 begin
-  PreviousDir := ShellTreeView.Path;
+  AppSettings.WriteString(asFileDialogPreviousDir, ShellTreeView.Path);
   FFilterNames.Free;
   FFilterMasks.Free;
   FEncodings.Free;
@@ -141,9 +143,10 @@ procedure TfrmExtFileDialog.FormDestroy(Sender: TObject);
 procedure TfrmExtFileDialog.FormShow(Sender: TObject);
 var
   LineBreakIndexInt: Integer;
+  PreviousDir: String;
 begin
   ShellListView.MultiSelect := ofAllowMultiSelect in FOptions;
-  // Todo: support ofFileMustExist
+  PreviousDir := AppSettings.ReadString(asFileDialogPreviousDir);
   if not FInitialDir.IsEmpty then
     SetInitialDir(FInitialDir)
   else if not PreviousDir.IsEmpty then
@@ -251,6 +254,12 @@ procedure TfrmExtFileDialog.comboLineBreaksChange(Sender: TObject);
   end;
 end;
 
+procedure TfrmExtFileDialog.editFilenameEditingDone(Sender: TObject);
+begin
+  FFiles.Clear;
+  FFiles.Add(GetFileName);
+end;
+
 procedure TfrmExtFileDialog.FormCloseQuery(Sender: TObject;
   var CanClose: Boolean);
 begin
@@ -265,10 +274,16 @@ procedure TfrmExtFileDialog.FormCloseQuery(Sender: TObject;
     Exit;
   end;
 
-  // Ask user whether to overwrite the selected file
-  if (Self is TExtFileSaveDialog) and (ofOverwritePrompt in FOptions) and (FileExists(FileName)) then begin
+  // Only for save dialogs: Ask user whether to overwrite the selected file
+  if (ofOverwritePrompt in FOptions) and (FileExists(FileName)) then begin
     CanClose := MessageDialog(f_('File already exists: %s'+sLineBreak+sLineBreak+'Overwrite it?', [FileName]), mtConfirmation, [mbYes, mbNo]) = mrYes;
   end;
+
+  // Only for open dialogs: Error if file does not exist
+  if (ofFileMustExist in FOptions) and (not FileExists(FileName)) then begin
+    ErrorDialog(f_('File does not exist: %s', [FileName]));
+    CanClose := False;
+  end;
 end;
 
 procedure TfrmExtFileDialog.comboEncodingChange(Sender: TObject);
@@ -337,6 +352,8 @@ procedure TfrmExtFileDialog.SetFileName(const AValue: String);
 var
   fn: String;
 begin
+  if AValue.IsEmpty then
+    Exit;
   fn := ExpandFileName(AValue);
   SetInitialDir(ExtractFilePath(fn));
   editFilename.Text := ExtractFileName(fn);
@@ -349,6 +366,9 @@ procedure TfrmExtFileDialog.SetInitialDir(const AValue: String);
   i: Integer;
 begin
   // Try to set path on tree
+  // Note both .FileName and .InitialDir go here, and .FileName := '' sets the initial dir to the app directory.
+  if AValue.IsEmpty then
+    Exit;
   FInitialDir := AValue;
   CurPath := AValue;
   for i:=0 to 10 do begin
@@ -378,6 +398,13 @@ procedure TfrmExtFileDialog.SetFilterIndex(AValue: Integer);
 
 { TExtFileOpenDialog }
 
+procedure TExtFileOpenDialog.FormCreate(Sender: TObject);
+begin
+  inherited;
+  Include(FOptions, ofFileMustExist);
+  Caption := _('Open existing file');
+end;
+
 procedure TExtFileOpenDialog.FormShow(Sender: TObject);
 var
   EncodingVisible: Boolean;
@@ -392,6 +419,12 @@ procedure TExtFileOpenDialog.FormShow(Sender: TObject);
 
 { TExtFileSaveDialog }
 
+procedure TExtFileSaveDialog.FormCreate(Sender: TObject);
+begin
+  inherited;
+  Caption := _('Save to file');
+end;
+
 procedure TExtFileSaveDialog.FormShow(Sender: TObject);
 var
   LinebreaksVisible: Boolean;
