From ea891beeedce91c21251e54ed2119c0aff54548f Mon Sep 17 00:00:00 2001 From: mattias Date: Sun, 31 Oct 2010 11:20:11 +0000 Subject: [PATCH] IDE: fixed break point dlg layout git-svn-id: trunk@28007 - --- debugger/breakpropertydlg.lfm | 148 ++++++++++++++++++---------------- debugger/breakpropertydlg.pas | 2 +- lcl/include/wincontrol.inc | 3 +- 3 files changed, 82 insertions(+), 71 deletions(-) diff --git a/debugger/breakpropertydlg.lfm b/debugger/breakpropertydlg.lfm index 417ee04336..ccb20ace18 100644 --- a/debugger/breakpropertydlg.lfm +++ b/debugger/breakpropertydlg.lfm @@ -1,7 +1,7 @@ inherited BreakPropertyDlg: TBreakPropertyDlg - Left = 586 + Left = 60 Height = 435 - Top = 151 + Top = 274 Width = 443 HorzScrollBar.Page = 386 VertScrollBar.Page = 366 @@ -19,9 +19,9 @@ inherited BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Control = edtFilename AnchorSideTop.Side = asrCenter Left = 6 - Height = 14 + Height = 18 Top = 10 - Width = 55 + Width = 66 BorderSpacing.Around = 6 Caption = 'Filename:' ParentColor = False @@ -31,9 +31,9 @@ inherited BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Control = edtLine AnchorSideTop.Side = asrCenter Left = 6 - Height = 14 - Top = 39 - Width = 28 + Height = 18 + Top = 43 + Width = 33 BorderSpacing.Around = 6 Caption = 'Line:' ParentColor = False @@ -42,9 +42,9 @@ inherited BreakPropertyDlg: TBreakPropertyDlg AnchorSideLeft.Control = Owner AnchorSideTop.Side = asrCenter Left = 6 - Height = 14 + Height = 18 Top = 76 - Width = 58 + Width = 71 BorderSpacing.Around = 6 Caption = 'Condition:' ParentColor = False @@ -54,9 +54,9 @@ inherited BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Control = edtCounter AnchorSideTop.Side = asrCenter Left = 6 - Height = 14 + Height = 18 Top = 109 - Width = 51 + Width = 63 BorderSpacing.Around = 6 Caption = 'Hitcount:' ParentColor = False @@ -66,9 +66,9 @@ inherited BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Control = cmbGroup AnchorSideTop.Side = asrCenter Left = 6 - Height = 14 - Top = 169 - Width = 40 + Height = 18 + Top = 175 + Width = 47 BorderSpacing.Around = 6 Caption = 'Group:' ParentColor = False @@ -78,9 +78,9 @@ inherited BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Control = edtAutocontinueMS AnchorSideTop.Side = asrCenter Left = 6 - Height = 14 - Top = 138 - Width = 109 + Height = 18 + Top = 142 + Width = 133 BorderSpacing.Around = 6 Caption = 'Auto continue after' ParentColor = False @@ -90,10 +90,10 @@ inherited BreakPropertyDlg: TBreakPropertyDlg AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = lblAutoContinue AnchorSideTop.Side = asrCenter - Left = 193 - Height = 14 - Top = 138 - Width = 27 + Left = 217 + Height = 18 + Top = 142 + Width = 31 BorderSpacing.Left = 6 Caption = '(ms)' ParentColor = False @@ -104,9 +104,9 @@ inherited BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Control = edtCounter AnchorSideTop.Side = asrBottom AnchorSideRight.Side = asrBottom - Left = 127 - Height = 23 - Top = 134 + Left = 151 + Height = 27 + Top = 138 Width = 60 BorderSpacing.Left = 6 BorderSpacing.Around = 6 @@ -116,13 +116,14 @@ inherited BreakPropertyDlg: TBreakPropertyDlg object edtCounter: TEdit[8] AnchorSideLeft.Control = lblAutoContinue AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = edtCondition AnchorSideTop.Side = asrBottom AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom - Left = 127 - Height = 23 + Left = 151 + Height = 27 Top = 105 - Width = 310 + Width = 286 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 BorderSpacing.Around = 6 @@ -135,9 +136,9 @@ inherited BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Control = edtFilename AnchorSideTop.Side = asrBottom AnchorSideRight.Side = asrBottom - Left = 127 - Height = 23 - Top = 35 + Left = 151 + Height = 27 + Top = 39 Width = 60 BorderSpacing.Left = 6 BorderSpacing.Around = 6 @@ -152,10 +153,10 @@ inherited BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Control = Owner AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom - Left = 127 - Height = 23 + Left = 151 + Height = 27 Top = 6 - Width = 310 + Width = 286 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 BorderSpacing.Around = 6 @@ -171,10 +172,10 @@ inherited BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Side = asrBottom AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom - Left = 127 + Left = 151 Height = 27 - Top = 163 - Width = 310 + Top = 171 + Width = 286 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 BorderSpacing.Around = 6 @@ -189,15 +190,15 @@ inherited BreakPropertyDlg: TBreakPropertyDlg AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom Left = 6 - Height = 165 - Top = 196 + Height = 187 + Top = 204 Width = 431 Anchors = [akTop, akLeft, akRight] AutoSize = True BorderSpacing.Around = 6 Caption = 'Actions' - ClientHeight = 150 - ClientWidth = 427 + ClientHeight = 166 + ClientWidth = 423 TabOrder = 5 object chkActionBreak: TCheckBox AnchorSideLeft.Control = gbActions @@ -205,7 +206,7 @@ inherited BreakPropertyDlg: TBreakPropertyDlg Left = 6 Height = 22 Top = 6 - Width = 57 + Width = 69 BorderSpacing.Around = 6 Caption = 'Break' TabOrder = 0 @@ -216,8 +217,8 @@ inherited BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Side = asrCenter Left = 6 Height = 22 - Top = 34 - Width = 101 + Top = 36 + Width = 118 BorderSpacing.Around = 6 Caption = 'Enable goups' TabOrder = 1 @@ -228,8 +229,8 @@ inherited BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Side = asrCenter Left = 6 Height = 22 - Top = 63 - Width = 110 + Top = 69 + Width = 130 BorderSpacing.Around = 6 Caption = 'Disable groups' TabOrder = 2 @@ -240,10 +241,10 @@ inherited BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Control = chkActionBreak AnchorSideTop.Side = asrBottom AnchorSideRight.Side = asrBottom - Left = 143 - Height = 23 + Left = 155 + Height = 27 Top = 34 - Width = 255 + Width = 239 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 80 BorderSpacing.Top = 6 @@ -261,10 +262,10 @@ inherited BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Control = edtEnableGroups AnchorSideTop.Side = asrBottom AnchorSideRight.Side = asrBottom - Left = 143 - Height = 23 - Top = 63 - Width = 255 + Left = 155 + Height = 27 + Top = 67 + Width = 239 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 80 BorderSpacing.Top = 6 @@ -282,8 +283,8 @@ inherited BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Side = asrCenter Left = 6 Height = 22 - Top = 92 - Width = 114 + Top = 102 + Width = 133 BorderSpacing.Around = 6 Caption = 'Eval expression' Enabled = False @@ -295,8 +296,8 @@ inherited BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Side = asrCenter Left = 6 Height = 22 - Top = 121 - Width = 101 + Top = 135 + Width = 118 BorderSpacing.Around = 6 Caption = 'Log message' Enabled = False @@ -309,10 +310,10 @@ inherited BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Side = asrBottom AnchorSideRight.Control = gbActions AnchorSideRight.Side = asrBottom - Left = 143 - Height = 23 - Top = 92 - Width = 278 + Left = 155 + Height = 27 + Top = 100 + Width = 262 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 80 BorderSpacing.Top = 6 @@ -328,10 +329,10 @@ inherited BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Side = asrBottom AnchorSideRight.Control = gbActions AnchorSideRight.Side = asrBottom - Left = 143 - Height = 23 - Top = 121 - Width = 278 + Left = 155 + Height = 27 + Top = 133 + Width = 262 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 80 BorderSpacing.Top = 6 @@ -346,10 +347,19 @@ inherited BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Side = asrBottom AnchorSideRight.Side = asrBottom Left = 6 - Height = 62 - Top = 367 + Height = 32 + Top = 397 Width = 431 Anchors = [akTop, akLeft, akRight, akBottom] + OKButton.Name = 'OKButton' + OKButton.Caption = '&OK' + HelpButton.Name = 'HelpButton' + HelpButton.Caption = '&Help' + CloseButton.Name = 'CloseButton' + CloseButton.Caption = '&Close' + CloseButton.Enabled = False + CancelButton.Name = 'CancelButton' + CancelButton.Caption = 'Cancel' TabOrder = 6 ShowButtons = [pbOK, pbCancel, pbHelp] ShowBevel = False @@ -361,10 +371,10 @@ inherited BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Side = asrBottom AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom - Left = 127 + Left = 151 Height = 27 - Top = 64 - Width = 310 + Top = 72 + Width = 286 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 BorderSpacing.Around = 6 diff --git a/debugger/breakpropertydlg.pas b/debugger/breakpropertydlg.pas index 6b17744fe0..c76ae788b2 100644 --- a/debugger/breakpropertydlg.pas +++ b/debugger/breakpropertydlg.pas @@ -5,7 +5,7 @@ unit BreakPropertyDlg; interface uses - Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, + Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, LCLProc, ExtCtrls, StdCtrls, Buttons, DebuggerDlg, Debugger, ButtonPanel, EditBtn, BaseDebugManager, IDEContextHelpEdit, LazarusIDEStrConsts, InputHistory; diff --git a/lcl/include/wincontrol.inc b/lcl/include/wincontrol.inc index 0dfb129c06..837d9a4682 100644 --- a/lcl/include/wincontrol.inc +++ b/lcl/include/wincontrol.inc @@ -1160,7 +1160,8 @@ begin until ComputePositions; {$IFDEF VerboseAutoSizeCtrlData} - WriteDebugReport('Positions completed',''); + //if WinControl.ClassName='TBreakPropertyDlg' then + WriteDebugReport('Positions completed',''); {$ENDIF} // compute needed clientwidth/clientheight