diff --git a/ide/frames/compiler_compilation_options.lfm b/ide/frames/compiler_compilation_options.lfm index 78ebb873cf..3c05f83d85 100644 --- a/ide/frames/compiler_compilation_options.lfm +++ b/ide/frames/compiler_compilation_options.lfm @@ -12,9 +12,9 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame AnchorSideLeft.Control = Owner AnchorSideTop.Control = Owner Left = 0 - Height = 21 + Height = 24 Top = 0 - Width = 139 + Width = 129 Caption = 'chkCreateMakefile' TabOrder = 0 end @@ -25,14 +25,14 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom Left = 0 - Height = 110 - Top = 232 + Height = 114 + Top = 242 Width = 599 Anchors = [akTop, akLeft, akRight] AutoSize = True BorderSpacing.Top = 6 Caption = 'ExecuteAfterGroupBox' - ClientHeight = 91 + ClientHeight = 97 ClientWidth = 595 TabOrder = 3 object lblRunIfExecAfter: TLabel @@ -41,7 +41,7 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame Left = 6 Height = 15 Top = 6 - Width = 103 + Width = 99 BorderSpacing.Around = 6 Caption = 'lblRunIfExecAfter' ParentColor = False @@ -52,8 +52,8 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame AnchorSideTop.Side = asrCenter Left = 6 Height = 15 - Top = 38 - Width = 175 + Top = 41 + Width = 158 BorderSpacing.Around = 6 Caption = 'ExecuteAfterCommandLabel' ParentColor = False @@ -62,10 +62,10 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame AnchorSideLeft.Control = lblRunIfExecAfter AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = ExecuteAfterGroupBox - Left = 139 - Height = 21 + Left = 135 + Height = 24 Top = 6 - Width = 154 + Width = 145 BorderSpacing.Left = 24 BorderSpacing.Around = 6 Caption = 'chkExecAfterCompile' @@ -75,10 +75,10 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame AnchorSideLeft.Control = chkExecAfterCompile AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = ExecuteAfterGroupBox - Left = 323 - Height = 21 + Left = 310 + Height = 24 Top = 6 - Width = 135 + Width = 129 BorderSpacing.Left = 24 BorderSpacing.Around = 6 Caption = 'chkExecAfterBuild' @@ -88,10 +88,10 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame AnchorSideLeft.Control = chkExecAfterBuild AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = ExecuteAfterGroupBox - Left = 488 - Height = 21 + Left = 469 + Height = 24 Top = 6 - Width = 128 + Width = 123 BorderSpacing.Left = 24 BorderSpacing.Around = 6 Caption = 'chkExecAfterRun' @@ -104,10 +104,10 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame AnchorSideTop.Side = asrBottom AnchorSideRight.Control = ExecuteAfterGroupBox AnchorSideRight.Side = asrBottom - Left = 199 + Left = 182 Height = 25 - Top = 33 - Width = 390 + Top = 36 + Width = 407 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 12 BorderSpacing.Around = 6 @@ -119,10 +119,10 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = ExecuteAfterCommandEdit AnchorSideTop.Side = asrBottom - Left = 414 - Height = 21 - Top = 64 - Width = 218 + Left = 379 + Height = 24 + Top = 67 + Width = 199 BorderSpacing.Left = 24 BorderSpacing.Around = 6 Caption = 'ExecuteAfterScanFPCCheckBox' @@ -133,10 +133,10 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = ExecuteAfterCommandEdit AnchorSideTop.Side = asrBottom - Left = 156 - Height = 21 - Top = 64 - Width = 228 + Left = 141 + Height = 24 + Top = 67 + Width = 208 BorderSpacing.Around = 6 Caption = 'ExecuteAfterScanMakeCheckBox' TabOrder = 4 @@ -146,10 +146,10 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = ExecuteAfterCommandEdit AnchorSideTop.Side = asrBottom - Left = 662 - Height = 21 - Top = 64 - Width = 211 + Left = 608 + Height = 24 + Top = 67 + Width = 197 BorderSpacing.Left = 24 BorderSpacing.Around = 6 Caption = 'ExecuteAfterShowAllCheckBox' @@ -161,8 +161,8 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame AnchorSideTop.Side = asrCenter Left = 6 Height = 15 - Top = 67 - Width = 144 + Top = 72 + Width = 129 BorderSpacing.Left = 6 Caption = 'ExecuteAfterScanLabel' ParentColor = False @@ -175,14 +175,14 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom Left = 0 - Height = 83 - Top = 143 + Height = 86 + Top = 150 Width = 599 Anchors = [akTop, akLeft, akRight] AutoSize = True BorderSpacing.Top = 6 Caption = 'grpCompiler' - ClientHeight = 64 + ClientHeight = 69 ClientWidth = 595 TabOrder = 2 object lblRunIfCompiler: TLabel @@ -191,19 +191,18 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame Left = 6 Height = 15 Top = 6 - Width = 98 + Width = 92 BorderSpacing.Around = 6 Caption = 'lblRunIfCompiler' ParentColor = False end object lblCompiler: TLabel AnchorSideLeft.Control = grpCompiler - AnchorSideTop.Control = edtCompiler AnchorSideTop.Side = asrCenter Left = 6 Height = 15 Top = 38 - Width = 68 + Width = 62 BorderSpacing.Around = 6 Caption = 'lblCompiler' ParentColor = False @@ -212,10 +211,10 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame AnchorSideLeft.Control = lblRunIfCompiler AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = grpCompiler - Left = 134 - Height = 21 + Left = 128 + Height = 24 Top = 6 - Width = 149 + Width = 138 BorderSpacing.Left = 30 BorderSpacing.Top = 6 Caption = 'chkCompilerCompile' @@ -225,10 +224,10 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame AnchorSideLeft.Control = chkCompilerCompile AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = grpCompiler - Left = 313 - Height = 21 + Left = 296 + Height = 24 Top = 6 - Width = 130 + Width = 122 BorderSpacing.Left = 24 BorderSpacing.Around = 6 Caption = 'chkCompilerBuild' @@ -238,29 +237,30 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame AnchorSideLeft.Control = chkCompilerBuild AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = grpCompiler - Left = 473 - Height = 21 + Left = 448 + Height = 24 Top = 6 - Width = 123 + Width = 116 BorderSpacing.Left = 24 BorderSpacing.Around = 6 Caption = 'chkCompilerRun' TabOrder = 2 end - object edtCompiler: TEdit + object edtCompiler: TComboBox AnchorSideLeft.Control = lblCompiler AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = chkCompilerCompile AnchorSideTop.Side = asrBottom AnchorSideRight.Control = grpCompiler AnchorSideRight.Side = asrBottom - Left = 92 - Height = 25 - Top = 33 - Width = 497 + Left = 86 + Height = 27 + Top = 36 + Width = 503 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 12 BorderSpacing.Around = 6 + ItemHeight = 0 TabOrder = 3 Text = 'edtCompiler' end @@ -272,14 +272,14 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom Left = 0 - Height = 110 - Top = 27 + Height = 114 + Top = 30 Width = 599 Anchors = [akTop, akLeft, akRight] AutoSize = True BorderSpacing.Top = 6 Caption = 'ExecuteBeforeGroupBox' - ClientHeight = 91 + ClientHeight = 97 ClientWidth = 595 TabOrder = 1 object lblRunIfExecBefore: TLabel @@ -288,7 +288,7 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame Left = 6 Height = 15 Top = 6 - Width = 114 + Width = 108 BorderSpacing.Around = 6 Caption = 'lblRunIfExecBefore' ParentColor = False @@ -299,8 +299,8 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame AnchorSideTop.Side = asrCenter Left = 6 Height = 15 - Top = 38 - Width = 186 + Top = 41 + Width = 167 BorderSpacing.Around = 6 Caption = 'ExecuteBeforeCommandLabel' ParentColor = False @@ -309,10 +309,10 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame AnchorSideLeft.Control = lblRunIfExecBefore AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = ExecuteBeforeGroupBox - Left = 150 - Height = 21 + Left = 144 + Height = 24 Top = 6 - Width = 165 + Width = 154 BorderSpacing.Left = 24 BorderSpacing.Around = 6 Caption = 'chkExecBeforeCompile' @@ -322,10 +322,10 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame AnchorSideLeft.Control = chkExecBeforeCompile AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = ExecuteBeforeGroupBox - Left = 345 - Height = 21 + Left = 328 + Height = 24 Top = 6 - Width = 146 + Width = 138 BorderSpacing.Left = 24 BorderSpacing.Around = 6 Caption = 'chkExecBeforeBuild' @@ -335,10 +335,10 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame AnchorSideLeft.Control = chkExecBeforeBuild AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = ExecuteBeforeGroupBox - Left = 521 - Height = 21 + Left = 496 + Height = 24 Top = 6 - Width = 139 + Width = 132 BorderSpacing.Left = 24 BorderSpacing.Around = 6 Caption = 'chkExecBeforeRun' @@ -351,10 +351,10 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame AnchorSideTop.Side = asrBottom AnchorSideRight.Control = ExecuteBeforeGroupBox AnchorSideRight.Side = asrBottom - Left = 210 + Left = 191 Height = 25 - Top = 33 - Width = 379 + Top = 36 + Width = 398 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 12 BorderSpacing.Around = 6 @@ -366,10 +366,10 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = ExecuteBeforeCommandEdit AnchorSideTop.Side = asrBottom - Left = 436 - Height = 21 - Top = 64 - Width = 229 + Left = 397 + Height = 24 + Top = 67 + Width = 208 BorderSpacing.Left = 24 BorderSpacing.Around = 6 Caption = 'ExecuteBeforeScanFPCCheckBox' @@ -380,10 +380,10 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = ExecuteBeforeCommandEdit AnchorSideTop.Side = asrBottom - Left = 167 - Height = 21 - Top = 64 - Width = 239 + Left = 150 + Height = 24 + Top = 67 + Width = 217 BorderSpacing.Around = 6 Caption = 'ExecuteBeforeScanMakeCheckBox' TabOrder = 4 @@ -393,10 +393,10 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = ExecuteBeforeCommandEdit AnchorSideTop.Side = asrBottom - Left = 695 - Height = 21 - Top = 64 - Width = 222 + Left = 635 + Height = 24 + Top = 67 + Width = 206 BorderSpacing.Left = 24 BorderSpacing.Around = 6 Caption = 'ExecuteBeforeShowAllCheckBox' @@ -408,8 +408,8 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame AnchorSideTop.Side = asrCenter Left = 6 Height = 15 - Top = 67 - Width = 155 + Top = 72 + Width = 138 BorderSpacing.Left = 6 Caption = 'ExecuteBeforeScanLabel' ParentColor = False diff --git a/ide/frames/compiler_compilation_options.pas b/ide/frames/compiler_compilation_options.pas index 6d133595b3..84255145f7 100644 --- a/ide/frames/compiler_compilation_options.pas +++ b/ide/frames/compiler_compilation_options.pas @@ -23,7 +23,7 @@ type chkExecBeforeBuild: TCheckBox; chkExecBeforeCompile: TCheckBox; chkExecBeforeRun: TCheckBox; - edtCompiler: TEdit; + edtCompiler: TComboBox; ExecuteAfterCommandEdit: TEdit; ExecuteAfterCommandLabel: TLabel; ExecuteAfterGroupBox: TGroupBox;