From 53b17f56143c8512440cdab3aba7cf448085d342 Mon Sep 17 00:00:00 2001 From: mattias Date: Sun, 23 Apr 2023 13:33:44 +0200 Subject: [PATCH] IDE: hide obsolete bmCleanBuild --- ide/buildlazdialog.lfm | 28 ++++++++-------------------- ide/buildlazdialog.pas | 9 +-------- ide/buildprofilemanager.pas | 4 ++-- 3 files changed, 11 insertions(+), 30 deletions(-) diff --git a/ide/buildlazdialog.lfm b/ide/buildlazdialog.lfm index 008ac687da..edeb8bc46d 100644 --- a/ide/buildlazdialog.lfm +++ b/ide/buildlazdialog.lfm @@ -229,7 +229,7 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg Height = 89 Hint = 'Defines without -d' Top = 237 - Width = 484 + Width = 505 Anchors = [akTop, akLeft, akRight, akBottom] ItemHeight = 0 ParentShowHint = False @@ -458,10 +458,10 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg AnchorSideRight.Control = DetailsPanel AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = CommonsDividerBevel - Left = 496 + Left = 517 Height = 104 Top = 222 - Width = 188 + Width = 167 Anchors = [akTop, akRight, akBottom] AutoSize = True BorderSpacing.Left = 6 @@ -476,7 +476,7 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 1 ClientHeight = 88 - ClientWidth = 186 + ClientWidth = 165 ParentShowHint = False ShowHint = True TabOrder = 13 @@ -493,40 +493,28 @@ object ConfigureBuildLazarusDlg: TConfigureBuildLazarusDlg TabOrder = 0 TabStop = True end - object CleanCommonRadioButton: TRadioButton + object CleanAllRadioButton: TRadioButton AnchorSideTop.Control = CleanAutoRadioButton AnchorSideTop.Side = asrBottom Left = 6 Height = 23 Top = 35 - Width = 174 - BorderSpacing.Top = 6 - Caption = 'CleanCommonRadioButton' - OnClick = CleanRadioButtonClick - TabOrder = 1 - end - object CleanAllRadioButton: TRadioButton - AnchorSideTop.Control = CleanCommonRadioButton - AnchorSideTop.Side = asrBottom - Left = 6 - Height = 23 - Top = 64 Width = 140 BorderSpacing.Top = 6 Caption = 'CleanAllRadioButton' OnClick = CleanRadioButtonClick - TabOrder = 2 + TabOrder = 1 end object CleanOnceCheckBox: TCheckBox AnchorSideTop.Control = CleanAllRadioButton AnchorSideTop.Side = asrBottom Left = 6 Height = 23 - Top = 93 + Top = 64 Width = 139 BorderSpacing.Top = 6 Caption = 'CleanOnceCheckBox' - TabOrder = 3 + TabOrder = 2 end end end diff --git a/ide/buildlazdialog.pas b/ide/buildlazdialog.pas index 2636fe20b5..71049ee45d 100644 --- a/ide/buildlazdialog.pas +++ b/ide/buildlazdialog.pas @@ -83,7 +83,6 @@ type TConfigureBuildLazarusDlg = class(TForm) CleanAllRadioButton: TRadioButton; CleanAutoRadioButton: TRadioButton; - CleanCommonRadioButton: TRadioButton; CleanOnceCheckBox: TCheckBox; CommonsDividerBevel: TDividerBevel; ConfirmBuildCheckBox: TCheckBox; @@ -1144,7 +1143,6 @@ begin CleanUpGroupBox.Caption:=lisCleanUp; CleanAutoRadioButton.Caption:=lisAutomatically; - CleanCommonRadioButton.Caption:=lisCleanCommonFiles; CleanAllRadioButton.Caption:=lisCleanAll; CleanOnceCheckBox.Caption:=lisCleanOnlyOnce; CleanOnceCheckBox.Hint:=lisAfterCleaningUpSwitchToAutomaticClean; @@ -1294,7 +1292,6 @@ var i: Integer; begin CleanAutoRadioButton.OnClick:=Nil; - CleanCommonRadioButton.OnClick:=Nil; CleanAllRadioButton.OnClick:=Nil; try LCLWidgetTypeComboBox.ItemIndex :=ord(AProfile.TargetPlatform); @@ -1304,8 +1301,7 @@ begin TargetCPUComboBox.Text :=AProfile.TargetCPU; case AProfile.IdeBuildMode of bmBuild: CleanAutoRadioButton.Checked:=true; - bmCleanBuild: CleanCommonRadioButton.Checked:=true; - bmCleanAllBuild: CleanAllRadioButton.Checked:=true; + bmCleanBuild, bmCleanAllBuild: CleanAllRadioButton.Checked:=true; end; CleanOnceCheckBox.Checked:=AProfile.CleanOnce; OptionsMemo.Lines.Assign(AProfile.OptionsLines); @@ -1313,7 +1309,6 @@ begin DefinesListBox.Checked[i]:=AProfile.Defines.IndexOf(DefinesListBox.Items[i]) > -1; finally CleanAutoRadioButton.OnClick:=@CleanRadioButtonClick; - CleanCommonRadioButton.OnClick:=@CleanRadioButtonClick; CleanAllRadioButton.OnClick:=@CleanRadioButtonClick; end; end; @@ -1329,8 +1324,6 @@ begin AProfile.TargetCPU :=TargetCPUComboBox.Text; if CleanAllRadioButton.Checked then AProfile.IdeBuildMode := bmCleanAllBuild - else if CleanCommonRadioButton.Checked then - AProfile.IdeBuildMode := bmCleanBuild else AProfile.IdeBuildMode := bmBuild; AProfile.CleanOnce:=CleanOnceCheckBox.Checked; diff --git a/ide/buildprofilemanager.pas b/ide/buildprofilemanager.pas index 58583581fc..4199a31c2d 100644 --- a/ide/buildprofilemanager.pas +++ b/ide/buildprofilemanager.pas @@ -49,7 +49,7 @@ type TIdeBuildMode = ( bmBuild, - bmCleanBuild, + bmCleanBuild, // obsolete since 2.3.0 bmCleanAllBuild ); @@ -412,7 +412,7 @@ begin Profile:=TBuildLazarusProfile.Create(Self, lisLazCleanUpBuildAll); with Profile, fOwnerCnt do begin fTargetPlatform:=Platfrm; - fIdeBuildMode:=bmCleanBuild; + fIdeBuildMode:=bmCleanAllBuild; fUpdateRevisionInc:=True; end; Add(Profile);