forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix, search & replace MRU persistence broken

This commit is contained in:
Basile Burg 2015-05-16 07:55:55 +02:00
parent 18dbc56938
commit 912cad0a26
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ce_search.pas
View File

@ -122,8 +122,8 @@ begin
if aValue is TCESearchWidget then if aValue is TCESearchWidget then
begin begin
widg := TCESearchWidget(aValue); widg := TCESearchWidget(aValue);
fMrSearches.Assign(widg.cbToFind.Items); fMrSearches.Assign(widg.fSearchMru);
fMrReplacements.Assign(widg.cbReplaceWth.Items); fMrReplacements.Assign(widg.fReplaceMru);
fPrompt := widg.chkPrompt.Checked; fPrompt := widg.chkPrompt.Checked;
fBackWard := widg.chkBack.Checked; fBackWard := widg.chkBack.Checked;
fCaseSens := widg.chkCaseSens.Checked; fCaseSens := widg.chkCaseSens.Checked;
@ -142,7 +142,9 @@ begin
begin begin
widg := TCESearchWidget(aValue); widg := TCESearchWidget(aValue);
widg.cbToFind.Items.Assign(fMrSearches); widg.cbToFind.Items.Assign(fMrSearches);
widg.fSearchMru.Assign(fMrSearches);
widg.cbReplaceWth.Items.Assign(fMrReplacements); widg.cbReplaceWth.Items.Assign(fMrReplacements);
widg.fReplaceMru.Assign(fMrReplacements);
widg.chkPrompt.Checked := fPrompt; widg.chkPrompt.Checked := fPrompt;
widg.chkBack.Checked := fBackWard; widg.chkBack.Checked := fBackWard;
widg.chkCaseSens.Checked:= fCaseSens; widg.chkCaseSens.Checked:= fCaseSens;
@ -180,6 +182,9 @@ begin
fActReplaceAll.OnExecute := @actReplaceAllExecute; fActReplaceAll.OnExecute := @actReplaceAllExecute;
inherited; inherited;
// //
fSearchMru := TCEMruList.Create;
fReplaceMru:= TCEMruList.Create;
//
fname := getCoeditDocPath + OptsFname; fname := getCoeditDocPath + OptsFname;
if FileExists(fname) then with TCESearchOptions.create(nil) do if FileExists(fname) then with TCESearchOptions.create(nil) do
try try
@ -192,9 +197,7 @@ begin
btnFind.Action := fActFindNext; btnFind.Action := fActFindNext;
btnReplace.Action := fActReplaceNext; btnReplace.Action := fActReplaceNext;
btnReplaceAll.Action := fActReplaceAll; btnReplaceAll.Action := fActReplaceAll;
// updateImperative;
fSearchMru := TCEMruList.Create;
fReplaceMru:= TCEMruList.Create;
// //
EntitiesConnector.addObserver(self); EntitiesConnector.addObserver(self);
end; end;
@ -274,6 +277,8 @@ begin
if fDoc = nil then exit; if fDoc = nil then exit;
// //
fSearchMru.Insert(0,fToFind); fSearchMru.Insert(0,fToFind);
cbToFind.Items.Assign(fSearchMru);
//
if not chkFromCur.Checked then if not chkFromCur.Checked then
begin begin
if chkBack.Checked then if chkBack.Checked then
@ -309,6 +314,9 @@ begin
// //
fSearchMru.Insert(0, fToFind); fSearchMru.Insert(0, fToFind);
fReplaceMru.Insert(0, fReplaceWth); fReplaceMru.Insert(0, fReplaceWth);
cbToFind.Items.Assign(fSearchMru);
cbReplaceWth.Items.Assign(fReplaceMru);
//
if chkPrompt.Checked then if chkPrompt.Checked then
fDoc.OnReplaceText := @replaceEvent; fDoc.OnReplaceText := @replaceEvent;
if not chkFromCur.Checked then if not chkFromCur.Checked then
@ -336,6 +344,7 @@ var
opts: TSynSearchOptions; opts: TSynSearchOptions;
begin begin
if fDoc = nil then exit; if fDoc = nil then exit;
cbReplaceWth.Items.Assign(fReplaceMru);
opts := getOptions + [ssoReplace]; opts := getOptions + [ssoReplace];
opts -= [ssoBackwards]; opts -= [ssoBackwards];
// //