LCL: compileroptionsdlg changed TNoteBook to TPageControl, fixes #27358

git-svn-id: trunk@27360 -

ide/compileroptionsdlg.lfm

@@ -3,7 +3,7 @@ object frmCompilerOptions: TfrmCompilerOptions
   Height = 528
   Top = 157
   Width = 659
-  ActiveControl = CategoryTreeView
+  ActiveControl = MainNotebook
   Align = alClient
   BorderIcons = [biSystemMenu]
   Caption = 'frmCompilerOptions'
@@ -14,19 +14,18 @@ object frmCompilerOptions: TfrmCompilerOptions
   OnClose = frmCompilerOptionsClose
   Position = poScreenCenter
   LCLVersion = '0.9.29'
-  object MainNotebook: TNotebook
+  object MainNotebook: TPageControl
     AnchorSideBottom.Control = BtnPanel
     Left = 126
-    Height = 462
+    Height = 470
     Top = 0
     Width = 533
     Align = alClient
-    PageIndex = 8
     TabOrder = 0
-    object PathPage: TPage
+    object PathPage: TTabSheet
       Caption = 'PathPage'
-      ClientWidth = 531
-      ClientHeight = 435
+      ClientHeight = 445
+      ClientWidth = 529
       object lblOtherUnits: TLabel
         Left = 6
         Height = 14
@@ -239,13 +238,13 @@ object frmCompilerOptions: TfrmCompilerOptions
         TabOrder = 6
       end
     end
-    object BuildModesPage: TPage
+    object BuildModesPage: TTabSheet
       Caption = 'BuildModesPage'
     end
-    object ParsingPage: TPage
+    object ParsingPage: TTabSheet
       Caption = 'ParsingPage'
-      ClientWidth = 531
       ClientHeight = 435
+      ClientWidth = 531
       object grpAsmStyle: TRadioGroup
         Left = 6
         Height = 40
@@ -294,8 +293,8 @@ object frmCompilerOptions: TfrmCompilerOptions
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'grpSyntaxMode'
-        ClientHeight = 32
-        ClientWidth = 525
+        ClientHeight = 51
+        ClientWidth = 529
         TabOrder = 2
         object cmbSyntaxMode: TComboBox
           Left = 6
@@ -310,10 +309,10 @@ object frmCompilerOptions: TfrmCompilerOptions
         end
       end
     end
-    object CodeGenPage: TPage
+    object CodeGenPage: TTabSheet
       Caption = 'CodeGenPage'
-      ClientWidth = 531
       ClientHeight = 435
+      ClientWidth = 531
       object grpSmartLinkUnit: TGroupBox
         AnchorSideLeft.Control = grpChecks
         AnchorSideLeft.Side = asrBottom
@@ -331,8 +330,8 @@ object frmCompilerOptions: TfrmCompilerOptions
         BorderSpacing.Top = 6
         BorderSpacing.Right = 6
         Caption = 'grpSmartLinkUnit'
-        ClientHeight = 28
-        ClientWidth = 371
+        ClientHeight = 47
+        ClientWidth = 375
         TabOrder = 0
         object chkSmartLinkUnit: TCheckBox
           Left = 6
@@ -358,8 +357,8 @@ object frmCompilerOptions: TfrmCompilerOptions
         Caption = 'grpChecks'
         ChildSizing.Layout = cclLeftToRightThenTopToBottom
         ChildSizing.ControlsPerLine = 1
-        ClientHeight = 114
-        ClientWidth = 144
+        ClientHeight = 133
+        ClientWidth = 148
         TabOrder = 1
         object chkChecksIO: TCheckBox
           Left = 6
@@ -421,8 +420,8 @@ object frmCompilerOptions: TfrmCompilerOptions
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'grpHeapSize'
-        ClientHeight = 32
-        ClientWidth = 371
+        ClientHeight = 51
+        ClientWidth = 375
         TabOrder = 2
         object edtHeapSize: TEdit
           Left = 6
@@ -450,8 +449,8 @@ object frmCompilerOptions: TfrmCompilerOptions
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'grpTargetPlatform'
-        ClientHeight = 86
-        ClientWidth = 371
+        ClientHeight = 105
+        ClientWidth = 375
         TabOrder = 3
         object lblTargetOS: TLabel
           AnchorSideLeft.Control = grpTargetPlatform
@@ -558,8 +557,8 @@ object frmCompilerOptions: TfrmCompilerOptions
         Anchors = [akTop, akLeft, akRight, akBottom]
         BorderSpacing.Around = 6
         Caption = 'grpOptimizations'
-        ClientHeight = 194
-        ClientWidth = 525
+        ClientHeight = 213
+        ClientWidth = 529
         TabOrder = 4
         object lblOptMiddle: TLabel
           AnchorSideLeft.Control = grpOptimizations
@@ -659,10 +658,10 @@ object frmCompilerOptions: TfrmCompilerOptions
         end
       end
     end
-    object LinkingPage: TPage
+    object LinkingPage: TTabSheet
       Caption = 'LinkingPage'
-      ClientWidth = 531
       ClientHeight = 435
+      ClientWidth = 531
       object grpLinkLibraries: TGroupBox
         Left = 6
         Height = 47
@@ -672,8 +671,8 @@ object frmCompilerOptions: TfrmCompilerOptions
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'grpLinkLibraries'
-        ClientHeight = 28
-        ClientWidth = 525
+        ClientHeight = 47
+        ClientWidth = 529
         TabOrder = 0
         object chkLinkSmart: TCheckBox
           Left = 6
@@ -695,8 +694,8 @@ object frmCompilerOptions: TfrmCompilerOptions
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'TargetSpecificsGrpBox'
-        ClientHeight = 28
-        ClientWidth = 525
+        ClientHeight = 47
+        ClientWidth = 529
         TabOrder = 1
         object chkWin32GraphicApp: TCheckBox
           Left = 6
@@ -718,8 +717,8 @@ object frmCompilerOptions: TfrmCompilerOptions
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'grpOptions'
-        ClientHeight = 55
-        ClientWidth = 525
+        ClientHeight = 74
+        ClientWidth = 529
         TabOrder = 2
         object chkOptionsLinkOpt: TCheckBox
           Left = 6
@@ -751,8 +750,8 @@ object frmCompilerOptions: TfrmCompilerOptions
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'grpDebugging'
-        ClientHeight = 189
-        ClientWidth = 525
+        ClientHeight = 208
+        ClientWidth = 529
         TabOrder = 3
         object chkDebugGDB: TCheckBox
           AnchorSideLeft.Control = grpDebugging
@@ -851,10 +850,10 @@ object frmCompilerOptions: TfrmCompilerOptions
         end
       end
     end
-    object MsgPage: TPage
+    object MsgPage: TTabSheet
       Caption = 'MsgPage'
-      ClientWidth = 531
       ClientHeight = 435
+      ClientWidth = 531
       object grpVerbosity: TCheckGroup
         Left = 6
         Height = 377
@@ -884,8 +883,8 @@ object frmCompilerOptions: TfrmCompilerOptions
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'grpErrorCnt'
-        ClientHeight = 32
-        ClientWidth = 525
+        ClientHeight = 51
+        ClientWidth = 529
         TabOrder = 1
         object edtErrorCnt: TEdit
           Left = 6
@@ -899,10 +898,10 @@ object frmCompilerOptions: TfrmCompilerOptions
         end
       end
     end
-    object CfgCmpMsgPage: TPage
+    object CfgCmpMsgPage: TTabSheet
       Caption = 'CfgCmpMsgPage'
-      ClientWidth = 531
       ClientHeight = 435
+      ClientWidth = 531
       object grpCompilerMessages: TGroupBox
         Left = 6
         Height = 434
@@ -911,8 +910,8 @@ object frmCompilerOptions: TfrmCompilerOptions
         Align = alClient
         BorderSpacing.Around = 6
         Caption = 'grpCompilerMessages'
-        ClientHeight = 415
-        ClientWidth = 525
+        ClientHeight = 434
+        ClientWidth = 529
         TabOrder = 0
         object chkUseMsgFile: TCheckBox
           AnchorSideLeft.Control = grpCompilerMessages
@@ -977,14 +976,13 @@ object frmCompilerOptions: TfrmCompilerOptions
           OnClick = chklistCompMsgClick
           Sorted = True
           TabOrder = 3
-          TopIndex = -1
         end
       end
     end
-    object OtherPage: TPage
+    object OtherPage: TTabSheet
       Caption = 'OtherPage'
-      ClientWidth = 531
       ClientHeight = 435
+      ClientWidth = 531
       object grpConfigFile: TGroupBox
         Left = 6
         Height = 97
@@ -994,8 +992,8 @@ object frmCompilerOptions: TfrmCompilerOptions
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'grpConfigFile'
-        ClientHeight = 78
-        ClientWidth = 525
+        ClientHeight = 97
+        ClientWidth = 529
         TabOrder = 0
         object chkConfigFile: TCheckBox
           Left = 6
@@ -1037,8 +1035,8 @@ object frmCompilerOptions: TfrmCompilerOptions
         Align = alClient
         BorderSpacing.Around = 6
         Caption = 'grpCustomOptions'
-        ClientHeight = 312
-        ClientWidth = 525
+        ClientHeight = 331
+        ClientWidth = 529
         TabOrder = 1
         object memCustomOptions: TMemo
           Left = 6
@@ -1051,10 +1049,10 @@ object frmCompilerOptions: TfrmCompilerOptions
         end
       end
     end
-    object MacrosPage: TPage
+    object MacrosPage: TTabSheet
       Caption = 'MacrosPage'
-      ClientWidth = 531
       ClientHeight = 435
+      ClientWidth = 531
       inline BuildMacrosFrame: TCompOptBuildMacrosFrame
         Height = 435
         Width = 531
@@ -1064,10 +1062,15 @@ object frmCompilerOptions: TfrmCompilerOptions
         Visible = True
         inherited MacrosGroupBox: TGroupBox
           Width = 531
-          ClientWidth = 527
+          ClientHeight = 243
+          ClientWidth = 531
+          inherited BuildMacrosTreeView: TTreeView
+            PopupMenu = BuildMacrosFrame.BuildMacrosTVPopupMenu
+          end
           inherited BuildMacroSelectedGroupBox: TGroupBox
             Width = 283
-            ClientWidth = 279
+            ClientHeight = 224
+            ClientWidth = 283
             inherited BuildMacroDefaultLabel: TLabel
               Width = 267
             end
@@ -1085,19 +1088,20 @@ object frmCompilerOptions: TfrmCompilerOptions
         inherited ConditionalsGroupBox: TGroupBox
           Height = 187
           Width = 531
-          ClientHeight = 168
-          ClientWidth = 527
+          ClientHeight = 187
+          ClientWidth = 531
           inherited CondSynEdit: TSynEdit
             Height = 168
             Width = 527
+            Highlighter = BuildMacrosFrame.ConditionalsSynPasSyn
           end
         end
       end
     end
-    object InheritedPage: TPage
+    object InheritedPage: TTabSheet
       Caption = 'InheritedPage'
-      ClientWidth = 531
       ClientHeight = 435
+      ClientWidth = 531
       object InhNoteLabel: TLabel
         Left = 6
         Height = 14
@@ -1145,10 +1149,10 @@ object frmCompilerOptions: TfrmCompilerOptions
         ResizeAnchor = akTop
       end
     end
-    object CompilationPage: TPage
+    object CompilationPage: TTabSheet
       Caption = 'CompilationPage'
-      ClientWidth = 531
       ClientHeight = 435
+      ClientWidth = 531
       object chkCreateMakefile: TCheckBox
         AnchorSideLeft.Control = CompilationPage
         AnchorSideTop.Control = CompilationPage
@@ -1174,8 +1178,8 @@ object frmCompilerOptions: TfrmCompilerOptions
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'ExecuteAfterGroupBox'
-        ClientHeight = 95
-        ClientWidth = 515
+        ClientHeight = 114
+        ClientWidth = 519
         TabOrder = 1
         object lblRunIfExecAfter: TLabel
           AnchorSideLeft.Control = ExecuteAfterGroupBox
@@ -1311,8 +1315,8 @@ object frmCompilerOptions: TfrmCompilerOptions
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'grpCompiler'
-        ClientHeight = 67
-        ClientWidth = 515
+        ClientHeight = 86
+        ClientWidth = 519
         TabOrder = 2
         object lblRunIfCompiler: TLabel
           AnchorSideLeft.Control = grpCompiler
@@ -1408,8 +1412,8 @@ object frmCompilerOptions: TfrmCompilerOptions
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'ExecuteBeforeGroupBox'
-        ClientHeight = 95
-        ClientWidth = 515
+        ClientHeight = 114
+        ClientWidth = 519
         TabOrder = 3
         object lblRunIfExecBefore: TLabel
           AnchorSideLeft.Control = ExecuteBeforeGroupBox
@@ -1535,18 +1539,18 @@ object frmCompilerOptions: TfrmCompilerOptions
   end
   object BtnPanel: TPanel
     Left = 0
-    Height = 44
-    Top = 484
+    Height = 38
+    Top = 490
     Width = 659
     Align = alBottom
     AutoSize = True
     BevelOuter = bvNone
-    ClientHeight = 44
+    ClientHeight = 38
     ClientWidth = 659
     TabOrder = 1
     object HelpButton: TBitBtn
       Left = 6
-      Height = 32
+      Height = 26
       Top = 6
       Width = 75
       Align = alLeft
@@ -1560,8 +1564,8 @@ object frmCompilerOptions: TfrmCompilerOptions
       TabOrder = 0
     end
     object btnShowOptions: TBitBtn
-      Left = 250
-      Height = 32
+      Left = 254
+      Height = 26
       Top = 6
       Width = 75
       Align = alRight
@@ -1610,8 +1614,8 @@ object frmCompilerOptions: TfrmCompilerOptions
       TabOrder = 1
     end
     object btnCheck: TBitBtn
-      Left = 331
-      Height = 32
+      Left = 335
+      Height = 26
       Top = 6
       Width = 75
       Align = alRight
@@ -1626,8 +1630,8 @@ object frmCompilerOptions: TfrmCompilerOptions
       TabOrder = 2
     end
     object btnLoadSave: TBitBtn
-      Left = 412
-      Height = 32
+      Left = 416
+      Height = 26
       Top = 6
       Width = 75
       Align = alRight
@@ -1678,8 +1682,8 @@ object frmCompilerOptions: TfrmCompilerOptions
       TabOrder = 3
     end
     object btnOK: TBitBtn
-      Left = 493
-      Height = 32
+      Left = 497
+      Height = 26
       Top = 6
       Width = 75
       Align = alRight
@@ -1694,10 +1698,10 @@ object frmCompilerOptions: TfrmCompilerOptions
       TabOrder = 4
     end
     object btnCancel: TBitBtn
-      Left = 574
-      Height = 32
+      Left = 578
+      Height = 26
       Top = 6
-      Width = 79
+      Width = 75
       Align = alRight
       AutoSize = True
       BorderSpacing.Around = 6
@@ -1713,11 +1717,11 @@ object frmCompilerOptions: TfrmCompilerOptions
   end
   object CategoryTreeView: TTreeView
     Left = 0
-    Height = 462
+    Height = 470
     Top = 0
     Width = 121
     Align = alLeft
-    DefaultItemHeight = 19
+    DefaultItemHeight = 17
     ReadOnly = True
     TabOrder = 2
     OnSelectionChanged = CategoryTreeViewSelectionChanged
@@ -1725,15 +1729,15 @@ object frmCompilerOptions: TfrmCompilerOptions
   end
   object CategorySplitter: TSplitter
     Left = 121
-    Height = 462
+    Height = 470
     Top = 0
     Width = 5
   end
   object chkUseAsDefault: TCheckBox
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 22
-    Top = 462
+    Height = 20
+    Top = 470
     Width = 647
     Align = alBottom
     BorderSpacing.Left = 6