mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

UPD: File Packages can't be selected when select a real file on macOS

Browse source
This commit is contained in:
rich2014 2026-01-19 17:08:24 +08:00
commit e206e475c2
8 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/fdiffer.pas
View file

@ -492,6 +492,7 @@ procedure TfrmDiffer.actOpenLeftExecute(Sender: TObject);
begin
dmComData.OpenDialog.FileName:= edtFileNameLeft.Text;
dmComData.OpenDialog.Filter:= EmptyStr;
dmComData.OpenDialog.OptionsEx:= [ofAllowsFilePackagesContents];
if dmComData.OpenDialog.Execute then
begin
edtFileNameLeft.Text:= dmComData.OpenDialog.FileName;
@ -503,6 +504,7 @@ procedure TfrmDiffer.actOpenRightExecute(Sender: TObject);
begin
dmComData.OpenDialog.FileName:= edtFileNameRight.Text;
dmComData.OpenDialog.Filter:= EmptyStr;
dmComData.OpenDialog.OptionsEx:= [ofAllowsFilePackagesContents];
if dmComData.OpenDialog.Execute then
begin
edtFileNameRight.Text:= dmComData.OpenDialog.FileName;
@ -545,6 +547,8 @@ end;
procedure TfrmDiffer.actSaveLeftAsExecute(Sender: TObject);
begin
dmComData.SaveDialog.FileName:= edtFileNameLeft.FileName;
dmComData.SaveDialog.Filter:= EmptyStr;
dmComData.SaveDialog.OptionsEx:= [ofAllowsFilePackagesContents];
if dmComData.SaveDialog.Execute then
begin
PushPop(FElevate);
@ -560,6 +564,8 @@ end;
procedure TfrmDiffer.actSaveRightAsExecute(Sender: TObject);
begin
dmComData.SaveDialog.FileName:= edtFileNameRight.FileName;
dmComData.SaveDialog.Filter:= EmptyStr;
dmComData.SaveDialog.OptionsEx:= [ofAllowsFilePackagesContents];
if dmComData.SaveDialog.Execute then
begin
PushPop(FElevate);

4
src/feditor.pas
View file

@ -248,7 +248,7 @@ implementation
{$R *.lfm}
uses
Clipbrd, dmCommonData, dmHigh, SynEditTypes, LCLType, LConvEncoding,
Clipbrd, Dialogs, dmCommonData, dmHigh, SynEditTypes, LCLType, LConvEncoding,
uLng, uShowMsg, uGlobs, fOptions, DCClassesUtf8, uAdministrator, uHighlighters,
uOSUtils, uConvEncoding, fOptionsToolsEditor, uDCUtils, uClipboard, uFindFiles,
DCOSUtils
@ -1041,6 +1041,7 @@ begin
FormCloseQuery(Self, CanClose);
if not CanClose then Exit;
dmComData.OpenDialog.Filter:= EmptyStr;
dmComData.OpenDialog.OptionsEx:= [ofAllowsFilePackagesContents];
if not dmComData.OpenDialog.Execute then Exit;
if OpenFile(dmComData.OpenDialog.FileName) then
UpdateStatus;
@ -1069,6 +1070,7 @@ var
begin
dmComData.SaveDialog.FileName := FileName;
dmComData.SaveDialog.Filter:= EmptyStr; // rewrite for highlighter
dmComData.SaveDialog.OptionsEx:= [ofAllowsFilePackagesContents];
if not dmComData.SaveDialog.Execute then
Exit;

3
src/frames/foptionsignorelist.pas
View file

@ -60,7 +60,7 @@ implementation
{$R *.lfm}
uses
Controls, uGlobs, uFile, uLng, fMain, uSpecialDir;
Controls, Dialogs, uGlobs, uFile, uLng, fMain, uSpecialDir;
{ TfrmOptionsIgnoreList }
@ -123,6 +123,7 @@ procedure TfrmOptionsIgnoreList.Load;
begin
chkIgnoreEnable.Checked:= gIgnoreListFileEnabled;
fneSaveIn.FileName:= gIgnoreListFile;
fneSaveIn.DialogOptionsEx:= [ofAllowsFilePackagesContents];
memIgnoreList.Lines.Assign(glsIgnoreList);
chkIgnoreEnableChange(chkIgnoreEnable);
gSpecialDirList.PopulateMenuWithSpecialDir(pmPathHelper,mp_PATHHELPER,nil);

3
src/frames/foptionslog.pas
View file

@ -73,7 +73,7 @@ implementation
{$R *.lfm}
uses
fMain, uGlobs, uLng, uSpecialDir;
Dialogs, fMain, uGlobs, uLng, uSpecialDir;
{ TfrmOptionsLog }
@ -127,6 +127,7 @@ begin
cbLogFile.Checked := gLogFile;
cbLogFileChange(cbLogFile);
fneLogFileName.FileName := gLogFileName;
fneLogFileName.DialogOptionsEx := [ofAllowsFilePackagesContents];
cbLogCpMvLn.Checked := (log_cp_mv_ln in gLogOptions);
cbLogDelete.Checked := (log_delete in gLogOptions);

3
src/frames/foptionsmultirename.pas
View file

@ -68,7 +68,7 @@ implementation
uses
//Lazarus, Free-Pascal, etc.
Controls,
Controls, Dialogs,
//DC
uShowMsg, uShowForm, uDCUtils, uSpecialDir, DCStrUtils, uGlobs, uLng;
@ -110,6 +110,7 @@ begin
mrsrlAppendSameLog: rbRenamingLogAppendSameFile.Checked := True;
end;
fneMulRenLogFilename.FileName := gMulRenLogFilename;
fneMulRenLogFilename.DialogOptionsEx := [ofAllowsFilePackagesContents];
ckbDailyIndividualDirMultRenLog.Checked := gMultRenDailyIndividualDirLog;
ckbFilenameWithFullPathInLog.Checked := gMulRenFilenameWithFullPathInLog;

1
src/frames/foptionstoolbarbase.pas
View file

@ -1044,6 +1044,7 @@ procedure TfrmOptionsToolbarBase.btnOpenFileClick(Sender: TObject);
begin
OpenDialog.DefaultExt:= EmptyStr;
OpenDialog.Filter:= EmptyStr;
OpenDialog.OptionsEx:= [ofShowsFilePackagesSwitch];
if edtExternalCommand.Text<>'' then OpenDialog.InitialDir:=ExtractFilePath(edtExternalCommand.Text);
if OpenDialog.Execute then
begin

3
src/frames/foptionstoolbase.pas
View file

@ -70,7 +70,7 @@ implementation
{$R *.lfm}
uses
uDCUtils, uSpecialDir;
uDCUtils, uSpecialDir, Dialogs;
{ TfrmOptionsToolBase }
@ -140,6 +140,7 @@ begin
cbToolsUseExternalProgram.Checked := FExternalToolOptions.Enabled;
fneToolsPath.FileName := FExternalToolOptions.Path;
fneToolsPath.DialogOptionsEx := [ofShowsFilePackagesSwitch] ;
edtToolsParameters.Text := FExternalToolOptions.Parameters;
cbToolsRunInTerminal.Checked := FExternalToolOptions.RunInTerminal;
cbToolsKeepTerminalOpen.Checked := FExternalToolOptions.KeepTerminalOpen;

2
src/ftweakplugin.pas
View file

@ -325,6 +325,8 @@ begin
nbTweakAll.ShowTabs := False;
nbTweakAll.TabStop := True;
{$endif}
fnePlugin1.DialogOptionsEx:= [ofAllowsFilePackagesContents];
fnePlugin2.DialogOptionsEx:= [ofAllowsFilePackagesContents];
end;
procedure TfrmTweakPlugin.btnDefaultClick(Sender: TObject);