From f0d82b263b0c0274cd1f5b506abfba7fed908e4e Mon Sep 17 00:00:00 2001 From: mattias Date: Sat, 13 Sep 2014 20:57:46 +0000 Subject: [PATCH] IDE: package compiler options: fixed showing unitstyle git-svn-id: trunk@46211 - --- ide/frames/compiler_codegen_options.lfm | 98 ++++++++++++------------- ide/frames/compiler_codegen_options.pas | 2 +- 2 files changed, 49 insertions(+), 51 deletions(-) diff --git a/ide/frames/compiler_codegen_options.lfm b/ide/frames/compiler_codegen_options.lfm index 9bb122a840..d036e5b177 100644 --- a/ide/frames/compiler_codegen_options.lfm +++ b/ide/frames/compiler_codegen_options.lfm @@ -13,24 +13,22 @@ object CompilerCodegenOptionsFrame: TCompilerCodegenOptionsFrame AnchorSideTop.Control = grpOptimizations AnchorSideTop.Side = asrBottom AnchorSideRight.Side = asrBottom - AnchorSideBottom.Control = grpHeapStackSize AnchorSideBottom.Side = asrBottom Left = 0 - Height = 82 - Top = 174 - Width = 157 - Anchors = [akTop, akLeft, akBottom] + Height = 74 + Top = 185 + Width = 146 AutoSize = True BorderSpacing.Top = 5 Caption = 'grpUnitStyle' - ClientHeight = 63 - ClientWidth = 153 + ClientHeight = 57 + ClientWidth = 142 TabOrder = 0 object chkSmartLinkUnit: TCheckBox Left = 6 - Height = 21 + Height = 24 Top = 3 - Width = 147 + Width = 136 Align = alTop BorderSpacing.Left = 6 BorderSpacing.Top = 3 @@ -42,9 +40,9 @@ object CompilerCodegenOptionsFrame: TCompilerCodegenOptionsFrame AnchorSideTop.Control = chkSmartLinkUnit AnchorSideTop.Side = asrBottom Left = 6 - Height = 21 - Top = 27 - Width = 144 + Height = 24 + Top = 30 + Width = 133 BorderSpacing.Top = 3 BorderSpacing.Right = 3 BorderSpacing.Bottom = 3 @@ -60,10 +58,10 @@ object CompilerCodegenOptionsFrame: TCompilerCodegenOptionsFrame AnchorSideRight.Control = grpOptimizations AnchorSideRight.Side = asrBottom AnchorSideBottom.Side = asrBottom - Left = 164 - Height = 82 - Top = 174 - Width = 437 + Left = 153 + Height = 80 + Top = 185 + Width = 448 Anchors = [akTop, akLeft, akRight] AutoSize = True BorderSpacing.Left = 7 @@ -71,7 +69,7 @@ object CompilerCodegenOptionsFrame: TCompilerCodegenOptionsFrame Caption = 'grpHeapStackSize' ChildSizing.TopBottomSpacing = 6 ClientHeight = 63 - ClientWidth = 433 + ClientWidth = 444 TabOrder = 1 object edtHeapSize: TEdit AnchorSideLeft.Control = lbHeapSize @@ -79,10 +77,10 @@ object CompilerCodegenOptionsFrame: TCompilerCodegenOptionsFrame AnchorSideTop.Control = grpHeapStackSize AnchorSideRight.Control = grpHeapStackSize AnchorSideRight.Side = asrBottom - Left = 80 + Left = 72 Height = 25 Top = 6 - Width = 347 + Width = 366 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 BorderSpacing.Right = 6 @@ -96,7 +94,7 @@ object CompilerCodegenOptionsFrame: TCompilerCodegenOptionsFrame Left = 6 Height = 15 Top = 11 - Width = 68 + Width = 60 BorderSpacing.Left = 6 Caption = 'lbHeapSize' ParentColor = False @@ -108,10 +106,10 @@ object CompilerCodegenOptionsFrame: TCompilerCodegenOptionsFrame AnchorSideTop.Side = asrBottom AnchorSideRight.Control = grpHeapStackSize AnchorSideRight.Side = asrBottom - Left = 82 + Left = 73 Height = 25 Top = 32 - Width = 345 + Width = 365 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 BorderSpacing.Top = 1 @@ -127,7 +125,7 @@ object CompilerCodegenOptionsFrame: TCompilerCodegenOptionsFrame Left = 6 Height = 15 Top = 37 - Width = 70 + Width = 61 Caption = 'lbStackSize' ParentColor = False end @@ -135,22 +133,22 @@ object CompilerCodegenOptionsFrame: TCompilerCodegenOptionsFrame object grpOptimizationLevels: TGroupBox AnchorSideBottom.Side = asrBottom Left = 0 - Height = 118 + Height = 128 Top = 0 Width = 601 Align = alTop AutoSize = True Caption = 'grpOptimizationLevels' - ClientHeight = 99 + ClientHeight = 111 ClientWidth = 597 TabOrder = 2 object radOptLevelNone: TRadioButton AnchorSideLeft.Control = grpOptimizationLevels AnchorSideTop.Control = grpOptimizationLevels Left = 6 - Height = 21 + Height = 24 Top = 3 - Width = 130 + Width = 124 BorderSpacing.Left = 6 BorderSpacing.Top = 3 BorderSpacing.Right = 6 @@ -164,9 +162,9 @@ object CompilerCodegenOptionsFrame: TCompilerCodegenOptionsFrame AnchorSideTop.Control = radOptLevelNone AnchorSideTop.Side = asrBottom Left = 6 - Height = 21 - Top = 27 - Width = 231 + Height = 24 + Top = 30 + Width = 210 BorderSpacing.Top = 3 BorderSpacing.Right = 6 Caption = '1 (quick, debugger friendly) (-O1)' @@ -177,9 +175,9 @@ object CompilerCodegenOptionsFrame: TCompilerCodegenOptionsFrame AnchorSideTop.Control = radOptLevel1 AnchorSideTop.Side = asrBottom Left = 6 - Height = 21 - Top = 51 - Width = 105 + Height = 24 + Top = 57 + Width = 101 BorderSpacing.Top = 3 BorderSpacing.Right = 6 Caption = 'radOptLevel2' @@ -190,9 +188,9 @@ object CompilerCodegenOptionsFrame: TCompilerCodegenOptionsFrame AnchorSideTop.Control = radOptLevel2 AnchorSideTop.Side = asrBottom Left = 6 - Height = 21 - Top = 75 - Width = 105 + Height = 24 + Top = 84 + Width = 101 BorderSpacing.Top = 3 BorderSpacing.Right = 6 BorderSpacing.Bottom = 3 @@ -202,24 +200,24 @@ object CompilerCodegenOptionsFrame: TCompilerCodegenOptionsFrame end object grpLinking: TGroupBox AnchorSideLeft.Control = grpUnitStyle - AnchorSideTop.Control = grpUnitStyle + AnchorSideTop.Control = grpHeapStackSize AnchorSideTop.Side = asrBottom AnchorSideRight.Control = grpOptimizations AnchorSideRight.Side = asrBottom Left = 0 - Height = 94 - Top = 261 + Height = 98 + Top = 270 Width = 601 Anchors = [akTop, akLeft, akRight] AutoSize = True BorderSpacing.Top = 5 Caption = 'grpLinking' - ClientHeight = 75 + ClientHeight = 81 ClientWidth = 597 TabOrder = 3 object chkLinkSmart: TCheckBox Left = 6 - Height = 21 + Height = 24 Top = 3 Width = 585 Align = alTop @@ -234,9 +232,9 @@ object CompilerCodegenOptionsFrame: TCompilerCodegenOptionsFrame AnchorSideTop.Control = chkLinkSmart AnchorSideTop.Side = asrBottom Left = 6 - Height = 21 - Top = 26 - Width = 140 + Height = 24 + Top = 29 + Width = 131 BorderSpacing.Top = 2 BorderSpacing.Right = 6 Caption = 'chkOptionsLinkOpt' @@ -250,7 +248,7 @@ object CompilerCodegenOptionsFrame: TCompilerCodegenOptionsFrame AnchorSideRight.Side = asrBottom Left = 25 Height = 25 - Top = 47 + Top = 53 Width = 566 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 19 @@ -262,23 +260,23 @@ object CompilerCodegenOptionsFrame: TCompilerCodegenOptionsFrame end object grpOptimizations: TGroupBox Left = 0 - Height = 46 - Top = 123 + Height = 47 + Top = 133 Width = 601 Align = alTop AutoSize = True BorderSpacing.Top = 5 Caption = 'grpOptimizations' - ClientHeight = 27 + ClientHeight = 30 ClientWidth = 597 TabOrder = 4 object chkOptSmaller: TCheckBox AnchorSideLeft.Control = grpOptimizations AnchorSideTop.Control = grpOptimizations Left = 6 - Height = 21 + Height = 24 Top = 3 - Width = 114 + Width = 106 BorderSpacing.Left = 6 BorderSpacing.Top = 3 BorderSpacing.Right = 6 diff --git a/ide/frames/compiler_codegen_options.pas b/ide/frames/compiler_codegen_options.pas index 126becf96b..40bed32fae 100644 --- a/ide/frames/compiler_codegen_options.pas +++ b/ide/frames/compiler_codegen_options.pas @@ -100,7 +100,7 @@ begin else radOptLevelNone.Checked := True; end; - grpLinking.Enabled := NeedsLinkerOpts; + grpLinking.Visible := NeedsLinkerOpts; chkLinkSmart.Checked := LinkSmart; chkLinkSmart.Enabled := NeedsLinkerOpts; chkOptionsLinkOpt.Checked := PassLinkerOptions;