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: SyncDirs - use separate file mask history (fixes #2696)

Browse source
This commit is contained in:
Alexander Koblov 2026-01-11 21:32:11 +03:00
commit fcba5ce8ee
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/fsyncdirsdlg.pas
View file

@ -591,7 +591,7 @@ var
bTemplate: Boolean;
begin
sMask:= cbExtFilter.Text;
if ShowMaskInputDlg(rsMarkPlus, rsMaskInput, glsMaskHistory, sMask) then
if ShowMaskInputDlg(rsMarkPlus, rsMaskInput, glsSyncMaskHistory, sMask) then
begin
bTemplate:= IsMaskSearchTemplate(sMask);
cbExtFilter.Enabled:= not bTemplate;
@ -894,7 +894,7 @@ begin
end;
if chkByContent.Enabled then
gSyncDirsByContent := chkByContent.Checked;
glsMaskHistory.Assign(cbExtFilter.Items);
glsSyncMaskHistory.Assign(cbExtFilter.Items);
with HeaderDG.Columns do
begin
@ -955,13 +955,13 @@ begin
sbSingles.Down := gSyncDirsShowFilterSingles;
if gSyncDirsFileMaskSave = False then
begin
Index := glsMaskHistory.IndexOf(gSyncDirsFileMask);
Index := glsSyncMaskHistory.IndexOf(gSyncDirsFileMask);
if Index <> -1 then
glsMaskHistory.Move(Index, 0)
glsSyncMaskHistory.Move(Index, 0)
else
glsMaskHistory.Insert(0, gSyncDirsFileMask);
glsSyncMaskHistory.Insert(0, gSyncDirsFileMask);
end;
cbExtFilter.Items.Assign(glsMaskHistory);
cbExtFilter.Items.Assign(glsSyncMaskHistory);
cbExtFilter.Text := gSyncDirsFileMask;
HMSync := HotMan.Register(Self, HotkeysCategory);

6
src/uglobs.pas
View file

@ -376,6 +376,7 @@ var
glsDirHistory:TStringListEx;
glsCmdLineHistory: TStringListEx;
glsMaskHistory : TStringListEx;
glsSyncMaskHistory : TStringListEx;
glsSearchHistory : TStringListEx;
glsSearchPathHistory : TStringListEx;
glsReplaceHistory : TStringListEx;
@ -976,6 +977,7 @@ begin
LoadHistory('CommandLine', glsCmdLineHistory);
LoadHistory('VolumeSize', glsVolumeSizeHistory);
LoadHistory('FileMask', glsMaskHistory);
LoadHistory('SyncDirsMask', glsSyncMaskHistory);
LoadHistory('SearchText', glsSearchHistory, True);
LoadHistory('SearchTextPath', glsSearchPathHistory);
LoadHistory('ReplaceText', glsReplaceHistory);
@ -1023,6 +1025,7 @@ begin
if gSaveDirHistory then SaveHistory('Navigation', glsDirHistory);
if gSaveCmdLineHistory then SaveHistory('CommandLine', glsCmdLineHistory);
if gSaveFileMaskHistory then SaveHistory('FileMask', glsMaskHistory);
if gSaveFileMaskHistory then SaveHistory('SyncDirsMask', glsSyncMaskHistory);
if gSaveVolumeSizeHistory then SaveHistory('VolumeSize', glsVolumeSizeHistory);
if gSaveCreateDirectoriesHistory then begin
SaveHistory('CreateDirectories', glsCreateDirectoriesHistory, True);
@ -1668,6 +1671,7 @@ begin
glsCmdLineHistory := TStringListEx.Create;
glsVolumeSizeHistory := TStringListEx.Create;
glsMaskHistory := TStringListEx.Create;
glsSyncMaskHistory := TStringListEx.Create;
glsSearchHistory := TStringListEx.Create;
glsSearchPathHistory := TStringListEx.Create;
glsReplaceHistory := TStringListEx.Create;
@ -1703,6 +1707,7 @@ begin
FreeAndNil(gDirectoryHotlist);
FreeAndNil(gFavoriteTabsList);
FreeAndNil(glsMaskHistory);
FreeAndNil(glsSyncMaskHistory);
FreeAndNil(glsSearchHistory);
FreeAndNil(glsSearchPathHistory);
FreeAndNil(glsReplaceHistory);
@ -2310,6 +2315,7 @@ begin
gFavoriteTabsList.Clear;
glsDirHistory.Clear;
glsMaskHistory.Clear;
glsSyncMaskHistory.Clear;
glsSearchHistory.Clear;
glsSearchPathHistory.Clear;
glsReplaceHistory.Clear;