diff --git a/debugger/inspectdlg.lfm b/debugger/inspectdlg.lfm index a5bd836170..753b567a63 100644 --- a/debugger/inspectdlg.lfm +++ b/debugger/inspectdlg.lfm @@ -14,22 +14,23 @@ object IDEInspectDlg: TIDEInspectDlg OnClose = FormClose OnCreate = FormCreate OnKeyDown = FormKeyDown + OnMouseDown = DataGridMouseDown LCLVersion = '2.1.0.0' object StatusBar1: TStatusBar Left = 0 - Height = 19 - Top = 387 + Height = 23 + Top = 383 Width = 295 Panels = <> end object PageControl: TPageControl Left = 0 - Height = 338 + Height = 334 Top = 49 Width = 295 - ActivePage = DataPage + ActivePage = ErrorPage Align = alClient - TabIndex = 0 + TabIndex = 3 TabOrder = 1 OnMouseDown = DataGridMouseDown object DataPage: TTabSheet @@ -38,9 +39,27 @@ object IDEInspectDlg: TIDEInspectDlg end object PropertiesPage: TTabSheet Caption = 'PropertiesPage' + OnMouseDown = DataGridMouseDown end object MethodsPage: TTabSheet Caption = 'MethodsPage' + OnMouseDown = DataGridMouseDown + end + object ErrorPage: TTabSheet + Caption = 'ErrorPage' + ClientHeight = 306 + ClientWidth = 287 + OnMouseDown = DataGridMouseDown + TabVisible = False + object ErrorLabel: TLabel + Left = 0 + Height = 1 + Top = 0 + Width = 287 + Align = alTop + ParentColor = False + OnMouseDown = DataGridMouseDown + end end end object EdInspect: TComboBox @@ -49,7 +68,7 @@ object IDEInspectDlg: TIDEInspectDlg Top = 0 Width = 295 Align = alTop - ItemHeight = 14 + ItemHeight = 15 OnEditingDone = EdInspectEditingDone OnKeyDown = EdInspectKeyDown TabOrder = 2 @@ -65,7 +84,7 @@ object IDEInspectDlg: TIDEInspectDlg ShowCaptions = True TabOrder = 3 object btnUseInstance: TToolButton - Left = 52 + Left = 54 Hint = 'Use Instance class' Top = 2 AllowAllUp = True @@ -76,14 +95,14 @@ object IDEInspectDlg: TIDEInspectDlg Style = tbsCheck end object ToolButton2: TToolButton - Left = 105 + Left = 106 Height = 22 Top = 2 Caption = 'ToolButton2' Style = tbsDivider end object btnColClass: TToolButton - Left = 110 + Left = 111 Hint = 'Show Class Column' Top = 2 AllowAllUp = True @@ -95,7 +114,7 @@ object IDEInspectDlg: TIDEInspectDlg Style = tbsCheck end object btnColType: TToolButton - Left = 133 + Left = 134 Top = 2 AllowAllUp = True Caption = 'T' @@ -106,7 +125,7 @@ object IDEInspectDlg: TIDEInspectDlg Style = tbsCheck end object btnColVisibility: TToolButton - Left = 156 + Left = 157 Top = 2 AllowAllUp = True Caption = 'V' @@ -123,13 +142,13 @@ object IDEInspectDlg: TIDEInspectDlg OnClick = btnBackwardClick end object btnForward: TToolButton - Left = 24 + Left = 25 Top = 2 Caption = '>>' OnClick = btnForwardClick end object ToolButton4: TToolButton - Left = 47 + Left = 49 Height = 22 Top = 2 Caption = 'ToolButton4' diff --git a/debugger/inspectdlg.pas b/debugger/inspectdlg.pas index 0c6f0c3591..c9ed102705 100644 --- a/debugger/inspectdlg.pas +++ b/debugger/inspectdlg.pas @@ -50,11 +50,13 @@ type TIDEInspectDlg = class(TDebuggerDlg) EdInspect: TComboBox; + ErrorLabel: TLabel; PageControl: TPageControl; StatusBar1: TStatusBar; DataPage: TTabSheet; PropertiesPage: TTabSheet; MethodsPage: TTabSheet; + ErrorPage: TTabSheet; ToolBar1: TToolBar; btnUseInstance: TToolButton; btnBackward: TToolButton; @@ -112,6 +114,7 @@ type procedure GridMethodsSetup(Initial: Boolean = False); procedure ShowDataFields; procedure ShowMethodsFields; + //procedure ShowError; procedure Clear; procedure GotoHistory(AIndex: Integer); protected @@ -722,6 +725,7 @@ begin DataPage.TabVisible:=false; PropertiesPage.TabVisible:=false; MethodsPage.TabVisible:=false; + ErrorPage.TabVisible:=false; GridDataSetup; FGridData.Visible := False; StatusBar1.SimpleText:=''; @@ -786,6 +790,7 @@ begin FGridData.OnDblClick := @DataGridDoubleClick; FGridData.OnMouseDown := @DataGridMouseDown; + FGridMethods.OnMouseDown := @DataGridMouseDown; ToolBar1.Images := IDEImages.Images_16; btnBackward.ImageIndex := IDEImages.LoadImage('arrow_left'); @@ -873,6 +878,8 @@ begin FreeAndNil(FDBGInfo); Clear; StatusBar1.SimpleText:=Format(lisInspectUnavailableError, [ShortenedExpression, FHumanReadable]); + ErrorLabel.Caption :=Format(lisInspectUnavailableError, [ShortenedExpression, FHumanReadable]); + PageControl.ActivePage := ErrorPage; Exit; end; case FDBGInfo.Kind of @@ -893,6 +900,8 @@ begin else begin Clear; StatusBar1.SimpleText:=Format(lisInspectUnavailableError, [ShortenedExpression, FHumanReadable]); + ErrorLabel.Caption :=Format(lisInspectUnavailableError, [ShortenedExpression, FHumanReadable]); + PageControl.ActivePage := ErrorPage; end; end; end;