diff --git a/ide/compileroptionsdlg.lfm b/ide/compileroptionsdlg.lfm index 1f57f649b7..b85f8a5b48 100644 --- a/ide/compileroptionsdlg.lfm +++ b/ide/compileroptionsdlg.lfm @@ -1,7 +1,7 @@ object frmCompilerOptions: TfrmCompilerOptions - Left = 316 + Left = 321 Height = 528 - Top = 238 + Top = 262 Width = 669 ActiveControl = MainNotebook BorderIcons = [biSystemMenu] @@ -16,7 +16,7 @@ object frmCompilerOptions: TfrmCompilerOptions object MainNotebook: TNotebook AnchorSideBottom.Control = BtnPanel Left = 0 - Height = 463 + Height = 480 Top = 0 Width = 669 Align = alTop @@ -26,7 +26,7 @@ object frmCompilerOptions: TfrmCompilerOptions object PathPage: TPage Caption = 'PathPage' ClientWidth = 665 - ClientHeight = 432 + ClientHeight = 449 object lblOtherUnits: TLabel Left = 6 Height = 18 @@ -242,7 +242,7 @@ object frmCompilerOptions: TfrmCompilerOptions object ParsingPage: TPage Caption = 'ParsingPage' ClientWidth = 665 - ClientHeight = 459 + ClientHeight = 432 object grpAsmStyle: TRadioGroup Left = 6 Height = 40 @@ -310,7 +310,7 @@ object frmCompilerOptions: TfrmCompilerOptions object CodeGenPage: TPage Caption = 'CodeGenPage' ClientWidth = 665 - ClientHeight = 459 + ClientHeight = 432 object grpSmartLinkUnit: TGroupBox AnchorSideLeft.Control = grpChecks AnchorSideLeft.Side = asrBottom @@ -549,13 +549,13 @@ object frmCompilerOptions: TfrmCompilerOptions AnchorSideBottom.Control = CodeGenPage AnchorSideBottom.Side = asrBottom Left = 6 - Height = 224 + Height = 197 Top = 229 Width = 653 Anchors = [akTop, akLeft, akRight, akBottom] BorderSpacing.Around = 6 Caption = 'grpOptimizations' - ClientHeight = 205 + ClientHeight = 178 ClientWidth = 649 TabOrder = 4 object lblOptMiddle: TLabel @@ -565,7 +565,7 @@ object frmCompilerOptions: TfrmCompilerOptions AnchorSideTop.Side = asrCenter Left = 324 Height = 1 - Top = 110 + Top = 96 Width = 1 AutoSize = False ParentColor = False @@ -662,7 +662,7 @@ object frmCompilerOptions: TfrmCompilerOptions object LinkingPage: TPage Caption = 'LinkingPage' ClientWidth = 665 - ClientHeight = 459 + ClientHeight = 432 object grpLinkLibraries: TGroupBox Left = 6 Height = 47 @@ -854,7 +854,7 @@ object frmCompilerOptions: TfrmCompilerOptions object MsgPage: TPage Caption = 'MsgPage' ClientWidth = 665 - ClientHeight = 459 + ClientHeight = 432 object grpVerbosity: TCheckGroup Left = 6 Height = 196 @@ -902,16 +902,16 @@ object frmCompilerOptions: TfrmCompilerOptions object CfgCmpMsgPage: TPage Caption = 'CfgCmpMsgPage' ClientWidth = 665 - ClientHeight = 459 + ClientHeight = 432 object grpCompilerMessages: TGroupBox Left = 6 - Height = 447 + Height = 420 Top = 6 Width = 653 Align = alClient BorderSpacing.Around = 6 Caption = 'grpCompilerMessages' - ClientHeight = 428 + ClientHeight = 401 ClientWidth = 649 TabOrder = 0 object chkUseMsgFile: TCheckBox @@ -968,7 +968,7 @@ object frmCompilerOptions: TfrmCompilerOptions AnchorSideBottom.Control = grpCompilerMessages AnchorSideBottom.Side = asrBottom Left = 6 - Height = 402 + Height = 375 Top = 35 Width = 637 Anchors = [akTop, akLeft, akRight, akBottom] @@ -984,7 +984,7 @@ object frmCompilerOptions: TfrmCompilerOptions object OtherPage: TPage Caption = 'OtherPage' ClientWidth = 665 - ClientHeight = 459 + ClientHeight = 432 object grpConfigFile: TGroupBox Left = 6 Height = 99 @@ -1031,18 +1031,18 @@ object frmCompilerOptions: TfrmCompilerOptions end object grpCustomOptions: TGroupBox Left = 6 - Height = 342 + Height = 315 Top = 111 Width = 653 Align = alClient BorderSpacing.Around = 6 Caption = 'grpCustomOptions' - ClientHeight = 323 + ClientHeight = 296 ClientWidth = 649 TabOrder = 1 object memCustomOptions: TMemo Left = 6 - Height = 326 + Height = 299 Top = 6 Width = 637 Align = alClient @@ -1054,7 +1054,7 @@ object frmCompilerOptions: TfrmCompilerOptions object ConditionalPage: TPage Caption = 'ConditionalPage' ClientWidth = 665 - ClientHeight = 459 + ClientHeight = 432 object ConditionalsGroupBox: TGroupBox Left = 0 Height = 214 @@ -1091,21 +1091,21 @@ object frmCompilerOptions: TfrmCompilerOptions ResizeAnchor = akTop end inline BuildModesFrame: TCompOptBuildModesFrame - Height = 240 + Height = 213 Top = 219 Width = 665 Align = alClient - ClientHeight = 240 + ClientHeight = 213 ClientWidth = 665 TabOrder = 2 Visible = True inherited BuildModesGroupBox: TGroupBox - Height = 240 + Height = 213 Width = 665 - ClientHeight = 221 + ClientHeight = 194 ClientWidth = 661 inherited BuildModesTreeView: TTreeView - Height = 236 + Height = 209 Width = 661 DefaultItemHeight = 15 ShowLines = True @@ -1117,7 +1117,7 @@ object frmCompilerOptions: TfrmCompilerOptions object InheritedPage: TPage Caption = 'InheritedPage' ClientWidth = 665 - ClientHeight = 459 + ClientHeight = 432 object InhNoteLabel: TLabel Left = 6 Height = 14 @@ -1144,7 +1144,7 @@ object frmCompilerOptions: TfrmCompilerOptions end object InhItemMemo: TMemo Left = 6 - Height = 175 + Height = 148 Top = 278 Width = 653 Align = alClient @@ -1168,7 +1168,7 @@ object frmCompilerOptions: TfrmCompilerOptions object CompilationPage: TPage Caption = 'CompilationPage' ClientWidth = 665 - ClientHeight = 459 + ClientHeight = 432 object chkCreateMakefile: TCheckBox AnchorSideLeft.Control = CompilationPage AnchorSideTop.Control = CompilationPage @@ -1555,19 +1555,19 @@ object frmCompilerOptions: TfrmCompilerOptions end object BtnPanel: TPanel Left = 0 - Height = 65 - Top = 463 + Height = 48 + Top = 480 Width = 669 Align = alBottom AutoSize = True BevelOuter = bvNone - ClientHeight = 65 + ClientHeight = 48 ClientWidth = 669 TabOrder = 1 object HelpButton: TBitBtn AnchorSideBottom.Side = asrBottom Left = 6 - Height = 53 + Height = 36 Top = 6 Width = 75 Align = alLeft @@ -1583,7 +1583,7 @@ object frmCompilerOptions: TfrmCompilerOptions object btnShowOptions: TBitBtn AnchorSideBottom.Side = asrBottom Left = 261 - Height = 53 + Height = 36 Top = 6 Width = 75 Align = alRight @@ -1634,7 +1634,7 @@ object frmCompilerOptions: TfrmCompilerOptions object btnCheck: TBitBtn AnchorSideBottom.Side = asrBottom Left = 342 - Height = 53 + Height = 36 Top = 6 Width = 75 Align = alRight @@ -1651,7 +1651,7 @@ object frmCompilerOptions: TfrmCompilerOptions object btnLoadSave: TBitBtn AnchorSideBottom.Side = asrBottom Left = 423 - Height = 53 + Height = 36 Top = 6 Width = 75 Align = alRight @@ -1704,7 +1704,7 @@ object frmCompilerOptions: TfrmCompilerOptions object btnOK: TBitBtn AnchorSideBottom.Side = asrBottom Left = 504 - Height = 53 + Height = 36 Top = 6 Width = 75 Align = alRight @@ -1722,7 +1722,7 @@ object frmCompilerOptions: TfrmCompilerOptions AnchorSideRight.Side = asrBottom AnchorSideBottom.Side = asrBottom Left = 585 - Height = 53 + Height = 36 Top = 6 Width = 78 Align = alRight diff --git a/ide/compileroptionsdlg.lrs b/ide/compileroptionsdlg.lrs index 2c4f036d08..9dbf6e9a97 100644 --- a/ide/compileroptionsdlg.lrs +++ b/ide/compileroptionsdlg.lrs @@ -1,17 +1,17 @@ -{ Das ist eine automatisch erzeugte Lazarus-Ressourcendatei } +{ This is an automatically generated lazarus resource file } LazarusResources.Add('TfrmCompilerOptions','FORMDATA',[ - 'TPF0'#19'TfrmCompilerOptions'#18'frmCompilerOptions'#4'Left'#3'<'#1#6'Height' - +#3#16#2#3'Top'#3#238#0#5'Width'#3#157#2#13'ActiveControl'#7#12'MainNotebook' - +#11'BorderIcons'#11#12'biSystemMenu'#0#7'Caption'#6#18'frmCompilerOptions'#12 - +'ClientHeight'#3#16#2#11'ClientWidth'#3#157#2#21'Constraints.MinHeight'#3#244 + 'TPF0'#19'TfrmCompilerOptions'#18'frmCompilerOptions'#4'Left'#3'A'#1#6'Height' + +#3#16#2#3'Top'#3#6#1#5'Width'#3#157#2#13'ActiveControl'#7#12'MainNotebook'#11 + +'BorderIcons'#11#12'biSystemMenu'#0#7'Caption'#6#18'frmCompilerOptions'#12'C' + +'lientHeight'#3#16#2#11'ClientWidth'#3#157#2#21'Constraints.MinHeight'#3#244 +#1#20'Constraints.MinWidth'#3'X'#2#7'OnClose'#7#23'frmCompilerOptionsClose'#8 +'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.27'#0#9'TNotebook'#12 +'MainNotebook'#24'AnchorSideBottom.Control'#7#8'BtnPanel'#4'Left'#2#0#6'Heig' - +'ht'#3#207#1#3'Top'#2#0#5'Width'#3#157#2#5'Align'#7#5'alTop'#7'Anchors'#11#5 + +'ht'#3#224#1#3'Top'#2#0#5'Width'#3#157#2#5'Align'#7#5'alTop'#7'Anchors'#11#5 +'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#9'PageIndex'#2#0#8'TabOrder'#2#0#0 +#5'TPage'#8'PathPage'#7'Caption'#6#8'PathPage'#11'ClientWidth'#3#153#2#12'Cl' - +'ientHeight'#3#176#1#0#6'TLabel'#13'lblOtherUnits'#4'Left'#2#6#6'Height'#2#18 + +'ientHeight'#3#193#1#0#6'TLabel'#13'lblOtherUnits'#4'Left'#2#6#6'Height'#2#18 +#3'Top'#2#6#5'Width'#3#141#2#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6 +#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#13'lblOt' +'herUnits'#11'ParentColor'#8#0#0#6'TLabel'#15'lblIncludeFiles'#22'AnchorSide' @@ -85,7 +85,7 @@ LazarusResources.Add('TfrmCompilerOptions','FORMDATA',[ +#4'Left'#3#140#0#6'Height'#2#31#3'Top'#3'8'#1#5'Width'#3#171#0#18'BorderSpac' +'ing.Left'#2#6#10'ItemHeight'#2#0#5'Style'#7#14'csDropDownList'#8'TabOrder'#2 +#6#0#0#0#5'TPage'#11'ParsingPage'#7'Caption'#6#11'ParsingPage'#11'ClientWidt' - +'h'#3#153#2#12'ClientHeight'#3#203#1#0#11'TRadioGroup'#11'grpAsmStyle'#4'Lef' + +'h'#3#153#2#12'ClientHeight'#3#176#1#0#11'TRadioGroup'#11'grpAsmStyle'#4'Lef' +'t'#2#6#6'Height'#2'('#3'Top'#3'G'#1#5'Width'#3#141#2#5'Align'#7#5'alTop'#8 +'AutoFill'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#11'grpAsmStyle'#28'Ch' +'ildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'Chi' @@ -109,7 +109,7 @@ LazarusResources.Add('TfrmCompilerOptions','FORMDATA',[ +'Width'#3'Q'#1#5'Align'#7#6'alLeft'#20'BorderSpacing.Around'#2#6#10'ItemHeig' +'ht'#2#0#8'TabOrder'#2#0#4'Text'#6#13'cmbSyntaxMode'#0#0#0#0#5'TPage'#11'Cod' +'eGenPage'#7'Caption'#6#11'CodeGenPage'#11'ClientWidth'#3#153#2#12'ClientHei' - +'ght'#3#203#1#0#9'TGroupBox'#16'grpSmartLinkUnit'#22'AnchorSideLeft.Control' + +'ght'#3#176#1#0#9'TGroupBox'#16'grpSmartLinkUnit'#22'AnchorSideLeft.Control' +#7#9'grpChecks'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Cont' +'rol'#7#11'CodeGenPage'#23'AnchorSideRight.Control'#7#11'CodeGenPage'#20'Anc' +'horSideRight.Side'#7#9'asrBottom'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4 @@ -190,14 +190,14 @@ LazarusResources.Add('TfrmCompilerOptions','FORMDATA',[ +#21'AnchorSideTop.Control'#7#17'grpTargetPlatform'#18'AnchorSideTop.Side'#7#9 +'asrBottom'#23'AnchorSideRight.Control'#7#11'CodeGenPage'#20'AnchorSideRight' +'.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#11'CodeGenPage'#21'Anc' - +'horSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#224#0#3'Top'#3 + +'horSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#197#0#3'Top'#3 +#229#0#5'Width'#3#141#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBott' +'om'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#16'grpOptimizations'#12'Cli' - ,'entHeight'#3#205#0#11'ClientWidth'#3#137#2#8'TabOrder'#2#4#0#6'TLabel'#12'l' + ,'entHeight'#3#178#0#11'ClientWidth'#3#137#2#8'TabOrder'#2#4#0#6'TLabel'#12'l' +'blOptMiddle'#22'AnchorSideLeft.Control'#7#16'grpOptimizations'#19'AnchorSid' +'eLeft.Side'#7#9'asrCenter'#21'AnchorSideTop.Control'#7#16'grpOptimizations' +#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3'D'#1#6'Height'#2#1#3'Top'#2 - +'n'#5'Width'#2#1#8'AutoSize'#8#11'ParentColor'#8#0#0#12'TRadioButton'#15'rad' + +'`'#5'Width'#2#1#8'AutoSize'#8#11'ParentColor'#8#0#0#12'TRadioButton'#15'rad' +'OptLevelNone'#22'AnchorSideLeft.Control'#7#16'grpOptimizations'#21'AnchorSi' +'deTop.Control'#7#16'grpOptimizations'#4'Left'#2#6#6'Height'#2#17#3'Top'#2#6 +#5'Width'#2'f'#20'BorderSpacing.Around'#2#6#7'Caption'#6#15'radOptLevelNone' @@ -226,7 +226,7 @@ LazarusResources.Add('TfrmCompilerOptions','FORMDATA',[ +#15'chkOptUncertain'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3'D'#1#6 +'Height'#2#17#3'Top'#2'4'#5'Width'#2'W'#17'BorderSpacing.Top'#2#6#7'Caption' +#6#13'chkOptSmaller'#8'TabOrder'#2#6#0#0#0#0#5'TPage'#11'LinkingPage'#7'Capt' - +'ion'#6#11'LinkingPage'#11'ClientWidth'#3#153#2#12'ClientHeight'#3#203#1#0#9 + +'ion'#6#11'LinkingPage'#11'ClientWidth'#3#153#2#12'ClientHeight'#3#176#1#0#9 +'TGroupBox'#16'grpLinkLibraries'#4'Left'#2#6#6'Height'#2'/'#3'Top'#3#220#0#5 +'Width'#3#141#2#5'Align'#7#5'alTop'#8'AutoSize'#9#20'BorderSpacing.Around'#2 +#6#7'Caption'#6#16'grpLinkLibraries'#12'ClientHeight'#2#28#11'ClientWidth'#3 @@ -282,7 +282,7 @@ LazarusResources.Add('TfrmCompilerOptions','FORMDATA',[ +'ol'#7#18'chkUseLineInfoUnit'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2 +#6#6'Height'#2#17#3'Top'#2'4'#5'Width'#2'l'#20'BorderSpacing.Around'#2#6#7'C' +'aption'#6#16'chkGenerateDwarf'#8'TabOrder'#2#7#0#0#0#0#5'TPage'#7'MsgPage'#7 - +'Caption'#6#7'MsgPage'#11'ClientWidth'#3#153#2#12'ClientHeight'#3#203#1#0#11 + +'Caption'#6#7'MsgPage'#11'ClientWidth'#3#153#2#12'ClientHeight'#3#176#1#0#11 +'TCheckGroup'#12'grpVerbosity'#4'Left'#2#6#6'Height'#3#196#0#3'Top'#2#6#5'Wi' +'dth'#3#141#2#5'Align'#7#5'alTop'#8'AutoFill'#9#20'BorderSpacing.Around'#2#6 +#7'Caption'#6#12'grpVerbosity'#28'ChildSizing.LeftRightSpacing'#2#6#28'Child' @@ -298,10 +298,10 @@ LazarusResources.Add('TfrmCompilerOptions','FORMDATA',[ +'Height'#2#23#3'Top'#2#6#5'Width'#3'}'#2#5'Align'#7#5'alTop'#20'BorderSpacin' +'g.Around'#2#6#8'TabOrder'#2#0#4'Text'#6#11'edtErrorCnt'#0#0#0#0#5'TPage'#13 +'CfgCmpMsgPage'#7'Caption'#6#13'CfgCmpMsgPage'#11'ClientWidth'#3#153#2#12'Cl' - +'ientHeight'#3#203#1#0#9'TGroupBox'#19'grpCompilerMessages'#4'Left'#2#6#6'He' - +'ight'#3#191#1#3'Top'#2#6#5'Width'#3#141#2#5'Align'#7#8'alClient'#20'BorderS' + +'ientHeight'#3#176#1#0#9'TGroupBox'#19'grpCompilerMessages'#4'Left'#2#6#6'He' + +'ight'#3#164#1#3'Top'#2#6#5'Width'#3#141#2#5'Align'#7#8'alClient'#20'BorderS' +'pacing.Around'#2#6#7'Caption'#6#19'grpCompilerMessages'#12'ClientHeight'#3 - +#172#1#11'ClientWidth'#3#137#2#8'TabOrder'#2#0#0#9'TCheckBox'#13'chkUseMsgFi' + +#145#1#11'ClientWidth'#3#137#2#8'TabOrder'#2#0#0#9'TCheckBox'#13'chkUseMsgFi' +'le'#22'AnchorSideLeft.Control'#7#19'grpCompilerMessages'#21'AnchorSideTop.C' +'ontrol'#7#15'editMsgFileName'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left' +#2#6#6'Height'#2#17#3'Top'#2#9#5'Width'#2'['#20'BorderSpacing.Around'#2#6#7 @@ -323,11 +323,11 @@ LazarusResources.Add('TfrmCompilerOptions','FORMDATA',[ +'horSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#19'grpCompile' ,'rMessages'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Cont' +'rol'#7#19'grpCompilerMessages'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'L' - +'eft'#2#6#6'Height'#3#146#1#3'Top'#2'#'#5'Width'#3'}'#2#7'Anchors'#11#5'akTo' - +'p'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#10'ItemH' - +'eight'#2#0#7'OnClick'#7#19'chklistCompMsgClick'#6'Sorted'#9#8'TabOrder'#2#3 - +#8'TopIndex'#2#255#0#0#0#0#5'TPage'#9'OtherPage'#7'Caption'#6#9'OtherPage'#11 - +'ClientWidth'#3#153#2#12'ClientHeight'#3#203#1#0#9'TGroupBox'#13'grpConfigFi' + +'eft'#2#6#6'Height'#3'w'#1#3'Top'#2'#'#5'Width'#3'}'#2#7'Anchors'#11#5'akTop' + +#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#10'ItemHeig' + +'ht'#2#0#7'OnClick'#7#19'chklistCompMsgClick'#6'Sorted'#9#8'TabOrder'#2#3#8 + +'TopIndex'#2#255#0#0#0#0#5'TPage'#9'OtherPage'#7'Caption'#6#9'OtherPage'#11 + +'ClientWidth'#3#153#2#12'ClientHeight'#3#176#1#0#9'TGroupBox'#13'grpConfigFi' +'le'#4'Left'#2#6#6'Height'#2'c'#3'Top'#2#6#5'Width'#3#141#2#5'Align'#7#5'alT' +'op'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#13'grpConfigFil' +'e'#12'ClientHeight'#2'P'#11'ClientWidth'#3#137#2#8'TabOrder'#2#0#0#9'TCheck' @@ -339,13 +339,13 @@ LazarusResources.Add('TfrmCompilerOptions','FORMDATA',[ +'omConfigFileClick'#8'TabOrder'#2#1#0#0#5'TEdit'#13'edtConfigPath'#4'Left'#2 +#6#6'Height'#2#23#3'Top'#2'4'#5'Width'#3'}'#2#5'Align'#7#5'alTop'#20'BorderS' +'pacing.Around'#2#6#8'TabOrder'#2#2#4'Text'#6#13'edtConfigPath'#0#0#0#9'TGro' - +'upBox'#16'grpCustomOptions'#4'Left'#2#6#6'Height'#3'V'#1#3'Top'#2'o'#5'Widt' + +'upBox'#16'grpCustomOptions'#4'Left'#2#6#6'Height'#3';'#1#3'Top'#2'o'#5'Widt' +'h'#3#141#2#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6#7'Caption'#6 - +#16'grpCustomOptions'#12'ClientHeight'#3'C'#1#11'ClientWidth'#3#137#2#8'TabO' - +'rder'#2#1#0#5'TMemo'#16'memCustomOptions'#4'Left'#2#6#6'Height'#3'F'#1#3'To' + +#16'grpCustomOptions'#12'ClientHeight'#3'('#1#11'ClientWidth'#3#137#2#8'TabO' + +'rder'#2#1#0#5'TMemo'#16'memCustomOptions'#4'Left'#2#6#6'Height'#3'+'#1#3'To' +'p'#2#6#5'Width'#3'}'#2#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6#8 +'TabOrder'#2#0#0#0#0#0#5'TPage'#15'ConditionalPage'#7'Caption'#6#15'Conditio' - +'nalPage'#11'ClientWidth'#3#153#2#12'ClientHeight'#3#203#1#0#9'TGroupBox'#20 + +'nalPage'#11'ClientWidth'#3#153#2#12'ClientHeight'#3#176#1#0#9'TGroupBox'#20 +'ConditionalsGroupBox'#4'Left'#2#0#6'Height'#3#214#0#3'Top'#2#0#5'Width'#3 +#153#2#5'Align'#7#5'alTop'#7'Caption'#6#20'ConditionalsGroupBox'#12'ClientHe' +'ight'#3#195#0#11'ClientWidth'#3#149#2#8'TabOrder'#2#0#0#244#26'TCompOptsCon' @@ -356,13 +356,13 @@ LazarusResources.Add('TfrmCompilerOptions','FORMDATA',[ +'litter'#19'ConditionalSplitter'#6'Cursor'#7#8'crVSplit'#4'Left'#2#0#6'Heigh' +'t'#2#5#3'Top'#3#214#0#5'Width'#3#153#2#5'Align'#7#5'alTop'#12'ResizeAnchor' +#7#5'akTop'#0#0#244#23'TCompOptBuildModesFrame'#15'BuildModesFrame'#6'Height' - +#3#240#0#3'Top'#3#219#0#5'Width'#3#153#2#5'Align'#7#8'alClient'#12'ClientHei' - +'ght'#3#240#0#11'ClientWidth'#3#153#2#8'TabOrder'#2#2#7'Visible'#9#0#241#9'T' - +'GroupBox'#18'BuildModesGroupBox'#6'Height'#3#240#0#5'Width'#3#153#2#12'Clie' - +'ntHeight'#3#221#0#11'ClientWidth'#3#149#2#0#241#9'TTreeView'#18'BuildModesT' - +'reeView'#6'Height'#3#236#0#5'Width'#3#149#2#17'DefaultItemHeight'#2#15#9'Sh' + +#3#213#0#3'Top'#3#219#0#5'Width'#3#153#2#5'Align'#7#8'alClient'#12'ClientHei' + +'ght'#3#213#0#11'ClientWidth'#3#153#2#8'TabOrder'#2#2#7'Visible'#9#0#241#9'T' + +'GroupBox'#18'BuildModesGroupBox'#6'Height'#3#213#0#5'Width'#3#153#2#12'Clie' + +'ntHeight'#3#194#0#11'ClientWidth'#3#149#2#0#241#9'TTreeView'#18'BuildModesT' + +'reeView'#6'Height'#3#209#0#5'Width'#3#149#2#17'DefaultItemHeight'#2#15#9'Sh' +'owLines'#9#8'ShowRoot'#9#0#0#0#0#0#5'TPage'#13'InheritedPage'#7'Caption'#6 - +#13'InheritedPage'#11'ClientWidth'#3#153#2#12'ClientHeight'#3#203#1#0#6'TLab' + +#13'InheritedPage'#11'ClientWidth'#3#153#2#12'ClientHeight'#3#176#1#0#6'TLab' +'el'#12'InhNoteLabel'#4'Left'#2#6#6'Height'#2#14#3'Top'#2#6#5'Width'#3#141#2 +#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#12'InhNoteLab' +'el'#11'ParentColor'#8#0#0#9'TTreeView'#11'InhTreeView'#4'Left'#2#6#6'Height' @@ -371,14 +371,14 @@ LazarusResources.Add('TfrmCompilerOptions','FORMDATA',[ +#9#8'TabOrder'#2#0#18'OnSelectionChanged'#7#27'InhTreeViewSelectionChanged'#7 +'Options'#11#17'tvoAutoItemHeight'#16'tvoHideSelection'#21'tvoKeepCollapsedN' +'odes'#11'tvoReadOnly'#14'tvoShowButtons'#12'tvoShowLines'#11'tvoShowRoot'#11 - +'tvoToolTips'#0#0#0#5'TMemo'#11'InhItemMemo'#4'Left'#2#6#6'Height'#3#175#0#3 + +'tvoToolTips'#0#0#0#5'TMemo'#11'InhItemMemo'#4'Left'#2#6#6'Height'#3#148#0#3 +'Top'#3#22#1#5'Width'#3#141#2#5'Align'#7#8'alClient'#18'BorderSpacing.Left'#2 +#6#19'BorderSpacing.Right'#2#6#20'BorderSpacing.Bottom'#2#6#8'ReadOnly'#9#10 +'ScrollBars'#7#14'ssAutoVertical'#8'TabOrder'#2#1#0#0#9'TSplitter'#11'InhSpl' +'itter'#6'Cursor'#7#8'crVSplit'#4'Left'#2#0#6'Height'#2#5#3'Top'#3#17#1#5'Wi' +'dth'#3#153#2#5'Align'#7#5'alTop'#12'ResizeAnchor'#7#5'akTop'#0#0#0#5'TPage' +#15'CompilationPage'#7'Caption'#6#15'CompilationPage'#11'ClientWidth'#3#153#2 - +#12'ClientHeight'#3#203#1#0#9'TCheckBox'#17'chkCreateMakefile'#22'AnchorSide' + +#12'ClientHeight'#3#176#1#0#9'TCheckBox'#17'chkCreateMakefile'#22'AnchorSide' +'Left.Control'#7#15'CompilationPage'#21'AnchorSideTop.Control'#7#15'Compilat' +'ionPage'#4'Left'#2#6#6'Height'#2#17#3'Top'#2#6#5'Width'#2'k'#20'BorderSpaci' +'ng.Around'#2#6#7'Caption'#6#17'chkCreateMakefile'#8'TabOrder'#2#0#0#0#9'TGr' @@ -519,15 +519,15 @@ LazarusResources.Add('TfrmCompilerOptions','FORMDATA',[ +'reCommandEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#181#1#6'Heig' +'ht'#2#17#3'Top'#2':'#5'Width'#3#175#0#18'BorderSpacing.Left'#2#24#20'Border' +'Spacing.Around'#2#6#7'Caption'#6#28'ExecuteBeforeShowAllCheckBox'#8'TabOrde' - +'r'#2#6#0#0#0#0#0#6'TPanel'#8'BtnPanel'#4'Left'#2#0#6'Height'#2'A'#3'Top'#3 - +#207#1#5'Width'#3#157#2#5'Align'#7#8'alBottom'#8'AutoSize'#9#10'BevelOuter'#7 - +#6'bvNone'#12'ClientHeight'#2'A'#11'ClientWidth'#3#157#2#8'TabOrder'#2#1#0#7 + +'r'#2#6#0#0#0#0#0#6'TPanel'#8'BtnPanel'#4'Left'#2#0#6'Height'#2'0'#3'Top'#3 + +#224#1#5'Width'#3#157#2#5'Align'#7#8'alBottom'#8'AutoSize'#9#10'BevelOuter'#7 + +#6'bvNone'#12'ClientHeight'#2'0'#11'ClientWidth'#3#157#2#8'TabOrder'#2#1#0#7 +'TBitBtn'#10'HelpButton'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6 - +#6'Height'#2'5'#3'Top'#2#6#5'Width'#2'K'#5'Align'#7#6'alLeft'#8'AutoSize'#9 + +#6'Height'#2'$'#3'Top'#2#6#5'Width'#2'K'#5'Align'#7#6'alLeft'#8'AutoSize'#9 +#20'BorderSpacing.Around'#2#6#21'Constraints.MinHeight'#2#25#20'Constraints.' +'MinWidth'#2'K'#4'Kind'#7#6'bkHelp'#9'NumGlyphs'#2#0#7'OnClick'#7#15'HelpBut' +'tonClick'#8'TabOrder'#2#0#0#0#7'TBitBtn'#14'btnShowOptions'#21'AnchorSideBo' - +'ttom.Side'#7#9'asrBottom'#4'Left'#3#5#1#6'Height'#2'5'#3'Top'#2#6#5'Width'#2 + +'ttom.Side'#7#9'asrBottom'#4'Left'#3#5#1#6'Height'#2'$'#3'Top'#2#6#5'Width'#2 +'K'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#21'Cons' +'traints.MinHeight'#2#25#20'Constraints.MinWidth'#2'K'#10'Glyph.Data'#10':'#4 +#0#0'6'#4#0#0'BM6'#4#0#0#0#0#0#0'6'#0#0#0'('#0#0#0#16#0#0#0#16#0#0#0#1#0' '#0 @@ -583,11 +583,11 @@ LazarusResources.Add('TfrmCompilerOptions','FORMDATA',[ +#255#128#146#218#255#254#254#254#0#247#247#251#0#254#254#254#0#255#255#255#0 +#9'NumGlyphs'#2#0#7'OnClick'#7#24'ButtonShowOptionsClicked'#8'TabOrder'#2#1#0 +#0#7'TBitBtn'#8'btnCheck'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3 - +'V'#1#6'Height'#2'5'#3'Top'#2#6#5'Width'#2'K'#5'Align'#7#7'alRight'#8'AutoSi' + +'V'#1#6'Height'#2'$'#3'Top'#2#6#5'Width'#2'K'#5'Align'#7#7'alRight'#8'AutoSi' +'ze'#9#20'BorderSpacing.Around'#2#6#21'Constraints.MinHeight'#2#25#20'Constr' +'aints.MinWidth'#2'K'#7'Default'#9#4'Kind'#7#5'bkYes'#9'NumGlyphs'#2#0#7'OnC' +'lick'#7#14'btnTestClicked'#8'TabOrder'#2#2#0#0#7'TBitBtn'#11'btnLoadSave'#21 - +'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#167#1#6'Height'#2'5'#3'Top' + +'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#167#1#6'Height'#2'$'#3'Top' +#2#6#5'Width'#2'K'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Arou' +'nd'#2#6#21'Constraints.MinHeight'#2#25#20'Constraints.MinWidth'#2'K'#10'Gly' +'ph.Data'#10':'#4#0#0'6'#4#0#0'BM6'#4#0#0#0#0#0#0'6'#0#0#0'('#0#0#0#16#0#0#0 @@ -644,12 +644,12 @@ LazarusResources.Add('TfrmCompilerOptions','FORMDATA',[ ,#187'm:'#255#187'k8'#239#187'p>'#203#182'i5T'#255#255#255#0#9'NumGlyphs'#2#0 +#7'OnClick'#7#19'ButtonLoadSaveClick'#14'ParentShowHint'#8#8'ShowHint'#9#8'T' +'abOrder'#2#3#0#0#7'TBitBtn'#5'btnOK'#21'AnchorSideBottom.Side'#7#9'asrBotto' - +'m'#4'Left'#3#248#1#6'Height'#2'5'#3'Top'#2#6#5'Width'#2'K'#5'Align'#7#7'alR' + +'m'#4'Left'#3#248#1#6'Height'#2'$'#3'Top'#2#6#5'Width'#2'K'#5'Align'#7#7'alR' +'ight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#3'&OK'#21'Con' +'straints.MinHeight'#2#25#20'Constraints.MinWidth'#2'K'#4'Kind'#7#4'bkOK'#9 +'NumGlyphs'#2#0#7'OnClick'#7#15'ButtonOKClicked'#8'TabOrder'#2#4#0#0#7'TBitB' +'tn'#9'btnCancel'#20'AnchorSideRight.Side'#7#9'asrBottom'#21'AnchorSideBotto' - +'m.Side'#7#9'asrBottom'#4'Left'#3'I'#2#6'Height'#2'5'#3'Top'#2#6#5'Width'#2 + +'m.Side'#7#9'asrBottom'#4'Left'#3'I'#2#6'Height'#2'$'#3'Top'#2#6#5'Width'#2 +'N'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#6'Cance' +'l'#9#7'Caption'#6#6'Cancel'#21'Constraints.MinHeight'#2#25#20'Constraints.M' +'inWidth'#2'K'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8 diff --git a/ide/compileroptionsdlg.pp b/ide/compileroptionsdlg.pp index 4895dbe9aa..3d1a69f074 100644 --- a/ide/compileroptionsdlg.pp +++ b/ide/compileroptionsdlg.pp @@ -306,6 +306,9 @@ function CaptionToSyntaxMode(const Caption: string): string; function ProcessorToCaption(const Processor: string): string; function CaptionToProcessor(const Caption: string): string; +function CheckCompileReasons(Reason: TCompileReason; + Options: TProjectCompilerOptions; Quiet: boolean): TModalResult; // check if Reason is handled at least once + implementation type @@ -381,6 +384,34 @@ begin Result:=''; end; +function CheckCompileReasons(Reason: TCompileReason; + Options: TProjectCompilerOptions; Quiet: boolean): TModalResult; +var + ProjToolOpts: TProjectCompilationToolOptions; +begin + if (Reason in Options.CompileReasons) + and (Options.CompilerPath<>'') then + exit(mrOk); + if Options.ExecuteBefore is TProjectCompilationToolOptions then begin + ProjToolOpts:=TProjectCompilationToolOptions(Options.ExecuteBefore); + if (Reason in ProjToolOpts.CompileReasons) and (ProjToolOpts.Command<>'') then + exit(mrOk); + end; + if Options.ExecuteAfter is TProjectCompilationToolOptions then begin + ProjToolOpts:=TProjectCompilationToolOptions(Options.ExecuteAfter); + if (Reason in ProjToolOpts.CompileReasons) and (ProjToolOpts.Command<>'') then + exit(mrOk); + end; + // reason is not handled + if Quiet then exit(mrCancel); + Result:=MessageDlg('Nothing to do', + 'The project''s compiler options has no compile command.'#13 + +'See Project / Compiler Options ... / Compilation',mtInformation, + [mbCancel,mbIgnore],0); + if Result=mrIgnore then + Result:=mrOk; +end; + {------------------------------------------------------------------------------ TfrmCompilerOptions Constructor ------------------------------------------------------------------------------} diff --git a/ide/main.pp b/ide/main.pp index 1776ae43ae..f26cacf7bf 100644 --- a/ide/main.pp +++ b/ide/main.pp @@ -9484,6 +9484,14 @@ begin Result:=PrepareForCompile; if Result<>mrOk then exit; + if (AReason in [crCompile,crBuild]) + and ([pbfDoNotCompileProject,pbfSkipTools]*Flags=[]) then + begin + // warn if nothing to do + Result:=CheckCompileReasons(AReason,Project1.CompilerOptions,false); + if Result<>mrOk then exit; + end; + // show messages if EnvironmentOptions.MsgViewFocus then MessagesView.EnsureVisible