diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas index 3097e196c5..9078513ae1 100644 --- a/ide/lazarusidestrconsts.pas +++ b/ide/lazarusidestrconsts.pas @@ -3571,6 +3571,11 @@ resourcestring lisCCDNoClass = 'no class'; lisCCDChangeClassOf = 'Change Class of %s'; + // View Search Results dialog + lisVSRSearchOrFilterPhrasesInList = 'Search or Filter Phrases In List'; + lisVSRForwardSearch = 'Forward Search'; + lisVSRResetResultList = 'Reset Result List'; + implementation end. diff --git a/ide/searchresultview.lfm b/ide/searchresultview.lfm index 678a242ad4..bad97886a0 100644 --- a/ide/searchresultview.lfm +++ b/ide/searchresultview.lfm @@ -16,8 +16,8 @@ object SearchResultsView: TSearchResultsView object ResultsNoteBook: TNotebook AnchorSideTop.Control = gbSearchPhraseInList AnchorSideTop.Side = asrBottom - Height = 157 - Top = 72 + Height = 164 + Top = 65 Width = 799 Align = alBottom Anchors = [akTop, akLeft] @@ -28,11 +28,12 @@ object SearchResultsView: TSearchResultsView end object btnSearchAgain: TButton AnchorSideLeft.Control = Owner - AnchorSideTop.Control = Owner + AnchorSideTop.Control = ClosePageButton + AnchorSideTop.Side = asrCenter Left = 6 - Height = 29 - Top = 6 - Width = 97 + Height = 23 + Top = 21 + Width = 90 AutoSize = True BorderSpacing.Around = 6 Caption = 'Search Again' @@ -46,16 +47,16 @@ object SearchResultsView: TSearchResultsView AnchorSideTop.Control = Owner AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom - Left = 236 - Height = 60 + Left = 216 + Height = 53 Top = 6 - Width = 557 + Width = 577 Anchors = [akTop, akLeft, akRight] AutoSize = True BorderSpacing.Around = 6 Caption = 'Search or Filter Phrases In List' - ClientHeight = 41 - ClientWidth = 553 + ClientHeight = 35 + ClientWidth = 573 TabOrder = 2 object edSearchInList: TEdit AnchorSideLeft.Control = gbSearchPhraseInList @@ -65,7 +66,7 @@ object SearchResultsView: TSearchResultsView Height = 23 Hint = 'Enter one or more phrases that you want'#10'to Search or Filter in the list,'#10'seperated by space ( '' '' ), or comma ( , )' Top = 6 - Width = 255 + Width = 272 Anchors = [akTop, akLeft, akRight] BorderSpacing.Around = 6 OnChange = edSearchInListChange @@ -75,38 +76,38 @@ object SearchResultsView: TSearchResultsView TabOrder = 0 end object bnForwardSearch: TButton - Left = 315 - Height = 29 + Left = 350 + Height = 23 Top = 6 - Width = 111 + Width = 110 Align = alRight AutoSize = True BorderSpacing.Around = 6 - Caption = 'Forward Search' + Caption = 'bnForwardSearch' OnClick = bnForwardSearchClick TabOrder = 1 end object bnResetResults: TButton - Left = 432 - Height = 29 + Left = 466 + Height = 23 Top = 6 - Width = 115 + Width = 101 Align = alRight AutoSize = True BorderSpacing.Around = 6 - Caption = 'Reset Result List' + Caption = 'bnResetResults' OnClick = bnResetResultsClick TabOrder = 2 end object bnFilter: TButton - Left = 267 - Height = 29 + Left = 284 + Height = 23 Top = 6 - Width = 42 + Width = 60 Align = alRight AutoSize = True BorderSpacing.Around = 6 - Caption = 'Filter' + Caption = 'bnFilter' OnClick = bnFilterClick TabOrder = 3 end @@ -114,12 +115,13 @@ object SearchResultsView: TSearchResultsView object ClosePageButton: TButton AnchorSideLeft.Control = btnSearchAgain AnchorSideLeft.Side = asrBottom - AnchorSideTop.Control = Owner + AnchorSideTop.Control = gbSearchPhraseInList + AnchorSideTop.Side = asrCenter AnchorSideBottom.Side = asrBottom - Left = 109 - Height = 29 - Top = 6 - Width = 121 + Left = 102 + Height = 23 + Top = 21 + Width = 108 AutoSize = True BorderSpacing.Around = 6 Caption = 'ClosePageButton' diff --git a/ide/searchresultview.lrs b/ide/searchresultview.lrs index e107aa8249..4b6615c2b5 100644 --- a/ide/searchresultview.lrs +++ b/ide/searchresultview.lrs @@ -8,42 +8,43 @@ LazarusResources.Add('TSearchResultsView','FORMDATA',[ +'reate'#7#11'Form1Create'#9'OnDestroy'#7#24'SearchResultsViewDestroy'#9'OnKe' +'yDown'#7#14'ListBoxKeyDown'#8'Position'#7#14'poScreenCenter'#0#9'TNotebook' +#15'ResultsNoteBook'#21'AnchorSideTop.Control'#7#20'gbSearchPhraseInList'#18 - +'AnchorSideTop.Side'#7#9'asrBottom'#6'Height'#3#157#0#3'Top'#2'H'#5'Width'#3 + +'AnchorSideTop.Side'#7#9'asrBottom'#6'Height'#3#164#0#3'Top'#2'A'#5'Width'#3 +#31#3#5'Align'#7#8'alBottom'#7'Anchors'#11#5'akTop'#6'akLeft'#0#17'OnCloseTa' +'bClicked'#7#30'ResultsNoteBookClosetabclicked'#13'OnPageChanged'#7#26'Resul' +'tsNoteBookPageChanged'#7'Options'#11#19'nboShowCloseButtons'#12'nboMultiLin' +'e'#0#8'TabOrder'#2#0#0#0#7'TButton'#14'btnSearchAgain'#22'AnchorSideLeft.Co' - +'ntrol'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#4'Left'#2#6#6'Height' - +#2#29#3'Top'#2#6#5'Width'#2'a'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7 - +'Caption'#6#12'Search Again'#7'OnClick'#7#19'btnSearchAgainClick'#9'OnKeyDow' - +'n'#7#14'ListBoxKeyDown'#8'TabOrder'#2#1#0#0#9'TGroupBox'#20'gbSearchPhraseI' - +'nList'#22'AnchorSideLeft.Control'#7#15'ClosePageButton'#19'AnchorSideLeft.S' - +'ide'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSideRight' - +'.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#236#0 - +#6'Height'#2'<'#3'Top'#2#6#5'Width'#3'-'#2#7'Anchors'#11#5'akTop'#6'akLeft'#7 - +'akRight'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6' Search ' - +'or Filter Phrases In List'#12'ClientHeight'#2')'#11'ClientWidth'#3')'#2#8'T' - +'abOrder'#2#2#0#5'TEdit'#14'edSearchInList'#22'AnchorSideLeft.Control'#7#20 - +'gbSearchPhraseInList'#21'AnchorSideTop.Control'#7#20'gbSearchPhraseInList' - +#23'AnchorSideRight.Control'#7#8'bnFilter'#4'Left'#2#6#6'Height'#2#23#4'Hint' - +#6'sEnter one or more phrases that you want'#10'to Search or Filter in the l' - +'ist,'#10'seperated by space ( '' '' ), or comma ( , )'#3'Top'#2#6#5'Width'#3 - +#255#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around' - +#2#6#8'OnChange'#7#20'edSearchInListChange'#9'OnKeyDown'#7#21'edSearchInList' - +'KeyDown'#14'ParentShowHint'#8#8'ShowHint'#9#8'TabOrder'#2#0#0#0#7'TButton' - +#15'bnForwardSearch'#4'Left'#3';'#1#6'Height'#2#29#3'Top'#2#6#5'Width'#2'o'#5 + +'ntrol'#7#5'Owner'#21'AnchorSideTop.Control'#7#15'ClosePageButton'#18'Anchor' + +'SideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#23#3'Top'#2#21#5'Width' + +#2'Z'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#12'Search Agai' + +'n'#7'OnClick'#7#19'btnSearchAgainClick'#9'OnKeyDown'#7#14'ListBoxKeyDown'#8 + +'TabOrder'#2#1#0#0#9'TGroupBox'#20'gbSearchPhraseInList'#22'AnchorSideLeft.C' + +'ontrol'#7#15'ClosePageButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'Anc' + +'horSideTop.Control'#7#5'Owner'#23'AnchorSideRight.Control'#7#5'Owner'#20'An' + +'chorSideRight.Side'#7#9'asrBottom'#4'Left'#3#216#0#6'Height'#2'5'#3'Top'#2#6 + +#5'Width'#3'A'#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9 + +#20'BorderSpacing.Around'#2#6#7'Caption'#6' Search or Filter Phrases In List' + +#12'ClientHeight'#2'#'#11'ClientWidth'#3'='#2#8'TabOrder'#2#2#0#5'TEdit'#14 + +'edSearchInList'#22'AnchorSideLeft.Control'#7#20'gbSearchPhraseInList'#21'An' + +'chorSideTop.Control'#7#20'gbSearchPhraseInList'#23'AnchorSideRight.Control' + +#7#8'bnFilter'#4'Left'#2#6#6'Height'#2#23#4'Hint'#6'sEnter one or more phras' + +'es that you want'#10'to Search or Filter in the list,'#10'seperated by spac' + +'e ( '' '' ), or comma ( , )'#3'Top'#2#6#5'Width'#3#16#1#7'Anchors'#11#5'akT' + +'op'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#6#8'OnChange'#7#20'ed' + +'SearchInListChange'#9'OnKeyDown'#7#21'edSearchInListKeyDown'#14'ParentShowH' + +'int'#8#8'ShowHint'#9#8'TabOrder'#2#0#0#0#7'TButton'#15'bnForwardSearch'#4'L' + +'eft'#3'^'#1#6'Height'#2#23#3'Top'#2#6#5'Width'#2'n'#5'Align'#7#7'alRight'#8 + +'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#15'bnForwardSearch'#7 + +'OnClick'#7#20'bnForwardSearchClick'#8'TabOrder'#2#1#0#0#7'TButton'#14'bnRes' + +'etResults'#4'Left'#3#210#1#6'Height'#2#23#3'Top'#2#6#5'Width'#2'e'#5'Align' + +#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#14'bnR' + +'esetResults'#7'OnClick'#7#19'bnResetResultsClick'#8'TabOrder'#2#2#0#0#7'TBu' + +'tton'#8'bnFilter'#4'Left'#3#28#1#6'Height'#2#23#3'Top'#2#6#5'Width'#2'<'#5 +'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6 - +#14'Forward Search'#7'OnClick'#7#20'bnForwardSearchClick'#8'TabOrder'#2#1#0#0 - +#7'TButton'#14'bnResetResults'#4'Left'#3#176#1#6'Height'#2#29#3'Top'#2#6#5'W' - +'idth'#2's'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6 - +#7'Caption'#6#17'Reset Result List'#7'OnClick'#7#19'bnResetResultsClick'#8'T' - +'abOrder'#2#2#0#0#7'TButton'#8'bnFilter'#4'Left'#3#11#1#6'Height'#2#29#3'Top' - +#2#6#5'Width'#2'*'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Arou' - +'nd'#2#6#7'Caption'#6#6'Filter'#7'OnClick'#7#13'bnFilterClick'#8'TabOrder'#2 - +#3#0#0#0#7'TButton'#15'ClosePageButton'#22'AnchorSideLeft.Control'#7#14'btnS' - +'earchAgain'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control' - +#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2'm'#6'Height'#2 - +#29#3'Top'#2#6#5'Width'#2'y'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Ca' - +'ption'#6#15'ClosePageButton'#7'OnClick'#7#20'ClosePageButtonClick'#8'TabOrd' - +'er'#2#3#0#0#0 + +#8'bnFilter'#7'OnClick'#7#13'bnFilterClick'#8'TabOrder'#2#3#0#0#0#7'TButton' + +#15'ClosePageButton'#22'AnchorSideLeft.Control'#7#14'btnSearchAgain'#19'Anch' + +'orSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#20'gbSearchPhra' + +'seInList'#18'AnchorSideTop.Side'#7#9'asrCenter'#21'AnchorSideBottom.Side'#7 + +#9'asrBottom'#4'Left'#2'f'#6'Height'#2#23#3'Top'#2#21#5'Width'#2'l'#8'AutoSi' + +'ze'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#15'ClosePageButton'#7'OnCli' + +'ck'#7#20'ClosePageButtonClick'#8'TabOrder'#2#3#0#0#0 ]); diff --git a/ide/searchresultview.pp b/ide/searchresultview.pp index 398e9daf72..fb98313f9a 100644 --- a/ide/searchresultview.pp +++ b/ide/searchresultview.pp @@ -224,8 +224,12 @@ begin ResultsNoteBook.Update; Caption:=lisMenuViewSearchResults; + gbSearchPhraseInList.Caption:=lisVSRSearchOrFilterPhrasesInList; btnSearchAgain.Caption:=lisSearchAgain; ClosePageButton.Caption:=lisSRClosePage; + bnFilter.Caption:=lisFilter; + bnForwardSearch.Caption:=lisVSRForwardSearch; + bnResetResults.Caption:=lisVSRResetResultList; Name := NonModalIDEWindowNames[nmiwSearchResultsViewName]; ALayout:=EnvironmentOptions.IDEWindowLayoutList.