Index: ide/editoroptions.lfm =================================================================== --- ide/editoroptions.lfm (revisión: 8473) +++ ide/editoroptions.lfm (copia de trabajo) @@ -7,9 +7,9 @@ Position = poScreenCenter HorzScrollBar.Page = 476 VertScrollBar.Page = 530 - Left = 469 + Left = 291 Height = 531 - Top = 143 + Top = 7 Width = 477 object MainNotebook: TNotebook Align = alTop @@ -365,6 +365,8 @@ ParentColor = False TabOrder = 2 Width = 457 + BookMarkOptions.OnChange = nil + Gutter.OnChange = nil Gutter.CodeFoldingWidth = 14 Keystrokes = < item @@ -691,6 +693,7 @@ 'DisplayPreview' ) ReadOnly = True + SelectedColor.OnChange = nil OnSpecialLineColors = OnSpecialLineColors Cursor = crIBeam Left = 6 @@ -856,6 +859,8 @@ TabOrder = 3 Width = 461 OnMouseDown = ColorPreviewMouseUp + BookMarkOptions.OnChange = nil + Gutter.OnChange = nil Gutter.CodeFoldingWidth = 14 Keystrokes = < item @@ -1182,6 +1187,7 @@ 'ColorPreview' ) ReadOnly = True + SelectedColor.OnChange = nil OnSpecialLineColors = OnSpecialLineColors Cursor = crIBeam Left = 4 @@ -1238,34 +1244,34 @@ Width = 83 end object ForegroundColorButton: TColorButton - BorderSpacing.Top = 2 + BorderSpacing.Top = 16 BorderWidth = 2 OnColorChanged = ColorButtonColorChanged AnchorSideTop.Control = ForeGroundLabel - Left = 8 + Left = 6 Height = 21 Top = 16 Width = 75 end object BackGroundColorButton: TColorButton - BorderSpacing.Top = 2 + BorderSpacing.Top = 16 BorderWidth = 2 OnColorChanged = ColorButtonColorChanged AnchorSideTop.Control = BackGroundLabel - Left = 8 + Left = 6 Height = 21 - Top = 58 + Top = 54 Width = 75 end object BackGroundLabel: TLabel - BorderSpacing.Top = 28 + BorderSpacing.Top = 38 Caption = 'BackGroundLabel' Color = clNone ParentColor = False AnchorSideTop.Control = ForeGroundLabel Left = 8 Height = 14 - Top = 42 + Top = 38 Width = 83 end object ForeGroundUseDefaultCheckBox: TCheckBox @@ -1277,7 +1283,7 @@ AnchorSideTop.Control = ForeGroundLabel Left = 94 Height = 13 - Top = 16 + Top = 2 Width = 140 end object BackGroundUseDefaultCheckBox: TCheckBox @@ -1289,7 +1295,7 @@ AnchorSideTop.Control = BackGroundLabel Left = 94 Height = 13 - Top = 56 + Top = 38 Width = 140 end object TextBoldCheckBox: TCheckBox Index: ide/environmentopts.lfm =================================================================== --- ide/environmentopts.lfm (revisión: 8473) +++ ide/environmentopts.lfm (copia de trabajo) @@ -1,28 +1,28 @@ object EnvironmentOptionsDialog: TEnvironmentOptionsDialog ActiveControl = CancelButton Caption = 'EnvironmentOptionsDialog' - ClientHeight = 520 + ClientHeight = 503 ClientWidth = 540 OnResize = FormResize PixelsPerInch = 96 Position = poScreenCenter HorzScrollBar.Page = 539 - VertScrollBar.Page = 519 - Left = 314 - Height = 520 - Top = 124 + VertScrollBar.Page = 502 + Left = 250 + Height = 503 + Top = 15 Width = 540 object Notebook: TNotebook Align = alTop Anchors = [akTop, akLeft, akRight, akBottom] - PageIndex = 6 - Height = 477 + PageIndex = 3 + Height = 460 Width = 540 object FilesPage: TPage Caption = 'FilesPage' ClientWidth = 532 - ClientHeight = 451 - Height = 451 + ClientHeight = 434 + Height = 434 Width = 532 object MaxRecentOpenFilesLabel: TLabel Caption = 'MaxRecentOpenFilesLabel' @@ -249,8 +249,8 @@ object DesktopPage: TPage Caption = 'DesktopPage' ClientWidth = 532 - ClientHeight = 451 - Height = 451 + ClientHeight = 434 + Height = 434 Width = 532 object LanguageGroupBox: TGroupBox Anchors = [akTop, akLeft, akRight] @@ -392,8 +392,8 @@ object WindowsPage: TPage Caption = 'WindowsPage' ClientWidth = 532 - ClientHeight = 451 - Height = 451 + ClientHeight = 434 + Height = 434 Width = 532 object MinimizeAllOnMinimizeMainCheckBox: TCheckBox Anchors = [akTop, akLeft, akRight] @@ -438,20 +438,20 @@ object FormEditorPage: TPage Caption = 'FormEditorPage' ClientWidth = 532 - ClientHeight = 451 + ClientHeight = 434 OnResize = FormEditorPageResize - Height = 451 + Height = 434 Width = 532 object GridGroupBox: TGroupBox BorderSpacing.Around = 6 Caption = 'GridGroupBox' - ClientHeight = 171 - ClientWidth = 337 + ClientHeight = 153 + ClientWidth = 240 TabOrder = 0 Left = 6 Height = 171 Top = 6 - Width = 337 + Width = 244 object GridColorLabel: TLabel Caption = 'GridColorLabel' Color = clNone @@ -469,7 +469,7 @@ Left = 117 Height = 14 Top = 60 - Width = 198 + Width = 101 end object GridSizeYLabel: TLabel Anchors = [akTop, akLeft, akRight] @@ -479,7 +479,7 @@ Left = 117 Height = 14 Top = 96 - Width = 198 + Width = 101 end object GridColorButton: TColorButton BorderWidth = 2 @@ -495,7 +495,7 @@ Left = 6 Height = 13 Top = 26 - Width = 309 + Width = 212 end object ShowGridCheckBox: TCheckBox Caption = 'ShowGridCheckBox' @@ -549,19 +549,19 @@ end object GuideLinesGroupBox: TGroupBox Anchors = [akTop, akLeft, akRight] - BorderSpacing.Left = 10 + BorderSpacing.Left = 250 Caption = 'GuideLinesGroupBox' - ClientHeight = 255 - ClientWidth = 172 + ClientHeight = 221 + ClientWidth = 264 TabOrder = 1 AnchorSideLeft.Control = FormEditMiscGroupBox - Left = 353 - Height = 255 + Left = 254 + Height = 239 Top = 187 - Width = 172 + Width = 268 object GuideLineColorLeftTopButton: TColorButton BorderWidth = 2 - Left = 6 + Left = 4 Height = 23 Top = 70 Width = 50 @@ -581,7 +581,7 @@ Left = 6 Height = 14 Top = 57 - Width = 146 + Width = 238 end object GuideLineColorRightBottomLabel: TLabel Anchors = [akTop, akLeft, akRight] @@ -591,7 +591,7 @@ Left = 6 Height = 14 Top = 102 - Width = 146 + Width = 238 end object ShowGuideLinesCheckBox: TCheckBox Anchors = [akTop, akLeft, akRight] @@ -599,7 +599,7 @@ TabOrder = 0 Left = 6 Height = 13 - Width = 146 + Width = 238 end object SnapToGuideLinesCheckBox: TCheckBox Anchors = [akTop, akLeft, akRight] @@ -608,21 +608,21 @@ Left = 6 Height = 13 Top = 19 - Width = 146 + Width = 238 end end object FormEditMiscGroupBox: TGroupBox BorderSpacing.Around = 6 Caption = 'FormEditMiscGroupBox' - ClientHeight = 255 - ClientWidth = 337 + ClientHeight = 222 + ClientWidth = 240 TabOrder = 2 AnchorSideRight.Control = FormEditorPage AnchorSideRight.Side = asrBottom - Left = 6 - Height = 255 - Top = 187 - Width = 337 + Left = 4 + Height = 240 + Top = 186 + Width = 244 object GrabberColorButton: TColorButton BorderWidth = 2 Left = 6 @@ -645,7 +645,7 @@ Left = 6 Height = 14 Top = 110 - Width = 324 + Width = 227 end object MarkerColorLabel: TLabel Anchors = [akTop, akLeft, akRight] @@ -655,15 +655,15 @@ Left = 6 Height = 14 Top = 160 - Width = 324 + Width = 227 end object ShowComponentCaptionsCheckBox: TCheckBox Anchors = [akTop, akLeft, akRight] Caption = 'ShowComponentCaptionsCheckBox' TabOrder = 0 - Left = 6 + Left = 4 Height = 13 - Width = 324 + Width = 227 end object ShowEditorHintsCheckBox: TCheckBox Anchors = [akTop, akLeft, akRight] @@ -672,7 +672,7 @@ Left = 6 Height = 13 Top = 25 - Width = 324 + Width = 227 end object AutoCreateFormsOnOpenCheckBox: TCheckBox Anchors = [akTop, akLeft, akRight] @@ -681,7 +681,7 @@ Left = 6 Height = 13 Top = 50 - Width = 324 + Width = 227 end object RightClickSelectsCheckBox: TCheckBox Anchors = [akTop, akLeft, akRight] @@ -690,7 +690,7 @@ Left = 6 Height = 13 Top = 75 - Width = 324 + Width = 227 end object DesignerPaintLazyCheckBox: TCheckBox Anchors = [akTop, akLeft, akRight] @@ -701,21 +701,22 @@ Left = 6 Height = 13 Top = 205 - Width = 324 + Width = 227 end end object RubberbandGroupBox: TGroupBox Anchors = [akTop, akLeft, akRight] - BorderSpacing.Left = 10 + BorderSpacing.Left = 250 Caption = 'RubberbandGroupBox' - ClientHeight = 170 - ClientWidth = 172 + ChildSizing.ControlsPerLine = 1 + ClientHeight = 152 + ClientWidth = 265 TabOrder = 3 AnchorSideLeft.Control = GridGroupBox - Left = 353 + Left = 256 Height = 170 Top = 6 - Width = 172 + Width = 269 object RubberbandSelectColorButton: TColorButton BorderWidth = 2 Left = 6 @@ -727,7 +728,7 @@ BorderWidth = 2 Left = 6 Height = 23 - Top = 70 + Top = 68 Width = 50 end object RubberbandSelectColorLabel: TLabel @@ -738,7 +739,7 @@ Left = 6 Height = 14 Top = 3 - Width = 159 + Width = 252 end object RubberbandCreateColorLabel: TLabel Anchors = [akTop, akLeft, akRight] @@ -748,7 +749,7 @@ Left = 6 Height = 14 Top = 54 - Width = 159 + Width = 252 end object RubberbandSelectsGrandChildsCheckBox: TCheckBox Anchors = [akTop, akLeft, akRight] @@ -757,15 +758,15 @@ Left = 6 Height = 13 Top = 102 - Width = 165 + Width = 258 end end end object ObjectInspectorPage: TPage Caption = 'ObjectInspectorPage' ClientWidth = 532 - ClientHeight = 451 - Height = 451 + ClientHeight = 434 + Height = 434 Width = 532 object ObjectInspectorColorsGroupBox: TGroupBox Anchors = [akTop, akLeft, akRight] @@ -828,9 +829,9 @@ Color = clNone ParentColor = False Left = 65 - Height = 13 + Height = 14 Top = 11 - Width = 427 + Width = 423 end object OISubPropsColorLabel: TLabel Anchors = [akTop, akLeft, akRight] @@ -838,9 +839,9 @@ Color = clNone ParentColor = False Left = 65 - Height = 13 + Height = 14 Top = 35 - Width = 427 + Width = 423 end object OIReferencesColorLabel: TLabel Anchors = [akTop, akLeft, akRight] @@ -848,9 +849,9 @@ Color = clNone ParentColor = False Left = 65 - Height = 13 + Height = 14 Top = 59 - Width = 427 + Width = 423 end object OIValueColorLabel: TLabel Anchors = [akTop, akLeft, akRight] @@ -858,9 +859,9 @@ Color = clNone ParentColor = False Left = 65 - Height = 13 + Height = 14 Top = 83 - Width = 427 + Width = 423 end object OIDefaultValueColorLabel: TLabel Anchors = [akTop, akLeft, akRight] @@ -868,9 +869,9 @@ Color = clNone ParentColor = False Left = 65 - Height = 13 + Height = 14 Top = 107 - Width = 427 + Width = 423 end object OIPropNameColorLabel: TLabel Anchors = [akTop, akLeft, akRight] @@ -878,9 +879,9 @@ Color = clNone ParentColor = False Left = 65 - Height = 13 + Height = 14 Top = 131 - Width = 427 + Width = 423 end end object OIMiscGroupBox: TGroupBox @@ -899,18 +900,18 @@ Color = clNone ParentColor = False Left = 6 - Height = 13 + Height = 14 Top = 6 - Width = 486 + Width = 482 end object OIShowHintCheckBox: TCheckBox Anchors = [akTop, akLeft, akRight] Caption = 'OIShowHintCheckBox' TabOrder = 0 Left = 6 - Height = 24 + Height = 13 Top = 55 - Width = 486 + Width = 482 end object OIDefaultItemHeightSpinEdit: TSpinEdit Anchors = [akTop, akLeft, akRight] @@ -918,15 +919,15 @@ Left = 6 Height = 20 Top = 24 - Width = 506 + Width = 508 end end end object BackupPage: TPage Caption = 'BackupPage' ClientWidth = 532 - ClientHeight = 451 - Height = 451 + ClientHeight = 434 + Height = 434 Width = 532 object BackupHelpLabel: TLabel Anchors = [akTop, akLeft, akRight] @@ -934,7 +935,7 @@ Color = clNone ParentColor = False Left = 4 - Height = 13 + Height = 14 Top = 7 Width = 526 end @@ -954,9 +955,9 @@ Color = clNone ParentColor = False Left = 117 - Height = 13 + Height = 14 Top = 100 - Width = 383 + Width = 379 end object BakProjMaxCounterLabel: TLabel Anchors = [akTop, akLeft, akRight] @@ -964,9 +965,9 @@ Color = clNone ParentColor = False Left = 118 - Height = 13 + Height = 14 Top = 125 - Width = 382 + Width = 378 end object BakProjSubDirLabel: TLabel Anchors = [akTop, akLeft, akRight] @@ -974,9 +975,9 @@ Color = clNone ParentColor = False Left = 117 - Height = 13 + Height = 14 Top = 154 - Width = 383 + Width = 379 end object BakProjTypeRadioGroup: TRadioGroup Anchors = [akTop, akLeft, akRight] @@ -986,7 +987,7 @@ TabOrder = 0 Left = 6 Height = 88 - Width = 494 + Width = 490 end object BakProjAddExtComboBox: TComboBox MaxLength = 0 @@ -1032,9 +1033,9 @@ Color = clNone ParentColor = False Left = 117 - Height = 13 + Height = 14 Top = 97 - Width = 383 + Width = 379 end object BakOtherMaxCounterLabel: TLabel Anchors = [akTop, akLeft, akRight] @@ -1042,9 +1043,9 @@ Color = clNone ParentColor = False Left = 117 - Height = 13 + Height = 14 Top = 124 - Width = 383 + Width = 379 end object BakOtherSubDirLabel: TLabel Anchors = [akTop, akLeft, akRight] @@ -1052,9 +1053,9 @@ Color = clNone ParentColor = False Left = 117 - Height = 13 + Height = 14 Top = 151 - Width = 383 + Width = 379 end object BakOtherTypeRadioGroup: TRadioGroup Anchors = [akTop, akLeft, akRight] @@ -1064,7 +1065,7 @@ TabOrder = 0 Left = 6 Height = 84 - Width = 494 + Width = 490 end object BakOtherAddExtComboBox: TComboBox MaxLength = 0 @@ -1098,8 +1099,8 @@ object NamingPage: TPage Caption = 'NamingPage' ClientWidth = 532 - ClientHeight = 451 - Height = 451 + ClientHeight = 434 + Height = 434 Width = 532 object PascalFileExtRadiogroup: TRadioGroup Align = alTop @@ -1139,24 +1140,24 @@ object LazDocPage: TPage Caption = 'LazDocPage' ClientWidth = 532 - ClientHeight = 451 - Height = 451 + ClientHeight = 434 + Height = 434 Width = 532 object Label1: TLabel Caption = 'NOTE: only absolute paths are supported now' Color = clNone ParentColor = False Left = 8 - Height = 13 + Height = 14 Top = 226 - Width = 259 + Width = 223 end object LazDocPathsGroupBox: TGroupBox Align = alTop BorderSpacing.Around = 6 Caption = 'LazDocPathsGroupBox' - ClientHeight = 210 - ClientWidth = 520 + ClientHeight = 192 + ClientWidth = 516 TabOrder = 0 Left = 6 Height = 210 @@ -1178,22 +1179,22 @@ OnClick = LazDocAddPathButtonClick TabOrder = 1 Left = 6 - Height = 26 + Height = 29 Top = 122 - Width = 136 + Width = 133 end object LazDocDeletePathButton: TButton AutoSize = True - BorderSpacing.Left = 10 + BorderSpacing.Left = 140 BorderSpacing.InnerBorder = 2 Caption = 'LazDocDeletePathButton' OnClick = LazDocDeletePathButtonClick TabOrder = 2 AnchorSideLeft.Control = LazDocAddPathButton - Left = 152 - Height = 26 + Left = 146 + Height = 29 Top = 122 - Width = 149 + Width = 145 end object LazDocPathEdit: TEdit Anchors = [akTop, akLeft, akRight] @@ -1202,7 +1203,7 @@ Left = 6 Height = 23 Top = 154 - Width = 468 + Width = 464 end object LazDocBrowseButton: TButton Anchors = [akTop, akRight] @@ -1210,7 +1211,7 @@ Caption = '...' OnClick = LazDocBrowseButtonClick TabOrder = 4 - Left = 479 + Left = 475 Height = 23 Top = 154 Width = 23 @@ -1227,7 +1228,7 @@ TabOrder = 1 Left = 457 Height = 25 - Top = 485 + Top = 468 Width = 75 end object OkButton: TButton @@ -1239,7 +1240,7 @@ TabOrder = 2 Left = 375 Height = 25 - Top = 485 + Top = 468 Width = 75 end object SelectDirectoryDialog: TSelectDirectoryDialog Index: ide/environmentopts.pp =================================================================== --- ide/environmentopts.pp (revisión: 8473) +++ ide/environmentopts.pp (copia de trabajo) @@ -2050,12 +2050,12 @@ end; procedure TEnvironmentOptionsDialog.FormEditorPageResize(Sender: TObject); -var - w: Integer; +{var + w: Integer; } begin - w:=((FormEditorPage.ClientWidth-3*5)*6) div 10; +{ w:=((FormEditorPage.ClientWidth-3*5)*6) div 10; GridGroupBox.Width:=w; - FormEditMiscGroupBox.Width:=GridGroupBox.Width; + FormEditMiscGroupBox.Width:=GridGroupBox.Width; } end; procedure TEnvironmentOptionsDialog.FormResize(Sender: TObject);