diff --git a/debugger/frames/debugger_language_exceptions_options.lfm b/debugger/frames/debugger_language_exceptions_options.lfm index 1474df5aa8..ef0b6d1ea1 100644 --- a/debugger/frames/debugger_language_exceptions_options.lfm +++ b/debugger/frames/debugger_language_exceptions_options.lfm @@ -5,8 +5,8 @@ inherited DebuggerLanguageExceptionsOptions: TDebuggerLanguageExceptionsOptions ClientWidth = 448 TabOrder = 0 Visible = False - DesignLeft = 132 - DesignTop = 174 + DesignLeft = 312 + DesignTop = 189 object bgIgnoreExceptions: TGroupBox[0] AnchorSideLeft.Control = Owner AnchorSideTop.Control = Owner @@ -14,38 +14,40 @@ inherited DebuggerLanguageExceptionsOptions: TDebuggerLanguageExceptionsOptions AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = chkNotifyOnException Left = 0 - Height = 398 + Height = 393 Top = 0 Width = 448 Anchors = [akTop, akLeft, akRight, akBottom] BorderSpacing.Bottom = 6 Caption = 'Ignore these exceptions' - ClientHeight = 380 + ClientHeight = 374 ClientWidth = 444 TabOrder = 0 object clbExceptions: TCheckListBox AnchorSideLeft.Control = bgIgnoreExceptions - AnchorSideTop.Control = bgIgnoreExceptions + AnchorSideTop.Control = DbgLangExceptHint + AnchorSideTop.Side = asrBottom AnchorSideRight.Control = bgIgnoreExceptions AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = cmdExceptionAdd Left = 6 - Height = 339 - Top = 6 + Height = 303 + Top = 30 Width = 432 Anchors = [akTop, akLeft, akRight, akBottom] BorderSpacing.Around = 6 ItemHeight = 0 OnClick = clbExceptionsClick TabOrder = 0 + TopIndex = -1 end object cmdExceptionAdd: TBitBtn AnchorSideRight.Control = cmdExceptionRemove AnchorSideBottom.Control = bgIgnoreExceptions AnchorSideBottom.Side = asrBottom Left = 282 - Height = 23 - Top = 351 + Height = 29 + Top = 339 Width = 75 Anchors = [akRight, akBottom] AutoSize = True @@ -62,8 +64,8 @@ inherited DebuggerLanguageExceptionsOptions: TDebuggerLanguageExceptionsOptions AnchorSideBottom.Control = bgIgnoreExceptions AnchorSideBottom.Side = asrBottom Left = 363 - Height = 23 - Top = 351 + Height = 29 + Top = 339 Width = 75 Anchors = [akRight, akBottom] AutoSize = True @@ -75,15 +77,25 @@ inherited DebuggerLanguageExceptionsOptions: TDebuggerLanguageExceptionsOptions OnClick = cmdExceptionRemoveClick TabOrder = 2 end + object DbgLangExceptHint: TLabel + Left = 6 + Height = 18 + Top = 6 + Width = 432 + Align = alTop + BorderSpacing.Around = 6 + Caption = 'DbgLangExceptHint' + ParentColor = False + end end object chkNotifyOnException: TCheckBox[1] AnchorSideLeft.Control = Owner AnchorSideBottom.Control = Owner AnchorSideBottom.Side = asrBottom Left = 0 - Height = 17 - Top = 404 - Width = 156 + Height = 22 + Top = 399 + Width = 208 Anchors = [akLeft, akBottom] Caption = 'Break on Lazarus Exceptions' TabOrder = 1 diff --git a/debugger/frames/debugger_language_exceptions_options.lrs b/debugger/frames/debugger_language_exceptions_options.lrs index 576db1cda6..7924cc6a13 100644 --- a/debugger/frames/debugger_language_exceptions_options.lrs +++ b/debugger/frames/debugger_language_exceptions_options.lrs @@ -3,36 +3,39 @@ LazarusResources.Add('TDebuggerLanguageExceptionsOptions','FORMDATA',[ 'TPF0'#241'"TDebuggerLanguageExceptionsOptions!DebuggerLanguageExceptionsOpti' +'ons'#6'Height'#3#165#1#5'Width'#3#192#1#12'ClientHeight'#3#165#1#11'ClientW' - +'idth'#3#192#1#8'TabOrder'#2#0#7'Visible'#8#10'DesignLeft'#3#132#0#9'DesignT' - +'op'#3#174#0#0#242#2#0#9'TGroupBox'#18'bgIgnoreExceptions'#22'AnchorSideLeft' - +'.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSideRigh' - +'t.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSide' - +'Bottom.Control'#7#20'chkNotifyOnException'#4'Left'#2#0#6'Height'#3#142#1#3 - +'Top'#2#0#5'Width'#3#192#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akB' - +'ottom'#0#20'BorderSpacing.Bottom'#2#6#7'Caption'#6#23'Ignore these exceptio' - +'ns'#12'ClientHeight'#3'|'#1#11'ClientWidth'#3#188#1#8'TabOrder'#2#0#0#13'TC' - +'heckListBox'#13'clbExceptions'#22'AnchorSideLeft.Control'#7#18'bgIgnoreExce' - +'ptions'#21'AnchorSideTop.Control'#7#18'bgIgnoreExceptions'#23'AnchorSideRig' - +'ht.Control'#7#18'bgIgnoreExceptions'#20'AnchorSideRight.Side'#7#9'asrBottom' - +#24'AnchorSideBottom.Control'#7#15'cmdExceptionAdd'#4'Left'#2#6#6'Height'#3 - +'S'#1#3'Top'#2#6#5'Width'#3#176#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight' - +#8'akBottom'#0#20'BorderSpacing.Around'#2#6#10'ItemHeight'#2#0#7'OnClick'#7 - +#18'clbExceptionsClick'#8'TabOrder'#2#0#0#0#7'TBitBtn'#15'cmdExceptionAdd'#23 - +'AnchorSideRight.Control'#7#18'cmdExceptionRemove'#24'AnchorSideBottom.Contr' - +'ol'#7#18'bgIgnoreExceptions'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Lef' - +'t'#3#26#1#6'Height'#2#23#3'Top'#3'_'#1#5'Width'#2'K'#7'Anchors'#11#7'akRigh' - +'t'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#3 - +'Add'#20'Constraints.MinWidth'#2'K'#9'NumGlyphs'#2#0#7'OnClick'#7#20'cmdExce' - +'ptionAddClick'#8'TabOrder'#2#1#0#0#7'TBitBtn'#18'cmdExceptionRemove'#23'Anc' - +'horSideRight.Control'#7#18'bgIgnoreExceptions'#20'AnchorSideRight.Side'#7#9 - +'asrBottom'#24'AnchorSideBottom.Control'#7#18'bgIgnoreExceptions'#21'AnchorS' - +'ideBottom.Side'#7#9'asrBottom'#4'Left'#3'k'#1#6'Height'#2#23#3'Top'#3'_'#1#5 - +'Width'#2'K'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderS' - +'pacing.Around'#2#6#7'Caption'#6#6'Remove'#20'Constraints.MinWidth'#2'K'#7'E' - +'nabled'#8#9'NumGlyphs'#2#0#7'OnClick'#7#23'cmdExceptionRemoveClick'#8'TabOr' - +'der'#2#2#0#0#0#242#2#1#9'TCheckBox'#20'chkNotifyOnException'#22'AnchorSideL' - +'eft.Control'#7#5'Owner'#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSi' - +'deBottom.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#17#3'Top'#3#148#1#5'W' - +'idth'#3#156#0#7'Anchors'#11#6'akLeft'#8'akBottom'#0#7'Caption'#6#27'Break o' - +'n Lazarus Exceptions'#8'TabOrder'#2#1#0#0#0 + +'idth'#3#192#1#8'TabOrder'#2#0#7'Visible'#8#10'DesignLeft'#3'8'#1#9'DesignTo' + +'p'#3#189#0#0#242#2#0#9'TGroupBox'#18'bgIgnoreExceptions'#22'AnchorSideLeft.' + +'Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSideRight' + +'.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideB' + +'ottom.Control'#7#20'chkNotifyOnException'#4'Left'#2#0#6'Height'#3#137#1#3'T' + +'op'#2#0#5'Width'#3#192#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBo' + +'ttom'#0#20'BorderSpacing.Bottom'#2#6#7'Caption'#6#23'Ignore these exception' + +'s'#12'ClientHeight'#3'v'#1#11'ClientWidth'#3#188#1#8'TabOrder'#2#0#0#13'TCh' + +'eckListBox'#13'clbExceptions'#22'AnchorSideLeft.Control'#7#18'bgIgnoreExcep' + +'tions'#21'AnchorSideTop.Control'#7#17'DbgLangExceptHint'#18'AnchorSideTop.S' + +'ide'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#18'bgIgnoreExceptions'#20 + +'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#15'cmdE' + +'xceptionAdd'#4'Left'#2#6#6'Height'#3'/'#1#3'Top'#2#30#5'Width'#3#176#1#7'An' + +'chors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Arou' + +'nd'#2#6#10'ItemHeight'#2#0#7'OnClick'#7#18'clbExceptionsClick'#8'TabOrder'#2 + +#0#8'TopIndex'#2#255#0#0#7'TBitBtn'#15'cmdExceptionAdd'#23'AnchorSideRight.C' + +'ontrol'#7#18'cmdExceptionRemove'#24'AnchorSideBottom.Control'#7#18'bgIgnore' + +'Exceptions'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#26#1#6'Heigh' + +'t'#2#29#3'Top'#3'S'#1#5'Width'#2'K'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8 + +'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#3'Add'#20'Constraints' + +'.MinWidth'#2'K'#9'NumGlyphs'#2#0#7'OnClick'#7#20'cmdExceptionAddClick'#8'Ta' + +'bOrder'#2#1#0#0#7'TBitBtn'#18'cmdExceptionRemove'#23'AnchorSideRight.Contro' + +'l'#7#18'bgIgnoreExceptions'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'Anch' + +'orSideBottom.Control'#7#18'bgIgnoreExceptions'#21'AnchorSideBottom.Side'#7#9 + +'asrBottom'#4'Left'#3'k'#1#6'Height'#2#29#3'Top'#3'S'#1#5'Width'#2'K'#7'Anch' + +'ors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6 + +#7'Caption'#6#6'Remove'#20'Constraints.MinWidth'#2'K'#7'Enabled'#8#9'NumGlyp' + +'hs'#2#0#7'OnClick'#7#23'cmdExceptionRemoveClick'#8'TabOrder'#2#2#0#0#6'TLab' + +'el'#17'DbgLangExceptHint'#4'Left'#2#6#6'Height'#2#18#3'Top'#2#6#5'Width'#3 + +#176#1#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#17'DbgL' + +'angExceptHint'#11'ParentColor'#8#0#0#0#242#2#1#9'TCheckBox'#20'chkNotifyOnE' + +'xception'#22'AnchorSideLeft.Control'#7#5'Owner'#24'AnchorSideBottom.Control' + +#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2 + +#22#3'Top'#3#143#1#5'Width'#3#208#0#7'Anchors'#11#6'akLeft'#8'akBottom'#0#7 + +'Caption'#6#27'Break on Lazarus Exceptions'#8'TabOrder'#2#1#0#0#0 ]); diff --git a/debugger/frames/debugger_language_exceptions_options.pas b/debugger/frames/debugger_language_exceptions_options.pas index 0e532290da..1e13e72aaf 100644 --- a/debugger/frames/debugger_language_exceptions_options.pas +++ b/debugger/frames/debugger_language_exceptions_options.pas @@ -39,6 +39,7 @@ type clbExceptions: TCheckListBox; cmdExceptionAdd: TBitBtn; cmdExceptionRemove: TBitBtn; + DbgLangExceptHint: TLabel; procedure clbExceptionsClick(Sender: TObject); procedure cmdExceptionAddClick(Sender: TObject); procedure cmdExceptionRemoveClick(Sender: TObject); @@ -142,6 +143,7 @@ procedure TDebuggerLanguageExceptionsOptions.Setup( ADialog: TAbstractOptionsEditorDialog); begin bgIgnoreExceptions.Caption := lisDebugOptionsFrmIgnoreTheseExceptions; + DbgLangExceptHint.Caption := lisTheseSettingsAreStoredWithTheProject; cmdExceptionRemove.Caption := lisExtToolRemove; cmdExceptionAdd.Caption := lisCodeTemplAdd; cmdExceptionRemove.LoadGlyphFromLazarusResource('laz_delete'); diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas index a92e8a79af..09c11bf216 100644 --- a/ide/lazarusidestrconsts.pas +++ b/ide/lazarusidestrconsts.pas @@ -3113,6 +3113,8 @@ resourcestring lisExtToolUnableToRunTheTool = 'Unable to run the tool %s%s%s:%s%s'; lisExtToolExternalTools = 'External tools'; lisExtToolRemove = 'Remove'; + lisTheseSettingsAreStoredWithTheProject = 'These settings are stored with ' + +'the project.'; lisKeepThemAndContinue = 'Keep them and continue'; lisRemoveThem = 'Remove them'; lisExtToolMoveUp = 'Up';