From 00498ec3426358eac150605ed27c3f98bf2b796d Mon Sep 17 00:00:00 2001 From: Maxim Ganetsky Date: Sun, 1 Aug 2021 21:38:06 +0000 Subject: [PATCH] Revert "Merge branch 'main' into 'main'" This reverts merge request !2 --- components/ideintf/idecommands.pas | 4 +--- ide/keymapping.pp | 5 ----- ide/lazarusidestrconsts.pas | 2 -- ide/mainbar.pas | 1 - ide/sourceeditor.pp | 19 ------------------- 5 files changed, 1 insertion(+), 30 deletions(-) diff --git a/components/ideintf/idecommands.pas b/components/ideintf/idecommands.pas index 75c47790fa..c558143b4b 100644 --- a/components/ideintf/idecommands.pas +++ b/components/ideintf/idecommands.pas @@ -376,7 +376,6 @@ const ecDesignerForwardOne = ecFirstLazarus + 1006; ecDesignerBackOne = ecFirstLazarus + 1007; ecDesignerToggleNonVisComps= ecFirstLazarus + 1008; - ecSetSearchText = ecFirstLazarus + 1009; (* SynEdit Plugins @@ -1936,7 +1935,7 @@ begin end; const - IDEEditorCommandStrs: array[0..324] of TIdentMapEntry = ( + IDEEditorCommandStrs: array[0..323] of TIdentMapEntry = ( // search (Value: ecFind; Name: 'ecFind'), (Value: ecFindAgain; Name: 'ecFindAgain'), @@ -1944,7 +1943,6 @@ const (Value: ecFindPrevious; Name: 'ecFindPrevious'), (Value: ecReplace; Name: 'ecReplace'), (Value: ecIncrementalFind; Name: 'ecIncrementalFind'), - (Value: ecSetSearchText; Name: 'ecSetSearchText'), (Value: ecFindProcedureDefinition; Name: 'ecFindProcedureDefinition'), (Value: ecFindProcedureMethod; Name: 'ecFindProcedureMethod'), (Value: ecGotoLineNumber; Name: 'ecGotoLineNumber'), diff --git a/ide/keymapping.pp b/ide/keymapping.pp index 6e97b269c8..76c93561ab 100644 --- a/ide/keymapping.pp +++ b/ide/keymapping.pp @@ -584,7 +584,6 @@ begin ecFindInFiles : Result:= srkmecFindInFiles; ecReplace : Result:= srkmecReplace; ecIncrementalFind : Result:= lisMenuIncrementalFind; - ecSetSearchText : Result:= lisMenuSetSearchText; ecFindProcedureDefinition : Result:= srkmecFindProcedureDefinition; ecFindProcedureMethod : Result:= srkmecFindProcedureMethod; ecGotoLineNumber : Result:= srkmecGotoLineNumber; @@ -1153,7 +1152,6 @@ begin ecFindInFiles: SetSingle(VK_F,[XCtrl,ssShift]); ecReplace: SetCombo(VK_R,[XCtrl],VK_UNKNOWN,[], VK_Q,[XCtrl],VK_A,[]); ecIncrementalFind: SetSingle(VK_E,[XCtrl]); - ecSetSearchText: SetCombo(VK_K,[XCtrl],VK_F,[]); ecGotoLineNumber: SetCombo(VK_G,[XCtrl],VK_UNKNOWN,[], VK_Q,[XCtrl],VK_G,[]); ecFindNextWordOccurrence:SetSingle(VK_UNKNOWN,[]); ecFindPrevWordOccurrence:SetSingle(VK_UNKNOWN,[]); @@ -1615,7 +1613,6 @@ begin ecFindInFiles: SetSingle(VK_UNKNOWN,[]); ecReplace: SetCombo(VK_Q,[SSCtrl],VK_A,[]); ecIncrementalFind: SetSingle(VK_UNKNOWN,[]); - ecSetSearchText: SetCombo(VK_K,[ssCtrl], VK_F,[]); ecGotoLineNumber: SetCombo(VK_Q,[ssCtrl],VK_G,[]); ecFindNextWordOccurrence:SetSingle(VK_UNKNOWN,[]); ecFindPrevWordOccurrence:SetSingle(VK_UNKNOWN,[]); @@ -2245,7 +2242,6 @@ begin ecFindInFiles: SetSingle(VK_F,[ssMeta,ssShift]); ecReplace: SetSingle(VK_UNKNOWN,[]); ecIncrementalFind: SetSingle(VK_E,[ssMeta]); - ecSetSearchText: SetCombo(VK_K,[SSCtrl],VK_F,[]); ecGotoLineNumber: SetSingle(VK_L,[ssMeta]); ecFindNextWordOccurrence:SetSingle(VK_UNKNOWN,[]); ecFindPrevWordOccurrence:SetSingle(VK_UNKNOWN,[]); @@ -2855,7 +2851,6 @@ begin AddDefault(C, 'Find in files', srkmecFindInFiles, ecFindInFiles); AddDefault(C, 'Replace text', srkmecReplace, ecReplace); AddDefault(C, 'Find incremental', lisKMFindIncremental, ecIncrementalFind); - AddDefault(C, 'Set Search Text', lisKMSetSearchText, ecSetSearchText); AddDefault(C, 'Go to line number', srkmecGotoLineNumber, ecGotoLineNumber); AddDefault(C, 'Find next word occurrence', srkmecFindNextWordOccurrence, ecFindNextWordOccurrence); AddDefault(C, 'Find previous word occurrence', srkmecFindPrevWordOccurrence, ecFindPrevWordOccurrence); diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas index 93f73f478e..79b8f42189 100644 --- a/ide/lazarusidestrconsts.pas +++ b/ide/lazarusidestrconsts.pas @@ -385,7 +385,6 @@ resourcestring lisMenuFindPrevious = 'Find &Previous'; lisMenuFindInFiles = 'Find &in Files ...'; lisMenuIncrementalFind = 'Incremental Find'; - lisMenuSetSearchText = 'Set Search Text'; lisMenuGotoLine = 'Goto Line ...'; lisMenuJumpBack = 'Jump Back'; lisMenuJumpForward = 'Jump Forward'; @@ -3294,7 +3293,6 @@ resourcestring srkmecFindInFiles = 'Find in Files'; srkmecReplace = 'Replace Text'; lisKMFindIncremental = 'Find Incremental'; - lisKMSetSearchText = 'Set Search Text'; srkmecFindProcedureDefinition = 'Find Procedure Definiton'; srkmecFindProcedureMethod = 'Find Procedure Method'; srkmecGotoLineNumber = 'Go to Line Number'; diff --git a/ide/mainbar.pas b/ide/mainbar.pas index 621ab20f7f..14800be778 100644 --- a/ide/mainbar.pas +++ b/ide/mainbar.pas @@ -140,7 +140,6 @@ type itmSearchFindInFiles: TIDEMenuCommand; itmSearchReplace: TIDEMenuCommand; itmIncrementalFind: TIDEMenuCommand; - //itmSetSearchText: TIDEMenuCommand; //itmJumpings: TIDEMenuSection; itmGotoLine: TIDEMenuCommand; itmJumpBack: TIDEMenuCommand; diff --git a/ide/sourceeditor.pp b/ide/sourceeditor.pp index a0293a8c66..4d594e135d 100644 --- a/ide/sourceeditor.pp +++ b/ide/sourceeditor.pp @@ -395,7 +395,6 @@ type function DoFindAndReplace(aFindText, aReplaceText: String; anOptions: TSynSearchOptions): Integer; procedure FindNextUTF8; procedure FindPrevious; - procedure SetSearchText; procedure FindNextWordOccurrence(DirectionForward: boolean); procedure ShowGotoLineDialog; @@ -3692,23 +3691,6 @@ begin end; end; -procedure TSourceEditor.SetSearchText; -var - S: string; -begin - if EditorComponent.SelAvail then - S := EditorComponent.SelText - else - begin - S := EditorComponent.GetWordAtRowCol(EditorComponent.LogicalCaretXY); - //EditorComponent.Flags:=[ssoWholeWord]; - end; - if S <> '' then begin - FSourceNoteBook.BeginIncrementalFind; - FSourceNoteBook.IncrementalSearchStr := S; - end; -end; - procedure TSourceEditor.FindNextWordOccurrence(DirectionForward: boolean); var StartX, EndX: Integer; @@ -4149,7 +4131,6 @@ Begin ecFindNext: FindNextUTF8; ecFindPrevious: FindPrevious; ecIncrementalFind: if FSourceNoteBook<>nil then FSourceNoteBook.BeginIncrementalFind; - ecSetSearchText: if FSourceNoteBook<>nil then SetSearchText; ecReplace: StartFindAndReplace(true); ecGotoLineNumber: ShowGotoLineDialog; ecFindNextWordOccurrence: FindNextWordOccurrence(true);