paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-11 11:00:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

IDE: Use TextHint in Message frame. Issue #28188, patch from Alexey Torgashin.

Browse Source 
git-svn-id: trunk@49189 -
This commit is contained in:
juha 2015-05-27 10:41:52 +00:00
parent 3cf46a5d3a
commit f5bdffceb6
2 changed files with 14 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ide/etmessageframe.lfm
View File

@ -10,29 +10,27 @@ object MessagesFrame: TMessagesFrame
DesignTop = 171 DesignTop = 171
object SearchPanel: TPanel object SearchPanel: TPanel
Left = 0 Left = 0
Height = 27 Height = 23
Top = 79 Top = 83
Width = 444 Width = 444
Align = alBottom Align = alBottom
AutoSize = True AutoSize = True
ClientHeight = 27 BevelOuter = bvNone
ClientHeight = 23
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 = 33
Height = 25 Height = 23
Top = 1 Top = 1
Width = 200 Width = 200
BorderSpacing.Left = 10 BorderSpacing.Left = 10
Constraints.MinWidth = 200 Constraints.MinWidth = 200
OnChange = SearchEditChange OnChange = SearchEditChange
OnEnter = SearchEditEnter
OnExit = SearchEditExit
OnKeyDown = SearchEditKeyDown OnKeyDown = SearchEditKeyDown
TabOrder = 0 TabOrder = 0
Text = 'SearchEdit'
end end
object SearchNextSpeedButton: TSpeedButton object SearchNextSpeedButton: TSpeedButton
AnchorSideLeft.Control = SearchEdit AnchorSideLeft.Control = SearchEdit
@ -40,8 +38,8 @@ object MessagesFrame: TMessagesFrame
AnchorSideTop.Control = SearchEdit AnchorSideTop.Control = SearchEdit
AnchorSideBottom.Control = SearchEdit AnchorSideBottom.Control = SearchEdit
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 234 Left = 233
Height = 25 Height = 23
Top = 1 Top = 1
Width = 23 Width = 23
Anchors = [akTop, akLeft, akBottom] Anchors = [akTop, akLeft, akBottom]
@ -56,8 +54,8 @@ object MessagesFrame: TMessagesFrame
AnchorSideTop.Control = SearchNextSpeedButton AnchorSideTop.Control = SearchNextSpeedButton
AnchorSideBottom.Control = SearchNextSpeedButton AnchorSideBottom.Control = SearchNextSpeedButton
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 257 Left = 256
Height = 25 Height = 23
Top = 1 Top = 1
Width = 23 Width = 23
Anchors = [akTop, akLeft, akBottom] Anchors = [akTop, akLeft, akBottom]
@ -71,9 +69,9 @@ object MessagesFrame: TMessagesFrame
AnchorSideTop.Control = SearchPanel AnchorSideTop.Control = SearchPanel
AnchorSideBottom.Control = SearchPanel AnchorSideBottom.Control = SearchPanel
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 1 Left = 0
Height = 25 Height = 23
Top = 1 Top = 0
Width = 23 Width = 23
Anchors = [akTop, akLeft, akBottom] Anchors = [akTop, akLeft, akBottom]
Flat = True Flat = True

27
ide/etmessageframe.pas
View File

@ -343,8 +343,6 @@ type
procedure SaveAllToFileMenuItemClick(Sender: TObject); procedure SaveAllToFileMenuItemClick(Sender: TObject);
procedure SaveShownToFileMenuItemClick(Sender: TObject); procedure SaveShownToFileMenuItemClick(Sender: TObject);
procedure SearchEditChange(Sender: TObject); procedure SearchEditChange(Sender: TObject);
procedure SearchEditEnter(Sender: TObject);
procedure SearchEditExit(Sender: TObject);
procedure SearchEditKeyDown(Sender: TObject; var Key: Word; procedure SearchEditKeyDown(Sender: TObject; var Key: Word;
{%H-}Shift: TShiftState); {%H-}Shift: TShiftState);
procedure SearchNextSpeedButtonClick(Sender: TObject); procedure SearchNextSpeedButtonClick(Sender: TObject);
@ -403,9 +401,6 @@ type
function AddCustomMessage(TheUrgency: TMessageLineUrgency; Msg: string; function AddCustomMessage(TheUrgency: TMessageLineUrgency; Msg: string;
aFilename: string = ''; LineNumber: integer = 0; Column: integer = 0; aFilename: string = ''; LineNumber: integer = 0; Column: integer = 0;
const ViewCaption: string = CustomViewCaption): TMessageLine; const ViewCaption: string = CustomViewCaption): TMessageLine;
// misc
function GetDefaultSearchText: string;
end; end;
const const
@ -2971,23 +2966,9 @@ var
s: TCaption; s: TCaption;
begin begin
s:=SearchEdit.Text; s:=SearchEdit.Text;
if s=GetDefaultSearchText then
s:='';
MessagesCtrl.SearchText:=s; MessagesCtrl.SearchText:=s;
end; end;
procedure TMessagesFrame.SearchEditEnter(Sender: TObject);
begin
if SearchEdit.Text=GetDefaultSearchText then
SearchEdit.Text:='';
end;
procedure TMessagesFrame.SearchEditExit(Sender: TObject);
begin
if SearchEdit.Text='' then
SearchEdit.Text:=GetDefaultSearchText;
end;
procedure TMessagesFrame.SearchEditKeyDown(Sender: TObject; var Key: Word; procedure TMessagesFrame.SearchEditKeyDown(Sender: TObject; var Key: Word;
Shift: TShiftState); Shift: TShiftState);
begin begin
@ -3292,7 +3273,6 @@ procedure TMessagesFrame.HideSearch;
begin begin
SearchPanel.Visible:=false; SearchPanel.Visible:=false;
MessagesCtrl.SearchText:=''; MessagesCtrl.SearchText:='';
SearchEdit.Text:=GetDefaultSearchText;
end; end;
procedure TMessagesFrame.SaveClicked(OnlyShown: boolean); procedure TMessagesFrame.SaveClicked(OnlyShown: boolean);
@ -3476,11 +3456,11 @@ begin
SearchPanel.Visible:=false; // by default the search is hidden SearchPanel.Visible:=false; // by default the search is hidden
HideSearchSpeedButton.Hint:=lisHideSearch; HideSearchSpeedButton.Hint:=lisHideSearch;
HideSearchSpeedButton.LoadGlyphFromResourceName(HInstance, 'debugger_power_grey'); HideSearchSpeedButton.LoadGlyphFromResourceName(HInstance, 'debugger_power_grey');
SearchEdit.Text:=GetDefaultSearchText;
SearchNextSpeedButton.Hint:=lisUDSearchNextOccurrenceOfThisPhrase; SearchNextSpeedButton.Hint:=lisUDSearchNextOccurrenceOfThisPhrase;
SearchNextSpeedButton.LoadGlyphFromResourceName(HInstance, 'callstack_bottom'); SearchNextSpeedButton.LoadGlyphFromResourceName(HInstance, 'callstack_bottom');
SearchPrevSpeedButton.Hint:=lisUDSearchPreviousOccurrenceOfThisPhrase; SearchPrevSpeedButton.Hint:=lisUDSearchPreviousOccurrenceOfThisPhrase;
SearchPrevSpeedButton.LoadGlyphFromResourceName(HInstance, 'callstack_top'); SearchPrevSpeedButton.LoadGlyphFromResourceName(HInstance, 'callstack_top');
SearchEdit.TextHint:=lisUDSearch;
end; end;
destructor TMessagesFrame.Destroy; destructor TMessagesFrame.Destroy;
@ -3612,11 +3592,6 @@ begin
MessagesCtrl.Select(Msg,DoScroll); MessagesCtrl.Select(Msg,DoScroll);
end; end;
function TMessagesFrame.GetDefaultSearchText: string;
begin
Result:=lisUDSearch;
end;
function TMessagesFrame.SelectFirstUrgentMessage( function TMessagesFrame.SelectFirstUrgentMessage(
aMinUrgency: TMessageLineUrgency; WithSrcPos: boolean): boolean; aMinUrgency: TMessageLineUrgency; WithSrcPos: boolean): boolean;
begin begin