From 0c7fee62f31247b5cf81f2e48b99cc27ed2df044 Mon Sep 17 00:00:00 2001 From: juha Date: Fri, 22 Nov 2019 00:14:36 +0000 Subject: [PATCH] IDE: Use configurable DropDownCount for IDE's ComboBoxes. Issue #36329, patch from Vojtech Cihak. git-svn-id: trunk@62278 - --- converter/chgencodingdlg.pas | 5 +- debugger/breakpropertydlg.lfm | 241 +++++++++++++++--------------- debugger/breakpropertydlg.pas | 9 +- designer/anchoreditor.lfm | 107 ++++++------- designer/anchoreditor.pas | 11 +- ide/buildfiledlg.pas | 3 + ide/buildlazdialog.pas | 5 + ide/buildmodediffdlg.lfm | 22 +-- ide/buildmodediffdlg.pas | 6 + ide/buildprojectdlg.pas | 4 + ide/charactermapdlg.pas | 4 +- ide/cleandirdlg.pas | 5 +- ide/codebrowser.lfm | 105 ++++++------- ide/codebrowser.pas | 6 + ide/codetoolsdefpreview.pas | 3 +- ide/desktopmanager.pas | 1 + ide/diffdialog.lfm | 97 ++++++------ ide/diffdialog.pas | 9 +- ide/encloseifdef.pas | 4 +- ide/environmentopts.pp | 20 ++- ide/findinfilesdlg.lfm | 93 ++++++------ ide/findinfilesdlg.pas | 11 +- ide/findreplacedialog.lfm | 83 +++++----- ide/findreplacedialog.pp | 9 +- ide/frames/desktop_options.lfm | 199 ++++++++++++++---------- ide/frames/desktop_options.pas | 15 +- ide/ideinfoneedbuild.pas | 1 + ide/lazarusidestrconsts.pas | 2 + ide/multipastedlg.pas | 5 +- ide/procedurelist.pas | 1 + ide/publishmoduledlg.pas | 2 + ide/runparamsopts.pas | 8 +- ide/unitdependencies.lfm | 155 +++++++++---------- ide/unitdependencies.pas | 6 + lcl/include/customcombobox.inc | 7 +- packager/addfiletoapackagedlg.lfm | 27 ++-- packager/addfiletoapackagedlg.pas | 8 +- 37 files changed, 738 insertions(+), 561 deletions(-) diff --git a/converter/chgencodingdlg.pas b/converter/chgencodingdlg.pas index dde02a367e..fa1730d349 100644 --- a/converter/chgencodingdlg.pas +++ b/converter/chgencodingdlg.pas @@ -41,7 +41,7 @@ uses // IDEIntf IDEWindowIntf, SrcEditorIntf, IDEHelpIntf, IDEImagesIntf, // IDE - IDEProcs, PackageDefs, PackageSystem, Project, LazarusIDEStrConsts; + IDEProcs, PackageDefs, PackageSystem, Project, LazarusIDEStrConsts, EnvironmentOpts; type @@ -165,6 +165,9 @@ begin OwnerComboBox.Text:=''; FFiles:=TFilenameToStringTree.Create(FilenamesCaseSensitive); UpdatePreview; + OwnerComboBox.DropDownCount:=EnvironmentOptions.DropDownCount; + NewEncodingComboBox.DropDownCount:=EnvironmentOptions.DropDownCount; + FileFilterCombobox.DropDownCount:=EnvironmentOptions.DropDownCount; end; procedure TChgEncodingDialog.FormDestroy(Sender: TObject); diff --git a/debugger/breakpropertydlg.lfm b/debugger/breakpropertydlg.lfm index 402057d971..20aaef731f 100644 --- a/debugger/breakpropertydlg.lfm +++ b/debugger/breakpropertydlg.lfm @@ -14,16 +14,17 @@ object BreakPropertyDlg: TBreakPropertyDlg ClientHeight = 577 ClientWidth = 450 Constraints.MinWidth = 450 + OnCreate = FormCreate Position = poScreenCenter - LCLVersion = '1.9.0.0' + LCLVersion = '2.1.0.0' object lblFileName: TLabel AnchorSideLeft.Control = Owner AnchorSideTop.Control = edtFilename AnchorSideTop.Side = asrCenter Left = 6 - Height = 15 - Top = 10 - Width = 51 + Height = 14 + Top = 9 + Width = 54 BorderSpacing.Left = 6 BorderSpacing.Right = 6 Caption = 'Filename:' @@ -34,9 +35,9 @@ object BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Control = edtLine AnchorSideTop.Side = asrCenter Left = 6 - Height = 15 - Top = 39 - Width = 25 + Height = 14 + Top = 34 + Width = 27 BorderSpacing.Left = 6 BorderSpacing.Right = 6 Caption = 'Line:' @@ -47,9 +48,9 @@ object BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Control = edtCondition AnchorSideTop.Side = asrCenter Left = 6 - Height = 15 - Top = 118 - Width = 56 + Height = 14 + Top = 109 + Width = 55 BorderSpacing.Left = 6 BorderSpacing.Right = 6 Caption = 'Condition:' @@ -60,9 +61,9 @@ object BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Control = edtCounter AnchorSideTop.Side = asrCenter Left = 6 - Height = 15 - Top = 147 - Width = 50 + Height = 14 + Top = 137 + Width = 49 BorderSpacing.Left = 6 BorderSpacing.Right = 6 Caption = 'Hitcount:' @@ -73,9 +74,9 @@ object BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Control = cmbGroup AnchorSideTop.Side = asrCenter Left = 6 - Height = 15 - Top = 205 - Width = 36 + Height = 14 + Top = 190 + Width = 38 BorderSpacing.Left = 6 BorderSpacing.Right = 6 Caption = 'Group:' @@ -86,9 +87,9 @@ object BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Control = edtAutocontinueMS AnchorSideTop.Side = asrCenter Left = 6 - Height = 15 - Top = 176 - Width = 103 + Height = 14 + Top = 163 + Width = 102 BorderSpacing.Left = 6 BorderSpacing.Right = 6 Caption = 'Auto continue after' @@ -99,10 +100,10 @@ object BreakPropertyDlg: TBreakPropertyDlg AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = lblAutoContinue AnchorSideTop.Side = asrCenter - Left = 205 - Height = 15 - Top = 176 - Width = 24 + Left = 204 + Height = 14 + Top = 163 + Width = 25 BorderSpacing.Left = 6 Caption = '(ms)' ParentColor = False @@ -113,9 +114,9 @@ object BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Control = edtCounter AnchorSideTop.Side = asrBottom AnchorSideRight.Side = asrBottom - Left = 139 - Height = 23 - Top = 172 + Left = 138 + Height = 20 + Top = 160 Width = 60 BorderSpacing.Left = 24 BorderSpacing.Around = 6 @@ -129,10 +130,10 @@ object BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Side = asrBottom AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom - Left = 139 - Height = 23 - Top = 143 - Width = 305 + Left = 138 + Height = 20 + Top = 134 + Width = 306 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 24 BorderSpacing.Around = 6 @@ -145,10 +146,10 @@ object BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Control = Owner AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom - Left = 139 - Height = 23 + Left = 138 + Height = 20 Top = 6 - Width = 305 + Width = 306 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 24 BorderSpacing.Around = 6 @@ -164,14 +165,14 @@ object BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Side = asrBottom AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom - Left = 139 + Left = 138 Height = 23 - Top = 201 - Width = 305 + Top = 186 + Width = 306 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 24 BorderSpacing.Around = 6 - ItemHeight = 15 + ItemHeight = 14 OnKeyPress = cmbGroupKeyPress TabOrder = 7 Text = 'cmbGroup' @@ -183,23 +184,23 @@ object BreakPropertyDlg: TBreakPropertyDlg AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom Left = 6 - Height = 215 - Top = 230 + Height = 195 + Top = 215 Width = 438 Anchors = [akTop, akLeft, akRight] AutoSize = True BorderSpacing.Around = 6 Caption = 'Actions' - ClientHeight = 195 + ClientHeight = 177 ClientWidth = 434 TabOrder = 8 object chkActionBreak: TCheckBox AnchorSideLeft.Control = gbActions AnchorSideTop.Control = gbActions Left = 6 - Height = 19 + Height = 18 Top = 6 - Width = 49 + Width = 53 BorderSpacing.Around = 6 Caption = 'Break' TabOrder = 0 @@ -209,9 +210,9 @@ object BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Control = edtEnableGroups AnchorSideTop.Side = asrCenter Left = 6 - Height = 19 - Top = 33 - Width = 91 + Height = 18 + Top = 31 + Width = 94 BorderSpacing.Left = 6 BorderSpacing.Right = 6 Caption = 'Enable goups' @@ -223,9 +224,9 @@ object BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Control = edtDisableGroups AnchorSideTop.Side = asrCenter Left = 6 - Height = 19 - Top = 62 - Width = 98 + Height = 18 + Top = 57 + Width = 100 BorderSpacing.Left = 6 BorderSpacing.Right = 6 Caption = 'Disable groups' @@ -239,10 +240,10 @@ object BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Side = asrBottom AnchorSideRight.Control = edtEvalExpression AnchorSideRight.Side = asrBottom - Left = 125 - Height = 23 - Top = 31 - Width = 303 + Left = 130 + Height = 20 + Top = 30 + Width = 298 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 20 BorderSpacing.Top = 6 @@ -263,10 +264,10 @@ object BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Side = asrBottom AnchorSideRight.Control = edtEvalExpression AnchorSideRight.Side = asrBottom - Left = 125 - Height = 23 - Top = 60 - Width = 303 + Left = 130 + Height = 20 + Top = 56 + Width = 298 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 20 BorderSpacing.Top = 6 @@ -285,9 +286,9 @@ object BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Control = edtEvalExpression AnchorSideTop.Side = asrCenter Left = 6 - Height = 19 - Top = 91 - Width = 99 + Height = 18 + Top = 83 + Width = 104 BorderSpacing.Left = 6 BorderSpacing.Right = 6 Caption = 'Eval expression' @@ -299,9 +300,9 @@ object BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Control = edtLogMessage AnchorSideTop.Side = asrCenter Left = 6 - Height = 19 - Top = 120 - Width = 89 + Height = 18 + Top = 109 + Width = 93 BorderSpacing.Left = 6 BorderSpacing.Right = 6 Caption = 'Log message' @@ -315,10 +316,10 @@ object BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Side = asrBottom AnchorSideRight.Control = gbActions AnchorSideRight.Side = asrBottom - Left = 125 - Height = 23 - Top = 89 - Width = 303 + Left = 130 + Height = 20 + Top = 82 + Width = 298 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 20 BorderSpacing.Top = 6 @@ -334,10 +335,10 @@ object BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Side = asrBottom AnchorSideRight.Control = gbActions AnchorSideRight.Side = asrBottom - Left = 125 - Height = 23 - Top = 118 - Width = 303 + Left = 130 + Height = 20 + Top = 108 + Width = 298 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 20 BorderSpacing.Top = 6 @@ -351,9 +352,9 @@ object BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Control = edtLogCallStack AnchorSideTop.Side = asrCenter Left = 6 - Height = 19 - Top = 149 - Width = 91 + Height = 18 + Top = 134 + Width = 94 BorderSpacing.Left = 6 Caption = 'Log call stack' OnChange = chkLogCallStackChange @@ -364,9 +365,9 @@ object BreakPropertyDlg: TBreakPropertyDlg AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = edtLogMessage AnchorSideTop.Side = asrBottom - Left = 125 - Height = 23 - Top = 147 + Left = 130 + Height = 19 + Top = 134 Width = 50 BorderSpacing.Left = 20 BorderSpacing.Top = 6 @@ -380,10 +381,10 @@ object BreakPropertyDlg: TBreakPropertyDlg AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = edtLogCallStack AnchorSideTop.Side = asrCenter - Left = 181 - Height = 15 - Top = 151 - Width = 108 + Left = 186 + Height = 14 + Top = 136 + Width = 110 BorderSpacing.Left = 6 Caption = 'lblLogCallStackLimit' ParentColor = False @@ -393,9 +394,9 @@ object BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Control = edtLogCallStack AnchorSideTop.Side = asrBottom Left = 6 - Height = 19 - Top = 176 - Width = 90 + Height = 18 + Top = 159 + Width = 93 BorderSpacing.Left = 6 BorderSpacing.Top = 6 Caption = 'chkTakeSnap' @@ -406,8 +407,8 @@ object BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Control = gbActions AnchorSideTop.Side = asrBottom Left = 6 - Height = 120 - Top = 451 + Height = 155 + Top = 416 Width = 438 Anchors = [akTop, akLeft, akRight, akBottom] OKButton.Name = 'OKButton' @@ -432,14 +433,14 @@ object BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Side = asrBottom AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom - Left = 139 + Left = 138 Height = 23 - Top = 114 - Width = 305 + Top = 105 + Width = 306 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 24 BorderSpacing.Around = 6 - ItemHeight = 15 + ItemHeight = 14 TabOrder = 4 Text = 'edtCondition' end @@ -449,9 +450,9 @@ object BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Control = edtFilename AnchorSideTop.Side = asrBottom AnchorSideRight.Side = asrBottom - Left = 139 - Height = 23 - Top = 35 + Left = 138 + Height = 19 + Top = 32 Width = 60 BorderSpacing.Left = 24 BorderSpacing.Around = 6 @@ -465,10 +466,10 @@ object BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Side = asrBottom AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom - Left = 139 - Height = 19 - Top = 64 - Width = 305 + Left = 138 + Height = 18 + Top = 57 + Width = 306 Anchors = [akTop, akLeft, akRight] AutoSize = True BorderSpacing.Left = 24 @@ -479,13 +480,13 @@ object BreakPropertyDlg: TBreakPropertyDlg ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 3 - ClientHeight = 19 - ClientWidth = 305 + ClientHeight = 18 + ClientWidth = 306 TabOrder = 2 Visible = False object rbWrite: TRadioButton Left = 6 - Height = 19 + Height = 18 Top = 0 Width = 59 Caption = 'rbWrite' @@ -495,18 +496,18 @@ object BreakPropertyDlg: TBreakPropertyDlg end object rbRead: TRadioButton Left = 68 - Height = 19 + Height = 18 Top = 0 - Width = 57 + Width = 59 BorderSpacing.Left = 3 Caption = 'rbRead' TabOrder = 1 end object rbReadWrite: TRadioButton - Left = 128 - Height = 19 + Left = 130 + Height = 18 Top = 0 - Width = 85 + Width = 88 BorderSpacing.Left = 3 Caption = 'rbReadWrite' TabOrder = 2 @@ -519,10 +520,10 @@ object BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Side = asrBottom AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom - Left = 139 - Height = 19 - Top = 89 - Width = 305 + Left = 138 + Height = 18 + Top = 81 + Width = 306 Anchors = [akTop, akLeft, akRight] AutoSize = True BorderSpacing.Left = 24 @@ -533,13 +534,13 @@ object BreakPropertyDlg: TBreakPropertyDlg ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 3 - ClientHeight = 19 - ClientWidth = 305 + ClientHeight = 18 + ClientWidth = 306 TabOrder = 3 Visible = False object rbGlobal: TRadioButton Left = 6 - Height = 19 + Height = 18 Top = 0 Width = 65 Caption = 'rbGlobal' @@ -549,7 +550,7 @@ object BreakPropertyDlg: TBreakPropertyDlg end object rbLocal: TRadioButton Left = 74 - Height = 19 + Height = 18 Top = 0 Width = 59 BorderSpacing.Left = 3 @@ -558,9 +559,9 @@ object BreakPropertyDlg: TBreakPropertyDlg end object Label1: TLabel Left = 133 - Height = 19 + Height = 18 Top = 0 - Width = 3 + Width = 4 Caption = ' ' ParentColor = False end @@ -570,9 +571,9 @@ object BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Control = rgWatchKind AnchorSideTop.Side = asrCenter Left = 6 - Height = 15 - Top = 66 - Width = 71 + Height = 14 + Top = 59 + Width = 70 BorderSpacing.Left = 6 Caption = 'lblWatchKind' ParentColor = False @@ -583,9 +584,9 @@ object BreakPropertyDlg: TBreakPropertyDlg AnchorSideTop.Control = rgWatchScope AnchorSideTop.Side = asrCenter Left = 6 - Height = 15 - Top = 91 - Width = 79 + Height = 14 + Top = 83 + Width = 81 BorderSpacing.Left = 6 Caption = 'lblWatchScope' ParentColor = False diff --git a/debugger/breakpropertydlg.pas b/debugger/breakpropertydlg.pas index b3b852ca1b..6fea698cab 100644 --- a/debugger/breakpropertydlg.pas +++ b/debugger/breakpropertydlg.pas @@ -14,7 +14,7 @@ uses DbgIntfDebuggerBase, // IDE BreakPropertyDlgGroups, DebuggerDlg, Debugger, - BaseDebugManager, LazarusIDEStrConsts, InputHistory, IDEProcs; + BaseDebugManager, LazarusIDEStrConsts, InputHistory, IDEProcs, EnvironmentOpts; type @@ -73,6 +73,7 @@ type procedure cmbGroupKeyPress(Sender: TObject; var Key: char); procedure edtDisableGroupsButtonClick(Sender: TObject); procedure edtEnableGroupsButtonClick(Sender: TObject); + procedure FormCreate(Sender: TObject); private FBreakpointsNotification : TIDEBreakPointsNotification; FBreakpoint: TIDEBreakPoint; @@ -147,6 +148,12 @@ begin then edtEnableGroups.Text := s; end; +procedure TBreakPropertyDlg.FormCreate(Sender: TObject); +begin + edtCondition.DropDownCount := EnvironmentOptions.DropDownCount; + cmbGroup.DropDownCount := EnvironmentOptions.DropDownCount; +end; + procedure TBreakPropertyDlg.btnHelpClick(Sender: TObject); begin LazarusHelp.ShowHelpForIDEControl(Self); diff --git a/designer/anchoreditor.lfm b/designer/anchoreditor.lfm index 3d80c8d2d0..833ad00652 100644 --- a/designer/anchoreditor.lfm +++ b/designer/anchoreditor.lfm @@ -9,11 +9,12 @@ object AnchorDesigner: TAnchorDesigner ClientWidth = 544 Constraints.MinHeight = 361 Constraints.MinWidth = 544 + OnActivate = FormActivate OnCreate = FormCreate OnDeactivate = FormDeactivate OnDestroy = FormDestroy OnShow = FormShow - LCLVersion = '1.7' + LCLVersion = '2.1.0.0' object BorderSpaceGroupBox: TGroupBox AnchorSideLeft.Control = Owner AnchorSideLeft.Side = asrCenter @@ -35,8 +36,8 @@ object AnchorDesigner: TAnchorDesigner AnchorSideTop.Control = AroundBorderSpaceSpinEdit AnchorSideRight.Control = AroundBorderSpaceSpinEdit Left = 6 - Height = 21 - Top = 50 + Height = 19 + Top = 51 Width = 56 Anchors = [akTop, akRight] BorderSpacing.Right = 6 @@ -52,8 +53,8 @@ object AnchorDesigner: TAnchorDesigner AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = AroundBorderSpaceSpinEdit Left = 130 - Height = 21 - Top = 50 + Height = 19 + Top = 51 Width = 56 BorderSpacing.Left = 6 MaxValue = 2048 @@ -67,8 +68,8 @@ object AnchorDesigner: TAnchorDesigner AnchorSideLeft.Control = AroundBorderSpaceSpinEdit AnchorSideBottom.Control = AroundBorderSpaceSpinEdit Left = 68 - Height = 21 - Top = 23 + Height = 19 + Top = 26 Width = 56 Anchors = [akLeft, akBottom] BorderSpacing.Bottom = 6 @@ -84,8 +85,8 @@ object AnchorDesigner: TAnchorDesigner AnchorSideTop.Control = AroundBorderSpaceSpinEdit AnchorSideTop.Side = asrBottom Left = 68 - Height = 21 - Top = 77 + Height = 19 + Top = 76 Width = 56 BorderSpacing.Top = 6 MaxValue = 2048 @@ -101,8 +102,8 @@ object AnchorDesigner: TAnchorDesigner AnchorSideTop.Control = BorderSpaceGroupBox AnchorSideTop.Side = asrCenter Left = 68 - Height = 21 - Top = 50 + Height = 19 + Top = 51 Width = 56 MaxValue = 2048 OnChange = BorderSpaceSpinEditChange @@ -188,9 +189,9 @@ object AnchorDesigner: TAnchorDesigner AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = TopSiblingComboBox Left = 6 - Height = 13 - Top = 47 - Width = 30 + Height = 14 + Top = 45 + Width = 36 Anchors = [akLeft, akBottom] Caption = 'Sibling' ParentColor = False @@ -200,9 +201,9 @@ object AnchorDesigner: TAnchorDesigner AnchorSideTop.Control = TopRefTopSpeedButton AnchorSideTop.Side = asrCenter Left = 6 - Height = 17 - Top = 6 - Width = 56 + Height = 18 + Top = 5 + Width = 64 Caption = 'Enabled' OnChange = AnchorEnabledCheckBoxChange TabOrder = 0 @@ -213,13 +214,13 @@ object AnchorDesigner: TAnchorDesigner AnchorSideTop.Side = asrCenter AnchorSideRight.Control = TopRefTopSpeedButton Left = 6 - Height = 21 - Top = 60 + Height = 23 + Top = 59 Width = 150 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 BorderSpacing.Right = 6 - ItemHeight = 13 + ItemHeight = 14 OnEditingDone = SiblingComboBoxChange ParentShowHint = False ShowHint = True @@ -302,9 +303,9 @@ object AnchorDesigner: TAnchorDesigner AnchorSideTop.Side = asrBottom AnchorSideBottom.Control = BottomSiblingComboBox Left = 6 - Height = 13 - Top = 47 - Width = 30 + Height = 14 + Top = 45 + Width = 36 Anchors = [akLeft, akBottom] Caption = 'Sibling' ParentColor = False @@ -314,9 +315,9 @@ object AnchorDesigner: TAnchorDesigner AnchorSideTop.Control = BottomRefTopSpeedButton AnchorSideTop.Side = asrCenter Left = 6 - Height = 17 - Top = 6 - Width = 56 + Height = 18 + Top = 5 + Width = 64 Caption = 'Enabled' OnChange = AnchorEnabledCheckBoxChange TabOrder = 0 @@ -327,13 +328,13 @@ object AnchorDesigner: TAnchorDesigner AnchorSideTop.Side = asrCenter AnchorSideRight.Control = BottomRefTopSpeedButton Left = 6 - Height = 21 - Top = 60 + Height = 23 + Top = 59 Width = 148 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 BorderSpacing.Right = 6 - ItemHeight = 13 + ItemHeight = 14 OnEditingDone = SiblingComboBoxChange ParentShowHint = False ShowHint = True @@ -366,7 +367,7 @@ object AnchorDesigner: TAnchorDesigner AnchorSideTop.Side = asrBottom Left = 6 Height = 24 - Top = 75 + Top = 76 Width = 24 AllowAllUp = True BorderSpacing.Top = 4 @@ -382,7 +383,7 @@ object AnchorDesigner: TAnchorDesigner AnchorSideTop.Control = RightRefLeftSpeedButton Left = 62 Height = 24 - Top = 75 + Top = 76 Width = 24 AllowAllUp = True BorderSpacing.Left = 4 @@ -399,7 +400,7 @@ object AnchorDesigner: TAnchorDesigner AnchorSideRight.Side = asrBottom Left = 34 Height = 24 - Top = 75 + Top = 76 Width = 24 AllowAllUp = True BorderSpacing.Left = 4 @@ -414,9 +415,9 @@ object AnchorDesigner: TAnchorDesigner AnchorSideTop.Side = asrBottom AnchorSideBottom.Control = RightSiblingComboBox Left = 6 - Height = 13 - Top = 37 - Width = 30 + Height = 14 + Top = 35 + Width = 36 Anchors = [akLeft, akBottom] Caption = 'Sibling' ParentColor = False @@ -426,9 +427,9 @@ object AnchorDesigner: TAnchorDesigner AnchorSideTop.Side = asrBottom AnchorSideBottom.Control = RightSiblingLabel Left = 6 - Height = 17 - Top = 16 - Width = 56 + Height = 18 + Top = 13 + Width = 64 Anchors = [akLeft, akBottom] BorderSpacing.Bottom = 4 Caption = 'Enabled' @@ -442,13 +443,13 @@ object AnchorDesigner: TAnchorDesigner AnchorSideRight.Control = RightGroupBox AnchorSideRight.Side = asrBottom Left = 6 - Height = 21 - Top = 50 + Height = 23 + Top = 49 Width = 150 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 BorderSpacing.Right = 6 - ItemHeight = 13 + ItemHeight = 14 OnEditingDone = SiblingComboBoxChange ParentShowHint = False ShowHint = True @@ -478,7 +479,7 @@ object AnchorDesigner: TAnchorDesigner AnchorSideRight.Control = LeftRefCenterSpeedButton Left = 76 Height = 24 - Top = 75 + Top = 76 Width = 24 AllowAllUp = True Anchors = [akTop, akRight] @@ -497,7 +498,7 @@ object AnchorDesigner: TAnchorDesigner AnchorSideRight.Side = asrBottom Left = 132 Height = 24 - Top = 75 + Top = 76 Width = 24 AllowAllUp = True Anchors = [akTop, akRight] @@ -514,7 +515,7 @@ object AnchorDesigner: TAnchorDesigner AnchorSideRight.Control = LeftRefRightSpeedButton Left = 104 Height = 24 - Top = 75 + Top = 76 Width = 24 AllowAllUp = True Anchors = [akTop, akRight] @@ -529,9 +530,9 @@ object AnchorDesigner: TAnchorDesigner AnchorSideLeft.Control = LeftSiblingComboBox AnchorSideBottom.Control = LeftSiblingComboBox Left = 6 - Height = 13 - Top = 37 - Width = 30 + Height = 14 + Top = 35 + Width = 36 Anchors = [akLeft, akBottom] Caption = 'Sibling' ParentColor = False @@ -540,9 +541,9 @@ object AnchorDesigner: TAnchorDesigner AnchorSideLeft.Control = LeftSiblingComboBox AnchorSideBottom.Control = LeftSiblingLabel Left = 6 - Height = 17 - Top = 16 - Width = 56 + Height = 18 + Top = 13 + Width = 64 Anchors = [akLeft, akBottom] BorderSpacing.Bottom = 4 Caption = 'Enabled' @@ -556,13 +557,13 @@ object AnchorDesigner: TAnchorDesigner AnchorSideRight.Control = LeftGroupBox AnchorSideRight.Side = asrBottom Left = 6 - Height = 21 - Top = 50 + Height = 23 + Top = 49 Width = 150 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 BorderSpacing.Right = 6 - ItemHeight = 13 + ItemHeight = 14 OnEditingDone = SiblingComboBoxChange ParentShowHint = False ShowHint = True diff --git a/designer/anchoreditor.pas b/designer/anchoreditor.pas index 8697102bd1..939200bb49 100644 --- a/designer/anchoreditor.pas +++ b/designer/anchoreditor.pas @@ -37,7 +37,7 @@ interface uses Classes, SysUtils, LCLProc, Forms, Controls, Dialogs, StdCtrls, Buttons, Spin, ExtCtrls, Graphics, IDECommands, PropEdits, IDEDialogs, LazarusIDEStrConsts, - IDEOptionDefs, IDEImagesIntf; + IDEOptionDefs, IDEImagesIntf, EnvironmentOpts; type @@ -159,6 +159,7 @@ type TopRefTopSpeedButton: TSpeedButton; TopSiblingComboBox: TComboBox; TopSiblingLabel: TLabel; + procedure FormActivate(Sender: TObject); procedure FormCreate(Sender: TObject); procedure FormDestroy(Sender: TObject); procedure FormShow(Sender: TObject); @@ -1118,6 +1119,14 @@ begin end; end; +procedure TAnchorDesigner.FormActivate(Sender: TObject); +begin + LeftSiblingComboBox.DropDownCount:=EnvironmentOptions.DropDownCount; + RightSiblingComboBox.DropDownCount:=EnvironmentOptions.DropDownCount; + TopSiblingComboBox.DropDownCount:=EnvironmentOptions.DropDownCount; + BottomSiblingComboBox.DropDownCount:=EnvironmentOptions.DropDownCount; +end; + class function TAnchorDesigner.ControlToStr(AControl: TControl): string; begin if AControl=nil then diff --git a/ide/buildfiledlg.pas b/ide/buildfiledlg.pas index 4f2f422aaf..1ac1aafe63 100644 --- a/ide/buildfiledlg.pas +++ b/ide/buildfiledlg.pas @@ -528,6 +528,9 @@ begin ButtonPanel.HelpButton.OnClick := @HelpButtonClick; ButtonPanel.OKButton.OnClick := @OKButtonClick; + + BuildWorkDirCombobox.DropDownCount:=EnvironmentOptions.DropDownCount; + RunWorkDirCombobox.DropDownCount:=EnvironmentOptions.DropDownCount; end; procedure TBuildFileDialog.BuildBrowseWorkDirButtonCLICK(Sender: TObject); diff --git a/ide/buildlazdialog.pas b/ide/buildlazdialog.pas index 06b7d9a28e..d2789b5cde 100644 --- a/ide/buildlazdialog.pas +++ b/ide/buildlazdialog.pas @@ -1112,6 +1112,11 @@ begin end; SetupInfoPage; + BuildProfileComboBox.DropDownCount:=EnvironmentOptions.DropDownCount; + LCLWidgetTypeComboBox.DropDownCount:=EnvironmentOptions.DropDownCount; + TargetOSComboBox.DropDownCount:=EnvironmentOptions.DropDownCount; + TargetCPUComboBox.DropDownCount:=EnvironmentOptions.DropDownCount; + TargetDirectoryComboBox.DropDownCount:=EnvironmentOptions.DropDownCount; end; procedure TConfigureBuildLazarusDlg.FormResize(Sender: TObject); diff --git a/ide/buildmodediffdlg.lfm b/ide/buildmodediffdlg.lfm index 44086f93f3..756f0e1f44 100644 --- a/ide/buildmodediffdlg.lfm +++ b/ide/buildmodediffdlg.lfm @@ -7,9 +7,10 @@ object BuildModeDiffDialog: TBuildModeDiffDialog Caption = 'BuildModeDiffDialog' ClientHeight = 409 ClientWidth = 476 + OnActivate = FormActivate OnCreate = FormCreate Position = poScreenCenter - LCLVersion = '1.5' + LCLVersion = '2.1.0.0' object ButtonPanel: TButtonPanel Left = 6 Height = 26 @@ -35,9 +36,9 @@ object BuildModeDiffDialog: TBuildModeDiffDialog AnchorSideTop.Control = ModeComboBox AnchorSideTop.Side = asrCenter Left = 6 - Height = 15 + Height = 14 Top = 10 - Width = 59 + Width = 60 BorderSpacing.Left = 6 Caption = 'ModeLabel' ParentColor = False @@ -48,22 +49,22 @@ object BuildModeDiffDialog: TBuildModeDiffDialog AnchorSideTop.Control = Owner AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom - Left = 71 + Left = 72 Height = 23 Top = 6 - Width = 399 + Width = 398 Anchors = [akTop, akLeft, akRight] BorderSpacing.Around = 6 - ItemHeight = 15 + ItemHeight = 14 OnChange = ModeComboBoxChange Style = csDropDownList TabOrder = 0 end object DiffLabel: TLabel Left = 6 - Height = 15 + Height = 14 Top = 33 - Width = 47 + Width = 48 Caption = 'DiffLabel' ParentColor = False end @@ -71,13 +72,12 @@ object BuildModeDiffDialog: TBuildModeDiffDialog AnchorSideTop.Control = DiffLabel AnchorSideTop.Side = asrBottom Left = 6 - Height = 317 - Top = 54 + Height = 318 + Top = 53 Width = 464 Align = alBottom Anchors = [akTop, akLeft, akRight, akBottom] BorderSpacing.Around = 6 - DefaultItemHeight = 18 TabOrder = 1 end end diff --git a/ide/buildmodediffdlg.pas b/ide/buildmodediffdlg.pas index 61064b95c5..91629e98b7 100644 --- a/ide/buildmodediffdlg.pas +++ b/ide/buildmodediffdlg.pas @@ -48,6 +48,7 @@ type DiffTreeView: TTreeView; ModeComboBox: TComboBox; ModeLabel: TLabel; + procedure FormActivate(Sender: TObject); procedure FormCreate(Sender: TObject); procedure ModeComboBoxChange(Sender: TObject); private @@ -127,6 +128,11 @@ begin end; end; +procedure TBuildModeDiffDialog.FormActivate(Sender: TObject); +begin + ModeComboBox.DropDownCount:=EnvironmentOptions.DropDownCount; +end; + procedure TBuildModeDiffDialog.FillDiffTreeView; procedure DiffsForMatrixCustomOptions(MatrixOptions: TBuildMatrixOptions; diff --git a/ide/buildprojectdlg.pas b/ide/buildprojectdlg.pas index 83ba9fe7a4..23ac4ba3d0 100644 --- a/ide/buildprojectdlg.pas +++ b/ide/buildprojectdlg.pas @@ -143,6 +143,10 @@ begin ImageIndexFile := IDEImages.LoadImage('laz_delete'); ButtonPanel1.OKButton.ModalResult:=mrNone; + ProjOutMaskComboBox.DropDownCount:=EnvironmentOptions.DropDownCount; + ProjSrcMaskComboBox.DropDownCount:=EnvironmentOptions.DropDownCount; + PkgOutMaskComboBox.DropDownCount:=EnvironmentOptions.DropDownCount; + PkgSrcMaskComboBox.DropDownCount:=EnvironmentOptions.DropDownCount; end; procedure TCleanBuildProjectDialog.FormDestroy(Sender: TObject); diff --git a/ide/charactermapdlg.pas b/ide/charactermapdlg.pas index df8907bbdd..6918fa7277 100644 --- a/ide/charactermapdlg.pas +++ b/ide/charactermapdlg.pas @@ -39,7 +39,7 @@ interface uses Classes, SysUtils, Forms, Controls, Graphics, Dialogs, Buttons, StdCtrls, LCLType, LCLUnicodeData, GraphType, Grids, ButtonPanel, ComCtrls, - IDEHelpIntf, LazUTF8, + IDEHelpIntf, LazUTF8, Math, {$ifdef WINDOWS}Windows,{$endif} lconvencoding, LazarusIDEStrConsts, IDEImagesIntf, EditorOptions, EnvironmentOpts; @@ -217,6 +217,8 @@ begin FUnicodeBlockIndex:=NOT_SELECTED; FillUniRangeList(SortUniRangeListButton.Down); FillUnicodeGrid; + cbCodePage.DropDownCount := Math.max(EnvironmentOptions.DropDownCount, 25); + cbUniRange.DropDownCount := Math.max(EnvironmentOptions.DropDownCount, 25); end; procedure TCharacterMapDialog.SortUniRangeListButtonClick(Sender: TObject); diff --git a/ide/cleandirdlg.pas b/ide/cleandirdlg.pas index 3ada60f310..61c310f8f4 100644 --- a/ide/cleandirdlg.pas +++ b/ide/cleandirdlg.pas @@ -39,7 +39,7 @@ uses IDEWindowIntf, IDEHelpIntf, IDEDialogs, // IDE IDEProcs, LazarusIDEStrConsts, LazConf, TransferMacros, InputHistory, - ShowDeletingFilesDlg; + ShowDeletingFilesDlg, EnvironmentOpts; type @@ -144,6 +144,9 @@ begin ButtonPanel.HelpButton.OnClick := @HelpButtonClick; IDEDialogLayoutList.ApplyLayout(Self); + DirCombobox.DropDownCount:=EnvironmentOptions.DropDownCount; + RemoveCombobox.DropDownCount:=EnvironmentOptions.DropDownCount; + KeepCombobox.DropDownCount:=EnvironmentOptions.DropDownCount; end; procedure TCleanDirectoryDialog.FormDestroy(Sender: TObject); diff --git a/ide/codebrowser.lfm b/ide/codebrowser.lfm index 2f889735ea..f890d9d4cf 100644 --- a/ide/codebrowser.lfm +++ b/ide/codebrowser.lfm @@ -7,20 +7,21 @@ object CodeBrowserView: TCodeBrowserView Caption = 'CodeBrowserView' ClientHeight = 563 ClientWidth = 645 + OnActivate = FormActivate OnCreate = FormCreate OnDeactivate = FormDeactivate OnDestroy = FormDestroy - LCLVersion = '1.9.0.0' + LCLVersion = '2.1.0.0' object ScopeGroupBox: TGroupBox Left = 6 - Height = 57 + Height = 54 Top = 6 Width = 633 Align = alTop AutoSize = True BorderSpacing.Around = 6 Caption = 'ScopeGroupBox' - ClientHeight = 37 + ClientHeight = 36 ClientWidth = 629 TabOrder = 0 object ScopeComboBox: TComboBox @@ -31,7 +32,7 @@ object CodeBrowserView: TCodeBrowserView Top = 6 Width = 315 BorderSpacing.Around = 6 - ItemHeight = 15 + ItemHeight = 14 OnChange = ScopeComboBoxChange Style = csDropDownList TabOrder = 0 @@ -42,9 +43,9 @@ object CodeBrowserView: TCodeBrowserView AnchorSideTop.Control = ScopeComboBox AnchorSideTop.Side = asrCenter Left = 327 - Height = 19 + Height = 18 Top = 8 - Width = 225 + Width = 234 BorderSpacing.Left = 6 BorderSpacing.Right = 50 Caption = 'ScopeWithRequiredPackagesCheckBox' @@ -52,10 +53,10 @@ object CodeBrowserView: TCodeBrowserView TabOrder = 1 end object RescanButton: TButton - Left = 524 - Height = 25 + Left = 538 + Height = 24 Top = 6 - Width = 99 + Width = 85 Align = alRight AutoSize = True BorderSpacing.Around = 6 @@ -73,8 +74,8 @@ object CodeBrowserView: TCodeBrowserView AnchorSideRight.Side = asrBottom AnchorSideBottom.Side = asrBottom Left = 6 - Height = 51 - Top = 188 + Height = 54 + Top = 174 Width = 633 Anchors = [akTop, akLeft, akRight] AutoSize = True @@ -85,16 +86,16 @@ object CodeBrowserView: TCodeBrowserView ChildSizing.EnlargeHorizontal = crsHomogenousSpaceResize ChildSizing.ShrinkHorizontal = crsHomogenousSpaceResize ChildSizing.Layout = cclTopToBottomThenLeftToRight - ClientHeight = 31 + ClientHeight = 36 ClientWidth = 629 TabOrder = 2 object ShowPrivateCheckBox: TCheckBox AnchorSideLeft.Control = OptionsGroupBox AnchorSideTop.Control = OptionsGroupBox Left = 6 - Height = 19 + Height = 18 Top = 6 - Width = 137 + Width = 142 BorderSpacing.Left = 6 BorderSpacing.Top = 6 BorderSpacing.Bottom = 6 @@ -106,10 +107,10 @@ object CodeBrowserView: TCodeBrowserView AnchorSideLeft.Control = ShowPrivateCheckBox AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = ShowPrivateCheckBox - Left = 167 - Height = 19 + Left = 172 + Height = 18 Top = 6 - Width = 152 + Width = 156 BorderSpacing.Left = 24 Caption = 'ShowProtectedCheckBox' OnChange = ShowPrivateCheckBoxChange @@ -121,10 +122,10 @@ object CodeBrowserView: TCodeBrowserView AnchorSideTop.Control = ShowPrivateCheckBox AnchorSideRight.Control = OptionsGroupBox AnchorSideRight.Side = asrBottom - Left = 343 - Height = 19 + Left = 352 + Height = 18 Top = 6 - Width = 169 + Width = 174 BorderSpacing.Left = 24 Caption = 'ShowEmptyNodesCheckBox' OnEditingDone = ShowPrivateCheckBoxChange @@ -135,8 +136,8 @@ object CodeBrowserView: TCodeBrowserView AnchorSideTop.Control = OptionsGroupBox AnchorSideTop.Side = asrBottom Left = 6 - Height = 269 - Top = 245 + Height = 284 + Top = 234 Width = 633 Align = alBottom Anchors = [akTop, akLeft, akRight, akBottom] @@ -154,8 +155,8 @@ object CodeBrowserView: TCodeBrowserView end object StatusBar1: TStatusBar Left = 0 - Height = 23 - Top = 540 + Height = 19 + Top = 544 Width = 645 Panels = <> end @@ -166,14 +167,14 @@ object CodeBrowserView: TCodeBrowserView AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom Left = 6 - Height = 113 - Top = 69 + Height = 102 + Top = 66 Width = 633 Anchors = [akTop, akLeft, akRight] AutoSize = True BorderSpacing.Around = 6 Caption = 'LevelsGroupBox' - ClientHeight = 93 + ClientHeight = 84 ClientWidth = 629 TabOrder = 1 object PackageFilterBeginsSpeedButton: TSpeedButton @@ -184,7 +185,7 @@ object CodeBrowserView: TCodeBrowserView AnchorSideBottom.Control = PackageFilterEdit AnchorSideBottom.Side = asrBottom Left = 451 - Height = 23 + Height = 20 Top = 6 Width = 86 Anchors = [akTop, akRight, akBottom] @@ -202,7 +203,7 @@ object CodeBrowserView: TCodeBrowserView AnchorSideBottom.Control = PackageFilterEdit AnchorSideBottom.Side = asrBottom Left = 537 - Height = 23 + Height = 20 Top = 6 Width = 86 Anchors = [akTop, akRight, akBottom] @@ -220,8 +221,8 @@ object CodeBrowserView: TCodeBrowserView AnchorSideBottom.Control = UnitFilterEdit AnchorSideBottom.Side = asrBottom Left = 451 - Height = 23 - Top = 35 + Height = 20 + Top = 32 Width = 86 Anchors = [akTop, akRight, akBottom] GroupIndex = 2 @@ -238,8 +239,8 @@ object CodeBrowserView: TCodeBrowserView AnchorSideBottom.Control = UnitFilterEdit AnchorSideBottom.Side = asrBottom Left = 537 - Height = 23 - Top = 35 + Height = 20 + Top = 32 Width = 86 Anchors = [akTop, akRight, akBottom] BorderSpacing.Right = 6 @@ -256,8 +257,8 @@ object CodeBrowserView: TCodeBrowserView AnchorSideBottom.Control = IdentifierFilterEdit AnchorSideBottom.Side = asrBottom Left = 451 - Height = 23 - Top = 64 + Height = 20 + Top = 58 Width = 86 Anchors = [akTop, akRight, akBottom] GroupIndex = 3 @@ -274,8 +275,8 @@ object CodeBrowserView: TCodeBrowserView AnchorSideBottom.Control = IdentifierFilterEdit AnchorSideBottom.Side = asrBottom Left = 537 - Height = 23 - Top = 64 + Height = 20 + Top = 58 Width = 86 Anchors = [akTop, akRight, akBottom] BorderSpacing.Right = 6 @@ -289,9 +290,9 @@ object CodeBrowserView: TCodeBrowserView AnchorSideTop.Control = PackageFilterEdit AnchorSideTop.Side = asrCenter Left = 6 - Height = 19 - Top = 8 - Width = 150 + Height = 18 + Top = 7 + Width = 158 BorderSpacing.Left = 6 BorderSpacing.Top = 6 Caption = 'ShowPackagesCheckBox' @@ -303,9 +304,9 @@ object CodeBrowserView: TCodeBrowserView AnchorSideTop.Control = UnitFilterEdit AnchorSideTop.Side = asrCenter Left = 6 - Height = 19 - Top = 37 - Width = 128 + Height = 18 + Top = 33 + Width = 132 BorderSpacing.Left = 6 Caption = 'ShowUnitsCheckBox' OnChange = ShowUnitsCheckBoxChange @@ -316,9 +317,9 @@ object CodeBrowserView: TCodeBrowserView AnchorSideTop.Control = IdentifierFilterEdit AnchorSideTop.Side = asrCenter Left = 6 - Height = 19 - Top = 66 - Width = 153 + Height = 18 + Top = 59 + Width = 157 BorderSpacing.Left = 6 BorderSpacing.Bottom = 6 Caption = 'ShowIdentifiersCheckBox' @@ -329,7 +330,7 @@ object CodeBrowserView: TCodeBrowserView AnchorSideTop.Control = LevelsGroupBox AnchorSideRight.Control = PackageFilterBeginsSpeedButton Left = 250 - Height = 23 + Height = 20 Top = 6 Width = 201 Anchors = [akTop, akRight] @@ -344,8 +345,8 @@ object CodeBrowserView: TCodeBrowserView AnchorSideTop.Side = asrBottom AnchorSideRight.Control = UnitFilterBeginsSpeedButton Left = 250 - Height = 23 - Top = 35 + Height = 20 + Top = 32 Width = 201 Anchors = [akTop, akRight] BorderSpacing.Top = 6 @@ -359,8 +360,8 @@ object CodeBrowserView: TCodeBrowserView AnchorSideTop.Side = asrBottom AnchorSideRight.Control = IdentifierFilterBeginsSpeedButton Left = 250 - Height = 23 - Top = 64 + Height = 20 + Top = 58 Width = 201 Anchors = [akTop, akRight] BorderSpacing.Top = 6 @@ -374,7 +375,7 @@ object CodeBrowserView: TCodeBrowserView object ProgressBar1: TProgressBar Left = 0 Height = 20 - Top = 520 + Top = 524 Width = 645 Align = alBottom Max = 10000 diff --git a/ide/codebrowser.pas b/ide/codebrowser.pas index 925cb13fa4..c62621d683 100644 --- a/ide/codebrowser.pas +++ b/ide/codebrowser.pas @@ -220,6 +220,7 @@ type UnitFilterEdit: TEdit; procedure BrowseTreeViewMouseMove(Sender: TObject; {%H-}Shift: TShiftState; {%H-}X, {%H-}Y: Integer); + procedure FormActivate(Sender: TObject); procedure FormDeactivate(Sender: TObject); procedure UseIdentifierInCurUnitMenuItemClick(Sender: TObject); procedure UsePkgInCurUnitMenuItemClick(Sender: TObject); @@ -801,6 +802,11 @@ begin end; end; +procedure TCodeBrowserView.FormActivate(Sender: TObject); +begin + ScopeComboBox.DropDownCount:=EnvironmentOptions.DropDownCount; +end; + procedure TCodeBrowserView.SetIdleConnected(AValue: boolean); begin if csDestroying in ComponentState then AValue:=false; diff --git a/ide/codetoolsdefpreview.pas b/ide/codetoolsdefpreview.pas index bce437c9ab..3a906e59f8 100644 --- a/ide/codetoolsdefpreview.pas +++ b/ide/codetoolsdefpreview.pas @@ -43,7 +43,7 @@ uses // IdeIntf IDEWindowIntf, IDEHelpIntf, // IDE - EditorOptions, LazarusIDEStrConsts, InputHistory, CodeToolsOptions, IDEProcs; + EditorOptions, LazarusIDEStrConsts, InputHistory, CodeToolsOptions, IDEProcs, EnvironmentOpts; type TCodeToolsDefinesNodeValues = class @@ -478,6 +478,7 @@ begin ReportTabSheet.Caption:=dlgReport; PageControl1.PageIndex:=0; + DirectoryCombobox.DropDownCount:=EnvironmentOptions.DropDownCount; end; procedure TCodeToolsDefinesDialog.CodeToolsDefinesDialogCLOSE(Sender: TObject; diff --git a/ide/desktopmanager.pas b/ide/desktopmanager.pas index ff89fb00cd..9ad0f47149 100644 --- a/ide/desktopmanager.pas +++ b/ide/desktopmanager.pas @@ -412,6 +412,7 @@ begin xIndex := DesktopListBox.Items.IndexOf(EnvironmentOptions.ActiveDesktopName); if xIndex >= 0 then DesktopListBox.ItemIndex := xIndex; + AssociatedDebugDesktopComboBox.DropDownCount := EnvironmentOptions.DropDownCount; end; procedure TDesktopForm.HelpButtonClick(Sender: TObject); diff --git a/ide/diffdialog.lfm b/ide/diffdialog.lfm index 5487619670..21ef3d1f12 100644 --- a/ide/diffdialog.lfm +++ b/ide/diffdialog.lfm @@ -1,20 +1,21 @@ object DiffDlg: TDiffDlg - Left = 220 + Left = 873 Height = 576 - Top = 72 + Top = 301 Width = 598 HelpType = htKeyword BorderIcons = [biSystemMenu] Caption = 'Compare files' ClientHeight = 576 ClientWidth = 598 + OnCreate = FormCreate Position = poScreenCenter - LCLVersion = '1.7' + LCLVersion = '2.1.0.0' object Text1GroupBox: TGroupBox AnchorSideLeft.Control = Owner AnchorSideTop.Control = Owner Left = 6 - Height = 57 + Height = 54 Top = 6 Width = 586 Align = alTop @@ -22,7 +23,7 @@ object DiffDlg: TDiffDlg AutoSize = True BorderSpacing.Around = 6 Caption = 'Text1GroupBox' - ClientHeight = 38 + ClientHeight = 36 ClientWidth = 582 TabOrder = 0 object Text1Combobox: TComboBox @@ -30,14 +31,14 @@ object DiffDlg: TDiffDlg AnchorSideTop.Control = Text1GroupBox AnchorSideRight.Control = Text1FileOpenButton Left = 6 - Height = 29 + Height = 23 Top = 6 - Width = 299 + Width = 342 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 BorderSpacing.Top = 6 BorderSpacing.Right = 6 - ItemHeight = 0 + ItemHeight = 14 OnChange = Text1ComboboxChange TabOrder = 0 Text = 'Text1Combobox' @@ -47,10 +48,10 @@ object DiffDlg: TDiffDlg AnchorSideTop.Side = asrCenter AnchorSideRight.Control = Text1GroupBox AnchorSideRight.Side = asrBottom - Left = 355 - Height = 24 + Left = 398 + Height = 18 Top = 8 - Width = 221 + Width = 178 Anchors = [akTop, akRight] BorderSpacing.Top = 6 BorderSpacing.Right = 6 @@ -64,8 +65,8 @@ object DiffDlg: TDiffDlg AnchorSideRight.Control = Text1OnlySelectionCheckBox AnchorSideBottom.Control = Text1Combobox AnchorSideBottom.Side = asrBottom - Left = 311 - Height = 29 + Left = 354 + Height = 23 Top = 6 Width = 32 Anchors = [akTop, akRight, akBottom] @@ -78,14 +79,14 @@ object DiffDlg: TDiffDlg object Text2GroupBox: TGroupBox AnchorSideTop.Control = Text1GroupBox Left = 6 - Height = 57 - Top = 69 + Height = 54 + Top = 66 Width = 586 Align = alTop AutoSize = True BorderSpacing.Around = 6 Caption = 'Text2GroupBox' - ClientHeight = 38 + ClientHeight = 36 ClientWidth = 582 TabOrder = 1 object Text2Combobox: TComboBox @@ -93,14 +94,14 @@ object DiffDlg: TDiffDlg AnchorSideTop.Control = Text2GroupBox AnchorSideRight.Control = Text2FileOpenButton Left = 6 - Height = 29 + Height = 23 Top = 6 - Width = 299 + Width = 342 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 BorderSpacing.Top = 6 BorderSpacing.Right = 6 - ItemHeight = 0 + ItemHeight = 14 OnChange = Text2ComboboxChange TabOrder = 0 Text = 'Text2Combobox' @@ -110,10 +111,10 @@ object DiffDlg: TDiffDlg AnchorSideTop.Side = asrCenter AnchorSideRight.Control = Text2GroupBox AnchorSideRight.Side = asrBottom - Left = 355 - Height = 24 + Left = 398 + Height = 18 Top = 8 - Width = 221 + Width = 178 Anchors = [akTop, akRight] BorderSpacing.Top = 6 BorderSpacing.Right = 6 @@ -127,8 +128,8 @@ object DiffDlg: TDiffDlg AnchorSideRight.Control = Text2OnlySelectionCheckBox AnchorSideBottom.Control = Text2Combobox AnchorSideBottom.Side = asrBottom - Left = 311 - Height = 29 + Left = 354 + Height = 23 Top = 6 Width = 32 Anchors = [akTop, akRight, akBottom] @@ -147,7 +148,7 @@ object DiffDlg: TDiffDlg AnchorSideBottom.Control = ProgressBar1 Left = 6 Height = 197 - Top = 308 + Top = 311 Width = 586 Anchors = [akLeft, akRight, akBottom] AutoFill = True @@ -169,8 +170,8 @@ object DiffDlg: TDiffDlg AnchorSideRight.Control = Owner AnchorSideBottom.Control = OptionsGroupBox Left = 6 - Height = 170 - Top = 132 + Height = 179 + Top = 126 Width = 586 Align = alTop BorderSpacing.Around = 6 @@ -704,10 +705,10 @@ object DiffDlg: TDiffDlg AnchorSideRight.Control = CloseButton AnchorSideBottom.Control = Owner AnchorSideBottom.Side = asrBottom - Left = 369 - Height = 29 - Top = 541 - Width = 148 + Left = 402 + Height = 24 + Top = 546 + Width = 116 Anchors = [akRight, akBottom] AutoSize = True BorderSpacing.Around = 6 @@ -720,10 +721,10 @@ object DiffDlg: TDiffDlg AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = Owner AnchorSideBottom.Side = asrBottom - Left = 523 - Height = 29 - Top = 541 - Width = 69 + Left = 524 + Height = 26 + Top = 544 + Width = 68 Anchors = [akRight, akBottom] AutoSize = True BorderSpacing.Around = 6 @@ -738,9 +739,9 @@ object DiffDlg: TDiffDlg AnchorSideBottom.Control = Owner AnchorSideBottom.Side = asrBottom Left = 6 - Height = 29 - Top = 541 - Width = 63 + Height = 26 + Top = 544 + Width = 62 Anchors = [akLeft, akBottom] AutoSize = True BorderSpacing.Around = 6 @@ -756,8 +757,8 @@ object DiffDlg: TDiffDlg AnchorSideBottom.Control = CloseButton Left = 6 Height = 24 - Top = 511 - Width = 462 + Top = 514 + Width = 479 Anchors = [akLeft, akRight, akBottom] BorderSpacing.Around = 6 Step = 0 @@ -768,10 +769,10 @@ object DiffDlg: TDiffDlg AnchorSideTop.Side = asrCenter AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom - Left = 474 - Height = 29 - Top = 509 - Width = 118 + Left = 491 + Height = 24 + Top = 514 + Width = 101 Anchors = [akTop, akRight] AutoSize = True BorderSpacing.Around = 6 @@ -786,12 +787,12 @@ object DiffDlg: TDiffDlg Filter = 'pascal files|*.pas;*.pp|any file|*.*' FilterIndex = 0 Options = [ofPathMustExist, ofFileMustExist, ofEnableSizing, ofViewDetail] - left = 176 - top = 48 + Left = 176 + Top = 48 end object SynDiffSyn1: TSynDiffSyn Enabled = False - left = 104 - top = 240 + Left = 104 + Top = 240 end end diff --git a/ide/diffdialog.pas b/ide/diffdialog.pas index e33d6362da..eccc9e6464 100644 --- a/ide/diffdialog.pas +++ b/ide/diffdialog.pas @@ -49,7 +49,7 @@ uses // IdeIntf IDEWindowIntf, IDEHelpIntf, IDEImagesIntf, // IDE - LazarusIDEStrConsts, EditorOptions, InputHistory, DiffPatch, SourceEditor; + LazarusIDEStrConsts, EditorOptions, InputHistory, DiffPatch, SourceEditor, EnvironmentOpts; type @@ -127,6 +127,7 @@ type procedure CancelScanningButtonClick(Sender: TObject); procedure FileOpenClick(Sender: TObject); + procedure FormCreate(Sender: TObject); procedure HelpButtonClick(Sender: TObject); procedure OnChangeFlag(Sender: TObject); procedure Text1ComboboxChange(Sender: TObject); @@ -474,6 +475,12 @@ begin Text2Combobox.Items.EndUpdate; end; +procedure TDiffDlg.FormCreate(Sender: TObject); +begin + Text1Combobox.DropDownCount:=EnvironmentOptions.DropDownCount; + Text2Combobox.DropDownCount:=EnvironmentOptions.DropDownCount; +end; + procedure TDiffDlg.SaveSettings; begin InputHistories.DiffFlags:=GetDiffOptions; diff --git a/ide/encloseifdef.pas b/ide/encloseifdef.pas index 9d202859c4..8542cb625d 100644 --- a/ide/encloseifdef.pas +++ b/ide/encloseifdef.pas @@ -54,7 +54,7 @@ interface uses Classes, SysUtils, Controls, Forms, StdCtrls, Buttons, ButtonPanel, LCLProc, LCLType, LazConf, LazFileUtils, Laz2_XMLCfg, LazFileCache, - IDEHelpIntf, IDEImagesIntf, LazarusIDEStrConsts; + IDEHelpIntf, IDEImagesIntf, LazarusIDEStrConsts, EnvironmentOpts; type @@ -266,6 +266,8 @@ begin end else ItemIndex := i; end; + FirstTest.DropDownCount := EnvironmentOptions.DropDownCount; + SecondTest.DropDownCount := EnvironmentOptions.DropDownCount; end; procedure TEncloseIfDefForm.FormShow(Sender: TObject); diff --git a/ide/environmentopts.pp b/ide/environmentopts.pp index 8d5a9a94a0..8b93eb4415 100644 --- a/ide/environmentopts.pp +++ b/ide/environmentopts.pp @@ -85,6 +85,8 @@ const DefaultGuideLineColorLeftTop = clBlue; DefaultGuideLineColorRightBottom = clGreen; + DefaultDropDownCount = 8; + //---------------------------------------------------------------------------- { Backup } @@ -565,6 +567,9 @@ type FLastSavedProjectFile: string; FLastOpenPackages: TLastOpenPackagesList;//list of filenames with open packages + // comboboxes + FDropDownCount: Integer; + // designer FCreateComponentFocusNameProperty: boolean; FSwitchToFavoritesOITab: boolean; @@ -740,8 +745,7 @@ type procedure SaveNonDesktop(Path: String); procedure SetCompilerFilename(const AValue: string); procedure SetCompilerMessagesFilename(AValue: string); - procedure SetCurrentDebuggerPropertiesOpt(AValue: TDebuggerPropertiesConfig - ); + procedure SetCurrentDebuggerPropertiesOpt(AValue: TDebuggerPropertiesConfig); procedure SetDebuggerEventLogColors(AIndex: TDBGEventType; const AValue: TDebuggerEventLogColor); procedure SetDebuggerSearchPath(const AValue: string); @@ -1039,7 +1043,8 @@ type // glyphs property ShowButtonGlyphs: TApplicationShowGlyphs read FShowButtonGlyphs write FShowButtonGlyphs; property ShowMenuGlyphs: TApplicationShowGlyphs read FShowMenuGlyphs write FShowMenuGlyphs; - + // comboboxes + property DropDownCount: Integer read FDropDownCount write FDropDownCount; // default template for each 'new item' category: Name=Path, Value=TemplateName property NewUnitTemplate: string read FNewUnitTemplate write FNewUnitTemplate; property NewFormTemplate: string read FNewFormTemplate write FNewFormTemplate; @@ -2150,6 +2155,9 @@ begin FShowButtonGlyphs := sbgSystem; FShowMenuGlyphs := sbgSystem; + // comboboxes + FDropDownCount:=DefaultDropDownCount; + // files LazarusDirectory:=''; FLazarusDirHistory:=TStringList.Create; @@ -2643,6 +2651,9 @@ begin FShowMenuGlyphs := TApplicationShowGlyphs(FXMLCfg.GetValue(Path+'ShowMenuGlyphs/Value', Ord(sbgSystem))); + // comboboxes + FDropDownCount:=FXMLCfg.GetValue(Path+'ComboBoxes/DropDownCount',DefaultDropDownCount); + // recent files and directories FMaxRecentOpenFiles:=FXMLCfg.GetValue(Path+'Recent/OpenFiles/Max',DefaultMaxRecentOpenFiles); LoadRecentList(FXMLCfg,FRecentOpenFiles,Path+'Recent/OpenFiles/',rltFile); @@ -3005,6 +3016,9 @@ begin FXMLCfg.SetDeleteValue(Path+'ShowButtonGlyphs/Value',Ord(FShowButtonGlyphs), Ord(sbgSystem)); FXMLCfg.SetDeleteValue(Path+'ShowMenuGlyphs/Value',Ord(FShowMenuGlyphs), Ord(sbgSystem)); + // comboboxes + FXMLCfg.SetDeleteValue(Path+'ComboBoxes/DropDownCount',FDropDownCount,DefaultDropDownCount); + // recent files and directories FXMLCfg.SetDeleteValue(Path+'Recent/OpenFiles/Max',FMaxRecentOpenFiles,DefaultMaxRecentOpenFiles); SaveRecentList(FXMLCfg,FRecentOpenFiles,Path+'Recent/OpenFiles/',FMaxRecentOpenFiles); diff --git a/ide/findinfilesdlg.lfm b/ide/findinfilesdlg.lfm index 6f48b19e0b..4ad44268ba 100644 --- a/ide/findinfilesdlg.lfm +++ b/ide/findinfilesdlg.lfm @@ -12,6 +12,7 @@ object LazFindInFilesDialog: TLazFindInFilesDialog Constraints.MinWidth = 400 OnClose = FormClose OnCreate = FormCreate + OnShow = FormShow LCLVersion = '2.1.0.0' object OptionsCheckGroupBox: TCheckGroup AnchorSideLeft.Control = Owner @@ -20,8 +21,8 @@ object LazFindInFilesDialog: TLazFindInFilesDialog AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom Left = 6 - Height = 83 - Top = 72 + Height = 72 + Top = 64 Width = 449 Anchors = [akTop, akLeft, akRight] AutoFill = True @@ -38,7 +39,7 @@ object LazFindInFilesDialog: TLazFindInFilesDialog ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 2 - ClientHeight = 66 + ClientHeight = 54 ClientWidth = 445 Columns = 2 Items.Strings = ( @@ -59,8 +60,8 @@ object LazFindInFilesDialog: TLazFindInFilesDialog AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom Left = 6 - Height = 83 - Top = 161 + Height = 72 + Top = 142 Width = 449 Anchors = [akTop, akLeft, akRight] AutoFill = True @@ -77,7 +78,7 @@ object LazFindInFilesDialog: TLazFindInFilesDialog ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 2 - ClientHeight = 66 + ClientHeight = 54 ClientWidth = 445 Columns = 2 ItemIndex = 1 @@ -97,14 +98,14 @@ object LazFindInFilesDialog: TLazFindInFilesDialog AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom Left = 6 - Height = 125 - Top = 250 + Height = 114 + Top = 220 Width = 449 Anchors = [akTop, akLeft, akRight] AutoSize = True BorderSpacing.Around = 6 Caption = 'Directories' - ClientHeight = 108 + ClientHeight = 96 ClientWidth = 445 Enabled = False TabOrder = 5 @@ -113,9 +114,9 @@ object LazFindInFilesDialog: TLazFindInFilesDialog AnchorSideTop.Control = DirectoriesComboBox AnchorSideTop.Side = asrCenter Left = 6 - Height = 15 - Top = 12 - Width = 65 + Height = 14 + Top = 10 + Width = 62 BorderSpacing.Left = 6 Caption = 'Directories:' FocusControl = DirectoriesComboBox @@ -126,9 +127,9 @@ object LazFindInFilesDialog: TLazFindInFilesDialog AnchorSideTop.Control = DirectoriesComboBox AnchorSideTop.Side = asrBottom Left = 6 - Height = 15 - Top = 45 - Width = 49 + Height = 14 + Top = 41 + Width = 54 BorderSpacing.Left = 6 BorderSpacing.Top = 12 Caption = 'File mask' @@ -140,15 +141,15 @@ object LazFindInFilesDialog: TLazFindInFilesDialog AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = DirectoriesOptionsGroupBox AnchorSideRight.Control = DirectoriesBrowse - Left = 77 - Height = 27 + Left = 74 + Height = 23 Top = 6 - Width = 331 + Width = 334 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 BorderSpacing.Top = 6 BorderSpacing.Right = 6 - ItemHeight = 0 + ItemHeight = 14 ParentShowHint = False ShowHint = True TabOrder = 0 @@ -176,13 +177,13 @@ object LazFindInFilesDialog: TLazFindInFilesDialog AnchorSideTop.Side = asrCenter AnchorSideRight.Control = DirectoriesComboBox AnchorSideRight.Side = asrBottom - Left = 61 - Height = 27 - Top = 39 - Width = 347 + Left = 66 + Height = 23 + Top = 37 + Width = 342 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 - ItemHeight = 0 + ItemHeight = 14 TabOrder = 2 Text = '*.pas;*.pp;*.inc' end @@ -191,9 +192,9 @@ object LazFindInFilesDialog: TLazFindInFilesDialog AnchorSideTop.Control = FileMaskComboBox AnchorSideTop.Side = asrBottom Left = 6 - Height = 24 - Top = 78 - Width = 151 + Height = 18 + Top = 72 + Width = 140 BorderSpacing.Left = 6 BorderSpacing.Top = 12 BorderSpacing.Bottom = 6 @@ -205,8 +206,8 @@ object LazFindInFilesDialog: TLazFindInFilesDialog end object ButtonPanel1: TButtonPanel Left = 6 - Height = 28 - Top = 403 + Height = 26 + Top = 405 Width = 449 OKButton.Name = 'OKButton' OKButton.DefaultCaption = True @@ -230,10 +231,10 @@ object LazFindInFilesDialog: TLazFindInFilesDialog AnchorSideTop.Side = asrBottom AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom - Left = 82 - Height = 27 - Top = 39 - Width = 373 + Left = 76 + Height = 23 + Top = 35 + Width = 379 Anchors = [akTop, akLeft, akRight] AutoComplete = True AutoCompleteText = [cbactEnabled, cbactEndOfLineComplete, cbactRetainPrefixCase, cbactSearchAscending] @@ -242,7 +243,7 @@ object LazFindInFilesDialog: TLazFindInFilesDialog BorderSpacing.Right = 6 BorderSpacing.Bottom = 6 Enabled = False - ItemHeight = 0 + ItemHeight = 14 TabOrder = 2 end object ReplaceCheckBox: TCheckBox @@ -250,9 +251,9 @@ object LazFindInFilesDialog: TLazFindInFilesDialog AnchorSideTop.Control = ReplaceTextComboBox AnchorSideTop.Side = asrCenter Left = 6 - Height = 24 - Top = 40 - Width = 70 + Height = 18 + Top = 37 + Width = 64 BorderSpacing.Left = 6 Caption = 'Replace' Enabled = False @@ -264,9 +265,9 @@ object LazFindInFilesDialog: TLazFindInFilesDialog AnchorSideTop.Control = TextToFindComboBox AnchorSideTop.Side = asrCenter Left = 6 - Height = 15 - Top = 12 - Width = 69 + Height = 14 + Top = 10 + Width = 70 BorderSpacing.Left = 6 Caption = 'Text To Find:' FocusControl = TextToFindComboBox @@ -278,23 +279,23 @@ object LazFindInFilesDialog: TLazFindInFilesDialog AnchorSideTop.Control = Owner AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom - Left = 81 - Height = 27 + Left = 82 + Height = 23 Top = 6 - Width = 374 + Width = 373 Anchors = [akTop, akLeft, akRight] AutoComplete = True AutoCompleteText = [cbactEnabled, cbactEndOfLineComplete, cbactRetainPrefixCase, cbactSearchAscending] BorderSpacing.Left = 6 BorderSpacing.Top = 6 BorderSpacing.Right = 6 - ItemHeight = 0 + ItemHeight = 14 TabOrder = 0 end object SelectDirectoryDialog: TSelectDirectoryDialog FilterIndex = 0 Options = [ofFileMustExist, ofEnableSizing, ofViewDetail] - left = 180 - top = 70 + Left = 180 + Top = 70 end end diff --git a/ide/findinfilesdlg.pas b/ide/findinfilesdlg.pas index c4288370bf..d448a01a87 100644 --- a/ide/findinfilesdlg.pas +++ b/ide/findinfilesdlg.pas @@ -31,7 +31,7 @@ uses ProjectGroupIntf, // IDE LazarusIDEStrConsts, InputHistory, InputhistoryWithSearchOpt, EditorOptions, Project, - IDEProcs, SearchFrm, SearchResultView; + IDEProcs, SearchFrm, SearchResultView, EnvironmentOpts; type { TLazFindInFilesDialog } @@ -55,6 +55,7 @@ type procedure DirectoriesBrowseClick(Sender: TObject); procedure FormClose(Sender: TObject; var {%H-}CloseAction: TCloseAction); procedure FormCreate(Sender: TObject); + procedure FormShow(Sender: TObject); procedure HelpButtonClick(Sender: TObject); procedure OKButtonClick(Sender : TObject); procedure ReplaceCheckBoxChange(Sender: TObject); @@ -214,6 +215,14 @@ begin IDEDialogLayoutList.ApplyLayout(Self); end; +procedure TLazFindInFilesDialog.FormShow(Sender: TObject); +begin + TextToFindComboBox.DropDownCount:=EnvironmentOptions.DropDownCount; + ReplaceTextComboBox.DropDownCount:=EnvironmentOptions.DropDownCount; + DirectoriesComboBox.DropDownCount:=EnvironmentOptions.DropDownCount; + FileMaskComboBox.DropDownCount:=EnvironmentOptions.DropDownCount; +end; + procedure TLazFindInFilesDialog.HelpButtonClick(Sender: TObject); begin LazarusHelp.ShowHelpForIDEControl(Self); diff --git a/ide/findreplacedialog.lfm b/ide/findreplacedialog.lfm index d4d0f0e6a6..8181f1a6ed 100644 --- a/ide/findreplacedialog.lfm +++ b/ide/findreplacedialog.lfm @@ -1,7 +1,7 @@ object LazFindReplaceDialog: TLazFindReplaceDialog - Left = 415 + Left = 425 Height = 367 - Top = 463 + Top = 322 Width = 487 ActiveControl = TextToFindComboBox BorderIcons = [biSystemMenu] @@ -13,15 +13,16 @@ object LazFindReplaceDialog: TLazFindReplaceDialog KeyPreview = True OnChangeBounds = FormChangeBounds OnClose = FormClose - LCLVersion = '1.9.0.0' + OnShow = FormShow + LCLVersion = '2.1.0.0' object TextToFindLabel: TLabel AnchorSideLeft.Control = Owner AnchorSideTop.Control = TextToFindComboBox AnchorSideTop.Side = asrCenter Left = 6 - Height = 15 + Height = 14 Top = 16 - Width = 85 + Width = 88 Alignment = taRightJustify BorderSpacing.Left = 6 Caption = 'TextToFindLabel' @@ -51,9 +52,9 @@ object LazFindReplaceDialog: TLazFindReplaceDialog AnchorSideTop.Control = ReplaceTextComboBox AnchorSideTop.Side = asrCenter Left = 6 - Height = 19 + Height = 18 Top = 43 - Width = 138 + Width = 142 BorderSpacing.Left = 6 Caption = 'ReplaceWithCheckbox' OnChange = ReplaceWithCheckboxChange @@ -63,15 +64,15 @@ object LazFindReplaceDialog: TLazFindReplaceDialog AnchorSideLeft.Control = TextToFindLabel AnchorSideLeft.Side = asrBottom AnchorSideRight.Control = EnableAutoCompleteSpeedButton - Left = 97 + Left = 100 Height = 23 Top = 12 - Width = 361 + Width = 358 Anchors = [akTop, akLeft, akRight] AutoComplete = True AutoCompleteText = [cbactEnabled, cbactEndOfLineComplete, cbactRetainPrefixCase, cbactSearchAscending] BorderSpacing.Left = 6 - ItemHeight = 15 + ItemHeight = 14 OnKeyDown = TextToFindComboboxKeyDown TabOrder = 0 Text = 'TextToFindComboBox' @@ -83,16 +84,16 @@ object LazFindReplaceDialog: TLazFindReplaceDialog AnchorSideTop.Side = asrBottom AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom - Left = 156 + Left = 160 Height = 23 Top = 41 - Width = 325 + Width = 321 Anchors = [akTop, akLeft, akRight] AutoComplete = True AutoCompleteText = [cbactEnabled, cbactEndOfLineComplete, cbactRetainPrefixCase, cbactSearchAscending] BorderSpacing.Left = 6 BorderSpacing.Around = 6 - ItemHeight = 15 + ItemHeight = 14 OnKeyDown = TextToFindComboboxKeyDown TabOrder = 2 Text = 'ReplaceTextComboBox' @@ -104,21 +105,21 @@ object LazFindReplaceDialog: TLazFindReplaceDialog AnchorSideBottom.Control = DirectionGroupBox AnchorSideBottom.Side = asrBottom Left = 6 - Height = 186 + Height = 174 Top = 70 Width = 231 Anchors = [akTop, akLeft, akBottom] BorderSpacing.Left = 6 BorderSpacing.Top = 6 Caption = 'OptionsGroupBox' - ClientHeight = 166 + ClientHeight = 156 ClientWidth = 227 TabOrder = 3 OnResize = OptionsGroupBoxResize object PromptOnReplaceCheckBox: TCheckBox Left = 6 - Height = 19 - Top = 124 + Height = 18 + Top = 120 Width = 215 Align = alTop BorderSpacing.Top = 3 @@ -132,8 +133,8 @@ object LazFindReplaceDialog: TLazFindReplaceDialog end object MultiLineCheckBox: TCheckBox Left = 6 - Height = 19 - Top = 96 + Height = 18 + Top = 93 Width = 215 Align = alTop BorderSpacing.Top = 3 @@ -145,8 +146,8 @@ object LazFindReplaceDialog: TLazFindReplaceDialog end object RegularExpressionsCheckBox: TCheckBox Left = 6 - Height = 19 - Top = 68 + Height = 18 + Top = 66 Width = 215 Align = alTop BorderSpacing.Top = 3 @@ -158,8 +159,8 @@ object LazFindReplaceDialog: TLazFindReplaceDialog end object WholeWordsOnlyCheckBox: TCheckBox Left = 6 - Height = 19 - Top = 40 + Height = 18 + Top = 39 Width = 215 Align = alTop BorderSpacing.Top = 3 @@ -171,7 +172,7 @@ object LazFindReplaceDialog: TLazFindReplaceDialog end object CaseSensitiveCheckBox: TCheckBox Left = 6 - Height = 19 + Height = 18 Top = 12 Width = 215 Align = alTop @@ -191,8 +192,8 @@ object LazFindReplaceDialog: TLazFindReplaceDialog AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom Left = 243 - Height = 58 - Top = 134 + Height = 54 + Top = 130 Width = 238 Anchors = [akTop, akLeft, akRight] AutoSize = True @@ -205,12 +206,12 @@ object LazFindReplaceDialog: TLazFindReplaceDialog ChildSizing.ShrinkVertical = crsHomogenousSpaceResize ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 1 - ClientHeight = 38 + ClientHeight = 36 ClientWidth = 234 TabOrder = 5 object SelectedRadioButton: TRadioButton Left = 6 - Height = 19 + Height = 18 Top = 0 Width = 222 Caption = 'SelectedRadioButton' @@ -218,8 +219,8 @@ object LazFindReplaceDialog: TLazFindReplaceDialog end object GlobalRadioButton: TRadioButton Left = 6 - Height = 19 - Top = 19 + Height = 18 + Top = 18 Width = 222 Caption = 'GlobalRadioButton' Checked = True @@ -235,8 +236,8 @@ object LazFindReplaceDialog: TLazFindReplaceDialog AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom Left = 243 - Height = 58 - Top = 198 + Height = 54 + Top = 190 Width = 238 Anchors = [akTop, akLeft, akRight] AutoSize = True @@ -249,12 +250,12 @@ object LazFindReplaceDialog: TLazFindReplaceDialog ChildSizing.ShrinkVertical = crsHomogenousSpaceResize ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 1 - ClientHeight = 38 + ClientHeight = 36 ClientWidth = 234 TabOrder = 6 object BackwardRadioButton: TRadioButton Left = 6 - Height = 19 + Height = 18 Top = 0 Width = 222 Caption = 'BackwardRadioButton' @@ -262,8 +263,8 @@ object LazFindReplaceDialog: TLazFindReplaceDialog end object ForwardRadioButton: TRadioButton Left = 6 - Height = 19 - Top = 19 + Height = 18 + Top = 18 Width = 222 Caption = 'ForwardRadioButton' Checked = True @@ -279,7 +280,7 @@ object LazFindReplaceDialog: TLazFindReplaceDialog AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom Left = 243 - Height = 58 + Height = 54 Top = 70 Width = 238 Anchors = [akTop, akLeft, akRight] @@ -293,12 +294,12 @@ object LazFindReplaceDialog: TLazFindReplaceDialog ChildSizing.ShrinkVertical = crsHomogenousSpaceResize ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 1 - ClientHeight = 38 + ClientHeight = 36 ClientWidth = 234 TabOrder = 4 object FromCursorRadioButton: TRadioButton Left = 6 - Height = 19 + Height = 18 Top = 0 Width = 222 AutoSize = False @@ -309,8 +310,8 @@ object LazFindReplaceDialog: TLazFindReplaceDialog end object EntireScopeRadioButton: TRadioButton Left = 6 - Height = 19 - Top = 19 + Height = 18 + Top = 18 Width = 222 AutoSize = False Caption = 'EntireScopeRadioButton' diff --git a/ide/findreplacedialog.pp b/ide/findreplacedialog.pp index b30ebe1152..c87afd1040 100644 --- a/ide/findreplacedialog.pp +++ b/ide/findreplacedialog.pp @@ -36,7 +36,7 @@ uses Buttons, ExtCtrls, Dialogs, Graphics, ButtonPanel, SynEditTypes, SynEdit, IDEHelpIntf, IDEImagesIntf, IDEWindowIntf, IDEDialogs, - LazarusIdeStrConsts, InputHistory; + LazarusIdeStrConsts, InputHistory, EnvironmentOpts; type TFindDlgComponent = (fdcText, fdcReplace); @@ -76,6 +76,7 @@ type procedure EnableAutoCompleteSpeedButtonClick(Sender: TObject); procedure FormChangeBounds(Sender: TObject); procedure FormClose(Sender: TObject; var {%H-}CloseAction: TCloseAction); + procedure FormShow(Sender: TObject); procedure HelpButtonClick(Sender: TObject); procedure OptionsGroupBoxResize(Sender: TObject); procedure ReplaceWithCheckboxChange(Sender: TObject); @@ -204,6 +205,12 @@ begin IDEDialogLayoutList.SaveLayout(Self); end; +procedure TLazFindReplaceDialog.FormShow(Sender: TObject); +begin + TextToFindComboBox.DropDownCount:=EnvironmentOptions.DropDownCount; + ReplaceTextComboBox.DropDownCount:=EnvironmentOptions.DropDownCount; +end; + procedure TLazFindReplaceDialog.UpdateHints; begin if EnableAutoComplete then diff --git a/ide/frames/desktop_options.lfm b/ide/frames/desktop_options.lfm index fe30cf9ab0..d4e27a41d8 100644 --- a/ide/frames/desktop_options.lfm +++ b/ide/frames/desktop_options.lfm @@ -14,9 +14,9 @@ object DesktopOptionsFrame: TDesktopOptionsFrame AnchorSideTop.Control = AutoSaveProjectCheckBox AnchorSideTop.Side = asrBottom Left = 6 - Height = 15 - Top = 308 - Width = 150 + Height = 14 + Top = 294 + Width = 158 BorderSpacing.Left = 6 BorderSpacing.Top = 6 Caption = 'AutoSaveIntervalInSecsLabel' @@ -29,9 +29,9 @@ object DesktopOptionsFrame: TDesktopOptionsFrame AnchorSideTop.Control = PanelGlyphsButtonsOptions AnchorSideTop.Side = asrCenter Left = 6 - Height = 15 - Top = 166 - Width = 57 + Height = 14 + Top = 159 + Width = 61 BorderSpacing.Left = 6 Caption = 'lblButtons' Font.Style = [fsBold] @@ -43,9 +43,9 @@ object DesktopOptionsFrame: TDesktopOptionsFrame AnchorSideTop.Control = PanelGlyphsMenusOptions AnchorSideTop.Side = asrCenter Left = 6 - Height = 15 - Top = 188 - Width = 50 + Height = 14 + Top = 180 + Width = 53 BorderSpacing.Left = 6 Caption = 'lblMenus' Font.Style = [fsBold] @@ -57,9 +57,9 @@ object DesktopOptionsFrame: TDesktopOptionsFrame AnchorSideTop.Control = lblCheckAndAutoSave AnchorSideTop.Side = asrBottom Left = 6 - Height = 19 - Top = 226 - Width = 241 + Height = 18 + Top = 216 + Width = 247 BorderSpacing.Left = 6 Caption = 'CheckDiskChangesWithLoadingCheckBox' ParentShowHint = False @@ -71,9 +71,9 @@ object DesktopOptionsFrame: TDesktopOptionsFrame AnchorSideTop.Control = ShowHintsForMainSpeedButtonsCheckBox AnchorSideTop.Side = asrBottom Left = 6 - Height = 19 - Top = 121 - Width = 246 + Height = 18 + Top = 116 + Width = 250 BorderSpacing.Left = 6 Caption = 'ShowHintsForComponentPaletteCheckBox' TabOrder = 3 @@ -83,9 +83,9 @@ object DesktopOptionsFrame: TDesktopOptionsFrame AnchorSideTop.Control = lblHints AnchorSideTop.Side = asrBottom Left = 6 - Height = 19 - Top = 102 - Width = 246 + Height = 18 + Top = 98 + Width = 252 BorderSpacing.Left = 6 Caption = 'ShowHintsForMainSpeedButtonsCheckBox' TabOrder = 2 @@ -98,13 +98,13 @@ object DesktopOptionsFrame: TDesktopOptionsFrame AnchorSideRight.Side = asrBottom Left = 6 Height = 23 - Top = 18 + Top = 17 Width = 584 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 BorderSpacing.Top = 3 BorderSpacing.Right = 6 - ItemHeight = 15 + ItemHeight = 14 ParentShowHint = False ShowHint = True Style = csDropDownList @@ -118,12 +118,12 @@ object DesktopOptionsFrame: TDesktopOptionsFrame AnchorSideRight.Side = asrBottom Left = 6 Height = 23 - Top = 329 + Top = 314 Width = 584 Anchors = [akTop, akLeft, akRight] BorderSpacing.Around = 6 Enabled = False - ItemHeight = 15 + ItemHeight = 14 Items.Strings = ( '1200' '600' @@ -138,9 +138,9 @@ object DesktopOptionsFrame: TDesktopOptionsFrame AnchorSideTop.Control = AutoSaveEditorFilesCheckBox AnchorSideTop.Side = asrBottom Left = 6 - Height = 19 - Top = 283 - Width = 159 + Height = 18 + Top = 270 + Width = 164 BorderSpacing.Left = 6 Caption = 'AutoSaveProjectCheckBox' Enabled = False @@ -154,9 +154,9 @@ object DesktopOptionsFrame: TDesktopOptionsFrame AnchorSideTop.Control = AskSavingOnlySessionCheckBox AnchorSideTop.Side = asrBottom Left = 6 - Height = 19 - Top = 264 - Width = 176 + Height = 18 + Top = 252 + Width = 184 BorderSpacing.Left = 6 Caption = 'AutoSaveEditorFilesCheckBox' Enabled = False @@ -172,8 +172,8 @@ object DesktopOptionsFrame: TDesktopOptionsFrame AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom Left = 299 - Height = 25 - Top = 376 + Height = 24 + Top = 360 Width = 291 Anchors = [akTop, akLeft, akRight] AutoSize = True @@ -192,8 +192,8 @@ object DesktopOptionsFrame: TDesktopOptionsFrame AnchorSideTop.Side = asrBottom AnchorSideRight.Control = lblCenter Left = 6 - Height = 25 - Top = 376 + Height = 24 + Top = 360 Width = 287 Anchors = [akTop, akLeft, akRight] AutoSize = True @@ -214,10 +214,10 @@ object DesktopOptionsFrame: TDesktopOptionsFrame AnchorSideTop.Side = asrBottom AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom - Left = 69 - Height = 19 - Top = 164 - Width = 521 + Left = 73 + Height = 18 + Top = 157 + Width = 517 Anchors = [akTop, akLeft, akRight] AutoSize = True BorderSpacing.Left = 6 @@ -226,15 +226,15 @@ object DesktopOptionsFrame: TDesktopOptionsFrame BevelOuter = bvNone ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 3 - ClientHeight = 19 - ClientWidth = 521 + ClientHeight = 18 + ClientWidth = 517 TabOrder = 4 object rbBtnGlyphShowSystem: TRadioButton AnchorSideRight.Side = asrBottom Left = 0 - Height = 19 + Height = 18 Top = 0 - Width = 147 + Width = 150 Caption = 'rbBtnGlyphShowSystem' Checked = True TabOrder = 0 @@ -242,18 +242,18 @@ object DesktopOptionsFrame: TDesktopOptionsFrame end object rbBtnGlyphShowNever: TRadioButton AnchorSideLeft.Side = asrCenter - Left = 147 - Height = 19 + Left = 150 + Height = 18 Top = 0 - Width = 140 + Width = 142 Caption = 'rbBtnGlyphShowNever' TabOrder = 1 end object rbBtnGlyphShowAlways: TRadioButton - Left = 287 - Height = 19 + Left = 292 + Height = 18 Top = 0 - Width = 146 + Width = 148 Caption = 'rbBtnGlyphShowAlways' TabOrder = 2 end @@ -264,10 +264,10 @@ object DesktopOptionsFrame: TDesktopOptionsFrame AnchorSideTop.Side = asrBottom AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom - Left = 69 - Height = 19 - Top = 186 - Width = 521 + Left = 73 + Height = 18 + Top = 178 + Width = 517 Anchors = [akTop, akLeft, akRight] AutoSize = True BorderSpacing.Top = 3 @@ -275,16 +275,16 @@ object DesktopOptionsFrame: TDesktopOptionsFrame BevelOuter = bvNone ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 3 - ClientHeight = 19 - ClientWidth = 521 + ClientHeight = 18 + ClientWidth = 517 TabOrder = 5 object rbMenuGlyphShowSystem: TRadioButton AnchorSideRight.Control = PanelGlyphsMenusOptions AnchorSideRight.Side = asrBottom Left = 0 - Height = 19 + Height = 18 Top = 0 - Width = 160 + Width = 162 Caption = 'rbMenuGlyphShowSystem' Checked = True TabOrder = 0 @@ -292,18 +292,18 @@ object DesktopOptionsFrame: TDesktopOptionsFrame end object rbMenuGlyphShowNever: TRadioButton AnchorSideLeft.Side = asrCenter - Left = 160 - Height = 19 + Left = 162 + Height = 18 Top = 0 - Width = 153 + Width = 154 Caption = 'rbMenuGlyphShowNever' TabOrder = 1 end object rbMenuGlyphShowAlways: TRadioButton - Left = 313 - Height = 19 + Left = 316 + Height = 18 Top = 0 - Width = 159 + Width = 160 Caption = 'rbMenuGlyphShowAlways' TabOrder = 2 end @@ -315,7 +315,7 @@ object DesktopOptionsFrame: TDesktopOptionsFrame AnchorSideTop.Side = asrBottom Left = 296 Height = 5 - Top = 373 + Top = 357 Width = 5 AutoSize = False ParentColor = False @@ -325,9 +325,9 @@ object DesktopOptionsFrame: TDesktopOptionsFrame AnchorSideTop.Control = CheckDiskChangesWithLoadingCheckBox AnchorSideTop.Side = asrBottom Left = 6 - Height = 19 - Top = 245 - Width = 190 + Height = 18 + Top = 234 + Width = 199 BorderSpacing.Left = 6 Caption = 'AskSavingOnlySessionCheckBox' ParentShowHint = False @@ -339,9 +339,9 @@ object DesktopOptionsFrame: TDesktopOptionsFrame AnchorSideTop.Control = lblMouseAction AnchorSideTop.Side = asrBottom Left = 6 - Height = 19 - Top = 62 - Width = 167 + Height = 18 + Top = 60 + Width = 172 BorderSpacing.Left = 6 Caption = 'PreferDoubleClickCheckBox' ParentShowHint = False @@ -351,9 +351,9 @@ object DesktopOptionsFrame: TDesktopOptionsFrame object lblLanguage: TDividerBevel AnchorSideTop.Control = Owner Left = 0 - Height = 15 + Height = 14 Top = 0 - Width = 590 + Width = 597 Caption = 'Language' Anchors = [akTop, akLeft, akRight] Font.Style = [fsBold] @@ -364,8 +364,8 @@ object DesktopOptionsFrame: TDesktopOptionsFrame AnchorSideTop.Control = PanelGlyphsMenusOptions AnchorSideTop.Side = asrBottom Left = 0 - Height = 15 - Top = 211 + Height = 14 + Top = 202 Width = 597 Caption = 'Check and Auto Save Files' Anchors = [akTop, akLeft, akRight] @@ -378,8 +378,8 @@ object DesktopOptionsFrame: TDesktopOptionsFrame AnchorSideTop.Control = AutoSaveIntervalInSecsComboBox AnchorSideTop.Side = asrBottom Left = 0 - Height = 15 - Top = 358 + Height = 14 + Top = 343 Width = 597 Caption = 'Import / Export' Anchors = [akTop, akLeft, akRight] @@ -393,8 +393,8 @@ object DesktopOptionsFrame: TDesktopOptionsFrame AnchorSideTop.Control = ShowHintsForComponentPaletteCheckBox AnchorSideTop.Side = asrBottom Left = 0 - Height = 15 - Top = 146 + Height = 14 + Top = 140 Width = 597 Caption = 'Show Glyphs for' Anchors = [akTop, akLeft, akRight] @@ -407,8 +407,8 @@ object DesktopOptionsFrame: TDesktopOptionsFrame AnchorSideTop.Control = PreferDoubleClickCheckBox AnchorSideTop.Side = asrBottom Left = 0 - Height = 15 - Top = 87 + Height = 14 + Top = 84 Width = 597 Caption = 'Hints' Anchors = [akTop, akLeft, akRight] @@ -421,8 +421,8 @@ object DesktopOptionsFrame: TDesktopOptionsFrame AnchorSideTop.Control = LanguageComboBox AnchorSideTop.Side = asrBottom Left = 0 - Height = 15 - Top = 47 + Height = 14 + Top = 46 Width = 597 Caption = 'Mouse Action' Anchors = [akTop, akLeft, akRight] @@ -431,4 +431,45 @@ object DesktopOptionsFrame: TDesktopOptionsFrame ParentColor = False ParentFont = False end + object lblComboBoxes: TDividerBevel + AnchorSideTop.Control = ExportDesktopButton + AnchorSideTop.Side = asrBottom + Left = 0 + Height = 14 + Top = 390 + Width = 597 + Caption = 'ComboBoxes' + Anchors = [akTop, akLeft, akRight] + BorderSpacing.Top = 6 + Font.Style = [fsBold] + ParentColor = False + ParentFont = False + end + object lblDropDownCount: TLabel + AnchorSideLeft.Control = Owner + AnchorSideTop.Control = spDropDownCount + AnchorSideTop.Side = asrCenter + Left = 6 + Height = 14 + Top = 409 + Width = 118 + BorderSpacing.Left = 6 + Caption = 'DropDownCountLabel' + ParentColor = False + end + object spDropDownCount: TSpinEdit + AnchorSideLeft.Control = lblDropDownCount + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = lblComboBoxes + AnchorSideTop.Side = asrBottom + Left = 130 + Height = 19 + Top = 407 + Width = 75 + BorderSpacing.Left = 6 + BorderSpacing.Top = 3 + MinValue = 5 + TabOrder = 13 + Value = 8 + end end diff --git a/ide/frames/desktop_options.pas b/ide/frames/desktop_options.pas index 1702994452..c18372a5c6 100644 --- a/ide/frames/desktop_options.pas +++ b/ide/frames/desktop_options.pas @@ -29,7 +29,7 @@ uses // LazUtils FileUtil, // LCL - Forms, StdCtrls, Dialogs, LCLProc, ExtCtrls, + Forms, StdCtrls, Dialogs, LCLProc, ExtCtrls, Spin, // LazControls DividerBevel, // IdeIntf @@ -47,6 +47,8 @@ type AutoSaveIntervalInSecsComboBox: TComboBox; AutoSaveIntervalInSecsLabel: TLabel; AutoSaveProjectCheckBox: TCheckBox; + lblDropDownCount: TLabel; + lblComboBoxes: TDividerBevel; lblCheckAndAutoSave: TDividerBevel; lblImportExport: TDividerBevel; lblGlyphs: TDividerBevel; @@ -71,6 +73,7 @@ type ExportDesktopButton: TButton; ShowHintsForComponentPaletteCheckBox: TCheckBox; ShowHintsForMainSpeedButtonsCheckBox: TCheckBox; + spDropDownCount: TSpinEdit; procedure ExportDesktopButtonClick(Sender: TObject); procedure ImportDesktopButtonClick(Sender: TObject); private @@ -159,6 +162,10 @@ begin ImportDesktopButton.Caption := lisImport; ExportDesktopButton.Hint := lisExportEnvironmentOptions; ImportDesktopButton.Hint := lisImportEnvironmentOptions; + + // comboboxes + lblComboBoxes.Caption := lisComboBoxes; + lblDropDownCount.Caption := lisDropDownCount; end; procedure TDesktopOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions); @@ -188,6 +195,9 @@ begin sbgSystem: rbMenuGlyphShowSystem.Checked := True; end; + // comboboxes + spDropDownCount.Value := DropDownCount; + // check and auto save files CheckDiskChangesWithLoadingCheckBox.Checked:=CheckDiskChangesWithLoading; AskSavingOnlySessionCheckBox.Checked:=AskSaveSessionOnly; @@ -236,6 +246,9 @@ begin AutoSaveProject:=AutoSaveProjectCheckBox.Checked; AutoSaveIntervalInSecs:=StrToIntDef( AutoSaveIntervalInSecsComboBox.Text,AutoSaveIntervalInSecs); + + // comboboxes + DropDownCount := spDropDownCount.Value; end; end; diff --git a/ide/ideinfoneedbuild.pas b/ide/ideinfoneedbuild.pas index 128c6aa612..ec2d089fd9 100644 --- a/ide/ideinfoneedbuild.pas +++ b/ide/ideinfoneedbuild.pas @@ -150,6 +150,7 @@ begin IDEDialogLayoutList.ApplyLayout(Self); IdleConnected:=true; + TargetComboBox.DropDownCount:=EnvironmentOptions.DropDownCount; end; procedure TIDEInfoNeedBuildDlg.FormDestroy(Sender: TObject); diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas index bc04efac42..d6ee763172 100644 --- a/ide/lazarusidestrconsts.pas +++ b/ide/lazarusidestrconsts.pas @@ -1378,6 +1378,8 @@ resourcestring +'jump history and search results.'; lisExportEnvironmentOptions = 'Export environment options'; lisImportEnvironmentOptions = 'Import environment options'; + lisComboBoxes = 'Combo Boxes'; + lisDropDownCount = 'Drop Down Count'; // Desktop options dlgManageDesktops = 'Manage desktops'; diff --git a/ide/multipastedlg.pas b/ide/multipastedlg.pas index 575f8220d1..77b4e3e49a 100644 --- a/ide/multipastedlg.pas +++ b/ide/multipastedlg.pas @@ -47,7 +47,7 @@ uses // IdeIntf IDEHelpIntf, // IDE - InputHistory, IDEProcs, LazarusIDEStrConsts; + InputHistory, IDEProcs, LazarusIDEStrConsts, EnvironmentOpts; const hlFormatPasteTxtBefore = 'FormatPasteTxtBefore'; @@ -124,6 +124,9 @@ begin EscQuotesStyleComboBox.Items[1] := lismpCStyle; TrimClipbrdContentsCheckBox.Caption := lismpTrimClipboardContents; PreviewGroupBox.Caption := lismpPreview; + TxtBeforeLinesComboBox.DropDownCount := EnvironmentOptions.DropDownCount; + TxtAfterLinesComboBox.DropDownCount := EnvironmentOptions.DropDownCount; + EscQuotesStyleComboBox.DropDownCount := EnvironmentOptions.DropDownCount; end; procedure TMultiPasteDialog.FormDestroy(Sender: TObject); diff --git a/ide/procedurelist.pas b/ide/procedurelist.pas index fdf4e047d2..5f36eace32 100644 --- a/ide/procedurelist.pas +++ b/ide/procedurelist.pas @@ -272,6 +272,7 @@ end; procedure TProcedureListForm.FormShow(Sender: TObject); begin edMethods.SetFocus; + cbObjects.DropDownCount := EnvironmentOptions.DropDownCount; end; procedure TProcedureListForm.SGDblClick(Sender: TObject); diff --git a/ide/publishmoduledlg.pas b/ide/publishmoduledlg.pas index 2fcc7cf0f7..5e1c5bb42c 100644 --- a/ide/publishmoduledlg.pas +++ b/ide/publishmoduledlg.pas @@ -557,6 +557,8 @@ begin IDEImages.AssignImage(ButtonPanel1.CloseButton, 'laz_save'); ButtonPanel1.CloseButton.OnClick := @SaveSettingsButtonCLICK; ButtonPanel1.HelpButton.OnClick := @HelpButtonClick; + DestDirComboBox.DropDownCount := EnvironmentOptions.DropDownCount; + FilterCombobox.DropDownCount := EnvironmentOptions.DropDownCount; end; procedure TPublishModuleDialog.BrowseDestDirBitBtnCLICK(Sender: TObject); diff --git a/ide/runparamsopts.pas b/ide/runparamsopts.pas index 3b71200523..7fc2bb1606 100644 --- a/ide/runparamsopts.pas +++ b/ide/runparamsopts.pas @@ -55,7 +55,8 @@ uses // LazUtils LazFileUtils, LazFileCache, LazUTF8, Laz2_XMLCfg, // IDE - IDEProcs, MiscOptions, SysVarUserOverrideDlg, InputHistory, LazarusIDEStrConsts; + IDEProcs, MiscOptions, SysVarUserOverrideDlg, InputHistory, LazarusIDEStrConsts, + EnvironmentOpts; { The xml format version: When the format changes (new values, changed formats) we can distinguish old @@ -933,6 +934,11 @@ end; procedure TRunParamsOptsDlg.FormCreate(Sender: TObject); begin + ModesComboBox.DropDownCount := EnvironmentOptions.DropDownCount; + SaveInComboBox.DropDownCount := EnvironmentOptions.DropDownCount; + CmdLineParametersComboBox.DropDownCount := EnvironmentOptions.DropDownCount; + UseLaunchingApplicationComboBox.DropDownCount := EnvironmentOptions.DropDownCount; + WorkingDirectoryComboBox.DropDownCount := EnvironmentOptions.DropDownCount; end; procedure TRunParamsOptsDlg.HelpButtonClick(Sender: TObject); diff --git a/ide/unitdependencies.lfm b/ide/unitdependencies.lfm index 74bbe59827..d753265dca 100644 --- a/ide/unitdependencies.lfm +++ b/ide/unitdependencies.lfm @@ -6,42 +6,43 @@ object UnitDependenciesWindow: TUnitDependenciesWindow Caption = 'UnitDependenciesWindow' ClientHeight = 440 ClientWidth = 620 + OnActivate = FormActivate OnCreate = FormCreate OnDestroy = FormDestroy OnShow = FormShow LCLVersion = '2.1.0.0' object MainPageControl: TPageControl Left = 0 - Height = 409 + Height = 410 Top = 0 Width = 620 - ActivePage = GroupsTabSheet + ActivePage = UnitsTabSheet Align = alClient - TabIndex = 1 + TabIndex = 0 TabOrder = 0 object UnitsTabSheet: TTabSheet Caption = 'UnitsTabSheet' - ClientHeight = 381 - ClientWidth = 612 + ClientHeight = 385 + ClientWidth = 616 object ScopePanel: TPanel Left = 0 - Height = 48 + Height = 47 Top = 0 - Width = 612 + Width = 616 Align = alTop AutoSize = True BevelOuter = bvNone - ClientHeight = 48 - ClientWidth = 612 + ClientHeight = 47 + ClientWidth = 616 TabOrder = 0 object SearchCustomFilesCheckBox: TCheckBox AnchorSideLeft.Control = ScopePanel AnchorSideTop.Control = SearchCustomFilesComboBox AnchorSideTop.Side = asrCenter Left = 2 - Height = 19 + Height = 18 Top = 4 - Width = 172 + Width = 180 BorderSpacing.Around = 2 Caption = 'SearchCustomFilesCheckBox' OnChange = SearchCustomFilesCheckBoxChange @@ -55,10 +56,10 @@ object UnitDependenciesWindow: TUnitDependenciesWindow AnchorSideTop.Side = asrCenter AnchorSideRight.Control = ScopePanel AnchorSideRight.Side = asrBottom - Left = 548 - Height = 25 + Left = 566 + Height = 24 Top = 1 - Width = 64 + Width = 50 Anchors = [akTop, akRight] AutoSize = True Caption = 'Browse' @@ -70,13 +71,13 @@ object UnitDependenciesWindow: TUnitDependenciesWindow AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = ScopePanel AnchorSideRight.Control = SearchCustomFilesBrowseButton - Left = 176 + Left = 184 Height = 23 Top = 2 - Width = 370 + Width = 380 Anchors = [akTop, akLeft, akRight] BorderSpacing.Around = 2 - ItemHeight = 15 + ItemHeight = 14 OnChange = SearchCustomFilesComboBoxChange TabOrder = 1 Text = 'SearchCustomFilesComboBox' @@ -86,9 +87,9 @@ object UnitDependenciesWindow: TUnitDependenciesWindow AnchorSideTop.Control = SearchCustomFilesComboBox AnchorSideTop.Side = asrBottom Left = 2 - Height = 19 + Height = 18 Top = 27 - Width = 132 + Width = 140 BorderSpacing.Around = 2 Caption = 'SearchPkgsCheckBox' OnChange = SearchPkgsCheckBoxChange @@ -99,10 +100,10 @@ object UnitDependenciesWindow: TUnitDependenciesWindow AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = SearchPkgsCheckBox AnchorSideTop.Side = asrCenter - Left = 151 - Height = 19 + Left = 159 + Height = 18 Top = 27 - Width = 143 + Width = 152 BorderSpacing.Left = 15 BorderSpacing.Around = 2 Caption = 'SearchSrcEditCheckBox' @@ -114,12 +115,12 @@ object UnitDependenciesWindow: TUnitDependenciesWindow end object AllUnitsGroupBox: TGroupBox Left = 0 - Height = 333 - Top = 48 + Height = 338 + Top = 47 Width = 248 Align = alLeft Caption = 'AllUnitsGroupBox' - ClientHeight = 313 + ClientHeight = 320 ClientWidth = 244 TabOrder = 1 object AllUnitsShowGroupNodesSpeedButton: TSpeedButton @@ -129,7 +130,7 @@ object UnitDependenciesWindow: TUnitDependenciesWindow AnchorSideRight.Control = AllUnitsShowDirsSpeedButton Left = 198 Height = 22 - Top = 0 + Top = -1 Width = 23 AllowAllUp = True Anchors = [akTop, akRight] @@ -146,7 +147,7 @@ object UnitDependenciesWindow: TUnitDependenciesWindow AnchorSideRight.Side = asrBottom Left = 221 Height = 22 - Top = 0 + Top = -1 Width = 23 AllowAllUp = True Anchors = [akTop, akRight] @@ -160,7 +161,7 @@ object UnitDependenciesWindow: TUnitDependenciesWindow AnchorSideTop.Control = AllUnitsGroupBox AnchorSideRight.Control = AllUnitsShowGroupNodesSpeedButton Left = 0 - Height = 23 + Height = 20 Top = 0 Width = 198 Anchors = [akTop, akLeft, akRight] @@ -173,7 +174,7 @@ object UnitDependenciesWindow: TUnitDependenciesWindow AnchorSideRight.Control = AllUnitsSearchPrevSpeedButton Left = 198 Height = 22 - Top = 290 + Top = 299 Width = 23 Anchors = [akTop, akRight] OnClick = AllUnitsSearchNextSpeedButtonClick @@ -187,7 +188,7 @@ object UnitDependenciesWindow: TUnitDependenciesWindow AnchorSideRight.Side = asrBottom Left = 221 Height = 22 - Top = 290 + Top = 299 Width = 23 Anchors = [akTop, akRight] OnClick = AllUnitsSearchPrevSpeedButtonClick @@ -202,8 +203,8 @@ object UnitDependenciesWindow: TUnitDependenciesWindow AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = AllUnitsSearchEdit Left = 0 - Height = 267 - Top = 23 + Height = 280 + Top = 20 Width = 244 Anchors = [akTop, akLeft, akRight, akBottom] HotTrack = True @@ -226,8 +227,8 @@ object UnitDependenciesWindow: TUnitDependenciesWindow AnchorSideBottom.Control = AllUnitsGroupBox AnchorSideBottom.Side = asrBottom Left = 0 - Height = 23 - Top = 290 + Height = 20 + Top = 300 Width = 198 Anchors = [akLeft, akRight, akBottom] OnChange = AllUnitsSearchEditChange @@ -236,27 +237,27 @@ object UnitDependenciesWindow: TUnitDependenciesWindow end object UnitsSplitter: TSplitter Left = 248 - Height = 333 - Top = 48 + Height = 338 + Top = 47 Width = 5 end object SelectedUnitsGroupBox: TGroupBox Left = 253 - Height = 333 - Top = 48 - Width = 359 + Height = 338 + Top = 47 + Width = 363 Align = alClient Caption = 'SelectedUnitsGroupBox' - ClientHeight = 313 - ClientWidth = 355 + ClientHeight = 320 + ClientWidth = 359 TabOrder = 3 object SelUnitsSearchNextSpeedButton: TSpeedButton AnchorSideTop.Control = SelUnitsSearchEdit AnchorSideTop.Side = asrCenter AnchorSideRight.Control = SelUnitsSearchPrevSpeedButton - Left = 309 + Left = 313 Height = 22 - Top = 290 + Top = 299 Width = 23 Anchors = [akTop, akRight] OnClick = SelUnitsSearchNextSpeedButtonClick @@ -268,9 +269,9 @@ object UnitDependenciesWindow: TUnitDependenciesWindow AnchorSideTop.Side = asrCenter AnchorSideRight.Control = SelectedUnitsGroupBox AnchorSideRight.Side = asrBottom - Left = 332 + Left = 336 Height = 22 - Top = 290 + Top = 299 Width = 23 Anchors = [akTop, akRight] OnClick = SelUnitsSearchPrevSpeedButtonClick @@ -283,9 +284,9 @@ object UnitDependenciesWindow: TUnitDependenciesWindow AnchorSideBottom.Control = SelectedUnitsGroupBox AnchorSideBottom.Side = asrBottom Left = 0 - Height = 23 - Top = 290 - Width = 309 + Height = 20 + Top = 300 + Width = 313 Anchors = [akLeft, akRight, akBottom] OnChange = SelUnitsSearchEditChange TabOrder = 1 @@ -297,9 +298,9 @@ object UnitDependenciesWindow: TUnitDependenciesWindow AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = SelUnitsSearchEdit Left = 0 - Height = 290 + Height = 300 Top = 0 - Width = 355 + Width = 359 Anchors = [akTop, akLeft, akRight, akBottom] HotTrack = True ParentShowHint = False @@ -318,35 +319,35 @@ object UnitDependenciesWindow: TUnitDependenciesWindow end object GroupsTabSheet: TTabSheet Caption = 'GroupsTabSheet' - ClientHeight = 381 - ClientWidth = 612 + ClientHeight = 385 + ClientWidth = 616 object GroupsSplitter: TSplitter Cursor = crVSplit Left = 0 Height = 5 Top = 0 - Width = 612 + Width = 616 Align = alTop ResizeAnchor = akTop end object UnitGraphPanel: TPanel Left = 0 - Height = 376 + Height = 380 Top = 5 - Width = 612 + Width = 616 Align = alClient BevelOuter = bvNone - ClientHeight = 376 - ClientWidth = 612 + ClientHeight = 380 + ClientWidth = 616 TabOrder = 1 object UnitGraphOptionPanel: TPanel Left = 0 - Height = 376 + Height = 380 Top = 0 Width = 140 Align = alLeft BevelOuter = bvNone - ClientHeight = 376 + ClientHeight = 380 ClientWidth = 140 TabOrder = 0 object UnitGraphFilter: TCheckListBox @@ -357,7 +358,7 @@ object UnitDependenciesWindow: TUnitDependenciesWindow AnchorSideBottom.Control = UnitGraphOptionPanel AnchorSideBottom.Side = asrBottom Left = 0 - Height = 373 + Height = 377 Top = 3 Width = 140 Anchors = [akTop, akLeft, akRight, akBottom] @@ -371,7 +372,7 @@ object UnitDependenciesWindow: TUnitDependenciesWindow end object UnitGraphOptionSplitter: TSplitter Left = 140 - Height = 376 + Height = 380 Top = 0 Width = 5 end @@ -380,12 +381,12 @@ object UnitDependenciesWindow: TUnitDependenciesWindow end object StatusPanel: TPanel Left = 0 - Height = 31 - Top = 409 + Height = 30 + Top = 410 Width = 620 Align = alBottom AutoSize = True - ClientHeight = 31 + ClientHeight = 30 ClientWidth = 620 TabOrder = 1 object ProgressBar1: TProgressBar @@ -395,18 +396,18 @@ object UnitDependenciesWindow: TUnitDependenciesWindow AnchorSideTop.Side = asrCenter AnchorSideRight.Control = RefreshButton AnchorSideBottom.Side = asrBottom - Left = 66 + Left = 70 Height = 20 Top = 5 - Width = 448 + Width = 458 Anchors = [akTop, akLeft, akRight] TabOrder = 0 end object RefreshButton: TButton - Left = 516 - Height = 25 + Left = 530 + Height = 24 Top = 3 - Width = 101 + Width = 87 Align = alRight AutoSize = True BorderSpacing.Around = 2 @@ -419,9 +420,9 @@ object UnitDependenciesWindow: TUnitDependenciesWindow AnchorSideTop.Control = RefreshButton AnchorSideTop.Side = asrCenter Left = 7 - Height = 15 + Height = 14 Top = 8 - Width = 53 + Width = 57 BorderSpacing.Left = 6 BorderSpacing.Right = 6 Caption = 'StatsLabel' @@ -430,8 +431,8 @@ object UnitDependenciesWindow: TUnitDependenciesWindow end object UnitsTVPopupMenu: TPopupMenu OnPopup = UnitsTVPopupMenuPopup - left = 120 - top = 193 + Left = 120 + Top = 193 object UnitsTVCopyFilenameMenuItem: TMenuItem Caption = 'UnitsTVCopyFilenameMenuItem' OnClick = UnitsTVCopyFilenameMenuItemClick @@ -455,12 +456,12 @@ object UnitDependenciesWindow: TUnitDependenciesWindow end object Timer1: TTimer OnTimer = Timer1Timer - left = 465 - top = 175 + Left = 465 + Top = 175 end object GraphPopupMenu: TPopupMenu - left = 207 - top = 70 + Left = 207 + Top = 70 object GraphOptsMenuItem: TMenuItem Caption = 'GraphOptsMenuItem' OnClick = GraphOptsMenuItemClick diff --git a/ide/unitdependencies.pas b/ide/unitdependencies.pas index 1f61500a75..78f5bbaadc 100644 --- a/ide/unitdependencies.pas +++ b/ide/unitdependencies.pas @@ -197,6 +197,7 @@ type procedure AllUnitsSearchPrevSpeedButtonClick(Sender: TObject); procedure AllUnitsShowDirsSpeedButtonClick(Sender: TObject); procedure AllUnitsShowGroupNodesSpeedButtonClick(Sender: TObject); + procedure FormActivate(Sender: TObject); procedure FormShow(Sender: TObject); procedure GraphOptsMenuItemClick(Sender: TObject); procedure RefreshButtonClick(Sender: TObject); @@ -2390,6 +2391,11 @@ begin Result:=nil; end; +procedure TUnitDependenciesWindow.FormActivate(Sender: TObject); +begin + SearchCustomFilesComboBox.DropDownCount:=EnvironmentOptions.DropDownCount; +end; + function TUnitDependenciesWindow.GetImgIndex(Node: TUDNode): integer; begin case Node.Typ of diff --git a/lcl/include/customcombobox.inc b/lcl/include/customcombobox.inc index 2a368a8e43..e236923e2c 100644 --- a/lcl/include/customcombobox.inc +++ b/lcl/include/customcombobox.inc @@ -696,6 +696,8 @@ end; ------------------------------------------------------------------------------} procedure TCustomComboBox.SetDropDownCount(const AValue: Integer); begin + if AValue = FDropDownCount then + exit; FDropDownCount := AValue; if HandleAllocated then TWSCustomComboBoxClass(WidgetSetClass).SetDropDownCount(Self, AValue); @@ -710,12 +712,9 @@ procedure TCustomComboBox.SetItemHeight(const AValue: Integer); begin if AValue = FItemHeight then exit; - FItemHeight := AValue; - - if (not HandleAllocated) then + if not HandleAllocated then exit; - if Style in [csOwnerDrawFixed, csOwnerDrawVariable, csOwnerDrawEditableFixed, csOwnerDrawEditableVariable] then TWSCustomComboBoxClass(WidgetSetClass).SetItemHeight(Self, FItemHeight); diff --git a/packager/addfiletoapackagedlg.lfm b/packager/addfiletoapackagedlg.lfm index be746dc512..b7430557bc 100644 --- a/packager/addfiletoapackagedlg.lfm +++ b/packager/addfiletoapackagedlg.lfm @@ -8,24 +8,25 @@ object AddFileToAPackageDialog: TAddFileToAPackageDialog ClientHeight = 272 ClientWidth = 469 OnClose = AddFileToAPackageDlgClose + OnCreate = FormCreate Position = poScreenCenter ShowHint = True - LCLVersion = '1.7' + LCLVersion = '2.1.0.0' object FileGroupBox: TGroupBox Left = 6 - Height = 58 + Height = 54 Top = 6 Width = 457 Align = alTop AutoSize = True BorderSpacing.Around = 6 Caption = 'FileGroupBox' - ClientHeight = 39 + ClientHeight = 36 ClientWidth = 453 TabOrder = 0 object FileNameEdit: TEdit Left = 6 - Height = 27 + Height = 20 Top = 6 Width = 439 Anchors = [akTop, akLeft, akRight] @@ -37,32 +38,32 @@ object AddFileToAPackageDialog: TAddFileToAPackageDialog end object PackagesGroupBox: TGroupBox Left = 6 - Height = 85 - Top = 70 + Height = 77 + Top = 66 Width = 457 Align = alTop Anchors = [akLeft, akRight] AutoSize = True BorderSpacing.Around = 6 Caption = 'PackagesGroupBox' - ClientHeight = 66 + ClientHeight = 59 ClientWidth = 453 TabOrder = 1 object PackagesComboBox: TComboBox Left = 6 - Height = 27 + Height = 23 Top = 6 Width = 441 Align = alTop BorderSpacing.Around = 6 - ItemHeight = 0 + ItemHeight = 14 TabOrder = 0 Text = 'PackagesComboBox' end object ShowAllCheckBox: TCheckBox Left = 6 - Height = 21 - Top = 39 + Height = 18 + Top = 35 Width = 441 Align = alTop BorderSpacing.Around = 6 @@ -73,8 +74,8 @@ object AddFileToAPackageDialog: TAddFileToAPackageDialog end object BtnPanel: TButtonPanel Left = 6 - Height = 32 - Top = 234 + Height = 26 + Top = 240 Width = 457 OKButton.Name = 'OKButton' OKButton.DefaultCaption = True diff --git a/packager/addfiletoapackagedlg.pas b/packager/addfiletoapackagedlg.pas index 79905efb1f..7a0018d01e 100644 --- a/packager/addfiletoapackagedlg.pas +++ b/packager/addfiletoapackagedlg.pas @@ -47,7 +47,7 @@ uses // IdeIntf IDEWindowIntf, PackageIntf, IDEHelpIntf, // IDE - LazarusIDEStrConsts, PackageDefs, PackageSystem; + LazarusIDEStrConsts, PackageDefs, PackageSystem, EnvironmentOpts; type @@ -62,6 +62,7 @@ type ShowAllCheckBox: TCheckBox; procedure AddFileToAPackageDlgClose(Sender: TObject; var {%H-}CloseAction: TCloseAction); + procedure FormCreate(Sender: TObject); procedure HelpButtonClick(Sender: TObject); procedure OkButtonClick(Sender: TObject); procedure PackagesGroupBoxResize(Sender: TObject); @@ -210,6 +211,11 @@ begin inherited Destroy; end; +procedure TAddFileToAPackageDialog.FormCreate(Sender: TObject); +begin + PackagesComboBox.DropDownCount:=EnvironmentOptions.DropDownCount; +end; + procedure TAddFileToAPackageDialog.UpdateAvailablePackages; var i: Integer;