paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-16 09:59:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: messages: escape to close search

Browse Source 
git-svn-id: trunk@45364 -
This commit is contained in:
mattias 2014-06-05 21:28:50 +00:00
parent 896e46a396
commit d0b3b3269f
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ide/etmessageframe.lfm
View File

@ -10,19 +10,19 @@ object MessagesFrame: TMessagesFrame
DesignTop = 171 DesignTop = 171
object SearchPanel: TPanel object SearchPanel: TPanel
Left = 0 Left = 0
Height = 23 Height = 27
Top = 83 Top = 79
Width = 444 Width = 444
Align = alBottom Align = alBottom
AutoSize = True AutoSize = True
ClientHeight = 23 ClientHeight = 27
ClientWidth = 444 ClientWidth = 444
TabOrder = 0 TabOrder = 0
object SearchEdit: TEdit object SearchEdit: TEdit
AnchorSideLeft.Control = HideSearchSpeedButton AnchorSideLeft.Control = HideSearchSpeedButton
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
Left = 34 Left = 34
Height = 21 Height = 25
Top = 1 Top = 1
Width = 200 Width = 200
BorderSpacing.Left = 10 BorderSpacing.Left = 10
@ -30,6 +30,7 @@ object MessagesFrame: TMessagesFrame
OnChange = SearchEditChange OnChange = SearchEditChange
OnEnter = SearchEditEnter OnEnter = SearchEditEnter
OnExit = SearchEditExit OnExit = SearchEditExit
OnKeyDown = SearchEditKeyDown
TabOrder = 0 TabOrder = 0
Text = 'SearchEdit' Text = 'SearchEdit'
end end
@ -40,7 +41,7 @@ object MessagesFrame: TMessagesFrame
AnchorSideBottom.Control = SearchEdit AnchorSideBottom.Control = SearchEdit
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 234 Left = 234
Height = 21 Height = 25
Top = 1 Top = 1
Width = 23 Width = 23
Anchors = [akTop, akLeft, akBottom] Anchors = [akTop, akLeft, akBottom]
@ -56,7 +57,7 @@ object MessagesFrame: TMessagesFrame
AnchorSideBottom.Control = SearchNextSpeedButton AnchorSideBottom.Control = SearchNextSpeedButton
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 257 Left = 257
Height = 21 Height = 25
Top = 1 Top = 1
Width = 23 Width = 23
Anchors = [akTop, akLeft, akBottom] Anchors = [akTop, akLeft, akBottom]
@ -71,7 +72,7 @@ object MessagesFrame: TMessagesFrame
AnchorSideBottom.Control = SearchPanel AnchorSideBottom.Control = SearchPanel
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 1 Left = 1
Height = 21 Height = 25
Top = 1 Top = 1
Width = 23 Width = 23
Anchors = [akTop, akLeft, akBottom] Anchors = [akTop, akLeft, akBottom]

21
ide/etmessageframe.pas
View File

@ -334,6 +334,8 @@ type
procedure SearchEditChange(Sender: TObject); procedure SearchEditChange(Sender: TObject);
procedure SearchEditEnter(Sender: TObject); procedure SearchEditEnter(Sender: TObject);
procedure SearchEditExit(Sender: TObject); procedure SearchEditExit(Sender: TObject);
procedure SearchEditKeyDown(Sender: TObject; var Key: Word;
Shift: TShiftState);
procedure SearchNextSpeedButtonClick(Sender: TObject); procedure SearchNextSpeedButtonClick(Sender: TObject);
procedure SearchPrevSpeedButtonClick(Sender: TObject); procedure SearchPrevSpeedButtonClick(Sender: TObject);
procedure ShowIDMenuItemClick(Sender: TObject); procedure ShowIDMenuItemClick(Sender: TObject);
@ -344,6 +346,7 @@ type
function AllMessagesAsString(const OnlyShown: boolean): String; function AllMessagesAsString(const OnlyShown: boolean): String;
function GetAboutView: TLMsgWndView; function GetAboutView: TLMsgWndView;
function GetViews(Index: integer): TLMsgWndView; function GetViews(Index: integer): TLMsgWndView;
procedure HideSearch;
procedure SaveClicked(OnlyShown: boolean); procedure SaveClicked(OnlyShown: boolean);
procedure CopyAllClicked(OnlyShown: boolean); procedure CopyAllClicked(OnlyShown: boolean);
procedure CopyMsgToClipboard(OnlyFilename: boolean); procedure CopyMsgToClipboard(OnlyFilename: boolean);
@ -2858,6 +2861,13 @@ begin
SearchEdit.Text:=GetDefaultSearchText; SearchEdit.Text:=GetDefaultSearchText;
end; end;
procedure TMessagesFrame.SearchEditKeyDown(Sender: TObject; var Key: Word;
Shift: TShiftState);
begin
if (Key=VK_ESCAPE) then
HideSearch;
end;
procedure TMessagesFrame.SearchNextSpeedButtonClick(Sender: TObject); procedure TMessagesFrame.SearchNextSpeedButtonClick(Sender: TObject);
begin begin
MessagesCtrl.SelectNextOccurence(true); MessagesCtrl.SelectNextOccurence(true);
@ -3014,9 +3024,7 @@ end;
procedure TMessagesFrame.HideSearchSpeedButtonClick(Sender: TObject); procedure TMessagesFrame.HideSearchSpeedButtonClick(Sender: TObject);
begin begin
SearchPanel.Visible:=false; HideSearch;
MessagesCtrl.SearchText:='';
SearchEdit.Text:=GetDefaultSearchText;
end; end;
procedure TMessagesFrame.CopyFilenameMenuItemClick(Sender: TObject); procedure TMessagesFrame.CopyFilenameMenuItemClick(Sender: TObject);
@ -3130,6 +3138,13 @@ begin
Result:=MessagesCtrl.Views[Index]; Result:=MessagesCtrl.Views[Index];
end; end;
procedure TMessagesFrame.HideSearch;
begin
SearchPanel.Visible:=false;
MessagesCtrl.SearchText:='';
SearchEdit.Text:=GetDefaultSearchText;
end;
procedure TMessagesFrame.SaveClicked(OnlyShown: boolean); procedure TMessagesFrame.SaveClicked(OnlyShown: boolean);
var var
Dlg: TSaveDialog; Dlg: TSaveDialog;