opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-26 11:17:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix unresponsive query memo on large "replace all" actions. Also, move redundant code to DoSearchReplace.

Browse Source
This commit is contained in:
Ansgar Becker
2010-02-02 07:18:26 +00:00
parent 3088490954
commit fb09ac1aa7
1 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
source/main.pas
View File

@ -764,6 +764,7 @@ type
procedure UpdateFilterPanel(Sender: TObject);
procedure DatabaseChanged(Database: String);
function GetBlobContent(Results: TMySQLQuery; Column: Integer): String;
procedure DoSearchReplace;
public
Connection: TMySQLConnection;
SessionName: String;
@ -2563,7 +2564,6 @@ end;
procedure TMainForm.actQueryFindReplaceExecute(Sender: TObject);
var
DlgResult: TModalResult;
Occurences: Integer;
begin
// Display search + replace dialog
if not Assigned(SearchReplaceDialog) then
@ -2571,49 +2571,51 @@ begin
SearchReplaceDialog.Editor := ActiveQueryMemo;
SearchReplaceDialog.chkReplace.Checked := Sender = actQueryReplace;
DlgResult := SearchReplaceDialog.ShowModal;
if SearchReplaceDialog.chkRegularExpression.Checked then
SearchReplaceDialog.Editor.SearchEngine := SynEditRegexSearch1
else
SearchReplaceDialog.Editor.SearchEngine := SynEditSearch1;
ShowStatus('Searching ...');
case DlgResult of
mrOK, mrAll: begin
Occurences := SearchReplaceDialog.Editor.SearchReplace(
SearchReplaceDialog.comboSearch.Text,
SearchReplaceDialog.comboReplace.Text,
SearchReplaceDialog.Options
);
DoSearchReplace;
FSearchReplaceExecuted := True; // Helper for later F3 hits
if DlgResult = mrAll then
ShowStatus('Text "'+SearchReplaceDialog.comboSearch.Text+'" '+FormatNumber(Occurences)+' times replaced.', 0);
end;
mrCancel: Exit;
end;
ShowStatus(STATUS_MSG_READY);
end;
procedure TMainForm.actQueryFindAgainExecute(Sender: TObject);
begin
// F3 - search or replace again, using previous settings
if not FSearchReplaceExecuted then begin
// Display dialog if not done yet
if not FSearchReplaceExecuted then
actQueryFindReplaceExecute(Sender)
end else begin
else begin
SearchReplaceDialog.Editor := ActiveQueryMemo;
if SearchReplaceDialog.chkRegularExpression.Checked then
SearchReplaceDialog.Editor.SearchEngine := SynEditRegexSearch1
else
SearchReplaceDialog.Editor.SearchEngine := SynEditSearch1;
SearchReplaceDialog.Editor.SearchReplace(
SearchReplaceDialog.comboSearch.Text,
SearchReplaceDialog.comboReplace.Text,
SearchReplaceDialog.Options
);
DoSearchReplace;
end;
end;
procedure TMainForm.DoSearchReplace;
var
Occurences: Integer;
begin
if SearchReplaceDialog.chkRegularExpression.Checked then
SearchReplaceDialog.Editor.SearchEngine := SynEditRegexSearch1
else
SearchReplaceDialog.Editor.SearchEngine := SynEditSearch1;
SearchReplaceDialog.Editor.BeginUpdate;
ShowStatus('Searching ...');
Occurences := SearchReplaceDialog.Editor.SearchReplace(
SearchReplaceDialog.comboSearch.Text,
SearchReplaceDialog.comboReplace.Text,
SearchReplaceDialog.Options
);
SearchReplaceDialog.Editor.EndUpdate;
if ssoReplaceAll in SearchReplaceDialog.Options then
ShowStatus('Text "'+SearchReplaceDialog.comboSearch.Text+'" '+FormatNumber(Occurences)+' times replaced.', 0)
else
ShowStatus(STATUS_MSG_READY);
end;
procedure TMainForm.SynMemoQuerySearchNotFound(Sender: TObject; FindText: string);
begin
// No text found