From d53bf25da169406de0d7fea167e56d4b0d7f8adf Mon Sep 17 00:00:00 2001 From: mattias Date: Mon, 18 Aug 2008 12:17:05 +0000 Subject: [PATCH] IDE: added lfm for TAddToPackageDlg git-svn-id: trunk@16114 - --- .gitattributes | 2 + ideintf/componentreg.pas | 1 + packager/addtopackagedlg.lfm | 754 +++++++++++++++++++++++++++++++++++ packager/addtopackagedlg.lrs | 255 ++++++++++++ packager/addtopackagedlg.pas | 548 ++----------------------- packager/packagesystem.pas | 2 +- 6 files changed, 1052 insertions(+), 510 deletions(-) create mode 100644 packager/addtopackagedlg.lfm create mode 100644 packager/addtopackagedlg.lrs diff --git a/.gitattributes b/.gitattributes index f09b96ad54..72a01be4a1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3606,6 +3606,8 @@ lcl/xmlpropstorage.pas svneol=native#text/pascal packager/addfiletoapackagedlg.lfm svneol=native#text/plain packager/addfiletoapackagedlg.lrs svneol=native#text/pascal packager/addfiletoapackagedlg.pas svneol=native#text/pascal +packager/addtopackagedlg.lfm svneol=native#text/plain +packager/addtopackagedlg.lrs svneol=native#text/plain packager/addtopackagedlg.pas svneol=native#text/pascal packager/basepkgmanager.pas svneol=native#text/pascal packager/brokendependenciesdlg.pas svneol=native#text/pascal diff --git a/ideintf/componentreg.pas b/ideintf/componentreg.pas index be38e56d83..5fbf40a4e5 100644 --- a/ideintf/componentreg.pas +++ b/ideintf/componentreg.pas @@ -631,6 +631,7 @@ begin i:=1; repeat Result:=Prefix+IntToStr(i); + inc(i); until FindComponent(Result)=nil; end; end; diff --git a/packager/addtopackagedlg.lfm b/packager/addtopackagedlg.lfm new file mode 100644 index 0000000000..9ca26abb85 --- /dev/null +++ b/packager/addtopackagedlg.lfm @@ -0,0 +1,754 @@ +object AddToPackageDlg: TAddToPackageDlg + Left = 390 + Height = 300 + Top = 362 + Width = 500 + ActiveControl = NoteBook + Caption = 'Add to package' + ClientHeight = 300 + ClientWidth = 500 + KeyPreview = True + OnClose = AddToPackageDlgClose + OnCreate = FormCreate + OnDestroy = FormDestroy + OnKeyDown = AddToPackageDlgKeyDown + Position = poScreenCenter + LCLVersion = '0.9.25' + object NoteBook: TNotebook + Height = 300 + Width = 500 + Align = alClient + PageIndex = 1 + TabOrder = 0 + object NewFilePage: TPage + Caption = 'New File' + ClientWidth = 498 + ClientHeight = 273 + OnResize = NewFilePageResize + object NewFileTreeView: TTreeView + AnchorSideBottom.Control = NewFileOkButton + Height = 218 + Width = 249 + Align = alLeft + BorderSpacing.Bottom = 5 + DefaultItemHeight = 19 + TabOrder = 0 + OnClick = NewFileTreeViewClick + OnDblClick = NewFileTreeViewDblClick + OnSelectionChanged = NewFileTreeViewSelectionChanged + end + object NewFileDescriptionGroupBox: TGroupBox + AnchorSideLeft.Control = NewFileTreeView + AnchorSideLeft.Side = asrBottom + AnchorSideRight.Side = asrBottom + AnchorSideBottom.Control = NewFileOkButton + Left = 249 + Height = 218 + Width = 249 + Align = alClient + BorderSpacing.Bottom = 5 + Caption = 'NewFileDescriptionGroupBox' + ClientHeight = 199 + ClientWidth = 245 + TabOrder = 1 + object NewFileHelpLabel: TLabel + Height = 199 + Width = 245 + Align = alClient + Caption = 'NewFileHelpLabel' + ParentColor = False + WordWrap = True + end + end + object NewFileBtnPanel: TPanel + Height = 50 + Top = 223 + Width = 498 + Align = alBottom + BevelOuter = bvNone + ClientHeight = 50 + ClientWidth = 498 + TabOrder = 2 + object NewFileOkButton: TButton + AnchorSideBottom.Side = asrBottom + Left = 222 + Height = 38 + Top = 6 + Width = 119 + Align = alRight + Anchors = [akBottom] + AutoSize = True + BorderSpacing.Around = 6 + Caption = 'NewFileOkButton' + Enabled = False + OnClick = NewFileOkButtonClick + TabOrder = 0 + end + object NewFileCancelButton: TButton + AnchorSideLeft.Side = asrBottom + Left = 347 + Height = 38 + Top = 6 + Width = 145 + Align = alRight + AutoSize = True + BorderSpacing.Around = 6 + Caption = 'NewFileCancelButton' + ModalResult = 2 + TabOrder = 1 + end + end + end + object AddUnitPage: TPage + Caption = 'Add Unit' + ClientWidth = 498 + ClientHeight = 273 + object AddUnitFilenameLabel: TLabel + AnchorSideTop.Control = AddUnitFilenameEdit + AnchorSideTop.Side = asrCenter + Left = 5 + Height = 20 + Top = 8 + Width = 143 + Caption = 'AddUnitFilenameLabel' + ParentColor = False + end + object AddUnitSrcNameLabel: TLabel + AnchorSideTop.Control = AddUnitSrcNameEdit + AnchorSideTop.Side = asrCenter + Left = 5 + Height = 20 + Top = 41 + Width = 146 + Caption = 'AddUnitSrcNameLabel' + ParentColor = False + end + object AddUnitFilenameEdit: TEdit + AnchorSideLeft.Control = AddUnitFilenameLabel + AnchorSideLeft.Side = asrBottom + AnchorSideRight.Control = AddUnitFileBrowseButton + Left = 148 + Height = 27 + Top = 5 + Width = 292 + Anchors = [akTop, akLeft, akRight] + AutoSize = True + TabOrder = 0 + Text = 'AddUnitFilenameEdit' + end + object AddUnitFileBrowseButton: TButton + AnchorSideRight.Control = AddUnitFileShortenButton + Left = 440 + Height = 29 + Top = 5 + Width = 24 + Anchors = [akTop, akRight] + AutoSize = True + Caption = '...' + OnClick = AddUnitFileBrowseButtonClick + TabOrder = 1 + end + object AddUnitFileShortenButton: TButton + AnchorSideRight.Control = AddUnitPage + AnchorSideRight.Side = asrBottom + Left = 464 + Height = 29 + Top = 5 + Width = 34 + Anchors = [akTop, akRight] + AutoSize = True + Caption = '<>' + OnClick = AddUnitFileShortenButtonClick + TabOrder = 2 + end + object AddUnitSrcNameEdit: TEdit + AnchorSideLeft.Control = AddUnitSrcNameLabel + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = AddUnitFilenameEdit + AnchorSideTop.Side = asrBottom + Left = 151 + Height = 27 + Top = 38 + Width = 156 + AutoSize = True + BorderSpacing.Top = 6 + TabOrder = 3 + Text = 'AddUnitSrcNameEdit' + end + object AddUnitHasRegisterCheckBox: TCheckBox + AnchorSideTop.Control = AddUnitSrcNameEdit + AnchorSideTop.Side = asrBottom + Left = 5 + Height = 22 + Top = 71 + Width = 214 + BorderSpacing.Around = 6 + Caption = 'AddUnitHasRegisterCheckBox' + TabOrder = 4 + end + object AddUnitIsVirtualCheckBox: TCheckBox + AnchorSideLeft.Control = AddUnitHasRegisterCheckBox + AnchorSideTop.Control = AddUnitHasRegisterCheckBox + AnchorSideTop.Side = asrBottom + Left = 5 + Height = 22 + Top = 99 + Width = 189 + BorderSpacing.Top = 6 + Caption = 'AddUnitIsVirtualCheckBox' + OnClick = AddUnitIsVirtualCheckBoxClick + TabOrder = 5 + end + object AddSecondaryFilesCheckBox: TCheckBox + AnchorSideLeft.Control = AddUnitHasRegisterCheckBox + AnchorSideTop.Control = AddUnitIsVirtualCheckBox + AnchorSideTop.Side = asrBottom + Left = 5 + Height = 22 + Top = 127 + Width = 207 + BorderSpacing.Top = 6 + Caption = 'AddSecondaryFilesCheckBox' + Checked = True + State = cbChecked + TabOrder = 6 + end + object AddUnitUpdateButton: TButton + AnchorSideLeft.Control = AddUnitHasRegisterCheckBox + AnchorSideTop.Control = AddSecondaryFilesCheckBox + AnchorSideTop.Side = asrBottom + Left = 5 + Height = 29 + Top = 155 + Width = 153 + AutoSize = True + BorderSpacing.Top = 6 + Caption = 'AddUnitUpdateButton' + OnClick = AddUnitUpdateButtonClick + TabOrder = 7 + end + object AddUnitButton: TButton + AnchorSideLeft.Control = AddUnitHasRegisterCheckBox + AnchorSideTop.Control = AddUnitUpdateButton + AnchorSideTop.Side = asrBottom + Left = 5 + Height = 29 + Top = 209 + Width = 106 + AutoSize = True + BorderSpacing.Top = 25 + Caption = 'AddUnitButton' + OnClick = AddUnitButtonClick + TabOrder = 8 + end + object CancelAddUnitButton: TButton + AnchorSideLeft.Control = AddUnitButton + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = AddUnitButton + Left = 121 + Height = 29 + Top = 209 + Width = 149 + AutoSize = True + BorderSpacing.Left = 10 + Caption = 'CancelAddUnitButton' + OnClick = CancelAddUnitButtonClick + TabOrder = 9 + end + end + object NewComponentPage: TPage + Caption = 'New Component' + ClientWidth = 498 + ClientHeight = 273 + object AncestorTypeLabel: TLabel + AnchorSideTop.Control = AncestorComboBox + AnchorSideTop.Side = asrCenter + Left = 5 + Height = 20 + Top = 9 + Width = 120 + Caption = 'AncestorTypeLabel' + ParentColor = False + end + object ClassNameLabel: TLabel + AnchorSideTop.Control = ClassNameEdit + AnchorSideTop.Side = asrCenter + Left = 5 + Height = 20 + Top = 43 + Width = 108 + Caption = 'ClassNameLabel' + ParentColor = False + end + object PalettePageLabel: TLabel + AnchorSideTop.Control = PalettePageCombobox + AnchorSideTop.Side = asrCenter + Left = 5 + Height = 20 + Top = 77 + Width = 110 + Caption = 'PalettePageLabel' + ParentColor = False + end + object ComponentUnitFileLabel: TLabel + AnchorSideTop.Control = ComponentUnitFileEdit + AnchorSideTop.Side = asrCenter + Left = 5 + Height = 20 + Top = 111 + Width = 156 + Caption = 'ComponentUnitFileLabel' + ParentColor = False + end + object ComponentUnitNameLabel: TLabel + AnchorSideTop.Control = ComponentUnitNameEdit + AnchorSideTop.Side = asrCenter + Left = 5 + Height = 20 + Top = 144 + Width = 175 + Caption = 'ComponentUnitNameLabel' + ParentColor = False + end + object AncestorComboBox: TComboBox + AnchorSideLeft.Control = AncestorTypeLabel + AnchorSideLeft.Side = asrBottom + Left = 125 + Height = 29 + Top = 5 + Width = 200 + AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending] + MaxLength = 0 + OnCloseUp = AncestorComboBoxCloseUp + TabOrder = 0 + Text = 'AncestorComboBox' + end + object AncestorShowAllCheckBox: TCheckBox + AnchorSideLeft.Control = AncestorComboBox + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = AncestorComboBox + AnchorSideTop.Side = asrCenter + Left = 325 + Height = 22 + Top = 8 + Width = 193 + Caption = 'AncestorShowAllCheckBox' + Checked = True + OnClick = AncestorShowAllCheckBoxClick + State = cbChecked + TabOrder = 1 + end + object ClassNameEdit: TEdit + AnchorSideLeft.Control = ClassNameLabel + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = AncestorComboBox + AnchorSideTop.Side = asrBottom + Left = 113 + Height = 27 + Top = 40 + Width = 200 + AutoSize = True + BorderSpacing.Top = 6 + OnChange = ClassNameEditChange + TabOrder = 2 + Text = 'ClassNameEdit' + end + object PalettePageCombobox: TComboBox + AnchorSideLeft.Control = PalettePageLabel + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = ClassNameEdit + AnchorSideTop.Side = asrBottom + Left = 115 + Height = 29 + Top = 73 + Width = 200 + AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending] + BorderSpacing.Top = 6 + MaxLength = 0 + TabOrder = 3 + Text = 'PalettePageCombobox' + end + object ComponentUnitFileEdit: TEdit + AnchorSideLeft.Control = ComponentUnitFileLabel + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = PalettePageCombobox + AnchorSideTop.Side = asrBottom + Left = 161 + Height = 27 + Top = 108 + Width = 129 + AutoSize = True + BorderSpacing.Top = 6 + TabOrder = 4 + Text = 'ComponentUnitFileEdit' + end + object ComponentUnitFileBrowseButton: TButton + AnchorSideLeft.Control = ComponentUnitFileEdit + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = ComponentUnitFileEdit + AnchorSideTop.Side = asrCenter + Left = 290 + Height = 29 + Hint = 'Save file dialog' + Top = 107 + Width = 24 + AutoSize = True + Caption = '...' + OnClick = ComponentUnitFileBrowseButtonClick + ParentShowHint = False + ShowHint = True + TabOrder = 5 + end + object ComponentUnitFileShortenButton: TButton + AnchorSideLeft.Control = ComponentUnitFileBrowseButton + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = ComponentUnitFileEdit + AnchorSideTop.Side = asrCenter + Left = 314 + Height = 29 + Hint = 'Shorten or expand filename' + Top = 107 + Width = 34 + AutoSize = True + Caption = '<>' + OnClick = ComponentUnitFileShortenButtonClick + ParentShowHint = False + ShowHint = True + TabOrder = 6 + end + object ComponentUnitNameEdit: TEdit + AnchorSideLeft.Control = ComponentUnitNameLabel + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = ComponentUnitFileEdit + AnchorSideTop.Side = asrBottom + Left = 180 + Height = 27 + Top = 141 + Width = 156 + AutoSize = True + BorderSpacing.Top = 6 + TabOrder = 7 + Text = 'ComponentUnitNameEdit' + end + object NewComponentButton: TButton + AnchorSideTop.Control = ComponentUnitNameEdit + AnchorSideTop.Side = asrBottom + Left = 5 + Height = 29 + Top = 193 + Width = 157 + AutoSize = True + BorderSpacing.Top = 25 + Caption = 'NewComponentButton' + OnClick = NewComponentButtonClick + TabOrder = 8 + end + object CancelNewComponentButton: TButton + AnchorSideLeft.Control = NewComponentButton + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = NewComponentButton + Left = 168 + Height = 29 + Top = 193 + Width = 200 + AutoSize = True + BorderSpacing.Left = 6 + Caption = 'CancelNewComponentButton' + OnClick = CancelNewComponentButtonClick + TabOrder = 9 + end + end + object NewRequirementPage: TPage + Caption = 'New Requirement' + ClientWidth = 498 + ClientHeight = 273 + object DependPkgNameLabel: TLabel + AnchorSideTop.Control = DependPkgNameComboBox + AnchorSideTop.Side = asrCenter + Left = 5 + Height = 20 + Top = 9 + Width = 147 + Caption = 'DependPkgNameLabel' + ParentColor = False + end + object DependMinVersionLabel: TLabel + AnchorSideTop.Control = DependMinVersionEdit + AnchorSideTop.Side = asrCenter + Left = 5 + Height = 20 + Top = 43 + Width = 154 + Caption = 'DependMinVersionLabel' + ParentColor = False + end + object DependMaxVersionLabel: TLabel + AnchorSideTop.Control = DependMaxVersionEdit + AnchorSideTop.Side = asrCenter + Left = 5 + Height = 20 + Top = 76 + Width = 158 + Caption = 'DependMaxVersionLabel' + ParentColor = False + end + object DependPkgNameComboBox: TComboBox + AnchorSideLeft.Control = DependPkgNameLabel + AnchorSideLeft.Side = asrBottom + Left = 152 + Height = 29 + Top = 5 + Width = 215 + AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending] + MaxLength = 0 + TabOrder = 0 + Text = 'DependPkgNameComboBox' + end + object DependMinVersionEdit: TEdit + AnchorSideLeft.Control = DependMinVersionLabel + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = DependPkgNameComboBox + AnchorSideTop.Side = asrBottom + Left = 159 + Height = 27 + Top = 40 + Width = 100 + AutoSize = True + BorderSpacing.Top = 6 + TabOrder = 1 + Text = 'DependMinVersionEdit' + end + object DependMaxVersionEdit: TEdit + AnchorSideLeft.Control = DependMaxVersionLabel + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = DependMinVersionEdit + AnchorSideTop.Side = asrBottom + Left = 163 + Height = 27 + Top = 73 + Width = 100 + AutoSize = True + BorderSpacing.Top = 6 + TabOrder = 2 + Text = 'DependMaxVersionEdit' + end + object NewDependButton: TButton + AnchorSideTop.Control = DependMaxVersionEdit + AnchorSideTop.Side = asrBottom + Left = 5 + Height = 29 + Top = 125 + Width = 132 + AutoSize = True + BorderSpacing.Top = 25 + Caption = 'NewDependButton' + OnClick = NewDependButtonClick + TabOrder = 3 + end + object CancelDependButton: TButton + AnchorSideLeft.Control = NewDependButton + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = NewDependButton + Left = 143 + Height = 29 + Top = 125 + Width = 148 + AutoSize = True + BorderSpacing.Left = 6 + Caption = 'CancelDependButton' + ModalResult = 2 + TabOrder = 4 + end + end + object AddFilePage: TPage + Caption = 'Add File' + ClientWidth = 498 + ClientHeight = 273 + object AddFilenameLabel: TLabel + AnchorSideTop.Control = AddFilenameEdit + AnchorSideTop.Side = asrCenter + Left = 5 + Height = 20 + Top = 8 + Width = 117 + Caption = 'AddFilenameLabel' + ParentColor = False + end + object AddFilenameEdit: TEdit + AnchorSideLeft.Control = AddFilenameLabel + AnchorSideLeft.Side = asrBottom + AnchorSideRight.Control = AddFileBrowseButton + Left = 122 + Height = 27 + Top = 5 + Width = 318 + Anchors = [akTop, akLeft, akRight] + AutoSize = True + TabOrder = 0 + Text = 'AddFilenameEdit' + end + object AddFileBrowseButton: TButton + AnchorSideRight.Control = AddFileShortenButton + Left = 440 + Height = 29 + Top = 5 + Width = 24 + Anchors = [akTop, akRight] + AutoSize = True + Caption = '...' + OnClick = AddFileBrowseButtonClick + TabOrder = 1 + end + object AddFileShortenButton: TButton + AnchorSideRight.Control = AddFilePage + AnchorSideRight.Side = asrBottom + Left = 464 + Height = 29 + Top = 5 + Width = 34 + Anchors = [akTop, akRight] + AutoSize = True + Caption = '<>' + OnClick = AddFileShortenButtonClick + TabOrder = 2 + end + object AddFileTypeRadioGroup: TRadioGroup + AnchorSideTop.Control = AddFilenameEdit + AnchorSideTop.Side = asrBottom + Left = 5 + Height = 30 + Top = 38 + Width = 100 + AutoFill = True + AutoSize = True + BorderSpacing.Top = 6 + Caption = 'AddFileTypeRadioGroup' + ChildSizing.LeftRightSpacing = 6 + ChildSizing.TopBottomSpacing = 6 + ChildSizing.EnlargeHorizontal = crsHomogenousChildResize + ChildSizing.EnlargeVertical = crsHomogenousChildResize + ChildSizing.ShrinkHorizontal = crsScaleChilds + ChildSizing.ShrinkVertical = crsScaleChilds + ChildSizing.Layout = cclLeftToRightThenTopToBottom + ChildSizing.ControlsPerLine = 1 + Constraints.MinHeight = 30 + Constraints.MinWidth = 100 + TabOrder = 3 + end + object AddFileButton: TButton + AnchorSideTop.Control = AddFileTypeRadioGroup + AnchorSideTop.Side = asrBottom + Left = 5 + Height = 29 + Top = 93 + Width = 100 + AutoSize = True + BorderSpacing.Top = 25 + Caption = 'AddFileButton' + OnClick = AddFileButtonClick + TabOrder = 4 + end + object CancelAddFileButton: TButton + AnchorSideLeft.Control = AddFileButton + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = AddFileButton + Left = 111 + Height = 29 + Top = 93 + Width = 143 + AutoSize = True + BorderSpacing.Left = 6 + Caption = 'CancelAddFileButton' + OnClick = CancelAddFileButtonClick + TabOrder = 5 + end + end + object AddFilesPage: TPage + Caption = 'Add Files' + ClientWidth = 498 + ClientHeight = 273 + object FilesListView: TListView + AnchorSideBottom.Control = FilesBrowseButton + Height = 227 + Width = 498 + Align = alClient + BorderSpacing.Bottom = 5 + Columns = < + item + Caption = 'Filename' + Width = 200 + end + item + Caption = 'Type' + Width = 280 + end> + MultiSelect = True + TabOrder = 0 + ViewStyle = vsReport + end + object AddFilesBtnPanel: TPanel + Height = 41 + Top = 232 + Width = 498 + Align = alBottom + AutoSize = True + BevelOuter = bvNone + ClientHeight = 41 + ClientWidth = 498 + TabOrder = 1 + object FilesBrowseButton: TButton + AnchorSideBottom.Side = asrBottom + Left = 6 + Height = 29 + Top = 6 + Width = 128 + Align = alLeft + AutoSize = True + BorderSpacing.Around = 6 + Caption = 'FilesBrowseButton' + OnClick = FilesBrowseButtonClick + TabOrder = 0 + end + object FilesShortenButton: TButton + AnchorSideLeft.Side = asrBottom + Left = 140 + Height = 29 + Top = 6 + Width = 133 + Align = alLeft + AutoSize = True + BorderSpacing.Around = 6 + Caption = 'FilesShortenButton' + OnClick = FilesShortenButtonClick + TabOrder = 1 + end + object FilesDeleteButton: TButton + AnchorSideLeft.Side = asrBottom + Left = 279 + Height = 29 + Top = 6 + Width = 124 + Align = alLeft + AutoSize = True + BorderSpacing.Around = 6 + Caption = 'FilesDeleteButton' + OnClick = FilesDeleteButtonClick + TabOrder = 2 + end + object FilesAddButton: TButton + AnchorSideLeft.Side = asrBottom + Left = 409 + Height = 29 + Top = 6 + Width = 107 + Align = alLeft + AutoSize = True + BorderSpacing.Around = 6 + Caption = 'FilesAddButton' + OnClick = FilesAddButtonClick + TabOrder = 3 + end + end + end + end +end diff --git a/packager/addtopackagedlg.lrs b/packager/addtopackagedlg.lrs new file mode 100644 index 0000000000..9a8b395c7b --- /dev/null +++ b/packager/addtopackagedlg.lrs @@ -0,0 +1,255 @@ +{ This is an automatically generated lazarus resource file } + +LazarusResources.Add('TAddToPackageDlg','FORMDATA',[ + 'TPF0'#16'TAddToPackageDlg'#15'AddToPackageDlg'#4'Left'#3#134#1#6'Height'#3',' + +#1#3'Top'#3'j'#1#5'Width'#3#244#1#13'ActiveControl'#7#8'NoteBook'#7'Caption' + +#6#14'Add to package'#12'ClientHeight'#3','#1#11'ClientWidth'#3#244#1#10'Key' + +'Preview'#9#7'OnClose'#7#20'AddToPackageDlgClose'#8'OnCreate'#7#10'FormCreat' + +'e'#9'OnDestroy'#7#11'FormDestroy'#9'OnKeyDown'#7#22'AddToPackageDlgKeyDown' + +#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.25'#0#9'TNotebook'#8 + +'NoteBook'#6'Height'#3','#1#5'Width'#3#244#1#5'Align'#7#8'alClient'#9'PageIn' + +'dex'#2#1#8'TabOrder'#2#0#0#5'TPage'#11'NewFilePage'#7'Caption'#6#8'New File' + +#11'ClientWidth'#3#242#1#12'ClientHeight'#3#17#1#8'OnResize'#7#17'NewFilePag' + +'eResize'#0#9'TTreeView'#15'NewFileTreeView'#24'AnchorSideBottom.Control'#7 + +#15'NewFileOkButton'#6'Height'#3#218#0#5'Width'#3#249#0#5'Align'#7#6'alLeft' + +#20'BorderSpacing.Bottom'#2#5#17'DefaultItemHeight'#2#19#8'TabOrder'#2#0#7'O' + +'nClick'#7#20'NewFileTreeViewClick'#10'OnDblClick'#7#23'NewFileTreeViewDblCl' + +'ick'#18'OnSelectionChanged'#7#31'NewFileTreeViewSelectionChanged'#0#0#9'TGr' + +'oupBox'#26'NewFileDescriptionGroupBox'#22'AnchorSideLeft.Control'#7#15'NewF' + +'ileTreeView'#19'AnchorSideLeft.Side'#7#9'asrBottom'#20'AnchorSideRight.Side' + +#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#15'NewFileOkButton'#4'Left'#3 + +#249#0#6'Height'#3#218#0#5'Width'#3#249#0#5'Align'#7#8'alClient'#20'BorderSp' + +'acing.Bottom'#2#5#7'Caption'#6#26'NewFileDescriptionGroupBox'#12'ClientHeig' + +'ht'#3#199#0#11'ClientWidth'#3#245#0#8'TabOrder'#2#1#0#6'TLabel'#16'NewFileH' + +'elpLabel'#6'Height'#3#199#0#5'Width'#3#245#0#5'Align'#7#8'alClient'#7'Capti' + +'on'#6#16'NewFileHelpLabel'#11'ParentColor'#8#8'WordWrap'#9#0#0#0#6'TPanel' + +#15'NewFileBtnPanel'#6'Height'#2'2'#3'Top'#3#223#0#5'Width'#3#242#1#5'Align' + +#7#8'alBottom'#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'2'#11'ClientWid' + +'th'#3#242#1#8'TabOrder'#2#2#0#7'TButton'#15'NewFileOkButton'#21'AnchorSideB' + +'ottom.Side'#7#9'asrBottom'#4'Left'#3#222#0#6'Height'#2'&'#3'Top'#2#6#5'Widt' + +'h'#2'w'#5'Align'#7#7'alRight'#7'Anchors'#11#8'akBottom'#0#8'AutoSize'#9#20 + +'BorderSpacing.Around'#2#6#7'Caption'#6#15'NewFileOkButton'#7'Enabled'#8#7'O' + +'nClick'#7#20'NewFileOkButtonClick'#8'TabOrder'#2#0#0#0#7'TButton'#19'NewFil' + +'eCancelButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left'#3'['#1#6'Heig' + +'ht'#2'&'#3'Top'#2#6#5'Width'#3#145#0#5'Align'#7#7'alRight'#8'AutoSize'#9#20 + +'BorderSpacing.Around'#2#6#7'Caption'#6#19'NewFileCancelButton'#11'ModalResu' + +'lt'#2#2#8'TabOrder'#2#1#0#0#0#0#5'TPage'#11'AddUnitPage'#7'Caption'#6#8'Add' + +' Unit'#11'ClientWidth'#3#242#1#12'ClientHeight'#3#17#1#0#6'TLabel'#20'AddUn' + +'itFilenameLabel'#21'AnchorSideTop.Control'#7#19'AddUnitFilenameEdit'#18'Anc' + +'horSideTop.Side'#7#9'asrCenter'#4'Left'#2#5#6'Height'#2#20#3'Top'#2#8#5'Wid' + +'th'#3#143#0#7'Caption'#6#20'AddUnitFilenameLabel'#11'ParentColor'#8#0#0#6'T' + +'Label'#19'AddUnitSrcNameLabel'#21'AnchorSideTop.Control'#7#18'AddUnitSrcNam' + +'eEdit'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#5#6'Height'#2#20#3'T' + +'op'#2')'#5'Width'#3#146#0#7'Caption'#6#19'AddUnitSrcNameLabel'#11'ParentCol' + +'or'#8#0#0#5'TEdit'#19'AddUnitFilenameEdit'#22'AnchorSideLeft.Control'#7#20 + +'AddUnitFilenameLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#23'AnchorSideR' + +'ight.Control'#7#23'AddUnitFileBrowseButton'#4'Left'#3#148#0#6'Height'#2#27#3 + +'Top'#2#5#5'Width'#3'$'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'Au' + +'toSize'#9#8'TabOrder'#2#0#4'Text'#6#19'AddUnitFilenameEdit'#0#0#7'TButton' + +#23'AddUnitFileBrowseButton'#23'AnchorSideRight.Control'#7#24'AddUnitFileSho' + +'rtenButton'#4'Left'#3#184#1#6'Height'#2#29#3'Top'#2#5#5'Width'#2#24#7'Ancho' + +'rs'#11#5'akTop'#7'akRight'#0#8'AutoSize'#9#7'Caption'#6#3'...'#7'OnClick'#7 + +#28'AddUnitFileBrowseButtonClick'#8'TabOrder'#2#1#0#0#7'TButton'#24'AddUnitF' + +'ileShortenButton'#23'AnchorSideRight.Control'#7#11'AddUnitPage'#20'AnchorSi' + +'deRight.Side'#7#9'asrBottom'#4'Left'#3#208#1#6'Height'#2#29#3'Top'#2#5#5'Wi' + +'dth'#2'"'#7'Anchors'#11#5'akTop'#7'akRight'#0#8'AutoSize'#9#7'Caption'#6#2 + +'<>'#7'OnClick'#7#29'AddUnitFileShortenButtonClick'#8'TabOrder'#2#2#0#0#5'TE' + +'dit'#18'AddUnitSrcNameEdit'#22'AnchorSideLeft.Control'#7#19'AddUnitSrcNameL' + +'abel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#19 + +'AddUnitFilenameEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#151#0#6 + +'Height'#2#27#3'Top'#2'&'#5'Width'#3#156#0#8'AutoSize'#9#17'BorderSpacing.To' + +'p'#2#6#8'TabOrder'#2#3#4'Text'#6#18'AddUnitSrcNameEdit'#0#0#9'TCheckBox'#26 + +'AddUnitHasRegisterCheckBox'#21'AnchorSideTop.Control'#7#18'AddUnitSrcNameEd' + +'it'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#5#6'Height'#2#22#3'Top' + +#2'G'#5'Width'#3#214#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#26'AddUnitH' + +'asRegisterCheckBox'#8'TabOrder'#2#4#0#0#9'TCheckBox'#24'AddUnitIsVirtualChe' + +'ckBox'#22'AnchorSideLeft.Control'#7#26'AddUnitHasRegisterCheckBox'#21'Ancho' + +'rSideTop.Control'#7#26'AddUnitHasRegisterCheckBox'#18'AnchorSideTop.Side'#7 + ,#9'asrBottom'#4'Left'#2#5#6'Height'#2#22#3'Top'#2'c'#5'Width'#3#189#0#17'Bor' + +'derSpacing.Top'#2#6#7'Caption'#6#24'AddUnitIsVirtualCheckBox'#7'OnClick'#7 + +#29'AddUnitIsVirtualCheckBoxClick'#8'TabOrder'#2#5#0#0#9'TCheckBox'#25'AddSe' + +'condaryFilesCheckBox'#22'AnchorSideLeft.Control'#7#26'AddUnitHasRegisterChe' + +'ckBox'#21'AnchorSideTop.Control'#7#24'AddUnitIsVirtualCheckBox'#18'AnchorSi' + +'deTop.Side'#7#9'asrBottom'#4'Left'#2#5#6'Height'#2#22#3'Top'#2''#5'Width'#3 + +#207#0#17'BorderSpacing.Top'#2#6#7'Caption'#6#25'AddSecondaryFilesCheckBox'#7 + +'Checked'#9#5'State'#7#9'cbChecked'#8'TabOrder'#2#6#0#0#7'TButton'#19'AddUni' + +'tUpdateButton'#22'AnchorSideLeft.Control'#7#26'AddUnitHasRegisterCheckBox' + +#21'AnchorSideTop.Control'#7#25'AddSecondaryFilesCheckBox'#18'AnchorSideTop.' + +'Side'#7#9'asrBottom'#4'Left'#2#5#6'Height'#2#29#3'Top'#3#155#0#5'Width'#3 + +#153#0#8'AutoSize'#9#17'BorderSpacing.Top'#2#6#7'Caption'#6#19'AddUnitUpdate' + +'Button'#7'OnClick'#7#24'AddUnitUpdateButtonClick'#8'TabOrder'#2#7#0#0#7'TBu' + +'tton'#13'AddUnitButton'#22'AnchorSideLeft.Control'#7#26'AddUnitHasRegisterC' + +'heckBox'#21'AnchorSideTop.Control'#7#19'AddUnitUpdateButton'#18'AnchorSideT' + +'op.Side'#7#9'asrBottom'#4'Left'#2#5#6'Height'#2#29#3'Top'#3#209#0#5'Width'#2 + +'j'#8'AutoSize'#9#17'BorderSpacing.Top'#2#25#7'Caption'#6#13'AddUnitButton'#7 + +'OnClick'#7#18'AddUnitButtonClick'#8'TabOrder'#2#8#0#0#7'TButton'#19'CancelA' + +'ddUnitButton'#22'AnchorSideLeft.Control'#7#13'AddUnitButton'#19'AnchorSideL' + +'eft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#13'AddUnitButton'#4'Le' + +'ft'#2'y'#6'Height'#2#29#3'Top'#3#209#0#5'Width'#3#149#0#8'AutoSize'#9#18'Bo' + +'rderSpacing.Left'#2#10#7'Caption'#6#19'CancelAddUnitButton'#7'OnClick'#7#24 + +'CancelAddUnitButtonClick'#8'TabOrder'#2#9#0#0#0#5'TPage'#16'NewComponentPag' + +'e'#7'Caption'#6#13'New Component'#11'ClientWidth'#3#242#1#12'ClientHeight'#3 + +#17#1#0#6'TLabel'#17'AncestorTypeLabel'#21'AnchorSideTop.Control'#7#16'Ances' + +'torComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#5#6'Height'#2 + +#20#3'Top'#2#9#5'Width'#2'x'#7'Caption'#6#17'AncestorTypeLabel'#11'ParentCol' + +'or'#8#0#0#6'TLabel'#14'ClassNameLabel'#21'AnchorSideTop.Control'#7#13'Class' + +'NameEdit'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#5#6'Height'#2#20#3 + +'Top'#2'+'#5'Width'#2'l'#7'Caption'#6#14'ClassNameLabel'#11'ParentColor'#8#0 + +#0#6'TLabel'#16'PalettePageLabel'#21'AnchorSideTop.Control'#7#19'PalettePage' + +'Combobox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#5#6'Height'#2#20#3 + +'Top'#2'M'#5'Width'#2'n'#7'Caption'#6#16'PalettePageLabel'#11'ParentColor'#8 + +#0#0#6'TLabel'#22'ComponentUnitFileLabel'#21'AnchorSideTop.Control'#7#21'Com' + +'ponentUnitFileEdit'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#5#6'Hei' + +'ght'#2#20#3'Top'#2'o'#5'Width'#3#156#0#7'Caption'#6#22'ComponentUnitFileLab' + +'el'#11'ParentColor'#8#0#0#6'TLabel'#22'ComponentUnitNameLabel'#21'AnchorSid' + +'eTop.Control'#7#21'ComponentUnitNameEdit'#18'AnchorSideTop.Side'#7#9'asrCen' + +'ter'#4'Left'#2#5#6'Height'#2#20#3'Top'#3#144#0#5'Width'#3#175#0#7'Caption'#6 + +#22'ComponentUnitNameLabel'#11'ParentColor'#8#0#0#9'TComboBox'#16'AncestorCo' + +'mboBox'#22'AnchorSideLeft.Control'#7#17'AncestorTypeLabel'#19'AnchorSideLef' + +'t.Side'#7#9'asrBottom'#4'Left'#2'}'#6'Height'#2#29#3'Top'#2#5#5'Width'#3#200 + +#0#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscendin' + +'g'#0#9'MaxLength'#2#0#9'OnCloseUp'#7#23'AncestorComboBoxCloseUp'#8'TabOrder' + +#2#0#4'Text'#6#16'AncestorComboBox'#0#0#9'TCheckBox'#23'AncestorShowAllCheck' + +'Box'#22'AnchorSideLeft.Control'#7#16'AncestorComboBox'#19'AnchorSideLeft.Si' + +'de'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#16'AncestorComboBox'#18'Anch' + +'orSideTop.Side'#7#9'asrCenter'#4'Left'#3'E'#1#6'Height'#2#22#3'Top'#2#8#5'W' + +'idth'#3#193#0#7'Caption'#6#23'AncestorShowAllCheckBox'#7'Checked'#9#7'OnCli' + +'ck'#7#28'AncestorShowAllCheckBoxClick'#5'State'#7#9'cbChecked'#8'TabOrder'#2 + +#1#0#0#5'TEdit'#13'ClassNameEdit'#22'AnchorSideLeft.Control'#7#14'ClassNameL' + +'abel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#16 + +'AncestorComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'q'#6'Heig' + +'ht'#2#27#3'Top'#2'('#5'Width'#3#200#0#8'AutoSize'#9#17'BorderSpacing.Top'#2 + +#6#8'OnChange'#7#19'ClassNameEditChange'#8'TabOrder'#2#2#4'Text'#6#13'ClassN' + +'ameEdit'#0#0#9'TComboBox'#19'PalettePageCombobox'#22'AnchorSideLeft.Control' + +#7#16'PalettePageLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSide' + +'Top.Control'#7#13'ClassNameEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Le' + +'ft'#2's'#6'Height'#2#29#3'Top'#2'I'#5'Width'#3#200#0#16'AutoCompleteText'#11 + +#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#17'BorderSpacing.Top' + +#2#6#9'MaxLength'#2#0#8'TabOrder'#2#3#4'Text'#6#19'PalettePageCombobox'#0#0#5 + +'TEdit'#21'ComponentUnitFileEdit'#22'AnchorSideLeft.Control'#7#22'ComponentU' + +'nitFileLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Contr' + +'ol'#7#19'PalettePageCombobox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left' + ,#3#161#0#6'Height'#2#27#3'Top'#2'l'#5'Width'#3#129#0#8'AutoSize'#9#17'Border' + +'Spacing.Top'#2#6#8'TabOrder'#2#4#4'Text'#6#21'ComponentUnitFileEdit'#0#0#7 + +'TButton'#29'ComponentUnitFileBrowseButton'#22'AnchorSideLeft.Control'#7#21 + +'ComponentUnitFileEdit'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSide' + +'Top.Control'#7#21'ComponentUnitFileEdit'#18'AnchorSideTop.Side'#7#9'asrCent' + +'er'#4'Left'#3'"'#1#6'Height'#2#29#4'Hint'#6#16'Save file dialog'#3'Top'#2'k' + +#5'Width'#2#24#8'AutoSize'#9#7'Caption'#6#3'...'#7'OnClick'#7'"ComponentUnit' + +'FileBrowseButtonClick'#14'ParentShowHint'#8#8'ShowHint'#9#8'TabOrder'#2#5#0 + +#0#7'TButton'#30'ComponentUnitFileShortenButton'#22'AnchorSideLeft.Control'#7 + +#29'ComponentUnitFileBrowseButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21 + +'AnchorSideTop.Control'#7#21'ComponentUnitFileEdit'#18'AnchorSideTop.Side'#7 + +#9'asrCenter'#4'Left'#3':'#1#6'Height'#2#29#4'Hint'#6#26'Shorten or expand f' + +'ilename'#3'Top'#2'k'#5'Width'#2'"'#8'AutoSize'#9#7'Caption'#6#2'<>'#7'OnCli' + +'ck'#7'#ComponentUnitFileShortenButtonClick'#14'ParentShowHint'#8#8'ShowHint' + +#9#8'TabOrder'#2#6#0#0#5'TEdit'#21'ComponentUnitNameEdit'#22'AnchorSideLeft.' + +'Control'#7#22'ComponentUnitNameLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom' + +#21'AnchorSideTop.Control'#7#21'ComponentUnitFileEdit'#18'AnchorSideTop.Side' + +#7#9'asrBottom'#4'Left'#3#180#0#6'Height'#2#27#3'Top'#3#141#0#5'Width'#3#156 + +#0#8'AutoSize'#9#17'BorderSpacing.Top'#2#6#8'TabOrder'#2#7#4'Text'#6#21'Comp' + +'onentUnitNameEdit'#0#0#7'TButton'#18'NewComponentButton'#21'AnchorSideTop.C' + +'ontrol'#7#21'ComponentUnitNameEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#4 + +'Left'#2#5#6'Height'#2#29#3'Top'#3#193#0#5'Width'#3#157#0#8'AutoSize'#9#17'B' + +'orderSpacing.Top'#2#25#7'Caption'#6#18'NewComponentButton'#7'OnClick'#7#23 + +'NewComponentButtonClick'#8'TabOrder'#2#8#0#0#7'TButton'#24'CancelNewCompone' + +'ntButton'#22'AnchorSideLeft.Control'#7#18'NewComponentButton'#19'AnchorSide' + +'Left.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#18'NewComponentButton' + +#4'Left'#3#168#0#6'Height'#2#29#3'Top'#3#193#0#5'Width'#3#200#0#8'AutoSize'#9 + +#18'BorderSpacing.Left'#2#6#7'Caption'#6#24'CancelNewComponentButton'#7'OnCl' + +'ick'#7#29'CancelNewComponentButtonClick'#8'TabOrder'#2#9#0#0#0#5'TPage'#18 + +'NewRequirementPage'#7'Caption'#6#15'New Requirement'#11'ClientWidth'#3#242#1 + +#12'ClientHeight'#3#17#1#0#6'TLabel'#18'DependPkgNameLabel'#21'AnchorSideTop' + +'.Control'#7#21'DependPkgNameComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter' + +#4'Left'#2#5#6'Height'#2#20#3'Top'#2#9#5'Width'#3#147#0#7'Caption'#6#18'Depe' + +'ndPkgNameLabel'#11'ParentColor'#8#0#0#6'TLabel'#21'DependMinVersionLabel'#21 + +'AnchorSideTop.Control'#7#20'DependMinVersionEdit'#18'AnchorSideTop.Side'#7#9 + +'asrCenter'#4'Left'#2#5#6'Height'#2#20#3'Top'#2'+'#5'Width'#3#154#0#7'Captio' + +'n'#6#21'DependMinVersionLabel'#11'ParentColor'#8#0#0#6'TLabel'#21'DependMax' + +'VersionLabel'#21'AnchorSideTop.Control'#7#20'DependMaxVersionEdit'#18'Ancho' + +'rSideTop.Side'#7#9'asrCenter'#4'Left'#2#5#6'Height'#2#20#3'Top'#2'L'#5'Widt' + +'h'#3#158#0#7'Caption'#6#21'DependMaxVersionLabel'#11'ParentColor'#8#0#0#9'T' + +'ComboBox'#21'DependPkgNameComboBox'#22'AnchorSideLeft.Control'#7#18'DependP' + +'kgNameLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left'#3#152#0#6'Heigh' + +'t'#2#29#3'Top'#2#5#5'Width'#3#215#0#16'AutoCompleteText'#11#22'cbactEndOfLi' + +'neComplete'#20'cbactSearchAscending'#0#9'MaxLength'#2#0#8'TabOrder'#2#0#4'T' + +'ext'#6#21'DependPkgNameComboBox'#0#0#5'TEdit'#20'DependMinVersionEdit'#22'A' + +'nchorSideLeft.Control'#7#21'DependMinVersionLabel'#19'AnchorSideLeft.Side'#7 + +#9'asrBottom'#21'AnchorSideTop.Control'#7#21'DependPkgNameComboBox'#18'Ancho' + +'rSideTop.Side'#7#9'asrBottom'#4'Left'#3#159#0#6'Height'#2#27#3'Top'#2'('#5 + +'Width'#2'd'#8'AutoSize'#9#17'BorderSpacing.Top'#2#6#8'TabOrder'#2#1#4'Text' + +#6#20'DependMinVersionEdit'#0#0#5'TEdit'#20'DependMaxVersionEdit'#22'AnchorS' + +'ideLeft.Control'#7#21'DependMaxVersionLabel'#19'AnchorSideLeft.Side'#7#9'as' + +'rBottom'#21'AnchorSideTop.Control'#7#20'DependMinVersionEdit'#18'AnchorSide' + +'Top.Side'#7#9'asrBottom'#4'Left'#3#163#0#6'Height'#2#27#3'Top'#2'I'#5'Width' + +#2'd'#8'AutoSize'#9#17'BorderSpacing.Top'#2#6#8'TabOrder'#2#2#4'Text'#6#20'D' + +'ependMaxVersionEdit'#0#0#7'TButton'#15'NewDependButton'#21'AnchorSideTop.Co' + +'ntrol'#7#20'DependMaxVersionEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'L' + +'eft'#2#5#6'Height'#2#29#3'Top'#2'}'#5'Width'#3#132#0#8'AutoSize'#9#17'Borde' + +'rSpacing.Top'#2#25#7'Caption'#6#15'NewDependButton'#7'OnClick'#7#20'NewDepe' + +'ndButtonClick'#8'TabOrder'#2#3#0#0#7'TButton'#18'CancelDependButton'#22'Anc' + +'horSideLeft.Control'#7#15'NewDependButton'#19'AnchorSideLeft.Side'#7#9'asrB' + +'ottom'#21'AnchorSideTop.Control'#7#15'NewDependButton'#4'Left'#3#143#0#6'He' + +'ight'#2#29#3'Top'#2'}'#5'Width'#3#148#0#8'AutoSize'#9#18'BorderSpacing.Left' + +#2#6#7'Caption'#6#18'CancelDependButton'#11'ModalResult'#2#2#8'TabOrder'#2#4 + +#0#0#0#5'TPage'#11'AddFilePage'#7'Caption'#6#8'Add File'#11'ClientWidth'#3 + ,#242#1#12'ClientHeight'#3#17#1#0#6'TLabel'#16'AddFilenameLabel'#21'AnchorSid' + +'eTop.Control'#7#15'AddFilenameEdit'#18'AnchorSideTop.Side'#7#9'asrCenter'#4 + +'Left'#2#5#6'Height'#2#20#3'Top'#2#8#5'Width'#2'u'#7'Caption'#6#16'AddFilena' + +'meLabel'#11'ParentColor'#8#0#0#5'TEdit'#15'AddFilenameEdit'#22'AnchorSideLe' + +'ft.Control'#7#16'AddFilenameLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#23 + +'AnchorSideRight.Control'#7#19'AddFileBrowseButton'#4'Left'#2'z'#6'Height'#2 + +#27#3'Top'#2#5#5'Width'#3'>'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0 + +#8'AutoSize'#9#8'TabOrder'#2#0#4'Text'#6#15'AddFilenameEdit'#0#0#7'TButton' + +#19'AddFileBrowseButton'#23'AnchorSideRight.Control'#7#20'AddFileShortenButt' + +'on'#4'Left'#3#184#1#6'Height'#2#29#3'Top'#2#5#5'Width'#2#24#7'Anchors'#11#5 + +'akTop'#7'akRight'#0#8'AutoSize'#9#7'Caption'#6#3'...'#7'OnClick'#7#24'AddFi' + +'leBrowseButtonClick'#8'TabOrder'#2#1#0#0#7'TButton'#20'AddFileShortenButton' + +#23'AnchorSideRight.Control'#7#11'AddFilePage'#20'AnchorSideRight.Side'#7#9 + +'asrBottom'#4'Left'#3#208#1#6'Height'#2#29#3'Top'#2#5#5'Width'#2'"'#7'Anchor' + +'s'#11#5'akTop'#7'akRight'#0#8'AutoSize'#9#7'Caption'#6#2'<>'#7'OnClick'#7#25 + +'AddFileShortenButtonClick'#8'TabOrder'#2#2#0#0#11'TRadioGroup'#21'AddFileTy' + +'peRadioGroup'#21'AnchorSideTop.Control'#7#15'AddFilenameEdit'#18'AnchorSide' + +'Top.Side'#7#9'asrBottom'#4'Left'#2#5#6'Height'#2#30#3'Top'#2'&'#5'Width'#2 + +'d'#8'AutoFill'#9#8'AutoSize'#9#17'BorderSpacing.Top'#2#6#7'Caption'#6#21'Ad' + +'dFileTypeRadioGroup'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.To' + +'pBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChi' + +'ldResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResize'#28 + +'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVer' + +'tical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenT' + +'opToBottom'#27'ChildSizing.ControlsPerLine'#2#1#21'Constraints.MinHeight'#2 + +#30#20'Constraints.MinWidth'#2'd'#8'TabOrder'#2#3#0#0#7'TButton'#13'AddFileB' + +'utton'#21'AnchorSideTop.Control'#7#21'AddFileTypeRadioGroup'#18'AnchorSideT' + +'op.Side'#7#9'asrBottom'#4'Left'#2#5#6'Height'#2#29#3'Top'#2']'#5'Width'#2'd' + +#8'AutoSize'#9#17'BorderSpacing.Top'#2#25#7'Caption'#6#13'AddFileButton'#7'O' + +'nClick'#7#18'AddFileButtonClick'#8'TabOrder'#2#4#0#0#7'TButton'#19'CancelAd' + +'dFileButton'#22'AnchorSideLeft.Control'#7#13'AddFileButton'#19'AnchorSideLe' + +'ft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#13'AddFileButton'#4'Lef' + +'t'#2'o'#6'Height'#2#29#3'Top'#2']'#5'Width'#3#143#0#8'AutoSize'#9#18'Border' + +'Spacing.Left'#2#6#7'Caption'#6#19'CancelAddFileButton'#7'OnClick'#7#24'Canc' + +'elAddFileButtonClick'#8'TabOrder'#2#5#0#0#0#5'TPage'#12'AddFilesPage'#7'Cap' + +'tion'#6#9'Add Files'#11'ClientWidth'#3#242#1#12'ClientHeight'#3#17#1#0#9'TL' + +'istView'#13'FilesListView'#24'AnchorSideBottom.Control'#7#17'FilesBrowseBut' + +'ton'#6'Height'#3#227#0#5'Width'#3#242#1#5'Align'#7#8'alClient'#20'BorderSpa' + +'cing.Bottom'#2#5#7'Columns'#14#1#7'Caption'#6#8'Filename'#5'Width'#3#200#0#0 + +#1#7'Caption'#6#4'Type'#5'Width'#3#24#1#0#0#11'MultiSelect'#9#8'TabOrder'#2#0 + +#9'ViewStyle'#7#8'vsReport'#0#0#6'TPanel'#16'AddFilesBtnPanel'#6'Height'#2')' + +#3'Top'#3#232#0#5'Width'#3#242#1#5'Align'#7#8'alBottom'#8'AutoSize'#9#10'Bev' + +'elOuter'#7#6'bvNone'#12'ClientHeight'#2')'#11'ClientWidth'#3#242#1#8'TabOrd' + +'er'#2#1#0#7'TButton'#17'FilesBrowseButton'#21'AnchorSideBottom.Side'#7#9'as' + +'rBottom'#4'Left'#2#6#6'Height'#2#29#3'Top'#2#6#5'Width'#3#128#0#5'Align'#7#6 + +'alLeft'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#17'FilesBro' + +'wseButton'#7'OnClick'#7#22'FilesBrowseButtonClick'#8'TabOrder'#2#0#0#0#7'TB' + +'utton'#18'FilesShortenButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left' + +#3#140#0#6'Height'#2#29#3'Top'#2#6#5'Width'#3#133#0#5'Align'#7#6'alLeft'#8'A' + +'utoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#18'FilesShortenButton' + +#7'OnClick'#7#23'FilesShortenButtonClick'#8'TabOrder'#2#1#0#0#7'TButton'#17 + +'FilesDeleteButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left'#3#23#1#6 + +'Height'#2#29#3'Top'#2#6#5'Width'#2'|'#5'Align'#7#6'alLeft'#8'AutoSize'#9#20 + +'BorderSpacing.Around'#2#6#7'Caption'#6#17'FilesDeleteButton'#7'OnClick'#7#22 + +'FilesDeleteButtonClick'#8'TabOrder'#2#2#0#0#7'TButton'#14'FilesAddButton'#19 + +'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left'#3#153#1#6'Height'#2#29#3'Top'#2 + +#6#5'Width'#2'k'#5'Align'#7#6'alLeft'#8'AutoSize'#9#20'BorderSpacing.Around' + +#2#6#7'Caption'#6#14'FilesAddButton'#7'OnClick'#7#19'FilesAddButtonClick'#8 + +'TabOrder'#2#3#0#0#0#0#0#0 +]); diff --git a/packager/addtopackagedlg.pas b/packager/addtopackagedlg.pas index 0be01b9e77..7bb10826f0 100644 --- a/packager/addtopackagedlg.pas +++ b/packager/addtopackagedlg.pas @@ -82,12 +82,12 @@ type TAddToPackageDlg = class(TForm) // notebook NoteBook: TNoteBook; + NewFilePage: TPage; AddUnitPage: TPage; + NewComponentPage: TPage; + NewRequirementPage: TPage; AddFilePage: TPage; AddFilesPage: TPage; - NewComponentPage: TPage; - NewDependPage: TPage; - NewFilePage: TPage; // new file page NewFileTreeView: TTreeView; NewFileDescriptionGroupBox: TGroupBox; @@ -146,9 +146,10 @@ type FilesShortenButton: TButton; FilesDeleteButton: TButton; FilesAddButton: TButton; + NewFileBtnPanel: TPanel; + AddFilesBtnPanel: TPanel; procedure AddFileBrowseButtonClick(Sender: TObject); procedure AddFileButtonClick(Sender: TObject); - procedure AddFilePageResize(Sender: TObject); procedure AddFileShortenButtonClick(Sender: TObject); procedure AddToPackageDlgClose(Sender: TObject; var CloseAction: TCloseAction); @@ -158,7 +159,6 @@ type procedure AddUnitFileBrowseButtonClick(Sender: TObject); procedure AddUnitFileShortenButtonClick(Sender: TObject); procedure AddUnitIsVirtualCheckBoxClick(Sender: TObject); - procedure AddUnitPageResize(Sender: TObject); procedure AddUnitUpdateButtonClick(Sender: TObject); procedure AncestorComboBoxCloseUp(Sender: TObject); procedure AncestorShowAllCheckBoxClick(Sender: TObject); @@ -168,15 +168,14 @@ type procedure ClassNameEditChange(Sender: TObject); procedure ComponentUnitFileBrowseButtonClick(Sender: TObject); procedure ComponentUnitFileShortenButtonClick(Sender: TObject); - procedure AddFilesPageResize(Sender: TObject); procedure FilesAddButtonClick(Sender: TObject); procedure FilesBrowseButtonClick(Sender: TObject); procedure FilesDeleteButtonClick(Sender: TObject); procedure FilesShortenButtonClick(Sender: TObject); + procedure FormCreate(Sender: TObject); + procedure FormDestroy(Sender: TObject); procedure NewComponentButtonClick(Sender: TObject); - procedure NewComponentPageResize(Sender: TObject); procedure NewDependButtonClick(Sender: TObject); - procedure NewDependPageResize(Sender: TObject); procedure NewFileOkButtonClick(Sender: TObject); procedure NewFilePageResize(Sender: TObject); procedure NewFileTreeViewClick(Sender: TObject); @@ -192,8 +191,8 @@ type fPackages: TAVLTree;// tree of TLazPackage or TPackageLink procedure SetLazPackage(const AValue: TLazPackage); procedure SetupComponents; - procedure SetupAddUnitPage; procedure SetupNewFilePage; + procedure SetupAddUnitPage; procedure SetupNewComponentPage; procedure SetupAddDependencyPage; procedure SetupAddFilePage; @@ -208,8 +207,6 @@ type procedure FillNewFileTreeView; public Params: TAddToPkgResult; - constructor Create(TheOwner: TComponent); override; - destructor Destroy; override; procedure UpdateAvailableAncestorTypes; procedure UpdateAvailablePageNames; procedure UpdateAvailableDependencyNames; @@ -243,9 +240,9 @@ var AddDlg: TAddToPackageDlg; begin AddDlg:=TAddToPackageDlg.Create(nil); - AddDlg.LazPackage:=Pkg; AddDlg.OnGetIDEFileInfo:=OnGetIDEFileInfo; AddDlg.OnGetUnitRegisterInfo:=OnGetUnitRegisterInfo; + AddDlg.LazPackage:=Pkg; Result:=AddDlg.ShowModal; if Result=mrOk then begin Params:=AddDlg.Params; @@ -501,44 +498,6 @@ begin ModalResult:=mrCancel; end; -procedure TAddToPackageDlg.AddFilePageResize(Sender: TObject); -var - x: Integer; - y: Integer; - w: Integer; -begin - x:=5; - y:=5; - with AddFilenameLabel do - SetBounds(x,y+2,100,Height); - inc(x,AddFilenameLabel.Width+5); - - w:=AddFilenameEdit.Height; - with AddFilenameEdit do - SetBounds(x,y,Parent.ClientWidth-x-2-w-2-w-5,Height); - inc(x,AddFilenameEdit.Width+2); - - with AddFileBrowseButton do - SetBounds(x,y,w,w); - inc(x,w+2); - with AddFileShortenButton do - SetBounds(x,y,w,w); - x:=5; - y:=AddFilenameEdit.Top+AddFilenameEdit.Height+5; - - with AddFileTypeRadioGroup do begin - SetBounds(x,y,Parent.ClientWidth-2*x,140); - inc(y,Height+20); - end; - - with AddFileButton do - SetBounds(x,y,80,Height); - inc(x,AddFileButton.Width+10); - - with CancelAddFileButton do - SetBounds(x,y,80,Height); -end; - procedure TAddToPackageDlg.AddFileShortenButtonClick(Sender: TObject); begin if lisA2PchooseAnExistingFile=AddFilenameEdit.Text then exit; @@ -546,10 +505,6 @@ begin SwitchRelativeAbsoluteFilename(AddFilenameEdit.Text); end; -procedure TAddToPackageDlg.AddFilesPageResize(Sender: TObject); -begin -end; - procedure TAddToPackageDlg.AddFileBrowseButtonClick(Sender: TObject); var OpenDialog: TOpenDialog; @@ -676,46 +631,6 @@ begin AddSecondaryFilesCheckBox.Enabled:=not VirtualFile; end; -procedure TAddToPackageDlg.AddUnitPageResize(Sender: TObject); -var - x: Integer; - y: Integer; - w: Integer; -begin - x:=5; - y:=5; - with AddUnitFilenameLabel do - SetBounds(x,y+2,100,Height); - inc(x,AddUnitFilenameLabel.Width+5); - - w:=AddUnitFilenameEdit.Height; - with AddUnitFilenameEdit do - SetBounds(x,y,Parent.ClientWidth-x-2*w-2-2-5,Height); - inc(x,AddUnitFilenameEdit.Width+2); - - with AddUnitFileBrowseButton do - SetBounds(x,y,w,w); - inc(x,w+2); - with AddUnitFileShortenButton do - SetBounds(x,y,w,w); - - x:=5; - y:=AddUnitFilenameEdit.Top+AddUnitFilenameEdit.Height+5; - - with AddUnitSrcNameLabel do - SetBounds(x,y+2,100,Height); - inc(x,AddUnitSrcNameLabel.Width+5); - - with AddUnitSrcNameEdit do - SetBounds(x,y,100,Height); - inc(y,AddUnitSrcNameEdit.Height+5); - x:=5; - - with AddUnitHasRegisterCheckBox do - SetBounds(x,y,Parent.ClientWidth-2*x,Height); - inc(y,AddUnitHasRegisterCheckBox.Height+5); -end; - procedure TAddToPackageDlg.AddUnitUpdateButtonClick(Sender: TObject); begin UpdateAddUnitInfo; @@ -958,6 +873,23 @@ begin end; end; +procedure TAddToPackageDlg.FormCreate(Sender: TObject); +begin + Caption:=lisA2PAddToPackage; + fPkgComponents:=TAVLTree.Create(@CompareIDEComponentByClassName); + fPackages:=TAVLTree.Create(@CompareLazPackageID); + Params:=TAddToPkgResult.Create; + IDEDialogLayoutList.ApplyLayout(Self,500,300); + SetupComponents; +end; + +procedure TAddToPackageDlg.FormDestroy(Sender: TObject); +begin + FreeAndNil(fPkgComponents); + FreeAndNil(fPackages); + FreeAndNil(Params); +end; + procedure TAddToPackageDlg.NewComponentButtonClick(Sender: TObject); var PkgFile: TPkgFile; @@ -1075,80 +1007,6 @@ begin ModalResult:=mrOk; end; -procedure TAddToPackageDlg.NewComponentPageResize(Sender: TObject); -var - x: Integer; - y: Integer; - w: Integer; -begin - x:=5; - y:=5; - - with AncestorTypeLabel do - SetBounds(x,y+2,100,Height); - inc(x,AncestorTypeLabel.Width+5); - - with AncestorComboBox do - SetBounds(x,y,200,Height); - inc(x,AncestorComboBox.Width+5); - - with AncestorShowAllCheckBox do - SetBounds(x,y,100,Height); - x:=5; - inc(y,AncestorComboBox.Height+5); - - with ClassNameLabel do - SetBounds(x,y+2,100,Height); - inc(x,ClassNameLabel.Width+5); - - with ClassNameEdit do - SetBounds(x,y,200,Height); - x:=5; - inc(y,ClassNameEdit.Height+5); - - with PalettePageLabel do - SetBounds(x,y+2,100,Height); - inc(x,PalettePageLabel.Width+5); - - with PalettePageCombobox do - SetBounds(x,y,200,Height); - x:=5; - inc(y,PalettePageCombobox.Height+5); - - with ComponentUnitFileLabel do - SetBounds(x,y+2,100,Height); - inc(x,ComponentUnitFileLabel.Width+5); - - w:=ComponentUnitFileEdit.Height; - with ComponentUnitFileEdit do - SetBounds(x,y,Parent.ClientWidth-x-2-w-2-w-5,Height); - inc(x,ComponentUnitFileEdit.Width+2); - - with ComponentUnitFileBrowseButton do - SetBounds(x,y,w,w); - inc(x,w+2); - with ComponentUnitFileShortenButton do - SetBounds(x,y,w,w); - x:=5; - inc(y,ComponentUnitFileEdit.Height+5); - - with ComponentUnitNameLabel do - SetBounds(x,y+2,100,Height); - inc(x,ComponentUnitNameLabel.Width+5); - - with ComponentUnitNameEdit do - SetBounds(x,y,100,Height); - inc(y,ComponentUnitNameEdit.Height+15); - x:=5; - - with NewComponentButton do - SetBounds(x,y,80,Height); - inc(x,NewComponentButton.Width+10); - - with CancelNewComponentButton do - SetBounds(x,y,80,Height); -end; - procedure TAddToPackageDlg.NewDependButtonClick(Sender: TObject); var NewDependency: TPkgDependency; @@ -1196,43 +1054,6 @@ begin end; end; -procedure TAddToPackageDlg.NewDependPageResize(Sender: TObject); -var - x: Integer; - y: Integer; -begin - x:=5; - y:=5; - - with DependPkgNameLabel do - SetBounds(x,y+3,110,Height); - - with DependPkgNameComboBox do - SetBounds(x+DependPkgNameLabel.Width+5,y,150,Height); - inc(y,DependPkgNameComboBox.Height+5); - - with DependMinVersionLabel do - SetBounds(x,y+3,170,Height); - - with DependMinVersionEdit do - SetBounds(x+DependMinVersionLabel.Width+5,y,100,Height); - inc(y,DependMinVersionEdit.Height+5); - - with DependMaxVersionLabel do - SetBounds(x,y+3,DependMinVersionLabel.Width,Height); - - with DependMaxVersionEdit do - SetBounds(x+DependMaxVersionLabel.Width+5,y, - DependMinVersionEdit.Width,Height); - inc(y,DependMaxVersionEdit.Height+20); - - with NewDependButton do - SetBounds(x,y,80,Height); - - with CancelDependButton do - SetBounds(x+NewDependButton.Width+10,y,80,Height); -end; - procedure TAddToPackageDlg.NewFileOkButtonClick(Sender: TObject); var ANode: TTreeNode; @@ -1294,31 +1115,13 @@ end; procedure TAddToPackageDlg.SetupComponents; begin - NoteBook:=TNoteBook.Create(Self); - with NoteBook do begin - Name:='NoteBook'; - Parent:=Self; - Pages.Add(lisA2PNewFile); - NewFilePage:=Page[Pages.Count-1]; - Pages.Add(lisA2PAddUnit); - AddUnitPage:=Page[Pages.Count-1]; - Pages.Add(lisA2PNewComponent); - NewComponentPage:=Page[Pages.Count-1]; - Pages.Add(lisProjAddNewRequirement); - NewDependPage:=Page[Pages.Count-1]; - Pages.Add(lisA2PAddFile); - AddFilePage:=Page[Pages.Count-1]; - Pages.Add(lisA2PAddFiles); - AddFilesPage:=Page[Pages.Count-1]; - PageIndex:=0; - Align:=alClient; - end; - - AddUnitPage.OnResize:=@AddUnitPageResize; - NewComponentPage.OnResize:=@NewComponentPageResize; - NewDependPage.OnResize:=@NewDependPageResize; - AddFilePage.OnResize:=@AddFilePageResize; - AddFilesPage.OnResize:=@AddFilesPageResize; + NewFilePage.Caption:=lisA2PNewFile; + AddUnitPage.Caption:=lisA2PAddUnit; + NewComponentPage.Caption:=lisA2PNewComponent; + NewRequirementPage.Caption:=lisProjAddNewRequirement; + AddFilePage.Caption:=lisA2PAddFile; + AddFilesPage.Caption:=lisA2PAddFiles; + NoteBook.PageIndex:=0; SetupAddUnitPage; SetupNewFilePage; @@ -1330,173 +1133,71 @@ end; procedure TAddToPackageDlg.SetupAddUnitPage; begin - AddUnitFilenameLabel:=TLabel.Create(Self); with AddUnitFilenameLabel do begin - Name:='AddUnitFilenameLabel'; - Parent:=AddUnitPage; Caption:=lisA2PUnitFileName; end; - AddUnitFilenameEdit:=TEdit.Create(Self); with AddUnitFilenameEdit do begin - Name:='AddUnitFilenameEdit'; - Parent:=AddUnitPage; Text:=lisA2PchooseAnExistingFile; end; - AddUnitFileBrowseButton:=TButton.Create(Self); with AddUnitFileBrowseButton do begin - Name:='AddUnitFileBrowseButton'; - Parent:=AddUnitPage; Caption:='...'; - OnClick:=@AddUnitFileBrowseButtonClick; - AutoSize:=true; end; - AddUnitFileShortenButton:=TButton.Create(Self); with AddUnitFileShortenButton do begin - Name:='AddUnitFileShortenButton'; - Parent:=AddUnitPage; Caption:='<>'; - OnClick:=@AddUnitFileShortenButtonClick; - AutoSize:=true; end; - AddUnitSrcNameLabel:=TLabel.Create(Self); with AddUnitSrcNameLabel do begin - Name:='AddUnitSrcNameLabel'; - Parent:=AddUnitPage; Caption:=lisAF2PUnitName; end; - AddUnitSrcNameEdit:=TEdit.Create(Self); with AddUnitSrcNameEdit do begin - Name:='AddUnitSrcNameEdit'; - Parent:=AddUnitPage; Text:=''; end; - AddUnitHasRegisterCheckBox:=TCheckBox.Create(Self); with AddUnitHasRegisterCheckBox do begin - Name:='AddUnitHasRegisterCheckBox'; - Parent:=AddUnitPage; Caption:=lisAF2PHasRegisterProcedure; end; - AddUnitIsVirtualCheckBox:=TCheckBox.Create(Self); with AddUnitIsVirtualCheckBox do begin - Name:='AddUnitIsVirtualCheckBox'; - Parent:=AddUnitPage; Caption:=lisAF2PIsVirtualUnit; - OnClick:=@AddUnitIsVirtualCheckBoxClick; - AnchorParallel(akLeft,0,AddUnitHasRegisterCheckBox); - AnchorToNeighbour(akTop,5,AddUnitHasRegisterCheckBox); end; - AddSecondaryFilesCheckBox:=TCheckBox.Create(Self); with AddSecondaryFilesCheckBox do begin - Name:='AddSecondaryFilesCheckBox'; - Parent:=AddUnitPage; Caption:=lisA2PAddLFMLRSFilesIfTheyExist; - Checked:=true; - AnchorParallel(akLeft,0,AddUnitHasRegisterCheckBox); - AnchorToNeighbour(akTop,5,AddUnitIsVirtualCheckBox); end; - AddUnitUpdateButton:=TButton.Create(Self); with AddUnitUpdateButton do begin - Name:='AddUnitUpdateButton'; - Parent:=AddUnitPage; Caption:=lisA2PUpdateUnitNameAndHasRegisterProcedure; - OnClick:=@AddUnitUpdateButtonClick; - AutoSize:=true; - AnchorParallel(akLeft,0,AddUnitHasRegisterCheckBox); - AnchorToNeighbour(akTop,5,AddSecondaryFilesCheckBox); - AutoSize:=true; end; - AddUnitButton:=TButton.Create(Self); with AddUnitButton do begin - Name:='AddUnitButton'; - Parent:=AddUnitPage; Caption:=lisA2PAddUnit; - OnClick:=@AddUnitButtonClick; - AutoSize:=true; - AnchorParallel(akLeft,0,AddUnitHasRegisterCheckBox); - AnchorToNeighbour(akTop,25,AddUnitUpdateButton); - AutoSize:=true; end; - CancelAddUnitButton:=TButton.Create(Self); with CancelAddUnitButton do begin - Name:='CancelAddUnitButton'; - Parent:=AddUnitPage; Caption:=dlgCancel; - OnClick:=@CancelAddUnitButtonClick; - AutoSize:=true; - AnchorToNeighbour(akLeft,10,AddUnitButton); - AnchorParallel(akTop,0,AddUnitButton); - AutoSize:=true; end; end; procedure TAddToPackageDlg.SetupNewFilePage; begin - NewFilePage.OnResize:=@NewFilePageResize; - - NewFileTreeView:=TTreeView.Create(Self); - with NewFileTreeView do begin - Name:='NewUnitTreeView'; - Parent:=NewFilePage; - OnClick:=@NewFileTreeViewClick; - OnDblClick:=@NewFileTreeViewDblClick; - OnSelectionChanged:=@NewFileTreeViewSelectionChanged; - end; - - NewFileDescriptionGroupBox:=TGroupBox.Create(Self); with NewFileDescriptionGroupBox do begin - Name:='NewUnitDescriptionGroupBox'; Caption:=lisToDoLDescription; - Parent:=NewFilePage; - AnchorToNeighbour(akLeft,0,NewFileTreeView); - AnchorParallel(akTop,0,NewFilePage); - AnchorParallel(akRight,0,NewFilePage); end; - NewFileHelpLabel:=TLabel.Create(Self); with NewFileHelpLabel do begin - Name:='NewUnitHelpLabel'; Caption:=''; - Align:=alClient; - WordWrap:=true; - Parent:=NewFileDescriptionGroupBox; end; - NewFileOkButton:=TButton.Create(Self); with NewFileOkButton do begin - Name:='NewUnitOkButton'; Caption:=lisA2PCreateNewFile; - Anchors:=[akLeft,akBottom]; - Left:=5; - AutoSize:=true; - Parent:=NewFilePage; - AnchorParallel(akBottom,5,NewFilePage); - OnClick:=@NewFileOkButtonClick; - Enabled:=false; end; - NewFileTreeView.AnchorToNeighbour(akBottom,5,NewFileOkButton); - NewFileDescriptionGroupBox.AnchorToNeighbour(akBottom,5,NewFileOkButton); - - NewFileCancelButton:=TButton.Create(Self); with NewFileCancelButton do begin - Name:='NewUnitCancelButton'; Caption:=dlgCancel; - AutoSize:=true; - Parent:=NewFilePage; - AnchorParallel(akTop,0,NewFileOkButton); - AnchorToNeighbour(akLeft,10,NewFileOkButton); - ModalResult:=mrCancel; end; FillNewFileTreeView; @@ -1504,188 +1205,103 @@ end; procedure TAddToPackageDlg.SetupNewComponentPage; begin - AncestorTypeLabel:=TLabel.Create(Self); with AncestorTypeLabel do begin - Name:='AncestorTypeLabel'; - Parent:=NewComponentPage; Caption:=lisA2PAncestorType; end; - AncestorComboBox:=TComboBox.Create(Self); with AncestorComboBox do begin - Name:='AncestorComboBox'; - Parent:=NewComponentPage; Text:=''; - OnCloseUp:=@AncestorComboBoxCloseUp; end; - AncestorShowAllCheckBox:=TCheckBox.Create(Self); with AncestorShowAllCheckBox do begin - Name:='AncestorShowAllCheckBox'; - Parent:=NewComponentPage; Text:=lisA2PShowAll; - Checked:=true; - OnClick:=@AncestorShowAllCheckBoxClick; end; - ClassNameLabel:=TLabel.Create(Self); with ClassNameLabel do begin - Name:='ClassNameLabel'; - Parent:=NewComponentPage; Caption:=lisA2PNewClassName; end; - ClassNameEdit:=TEdit.Create(Self); with ClassNameEdit do begin - Name:='ClassNameEdit'; - Parent:=NewComponentPage; Text:=''; - OnChange:=@ClassNameEditChange; end; - PalettePageLabel:=TLabel.Create(Self); with PalettePageLabel do begin - Name:='PalettePageLabel'; - Parent:=NewComponentPage; Caption:=lisA2PPalettePage; end; - PalettePageCombobox:=TCombobox.Create(Self); with PalettePageCombobox do begin - Name:='PalettePageCombobox'; - Parent:=NewComponentPage; Text:=''; end; - ComponentUnitFileLabel:=TLabel.Create(Self); with ComponentUnitFileLabel do begin - Name:='ComponentUnitFileLabel'; - Parent:=NewComponentPage; Caption:=lisA2PUnitFileName2; end; - ComponentUnitFileEdit:=TEdit.Create(Self); with ComponentUnitFileEdit do begin - Name:='ComponentUnitFileEdit'; - Parent:=NewComponentPage; Text:=''; end; - ComponentUnitFileBrowseButton:=TButton.Create(Self); with ComponentUnitFileBrowseButton do begin - Name:='ComponentUnitFileBrowseButton'; - Parent:=NewComponentPage; Caption:='...'; - OnClick:=@ComponentUnitFileBrowseButtonClick; ShowHint:=true; Hint:=lisA2PSaveFileDialog; - AutoSize:=true; end; - ComponentUnitFileShortenButton:=TButton.Create(Self); with ComponentUnitFileShortenButton do begin - Name:='ComponentUnitFileShortenButton'; - Parent:=NewComponentPage; Caption:='<>'; - OnClick:=@ComponentUnitFileShortenButtonClick; ShowHint:=true; Hint:=lisA2PShortenOrExpandFilename; - AutoSize:=true; end; - ComponentUnitNameLabel:=TLabel.Create(Self); with ComponentUnitNameLabel do begin - Name:='ComponentUnitNameLabel'; - Parent:=NewComponentPage; Caption:=lisA2PUnitName; end; - ComponentUnitNameEdit:=TEdit.Create(Self); with ComponentUnitNameEdit do begin - Name:='ComponentUnitNameEdit'; - Parent:=NewComponentPage; Text:=''; end; - NewComponentButton:=TButton.Create(Self); with NewComponentButton do begin - Name:='NewComponentButton'; - Parent:=NewComponentPage; Caption:=lisLazBuildOk; - OnClick:=@NewComponentButtonClick; - AutoSize:=true; end; - CancelNewComponentButton:=TButton.Create(Self); with CancelNewComponentButton do begin - Name:='CancelNewComponentButton'; - Parent:=NewComponentPage; Caption:=dlgCancel; - OnClick:=@CancelNewComponentButtonClick; - AutoSize:=true; end; end; procedure TAddToPackageDlg.SetupAddDependencyPage; begin - DependPkgNameLabel:=TLabel.Create(Self); with DependPkgNameLabel do begin - Name:='DependPkgNameLabel'; - Parent:=NewDependPage; Caption:=lisProjAddPackageName; end; - DependPkgNameComboBox:=TComboBox.Create(Self); with DependPkgNameComboBox do begin - Name:='DependPkgNameComboBox'; - Parent:=NewDependPage; Text:=''; end; - DependMinVersionLabel:=TLabel.Create(Self); with DependMinVersionLabel do begin - Name:='DependMinVersionLabel'; - Parent:=NewDependPage; Caption:=lisProjAddMinimumVersionOptional; end; - DependMinVersionEdit:=TEdit.Create(Self); with DependMinVersionEdit do begin - Name:='DependMinVersionEdit'; - Parent:=NewDependPage; Text:=''; end; - DependMaxVersionLabel:=TLabel.Create(Self); with DependMaxVersionLabel do begin - Name:='DependMaxVersionLabel'; - Parent:=NewDependPage; Caption:=lisProjAddMaximumVersionOptional; end; - DependMaxVersionEdit:=TEdit.Create(Self); with DependMaxVersionEdit do begin - Name:='DependMaxVersionEdit'; - Parent:=NewDependPage; Text:=''; end; - NewDependButton:=TButton.Create(Self); with NewDependButton do begin - Name:='NewDependButton'; - Parent:=NewDependPage; Caption:=lisLazBuildOk; - OnClick:=@NewDependButtonClick; - AutoSize:=true; end; - CancelDependButton:=TButton.Create(Self); with CancelDependButton do begin - Name:='CancelDependButton'; - Parent:=NewDependPage; Caption:=dlgCancel; - ModalResult:=mrCancel; - AutoSize:=true; end; end; @@ -1693,45 +1309,27 @@ procedure TAddToPackageDlg.SetupAddFilePage; var pft: TPkgFileType; begin - AddFilenameLabel:=TLabel.Create(Self); with AddFilenameLabel do begin - Name:='AddFilenameLabel'; - Parent:=AddFilePage; Caption:=lisA2PFileName; end; - AddFilenameEdit:=TEdit.Create(Self); with AddFilenameEdit do begin - Name:='AddFilenameEdit'; - Parent:=AddFilePage; Text:=lisA2PchooseAnExistingFile; end; - AddFileBrowseButton:=TButton.Create(Self); with AddFileBrowseButton do begin - Name:='AddFileBrowseButton'; - Parent:=AddFilePage; Caption:='...'; - OnClick:=@AddFileBrowseButtonClick; - AutoSize:=true; end; - AddFileShortenButton:=TButton.Create(Self); with AddFileShortenButton do begin - Name:='AddFileShortenButton'; - Parent:=AddFilePage; Caption:='<>'; - OnClick:=@AddFileShortenButtonClick; - AutoSize:=true; end; - AddFileTypeRadioGroup:=TRadioGroup.Create(Self); with AddFileTypeRadioGroup do begin - Name:='AddFileTypeRadioGroup'; - Parent:=AddFilePage; Caption:=lisAF2PFileType; with Items do begin BeginUpdate; + Clear; for pft:=Low(TPkgFileType) to High(TPkgFileType) do begin if pft=pftVirtualUnit then continue; Add(GetPkgFileTypeLocalizedName(pft)); @@ -1740,22 +1338,12 @@ begin end; end; - AddFileButton:=TButton.Create(Self); with AddFileButton do begin - Name:='AddFileButton'; - Parent:=AddFilePage; Caption:=lisLazBuildOk; - OnClick:=@AddFileButtonClick; - AutoSize:=true; end; - CancelAddFileButton:=TButton.Create(Self); with CancelAddFileButton do begin - Name:='CancelAddFileButton'; - Parent:=AddFilePage; Caption:=dlgCancel; - OnClick:=@CancelAddFileButtonClick; - AutoSize:=true; end; end; @@ -1763,66 +1351,29 @@ procedure TAddToPackageDlg.SetupAddFilesPage; var CurColumn: TListColumn; begin - FilesListView:=TListView.Create(Self); with FilesListView do begin - Name:='FilesListView'; - Parent:=AddFilesPage; - MultiSelect:=true; - ViewStyle:=vsReport; - CurColumn:=Columns.Add; + CurColumn:=Columns[0]; CurColumn.Width:=200; CurColumn.Caption:=lisA2PFilename2; - CurColumn:=Columns.Add; + CurColumn:=Columns[1]; CurColumn.Caption:=dlgEnvType; - Align:=alTop; end; - FilesBrowseButton:=TButton.Create(Self); with FilesBrowseButton do begin - Name:='FilesBrowseButton'; - Parent:=AddFilesPage; Caption:=lisPathEditBrowse; - OnClick:=@FilesBrowseButtonClick; - Left:=5; - AutoSize:=true; - Anchors:=Anchors-[akTop]+[akBottom]; - AnchorParallel(akBottom,5,Parent); end; - FilesShortenButton:=TButton.Create(Self); with FilesShortenButton do begin - Name:='FilesShortenButton'; - Parent:=AddFilesPage; Caption:=lisA2PSwitchPaths; - OnClick:=@FilesShortenButtonClick; - AutoSize:=true; - AnchorToNeighbour(akLeft,5,FilesBrowseButton); - AnchorParallel(akTop,0,FilesBrowseButton); end; - FilesDeleteButton:=TButton.Create(Self); with FilesDeleteButton do begin - Name:='FilesDeleteButton'; - Parent:=AddFilesPage; Caption:=dlgEdDelete; - OnClick:=@FilesDeleteButtonClick; - AutoSize:=true; - AnchorToNeighbour(akLeft,5,FilesShortenButton); - AnchorParallel(akTop,0,FilesBrowseButton); end; - FilesAddButton:=TButton.Create(Self); with FilesAddButton do begin - Name:='FilesAddButton'; - Parent:=AddFilesPage; Caption:=lisA2PAddFilesToPackage; - OnClick:=@FilesAddButtonClick; - AutoSize:=true; - AnchorToNeighbour(akLeft,5,FilesDeleteButton); - AnchorParallel(akTop,0,FilesBrowseButton); end; - - FilesListView.AnchorToNeighbour(akBottom,5,FilesBrowseButton); end; procedure TAddToPackageDlg.OnIterateComponentClasses(PkgComponent: TPkgComponent @@ -1964,30 +1515,6 @@ begin NewFileTreeView.EndUpdate; end; -constructor TAddToPackageDlg.Create(TheOwner: TComponent); -begin - inherited Create(TheOwner); - Name:='AddToPackageDlg'; - Caption:=lisA2PAddToPackage; - fPkgComponents:=TAVLTree.Create(@CompareIDEComponentByClassName); - fPackages:=TAVLTree.Create(@CompareLazPackageID); - Params:=TAddToPkgResult.Create; - Position:=poScreenCenter; - IDEDialogLayoutList.ApplyLayout(Self,500,300); - KeyPreview:=true; - OnKeyDown:=@AddToPackageDlgKeyDown; - SetupComponents; - OnClose:=@AddToPackageDlgClose; -end; - -destructor TAddToPackageDlg.Destroy; -begin - FreeAndNil(fPkgComponents); - FreeAndNil(fPackages); - FreeAndNil(Params); - inherited Destroy; -end; - procedure TAddToPackageDlg.UpdateAvailableAncestorTypes; var ANode: TAVLTreeNode; @@ -2085,5 +1612,8 @@ begin inherited Destroy; end; +initialization + {$I addtopackagedlg.lrs} + end. diff --git a/packager/packagesystem.pas b/packager/packagesystem.pas index f55cc10603..41a0b02da8 100644 --- a/packager/packagesystem.pas +++ b/packager/packagesystem.pas @@ -2671,7 +2671,7 @@ begin begin while (StartPos>1) and (Result[StartPos-1] in [' ',#9]) do dec(StartPos); - DebugLn(['TLazPackageGraph.ExtractCompilerParamsForBuildAll Removing: ',copy(Result,StartPos,EndPos-StartPos)]); + //DebugLn(['TLazPackageGraph.ExtractCompilerParamsForBuildAll Removing: ',copy(Result,StartPos,EndPos-StartPos)]); System.Delete(Result,StartPos,EndPos-StartPos); EndPos:=StartPos; end;